Skip to content

[stable-2.7] west.yml: update Zephyr to sofproject stable-v2.7#8353

Merged
kv2019i merged 4 commits intothesofproject:stable-v2.7from
kv2019i:202310-sof27-backport-8236-fix-to-zephyr
Oct 25, 2023
Merged

[stable-2.7] west.yml: update Zephyr to sofproject stable-v2.7#8353
kv2019i merged 4 commits intothesofproject:stable-v2.7from
kv2019i:202310-sof27-backport-8236-fix-to-zephyr

Conversation

@kv2019i
Copy link
Copy Markdown
Collaborator

@kv2019i kv2019i commented Oct 19, 2023

commit 335c51b (HEAD -> stable-v2.7)
Author: Kai Vehmanen kai.vehmanen@linux.intel.com
Date: Thu Oct 19 17:59:52 2023 +0300

versions.json: bump version to 2.7.1

Set version to 2.7.1 as we start merging bugfixes.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

commit f6b74af
Author: Kai Vehmanen kai.vehmanen@linux.intel.com
Date: Thu Oct 19 17:56:49 2023 +0300

west.yml: update Zephyr to sofproject stable-v2.7

Update Zephyr to use thesofproject/zephyr/stable-v2.7 with
following one commit backported from Zephyr main.

3c58926487eb drivers: dma: intel-adsp-hda: Correct DGCS:SCS bit for

Link: https://github.com/thesofproject/sof/issues/8236
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

@kv2019i kv2019i requested a review from mengdonglin October 19, 2023 14:59
@kv2019i kv2019i requested a review from marc-hb October 19, 2023 15:00
@keqiaozhang
Copy link
Copy Markdown
Collaborator

keqiaozhang commented Oct 20, 2023

SOFCI TEST

@kv2019i kv2019i requested a review from jsarha October 20, 2023 10:50
@kv2019i kv2019i requested a review from abonislawski October 20, 2023 11:17
jsarha
jsarha approved these changes Oct 20, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@jsarha jsarha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least the FW still builds with this PR after west update, and the back-ported Peter's DMA fix commit is on top of Zephyr repository.

@lgirdwood
Copy link
Copy Markdown
Member

lgirdwood commented Oct 20, 2023

@kv2019i I assume we are expecting the CI failures if CI is expecting to target config from main branch ?

@marc-hb marc-hb mentioned this pull request Oct 20, 2023
Merged
marc-hb
marc-hb previously requested changes Oct 20, 2023
View reviewed changes
Copy link
Copy Markdown
Collaborator

@marc-hb marc-hb left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kv2019i I assume we are expecting the CI failures if CI is expecting to target config from main branch ?

Yes and no.

- Yes the "zmain" builds are expected to fail because there's not a chance SOF stable-v2.7 compiles with the fast moving Zephyr main branch. Good news: I just removed that combination in #8368 (@dbaluta you want to cherry-pick -x that to imx-stable-v2.7)

- No the manifest (mnfst) builds are NOT expected to fail! They did not fail at all in recent stable-v2.7 PRs #8225 and #8368. This is happening only with this PR, so there's something wrong with it. Looking into it.
https://github.com/thesofproject/sof/actions/runs/6576490892/job/17866031229?pr=8353

fatal: 'zephyrproject' does not appear to be a git repository

marc-hb added a commit to marc-hb/sof that referenced this pull request Oct 20, 2023
@marc-hb
.github/zephyr: de-hardcode the name of the zephyr remote
201871b 
Fixes issue reported in stable-v2.7 thesofproject#8353 which wants to use our own,
downstream Zephyr branch.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb marc-hb mentioned this pull request Oct 20, 2023
Merged
@marc-hb
Copy link
Copy Markdown
Collaborator

marc-hb commented Oct 20, 2023

No the manifest (mnfst) builds are NOT expected to fail! They did not fail at all in recent stable-v2.7 PRs #8225 and #8368. This is happening only with this PR, so there's something wrong with it. Looking into it.

De-hardcoding fix submitted in #8369, please cherry-pick -x here after it's merged.

@marc-hb
Copy link
Copy Markdown
Collaborator

marc-hb commented Oct 20, 2023 •
edited
Loading

Sparse failure in https://github.com/thesofproject/sof/actions/runs/6576490890/job/17866025157?pr=8353. I suspect it's caused the only commit (so far) on this branch from @ujfalusi : 3c58926487ebef001e. It looks like this cherry-pick was pushed without any PR!

EDIT: I'm an idiot. This is exactly what this PR does. Fix submitted in:

/zep_workspace/zephyr/drivers/dma/dma_intel_adsp_hda.c:184:17: error: typename in expression
/zep_workspace/zephyr/drivers/dma/dma_intel_adsp_hda.c:184:26: error: Expected ; at end of statement
/zep_workspace/zephyr/drivers/dma/dma_intel_adsp_hda.c:184:26: error: got rp
/zep_workspace/zephyr/drivers/dma/dma_intel_adsp_hda.c:193:17: error: typename in expression
/zep_workspace/zephyr/drivers/dma/dma_intel_adsp_hda.c:193:26: error: Expected ; at end of statement
/zep_workspace/zephyr/drivers/dma/dma_intel_adsp_hda.c:193:26: error: got wp
/zep_workspace/zephyr/drivers/dma/dma_intel_adsp_hda.c:184:17: error: undefined identifier 'uint32_t'
/zep_workspace/zephyr/drivers/dma/dma_intel_adsp_hda.c:185:37: error: undefined identifier 'rp'
/zep_workspace/zephyr/drivers/dma/dma_intel_adsp_hda.c:193:17: error: undefined identifier 'uint32_t'
/zep_workspace/zephyr/drivers/dma/dma_intel_adsp_hda.c:194:37: error: undefined identifier 'wp'

