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.

Sign up for GitHub

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

Jump to bottom

Some Xtensa cores do not support NMI #67859

Merged
merged 1 commit into from
Feb 28, 2024
Merged

Some Xtensa cores do not support NMI #67859

merged 1 commit into from
Feb 28, 2024

Conversation

rysiof
Copy link
Contributor

@rysiof rysiof commented Jan 19, 2024

Some Xtensa cores do not support NMI, so XCHAL_HAVE_NMI=0 and XCHAL_NMILEVEL won't be defined at all causing arch/xtensa/include/xtensa-asm2-s.h` to throw compilation error.

Fixes: #67855

@zephyrbot zephyrbot added the area: Xtensa Xtensa Architecture label Jan 19, 2024
@rysiof
Copy link
Contributor Author

rysiof commented Jan 19, 2024

NOTE: this is for main branch

dcpleung
dcpleung previously approved these changes Jan 19, 2024
View reviewed changes
ceolin
ceolin reviewed Jan 22, 2024
View reviewed changes
Copy link
Member

@ceolin ceolin left a comment

Choose a reason for hiding this comment

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

Shouldn't other places using XCHAL_NMILEVEL be changed too ?

@rysiof rysiof force-pushed the fix_xtensa_no_nmi_main branch 2 times, most recently from c8026a2 to 4d70cc1 Compare January 24, 2024 17:06
@rysiof rysiof force-pushed the fix_xtensa_no_nmi_main branch from 4d70cc1 to a08b076 Compare January 24, 2024 17:08
@rysiof
Copy link
Contributor Author

rysiof commented Jan 24, 2024

per @ceolin feedback, I've added fixes in other places (userspace.S, vector_handlers.c)

andyross
andyross previously approved these changes Jan 24, 2024
View reviewed changes
Copy link
Contributor

@andyross andyross left a comment

Choose a reason for hiding this comment

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

Still good with me. Is the device in question likely to be upstreamed soon? (As mentioned before, the mt8195 DSP has the same issue -- no NMI level exists)

ceolin
ceolin previously approved these changes Jan 24, 2024
View reviewed changes
@rysiof rysiof force-pushed the fix_xtensa_no_nmi_main branch from a08b076 to 4a14acc Compare January 24, 2024 17:41
@rysiof
Copy link
Contributor Author

rysiof commented Jan 24, 2024

Updated title. My apologies, those are my first changes and it takes me a while to adjust to new requirements on workflow

dcpleung
dcpleung previously approved these changes Jan 24, 2024
View reviewed changes
@dcpleung
Copy link
Member

dcpleung commented Feb 2, 2024

Please fix the compliance check errors.

@nashif
xtensa: add support for cores without NMI
b96d0c1 
Some Xtensa cores do not support NMI, so XCHAL_HAVE_NMI=0 and
XCHAL_NMILEVEL won't be defined at all causing
arch/xtensa/include/xtensa-asm2-s.h to throw compilation error.

Fixes: zephyrproject-rtos#67855

Signed-off-by: Maciej Kusio <[email protected]>
Signed-off-by: Anas Nashif <[email protected]>
@nashif nashif force-pushed the fix_xtensa_no_nmi_main branch from 4a14acc to b96d0c1 Compare February 28, 2024 13:28
@fabiobaltieri
Copy link
Member

This branch cannot be rebased due to too many changes

Looks like this needs a rebase now.

@fabiobaltieri
Copy link
Member

...wait I see that on all commits, github issue I guess

@nashif nashif changed the base branch from main to v3.6-branch February 28, 2024 17:32
@nashif nashif changed the base branch from v3.6-branch to main February 28, 2024 17:33
@nashif nashif dismissed stale reviews from dcpleung, ceolin, and andyross February 28, 2024 17:33

The base branch was changed.

@fabiobaltieri fabiobaltieri merged commit 352b50b into zephyrproject-rtos:main Feb 28, 2024
17 checks passed
@github-actions GitHub Actions
Copy link

Hi @rysiof!
Congratulations on getting your very first Zephyr pull request merged 🎉🥳. This is a fantastic achievement, and we're thrilled to have you as part of our community!

To celebrate this milestone and showcase your contribution, we'd love to award you the Zephyr Technical Contributor badge. If you're interested, please claim your badge by filling out this form: Claim Your Zephyr Badge.

Thank you for your valuable input, and we look forward to seeing more of your contributions in the future! 🪁

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nashif nashif nashif approved these changes

@fabiobaltieri fabiobaltieri fabiobaltieri approved these changes

@andyross andyross andyross left review comments

@ceolin ceolin ceolin left review comments

@dcpleung dcpleung dcpleung left review comments

@erwango erwango Awaiting requested review from erwango

@anangl anangl Awaiting requested review from anangl

@mniestroj mniestroj Awaiting requested review from mniestroj

@FRASTM FRASTM Awaiting requested review from FRASTM

@aaillet aaillet Awaiting requested review from aaillet

@gmarull gmarull Awaiting requested review from gmarull

@uLipe uLipe Awaiting requested review from uLipe

@GTLin08 GTLin08 Awaiting requested review from GTLin08

@fkokosinski fkokosinski Awaiting requested review from fkokosinski

@kgugala kgugala Awaiting requested review from kgugala

@de-nordic de-nordic Awaiting requested review from de-nordic

@teburd teburd Awaiting requested review from teburd

@abonislawski abonislawski Awaiting requested review from abonislawski

@kv2019i kv2019i Awaiting requested review from kv2019i

@marcinszkudlinski marcinszkudlinski Awaiting requested review from marcinszkudlinski

@alwa-nordic alwa-nordic Awaiting requested review from alwa-nordic

@jhedberg jhedberg Awaiting requested review from jhedberg

@Vudentz Vudentz Awaiting requested review from Vudentz

@MulinChao MulinChao Awaiting requested review from MulinChao

@ChiHuaL ChiHuaL Awaiting requested review from ChiHuaL

@ABOSTM ABOSTM Awaiting requested review from ABOSTM

@mmahadevan108 mmahadevan108 Awaiting requested review from mmahadevan108

@dleach02 dleach02 Awaiting requested review from dleach02

@lixuzha lixuzha Awaiting requested review from lixuzha

@qianruh qianruh Awaiting requested review from qianruh

@soburi soburi Awaiting requested review from soburi

@henrikbrixandersen henrikbrixandersen Awaiting requested review from henrikbrixandersen

@carlescufi carlescufi Awaiting requested review from carlescufi

Assignees

@dcpleung dcpleung

Labels
area: Xtensa Xtensa Architecture
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

No support for Xtensa cores with no NMI
7 participants
@rysiof @dcpleung @fabiobaltieri @nashif @andyross @ceolin @zephyrbot