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

arch/risc-v/src/mpfs/mpfs_plic.c: Fix error introduced by earlier commit which added spinlocks #361

Merged
merged 1 commit into from
Feb 21, 2025

Conversation

jlaitine
Copy link

This issue is only present in our current version of NuttX, and is related to broken "global" spinlock "spin_lock_irqsave(NULL)". This is no longer present in upstream NuttX.

Still, change modifyreg32 calls to putreg32(getreg32...)... as we are anyway inside our own spinlock so calling modifyreg32 is useless in these cases - fixing the deadlocking issue in SMP with this older NuttX version at the same.

Copy link

@pussuw pussuw left a comment

Choose a reason for hiding this comment

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

I presume you should add a tag like [REMOVEME] since this is just not compatible with the upstream version at all and should be dropped when the next upstream rebase is made ?

@jlaitine
Copy link
Author

jlaitine commented Feb 21, 2025

I presume you should add a tag like [REMOVEME] since this is just not compatible with the upstream version at all and should be dropped when the next upstream rebase is made ?

I was planning to just upstream one patch with all 3, where also this is squashed - i.e. creae a confilict. Will add [REMOVEME] to this one

@jlaitine jlaitine force-pushed the fix_deadlock_in_mpfs_plic branch from df8145e to be636ae Compare February 21, 2025 09:00
@jlaitine jlaitine closed this Feb 21, 2025
@jlaitine jlaitine reopened this Feb 21, 2025
…earlier commit which added spinlocks

Signed-off-by: Jukka Laitinen <[email protected]>
@jlaitine jlaitine force-pushed the fix_deadlock_in_mpfs_plic branch from be636ae to d5f52b6 Compare February 21, 2025 09:22
@jlaitine
Copy link
Author

Only changed the commit message

@jlaitine jlaitine merged commit 2c05df4 into master Feb 21, 2025
7 checks passed
@jlaitine jlaitine deleted the fix_deadlock_in_mpfs_plic branch February 21, 2025 09:24
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.

2 participants