@marc-hb marc-hb mentioned this pull request Oct 20, 2023
Merged
@kv2019i kv2019i force-pushed the 202310-sof27-backport-8236-fix-to-zephyr branch from 335c51b to 0e61eb3 Compare October 23, 2023 11:00
@kv2019i kv2019i requested a review from marc-hb October 23, 2023 14:39
@kv2019i
Copy link
Copy Markdown
Collaborator Author

kv2019i commented Oct 23, 2023 •
edited
Loading

@marc-hb Can you recheck? given the pr-fw-build works ok, I'd be inclined to proceed with merge of this (and not wait for #8369 ).

UPDATE: or, it seems 8369 got enough reviews, so let me cherry-pick that as well.

kv2019i pushed a commit that referenced this pull request Oct 23, 2023
@marc-hb @kv2019i
.github/zephyr: de-hardcode the name of the zephyr remote
4bc6488 
Fixes issue reported in stable-v2.7 #8353 which wants to use our own,
downstream Zephyr branch.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@kv2019i kv2019i force-pushed the 202310-sof27-backport-8236-fix-to-zephyr branch from 0e61eb3 to 866d0b3 Compare October 23, 2023 14:56
@kv2019i kv2019i requested a review from cujomalainey as a code owner October 23, 2023 14:56
marc-hb and others added 3 commits October 23, 2023 17:58
@marc-hb @kv2019i
.github/zephyr: de-hardcode the name of the zephyr remote
b9c2366 
Fixes issue reported in stable-v2.7 thesofproject#8353 which wants to use our own,
downstream Zephyr branch.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
(cherry picked from commit 4bc6488)
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@marc-hb @kv2019i
.github/zephyr: time some fetch commands
866d0b3 
GitHub conveniently times each step but to reduce step proliferation we
sometimes have multiple commands in a single step and lose the ability
to time download commands. Prefix them with `time` to restore the data.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
(cherry picked from commit 92fa795)
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
west.yml: update Zephyr to sofproject stable-v2.7
3b6eda2 
Update Zephyr to use thesofproject/zephyr/stable-v2.7 with
following commits backported from Zephyr main.

3c58926487eb drivers: dma: intel-adsp-hda: Correct DGCS:SCS bit for
feaa6281b7fc drivers: hda: insert an empty ";" statement before

Link: thesofproject#8236
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
versions.json: bump version to 2.7.1
bb0e972 
Set version to 2.7.1 as we start merging bugfixes.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
Copy link
Copy Markdown
Collaborator Author

kv2019i commented Oct 23, 2023

Screwed up the N-1 update, but latest one is now good. The windows build tests fail, but I believe this is something we fixed in main, right? Otherwise this should be good to go now.

@marc-hb
Copy link
Copy Markdown
Collaborator

marc-hb commented Oct 23, 2023

The windows build tests fail, but I believe this is something we fixed in main, right?

Only now, sorry I missed Windows duplication the first time:

@kv2019i
Copy link
Copy Markdown
Collaborator Author

kv2019i commented Oct 25, 2023

@marc-hb @wszypelt The TGL QB tests are failing due to rimage option problem. The resulting binary is a TGL IPC4 binary. but rimage uses IPC3 toml config, so resulting binary is not valid and will not boot. I'll proceed to merge this PR, and will submit a follow-up PR to enable testing TGL on this stable branch as well.

@kv2019i kv2019i merged commit 4d3db0d into thesofproject:stable-v2.7 Oct 25, 2023
kv2019i pushed a commit that referenced this pull request Oct 25, 2023
@marc-hb @kv2019i
.github/zephyr: de-hardcode the name of the zephyr remote
b3371ec 
Fixes issue reported in stable-v2.7 #8353 which wants to use our own,
downstream Zephyr branch.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
(cherry picked from commit 4bc6488)
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jsarha jsarha jsarha approved these changes

@lgirdwood lgirdwood lgirdwood approved these changes

@singalsu singalsu singalsu approved these changes

@mengdonglin mengdonglin Awaiting requested review from mengdonglin

@plbossart plbossart Awaiting requested review from plbossart plbossart is a code owner

@mmaka1 mmaka1 Awaiting requested review from mmaka1 mmaka1 is a code owner

@lbetlej lbetlej Awaiting requested review from lbetlej lbetlej is a code owner

@dbaluta dbaluta Awaiting requested review from dbaluta dbaluta is a code owner

@abonislawski abonislawski Awaiting requested review from abonislawski

@marc-hb marc-hb Awaiting requested review from marc-hb marc-hb is a code owner

@cujomalainey cujomalainey Awaiting requested review from cujomalainey

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@kv2019i @keqiaozhang @lgirdwood @marc-hb @jsarha @singalsu