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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

rockchip64-edge: bump to 6.14 #7835

wants to merge 7 commits into from

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/[email protected]/
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/[email protected]/

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

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 

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

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

Choose a reason for hiding this comment

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

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

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

@iav iav iav approved these changes

@EvilOlaf EvilOlaf EvilOlaf approved these changes

@SuperKali SuperKali SuperKali approved these changes

@igorpecovnik igorpecovnik Awaiting requested review from igorpecovnik igorpecovnik is a code owner

@ColorfulRhino ColorfulRhino Awaiting requested review from ColorfulRhino ColorfulRhino is a code owner

@JohnTheCoolingFan JohnTheCoolingFan Awaiting requested review from JohnTheCoolingFan JohnTheCoolingFan is a code owner

@Manouchehri Manouchehri Awaiting requested review from Manouchehri Manouchehri is a code owner

@TRSx80 TRSx80 Awaiting requested review from TRSx80 TRSx80 is a code owner

@TheSnowfield TheSnowfield Awaiting requested review from TheSnowfield TheSnowfield is a code owner

@Tonymac32 Tonymac32 Awaiting requested review from Tonymac32 Tonymac32 is a code owner

@ahoneybun ahoneybun Awaiting requested review from ahoneybun ahoneybun is a code owner

@brentr brentr Awaiting requested review from brentr brentr is a code owner

@catalinii catalinii Awaiting requested review from catalinii catalinii is a code owner

@clee clee Awaiting requested review from clee clee is a code owner

@efectn efectn Awaiting requested review from efectn efectn is a code owner

@joekhoobyar joekhoobyar Awaiting requested review from joekhoobyar joekhoobyar is a code owner

@krachlatte krachlatte Awaiting requested review from krachlatte krachlatte is a code owner

@lanefu lanefu Awaiting requested review from lanefu lanefu is a code owner

@paolosabatino paolosabatino Awaiting requested review from paolosabatino paolosabatino is a code owner

@rpardini rpardini Awaiting requested review from rpardini rpardini is a code owner

@schwar3kat schwar3kat Awaiting requested review from schwar3kat schwar3kat is a code owner

Assignees
No one assigned
Labels
Framework Framework components Hardware Hardware related like kernel, U-Boot, ... Needs review Seeking for review Patches Patches related to kernel, U-Boot, ... size/large PR with 250 lines or more
Milestone
No milestone
Development

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