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

[STABLE-v2.2] Update rimage to version 02abc5d342a3, including critical openssl3 fix #9342

Merged
merged 1 commit into from
Aug 2, 2024

Conversation

marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented Jul 31, 2024

Fixes #9340

This adds the following commits from the main rimage branch:

commit 02abc5d342a3 ("rimage: ace signing functions need openssl 3.0 guards")
commit 73a9d7c897d3 ("rimage: fix openssl 3.0 support in ver25 signing")
commit 8ba3d1729656 ("adsp_config: fix name parsing error in parse_signed_pkg_ace_v1_5")
commit fe4dcaa62c13 ("mtl: Add ASRC module to the manifest")
commit af947cb63dd6 ("config: Add toml config for mtl")
commit c484d99abf89 ("rimage:  add ACE V1.5 handling")
commit 1b233f68bdee ("config: add rmb toml file to support rembrandt build")

This is the smallest main branch fast-forward that includes the critical openssl3 fix commit 73a9d7c ("rimage: fix openssl 3.0 support in ver25 signing") and compiles.

This happens to align the rimage version in stable-v2.2 to the version in stable-v2.3. stable-v2.3 is not in use anymore but it was routinely tested in CI for a long time. In fact this stable-v2.2 commit is the same as stable-v2.3 commit 4e1d3ba ("rimage: update to version 02abc5d")

Fixes thesofproject#9340

This adds the following commits from the main rimage branch:

```
commit 02abc5d ("rimage: ace signing functions need openssl 3.0 guards")
commit 73a9d7c ("rimage: fix openssl 3.0 support in ver25 signing")
commit 8ba3d17 ("adsp_config: fix name parsing error in parse_signed_pkg_ace_v1_5")
commit fe4dcaa ("mtl: Add ASRC module to the manifest")
commit af947cb ("config: Add toml config for mtl")
commit c484d99 ("rimage:  add ACE V1.5 handling")
commit 1b233f6 ("config: add rmb toml file to support rembrandt build")
```

This is the smallest main branch fast-forward that includes the critical
openssl3 fix commit 73a9d7c ("rimage: fix openssl 3.0 support in
ver25 signing") _and_ compiles.

This happens to align the rimage version in stable-v2.2 to the version
in stable-v2.3. stable-v2.3 is not in use anymore but it was routinely
tested in CI for a long time. In fact this stable-v2.2 commit is the
same as stable-v2.3 commit 4e1d3ba ("rimage: update to version 02abc5d")

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb marc-hb added bug Something isn't working as expected P1 Blocker bugs or important features labels Jul 31, 2024
@marc-hb marc-hb changed the title Update rimage to version 02abc5d342a3, including critical openssl3 fix [STABLE-v2.2] Update rimage to version 02abc5d342a3, including critical openssl3 fix Jul 31, 2024
@marc-hb marc-hb marked this pull request as ready for review July 31, 2024 18:33
@marc-hb
Copy link
Collaborator Author

marc-hb commented Jul 31, 2024

@plbossart
Copy link
Member

stable-2.2 should not have any support for ACE and MTL, I am confused here?

@marc-hb
Copy link
Collaborator Author

marc-hb commented Aug 1, 2024

stable-2.2 should not have any support for ACE and MTL, I am confused here?

Indeed not: here I'm trying NOT to create a new rimage branch and avoid cherry-picks to keep things simple. So this is just the smallest possible fast-forward on the old rimage main branch. This happens to pick up a couple irrelevant and harmless commits along the way.

@plbossart
Copy link
Member

stable-2.2 should not have any support for ACE and MTL, I am confused here?

Indeed not: here I'm trying NOT to create a new rimage branch and avoid cherry-picks to keep things simple. So this is just the smallest possible fast-forward on the old rimage main branch. This happens to pick up a couple irrelevant and harmless commits along the way.

ah ok, i thought those were cherry-picked. Thanks for the explanation.

@brentlu
Copy link
Contributor

brentlu commented Aug 2, 2024

The test result is promising. FW download success and HDA/DP playback and DMIC record also work.

=> current stable-v2.2
[ 7.692364] sof-audio-pci-intel-tgl 0000:00:1f.3: hda_cl_copy_fw: timeout with rom_status_reg (0x80000) read
[ 7.692775] sof-audio-pci-intel-tgl 0000:00:1f.3: ------------[ DSP dump start ]------------
[ 7.692778] sof-audio-pci-intel-tgl 0000:00:1f.3: Firmware download failed
[ 7.692779] sof-audio-pci-intel-tgl 0000:00:1f.3: fw_state: SOF_FW_BOOT_IN_PROGRESS (3)
[ 7.692794] sof-audio-pci-intel-tgl 0000:00:1f.3: 0x80000012: module: ROM, state: CSE_VALIDATE_IMAGE_REQUEST, not running
[ 7.692811] sof-audio-pci-intel-tgl 0000:00:1f.3: error code: 0x2c (error: signature verification failed)
[ 7.692828] sof-audio-pci-intel-tgl 0000:00:1f.3: extended rom status: 0x80000012 0x2c 0x0 0x0 0x0 0x0 0x256053e 0x0
[ 7.692830] sof-audio-pci-intel-tgl 0000:00:1f.3: ------------[ DSP dump end ]------------
[ 7.692912] sof-audio-pci-intel-tgl 0000:00:1f.3: Failed to start DSP
[ 7.692914] sof-audio-pci-intel-tgl 0000:00:1f.3: error: failed to boot DSP firmware -110
[ 7.743630] sof-audio-pci-intel-tgl 0000:00:1f.3: error: hda_dsp_core_reset_enter: timeout on HDA_DSP_REG_ADSPCS read
[ 7.743636] sof-audio-pci-intel-tgl 0000:00:1f.3: error: dsp core reset failed: core_mask 1
[ 8.380548] sof-audio-pci-intel-tgl 0000:00:1f.3: error: sof_probe_work failed err: -110

=> after patched:
[ 4.730057] sof-audio-pci-intel-tgl 0000:00:1f.3: Firmware info: version 2:2:10-159b6
[ 4.730065] sof-audio-pci-intel-tgl 0000:00:1f.3: Firmware: ABI 3:23:0 Kernel ABI 3:23:0
[ 4.730070] sof-audio-pci-intel-tgl 0000:00:1f.3: Firmware debug build 65535 on dtermin.-extman - options:

@marc-hb marc-hb merged commit 9e4dadc into thesofproject:stable-v2.2 Aug 2, 2024
20 of 22 checks passed
@marc-hb marc-hb deleted the rimage-ssl-22 branch August 2, 2024 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working as expected P1 Blocker bugs or important features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants