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

rockchip64-edge: bump to 6.14 #7835

Merged
merged 7 commits into from
Feb 26, 2025
Merged

rockchip64-edge: bump to 6.14 #7835

merged 7 commits into from
Feb 26, 2025

Conversation

amazingfate
Copy link
Contributor

Description

  • Rebase patches based on 6.14-rc2
  • Update some wifi driver code because there is a cfg80211 api change since 6.14: torvalds/linux@7a53af8
  • Add patch to remove pci_clean in tools because pci is moved to selftest: torvalds/linux@e19bde2

I just make to build success. I will test the kernel on boards later.

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=rock-5-itx BRANCH=edge KERNEL_GIT=shallow

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

@amazingfate amazingfate requested review from a team and igorpecovnik as code owners February 16, 2025 10:10
@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, ... Framework Framework components Patches Patches related to kernel, U-Boot, ... labels Feb 16, 2025
@amazingfate amazingfate mentioned this pull request Feb 16, 2025
Closed
6 tasks
@amazingfate amazingfate changed the title [WIP]rockchip64-edge: bump to 6.14 rockchip64-edge: bump to 6.14 Feb 16, 2025
@amazingfate
Copy link
Contributor Author

Tested with:

  • armsom sige7(rk3588)
  • rock 3a(rk3568)

@EvilOlaf
Copy link
Member

Oh wow, so I was actually right removing this from the Makefile with my own tests. Just didn't know why. Awesome.

@amazingfate
Copy link
Contributor Author

Oh wow, so I was actually right removing this from the Makefile with my own tests. Just didn't know why. Awesome.

I just sent a mail to the patch list: https://lore.kernel.org/all/20250217045910.102934-1-liujianfeng1994@gmail.com/
Hope we can get rid of this patch in our tree when 6.14 is finally released.

@EvilOlaf
Copy link
Member

Tested with Orange Pi 5: https://paste.next.armbian.com/miyigiseya

@amazingfate
Copy link
Contributor Author

After introducing vop mode improvment patch for hdmi1, all rk3588 boards that have only one hdmi port enabled are broken. I'm discussing with the patch author to see which way to fix:
https://lore.kernel.org/all/20250218033846.1251897-1-liujianfeng1994@gmail.com/

@amazingfate amazingfate mentioned this pull request Feb 18, 2025
Merged
This was referenced Feb 18, 2025
Closed
Merged
@palachzzz
Copy link
Contributor

BTW, bcmdhd-dkms is failing to build with that.

@EvilOlaf
Copy link
Member

BTW, bcmdhd-dkms is failing to build with that.

logs?

@palachzzz
Copy link
Contributor 

curl --data-binary output/logs/log-build-2d6e6b31-d707-4485-86ac-3c2d5a96f79c.log.ans https://paste.armbian.com/log
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Error</title>
</head>
<body>
<pre>Cannot POST /log</pre>
</body>
</html>

Is there any highlight why it is so?

(need to remove .log at the end)
log-build-2d6e6b31-d707-4485-86ac-3c2d5a96f79c.log.ans.log

@EvilOlaf
Copy link
Member

.com paste seems broken. Try .de or .eu

@EvilOlaf
Copy link
Member

Can you try to get hold of the log file mentioned? /var/lib/dkms/bcmdhd-sdio/101.10.591.52.27-3/build/make.log

@palachzzz
Copy link
Contributor

It seems it is cleaned up after failure

@rpardini
Copy link
Member

rpardini commented Feb 21, 2025 •
edited
Loading

Can you try to get hold of the log file mentioned? /var/lib/dkms/bcmdhd-sdio/101.10.591.52.27-3/build/make.log

It seems it is cleaned up after failure

Yes, it dies with the rest of the chroot. I've added long ago code to dump the contents of the dkms log, as you can see here

https://github.com/armbian/build/blob/main/extensions/bcmdhd.sh#L43-L45

but seems it is simply not working. I will try to reproduce your build and fix it

@paolosabatino
Copy link
Contributor

Quick check against a rk3318 tv box and rk3399 Orange PI 4 LTS, both boards boot and dmesg is clean is enough 👍

SuperKali
SuperKali approved these changes Feb 24, 2025
View reviewed changes
Copy link
Member

@SuperKali SuperKali left a comment

Choose a reason for hiding this comment

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

All work as expected 😊

EvilOlaf
EvilOlaf approved these changes Feb 25, 2025
View reviewed changes
Copy link
Member

@EvilOlaf EvilOlaf 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.

Re-tested Orangepi5 with full Gnome desktop on Bookworm with backported mesa. Works great!

@palachzzz
Copy link
Contributor

Re-tested with 6.14-rc4, works fine, including bcmdhd.
Is the understanding when it could be merged?

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 05 Milestone: Second quarter release and removed Needs review Seeking for review labels Feb 26, 2025
@amazingfate amazingfate merged commit db3615f into armbian:main Feb 26, 2025
13 checks passed
@JohnTheCoolingFan JohnTheCoolingFan mentioned this pull request Feb 28, 2025
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iav iav

@EvilOlaf EvilOlaf

@igorpecovnik igorpecovnik

@SuperKali SuperKali

@ColorfulRhino ColorfulRhino

@JohnTheCoolingFan JohnTheCoolingFan

@Manouchehri Manouchehri

@TRSx80 TRSx80

@TheSnowfield TheSnowfield

@Tonymac32 Tonymac32

@ahoneybun ahoneybun

@brentr brentr

@catalinii catalinii

@clee clee

@efectn efectn

@joekhoobyar joekhoobyar

@krachlatte krachlatte

@lanefu lanefu

@paolosabatino paolosabatino

@rpardini rpardini

@schwar3kat schwar3kat

Assignees
No one assigned
Labels
05 Milestone: Second quarter release Framework Framework components Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/large PR with 250 lines or more
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@amazingfate @EvilOlaf @palachzzz @rpardini @iav @qbisi @SuperKali @paolosabatino @igorpecovnik