Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sof-firmware: 1.4.2 -> 1.5.1 #89957

Merged
merged 1 commit into from Jun 15, 2020
Merged

Conversation

evenbrenden
Copy link
Contributor

Motivation for this change

Update stable version and change source repo from https://www.alsa-project.org/files/pub/misc/sof/ to https://github.com/thesofproject/sof-bin.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@evenbrenden
Copy link
Contributor Author

https://www.alsa-project.org/files/pub/misc/sof/ is deprecated and replaced by https://github.com/thesofproject/sof-bin. However, it's "(...) still very much WiP and may churn a little until things settle down", so I'm not sure about this change.

In the stable-1.4.2 branch, there's a go.sh script that handles installation. The same file is not (yet) implemented in the stable-1.5 branch, but as far as I can tell, the exact same script works with version 1.5. Therefore, I inlined the contents of the 1.4.2 script in the installPhase verbatim (except for the part that removes any old version). When the install script in the version 1.5 branch is updated, we could just call that instead. Or use our own - not sure what is preferred.

@lblasc
Copy link
Contributor

lblasc commented Jun 10, 2020

Just booted my x1 carbon gen 7 with new firmware, it works normally:

[    7.345822] sof-audio-pci 0000:00:1f.3: use msi interrupt mode
[    7.371687] sof-audio-pci 0000:00:1f.3: hda codecs found, mask 5
[    7.371689] sof-audio-pci 0000:00:1f.3: using HDA machine driver skl_hda_dsp_generic now
[    7.373705] sof-audio-pci 0000:00:1f.3: unexpected ipc interrupt raised!
[    7.373706] sof-audio-pci 0000:00:1f.3: error: no reply expected, received 0x0
[    7.476532] sof-audio-pci 0000:00:1f.3: Firmware info: version 1:5:0-7e6cd
[    7.476534] sof-audio-pci 0000:00:1f.3: Firmware: ABI 3:16:0 Kernel ABI 3:12:0
[    7.476534] sof-audio-pci 0000:00:1f.3: warn: FW ABI is more recent than kernel
[    7.476866] sof-audio-pci 0000:00:1f.3: warning: unknown ext header type 3 size 0x1c
[    7.476883] sof-audio-pci 0000:00:1f.3: warning: unknown ext header type 4 size 0x10
[    7.476902] sof-audio-pci 0000:00:1f.3: firmware boot complete

With same errors like before ( error: no reply expected, received 0x0 ), dmic works normally (like before).

I'm happy with the patch, hope they will add go.sh next time we will do update.

Thanks!

@evenbrenden
Copy link
Contributor Author

Yeah I was hoping for some improvements on the X1 Carbon Gen 7 too, but it's pretty much the same :) Nevertheless, I don't see a reason not to update.

I see that there's a pending PR for a generic install script, maybe it's right around the corner.

@lblasc
Copy link
Contributor

lblasc commented Jun 12, 2020

I've updated to kernel 5.7.1 - now this boring error is gone ( error: no reply expected, received 0x0 )

@evenbrenden evenbrenden changed the title sof-firmware: 1.4.2 -> 1.5 sof-firmware: 1.4.2 -> 1.5.1 Jun 14, 2020
@evenbrenden
Copy link
Contributor Author

Upped version to 1.5.1. Using the supplied installation script.

@ofborg ofborg bot requested a review from lblasc June 14, 2020 08:20
@lblasc
Copy link
Contributor

lblasc commented Jun 14, 2020

@evenbrenden thx. Can you please squash your changes into single commit ?

@lblasc
Copy link
Contributor

lblasc commented Jun 15, 2020

pinging random people.. @Mic92 can you maybe merge this ?

@Mic92 Mic92 merged commit 85baf71 into NixOS:master Jun 15, 2020
@evenbrenden evenbrenden deleted the sof-firmware-v1.5 branch June 16, 2020 06:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants