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

Update ROCK 4 features #118

Merged
merged 2 commits into from
May 10, 2023
Merged

Update ROCK 4 features #118

merged 2 commits into from
May 10, 2023

Conversation

RadxaYuntian
Copy link
Member

  • Disable UART2 since FIQ Debugger is already enabled.
  • Add SPI flash info for XT25F32B, which is used on ROCK 4.

@RadxaYuntian
arm64: dts: rock-4: disable uart2
1389013 
Fixes warning of "uart2 is enabled, please disable it" since fiq-debugger
is enabled in rk3399-linux.dtsi.

Signed-off-by: Yuntian Zhang <[email protected]>
@RadxaYuntian RadxaYuntian requested a review from RadxaStephen May 10, 2023 12:23
@RadxaYuntian
mtd: spi-nor: add flash info for XT25F32B
bc5be9e 
This is used on ROCK 4.

Signed-off-by: Yuntian Zhang <[email protected]>
@RadxaStephen RadxaStephen merged commit eacef30 into radxa:linux-5.10-gen-rkr3.4 May 10, 2023
@RadxaYuntian RadxaYuntian mentioned this pull request May 18, 2023
Closed
ruiqurm pushed a commit to BUPT-OS/radxa-kernel that referenced this pull request Jan 7, 2025
@pgerum @ruiqurm
Revert "evl/thread: remove useless dynamic lock key"
1c72718 
This reverts commit 5ae263a6ca027c4b79c4dfacfcf4eca8209eefd0, because
disambiguating the per-thread lock is not as useless as it seemed at
first.

Fixes this regression when CONFIG_DEBUG_HARD_SPINLOCKS is on:

[   52.090120]
[   52.090129] ============================================
[   52.090134] WARNING: possible recursive locking detected
[   52.090139] 5.10.199-00830-g18654c202dd6 radxa#118 Not tainted
[   52.090143] --------------------------------------------
[   52.090147] monitor-dlk-A:4/493 is trying to acquire lock:
[   52.090152] c34a7010 (__RAWLOCK(&thread->lock)){-.-.}-{0:0}, at: evl_lock_mutex_timeout+0x4e0/0x870
[   52.090169]
[   52.090173] but task is already holding lock:
[   52.090176] c34a5810 (__RAWLOCK(&thread->lock)){-.-.}-{0:0}, at: evl_lock_mutex_timeout+0x4e0/0x870
[   52.090192]
[   52.090195] other info that might help us debug this:
[   52.090199]  Possible unsafe locking scenario:
[   52.090202]
[   52.090205]        CPU0
[   52.090208]        ----
[   52.090211]   lock(__RAWLOCK(&thread->lock));
[   52.090221]   lock(__RAWLOCK(&thread->lock));
[   52.090229]
[   52.090233]  *** DEADLOCK ***
[   52.090235]
[   52.090239]  May be due to missing lock nesting notation
[   52.090242]
[   52.090246] 2 locks held by monitor-dlk-A:4/493:
[   52.090249]  #0: c2d030d4 (&mon->mutex){....}-{0:0}, at: evl_lock_mutex_timeout+0x104/0x870
[   52.090267]  radxa#1: c34a5810 (__RAWLOCK(&thread->lock)){-.-.}-{0:0}, at: evl_lock_mutex_timeout+0x4e0/0x870

Signed-off-by: Philippe Gerum <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RadxaStephen RadxaStephen Awaiting requested review from RadxaStephen

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@RadxaYuntian @RadxaStephen