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

rockchip64-edge: bump to 6.12 #7447

Merged
merged 3 commits into from
Nov 9, 2024
Merged

Conversation

amazingfate
Copy link
Contributor

Description

rebase patches to 6.12-rc6. I delete rockchip64-6.11 to make the changes more readable by git

  • Some patches merged upstream are deleted
  • rk3399-opp.dtsi is deleted, so I delete it in our board patches
  • add patch 0001-tools-disable-sched_ext_clean.patch to make kernel build success

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.

  • ./compile.sh kernel BOARD=orangepi3b BRANCH=edge DEB_COMPRESS=xz KERNEL_CONFIGURE=no KERNEL_GIT=shallow
  • tested with rk3566 orangepi3b

Checklist:

Please delete options that are not relevant.

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

@github-actions github-actions bot added size/large PR with 250 lines or more Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Nov 6, 2024
@EvilOlaf
Copy link
Member

EvilOlaf commented Nov 6, 2024

Does not boot on Radxa Rock-3A
UART dump 6.12: https://paste.armbian.de/oxivuzuqip.yaml
I checked the blkid and it was correct.

Working 6.11.y: https://paste.armbian.com/paculacagu

Same board, same PSU, same microSD card

Hm must have been a fluke or rewriting the kernel config into 6.12 helped.
https://paste.armbian.com/hepebaheca

@EvilOlaf
Copy link
Member

EvilOlaf commented Nov 6, 2024

build&boot on Nanopi R4s (RK3399): https://paste.armbian.com/hoviyuyuci

@EvilOlaf
Copy link
Member

EvilOlaf commented Nov 6, 2024

And just for good measure the same with mainline 2024.10 uboot :)
https://paste.armbian.de/vuximavavu.sql

@amazingfate
Copy link
Contributor Author

@EvilOlaf What't the output when setting verbosity=7 in /boot/armbianEnv.txt?
opi3b works fine, and the difference between rk3566 and rk3568 after 6.12 is that rk3568 has rng node enabled in devicetree. We have a patch of downstream rng driver, I have pushed a commit to delete this patch.

@EvilOlaf
Copy link
Member

EvilOlaf commented Nov 7, 2024

Rock 3A also works fine. As stated must have been some sort of fluke. The board is acting weird anyways. Maybe hw defect. Needed multiple power cycles until it recognized the sd properly.

With rng patches removed:
✅ Rock 3A UART: https://paste.armbian.de/ifunupafey.yaml with verbosity
✅ Zero 3E armbianmonitor -u: https://paste.armbian.com/igenuhekiq

@EvilOlaf
Copy link
Member

EvilOlaf commented Nov 7, 2024

With rng patches removed:
✅ Zero 3E UART: https://paste.armbian.de/idaxuledow.yaml with verbosity
✅ Zero 3E armbianmonitor -u: https://paste.armbian.com/eqoyizikal

@amazingfate
Copy link
Contributor Author

Deletion of rockchip64-6.11 has broken a linked patch patch/kernel/archive/rockchip-rk3588-6.11/0027-RK3588-Add-rkvdec2-Support-v3.patch. Fortunate that this patch has not changed in 6.12, so update the symlink to rockchip64-6.12/media-0001-Add-rkvdec2-Support-v3.patch
Tested with ./compile.sh kernel BOARD=rock-5b BRANCH=edge DEB_COMPRESS=xz KERNEL_CONFIGURE=no KERNEL_GIT=shallow, and on rock5b rkvdec2 driver works.

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 11 Milestone: Fourth quarter release labels Nov 9, 2024
@igorpecovnik igorpecovnik merged commit 8db8e19 into armbian:main Nov 9, 2024
11 checks passed
@paolosabatino
Copy link
Contributor

Hello, did a quick check on a rk3328 device and the 6.12 kernel boots without issues, I'll give an eye on rk3399 too.

BTW, I got rc2 instead of rc6 (uname: 6.12.0-rc2-edge-rockchip64), wondering why...

@amazingfate
Copy link
Contributor Author

Mainline 6.12 is defined rc2 now. I did the rebase on top of rc6 and it seems fine.

@paolosabatino
Copy link
Contributor

@amazingfate ok got it, thanks for the clarification and thanks for the work.
In the meantime I quickly checked on rk3399 (Opi4Lts), and the board boots and works ok. There is a warning/kernel dump due to infamous uwe5562 driver, but functionality is not invested.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
11 Milestone: Fourth quarter release Hardware Hardware related like kernel, U-Boot, ... Needs review Seeking for review Patches Patches related to kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/large PR with 250 lines or more
Development

Successfully merging this pull request may close these issues.

4 participants