mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
core/linux-aarch64-rc to 6.11.rc4-1
Run-tested: RPi4B
This commit is contained in:
graysky
parent
a75722a4a0
commit
66b5a5fca4
5 changed files with 1594 additions and 672 deletions
|
|
@ -1,11 +0,0 @@
|
||||||
[Trigger]
|
|
||||||
Type = File
|
|
||||||
Operation = Install
|
|
||||||
Operation = Upgrade
|
|
||||||
Operation = Remove
|
|
||||||
Target = usr/lib/modules/%KERNVER%/*
|
|
||||||
|
|
||||||
[Action]
|
|
||||||
Description = Updating %PKGBASE% module dependencies...
|
|
||||||
When = PostTransaction
|
|
||||||
Exec = /usr/bin/depmod %KERNVER%
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
[Trigger]
|
|
||||||
Type = File
|
|
||||||
Operation = Install
|
|
||||||
Operation = Upgrade
|
|
||||||
Target = boot/Image
|
|
||||||
Target = usr/lib/initcpio/*
|
|
||||||
|
|
||||||
[Action]
|
|
||||||
Description = Updating %PKGBASE% initcpios...
|
|
||||||
When = PostTransaction
|
|
||||||
Exec = /usr/bin/mkinitcpio -p %PKGBASE%
|
|
||||||
|
|
@ -3,8 +3,8 @@
|
||||||
|
|
||||||
buildarch=8
|
buildarch=8
|
||||||
|
|
||||||
_rcver=6.0
|
_rcver=6.11
|
||||||
_rcrel=5
|
_rcrel=4
|
||||||
|
|
||||||
pkgbase=linux-aarch64-rc
|
pkgbase=linux-aarch64-rc
|
||||||
_srcname=linux-${_rcver}-rc${_rcrel}
|
_srcname=linux-${_rcver}-rc${_rcrel}
|
||||||
|
|
@ -20,29 +20,26 @@ options=('!strip')
|
||||||
source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
|
source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
|
||||||
'0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
|
'0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
|
||||||
'0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch'
|
'0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch'
|
||||||
|
'pinctrl-rockchip-correct-RK3328-iomux-width-flag-for-GPIO2-B-pins.patch'
|
||||||
'config'
|
'config'
|
||||||
'generate_chromebook_its.sh'
|
'generate_chromebook_its.sh'
|
||||||
'kernel.keyblock'
|
'kernel.keyblock'
|
||||||
'kernel_data_key.vbprivk'
|
'kernel_data_key.vbprivk'
|
||||||
'linux.preset'
|
'linux.preset')
|
||||||
'60-linux.hook'
|
md5sums=('c8c40f02d5fa8a9c7250f1481f683942'
|
||||||
'90-linux.hook')
|
|
||||||
md5sums=('41d2f438d53dc25c998379d139ff0201'
|
|
||||||
'7b08a199a97e3e2288e5c03d8e8ded2d'
|
'7b08a199a97e3e2288e5c03d8e8ded2d'
|
||||||
'c9d4e392555b77034e24e9f87c5ff0b3'
|
'c9d4e392555b77034e24e9f87c5ff0b3'
|
||||||
'6ae4bc41e5a5e8f3d2b831d36f44f673'
|
'd4add3377b26d8b6f0818f7dddfb8cda'
|
||||||
|
'565acc322d1519eefe013e7d12859d5a'
|
||||||
'7c97cf141750ad810235b1ad06eb9f75'
|
'7c97cf141750ad810235b1ad06eb9f75'
|
||||||
'61c5ff73c136ed07a7aadbf58db3d96a'
|
'61c5ff73c136ed07a7aadbf58db3d96a'
|
||||||
'584777ae88bce2c5659960151b64c7d8'
|
'584777ae88bce2c5659960151b64c7d8'
|
||||||
'33ba82001fca579d43172a6db25d6aca'
|
'33ba82001fca579d43172a6db25d6aca')
|
||||||
'0a5f16bfec6ad982a2f6782724cca8ba'
|
|
||||||
'3dc88030a8f2f5a5f97266d99b149f77')
|
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd $_srcname
|
cd $_srcname
|
||||||
|
|
||||||
echo "Setting version..."
|
echo "Setting version..."
|
||||||
scripts/setlocalversion --save-scmversion
|
|
||||||
echo "-$pkgrel" > localversion.10-pkgrel
|
echo "-$pkgrel" > localversion.10-pkgrel
|
||||||
echo "${pkgbase#linux}" > localversion.20-pkgname
|
echo "${pkgbase#linux}" > localversion.20-pkgname
|
||||||
|
|
||||||
|
|
@ -50,6 +47,9 @@ prepare() {
|
||||||
git apply ../0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
|
git apply ../0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
|
||||||
git apply ../0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch
|
git apply ../0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch
|
||||||
|
|
||||||
|
# https://archlinuxarm.org/forum/viewtopic.php?f=65&t=16981
|
||||||
|
patch -p1 -i ../pinctrl-rockchip-correct-RK3328-iomux-width-flag-for-GPIO2-B-pins.patch
|
||||||
|
|
||||||
cat "${srcdir}/config" > ./.config
|
cat "${srcdir}/config" > ./.config
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -70,7 +70,7 @@ build() {
|
||||||
_package() {
|
_package() {
|
||||||
pkgdesc="The Linux Kernel and modules - ${_desc}"
|
pkgdesc="The Linux Kernel and modules - ${_desc}"
|
||||||
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
|
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
|
||||||
optdepends=('crda: to set the correct wireless channels of your country')
|
optdepends=('wireless-regdb: to set the correct wireless channels of your country')
|
||||||
provides=("linux=${pkgver}" "WIREGUARD-MODULE")
|
provides=("linux=${pkgver}" "WIREGUARD-MODULE")
|
||||||
replaces=('linux-armv8-rc')
|
replaces=('linux-armv8-rc')
|
||||||
conflicts=('linux')
|
conflicts=('linux')
|
||||||
|
|
@ -85,10 +85,10 @@ _package() {
|
||||||
make INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs" dtbs_install
|
make INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs" dtbs_install
|
||||||
|
|
||||||
echo "Installing modules..."
|
echo "Installing modules..."
|
||||||
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 modules_install
|
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 DEPMOD=/doesnt/exist modules_install
|
||||||
|
|
||||||
# remove build and source links
|
# remove build link
|
||||||
rm "$modulesdir"/{source,build}
|
rm "$modulesdir"/build
|
||||||
|
|
||||||
# sed expression for following substitutions
|
# sed expression for following substitutions
|
||||||
local _subst="
|
local _subst="
|
||||||
|
|
@ -100,11 +100,10 @@ _package() {
|
||||||
sed "${_subst}" ../linux.preset |
|
sed "${_subst}" ../linux.preset |
|
||||||
install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
|
install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
|
||||||
|
|
||||||
# install pacman hooks
|
# rather than use another hook (90-linux.hook) rely on mkinitcpio's 90-mkinitcpio-install.hook
|
||||||
sed "${_subst}" ../60-linux.hook |
|
# which avoids a double run of mkinitcpio that can occur
|
||||||
install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/60-${pkgbase}.hook"
|
install -d "${pkgdir}/usr/lib/initcpio/"
|
||||||
sed "${_subst}" ../90-linux.hook |
|
echo "dummy file to trigger mkinitcpio to run" > "${pkgdir}/usr/lib/initcpio/$(<version)"
|
||||||
install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_package-headers() {
|
_package-headers() {
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,160 @@
|
||||||
|
From patchwork Tue Jul 9 10:54:28 2024
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
X-Patchwork-Submitter: Huang-Huang Bao <i@eh5.me>
|
||||||
|
X-Patchwork-Id: 13727666
|
||||||
|
Return-Path:
|
||||||
|
<linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org>
|
||||||
|
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
|
||||||
|
aws-us-west-2-korg-lkml-1.web.codeaurora.org
|
||||||
|
Received: from bombadil.infradead.org (bombadil.infradead.org
|
||||||
|
[198.137.202.133])
|
||||||
|
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
||||||
|
(No client certificate requested)
|
||||||
|
by smtp.lore.kernel.org (Postfix) with ESMTPS id 72303C2BD09
|
||||||
|
for <linux-arm-kernel@archiver.kernel.org>;
|
||||||
|
Tue, 9 Jul 2024 10:55:31 +0000 (UTC)
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
|
||||||
|
d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help
|
||||||
|
:List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding:
|
||||||
|
MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type:
|
||||||
|
Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:
|
||||||
|
Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner;
|
||||||
|
bh=f/I3Vjm8cEq2ZeTlVvfzwsec4AJR5wa4TlSZ79HvmRk=; b=O7cElN4dmZodzhChoM4RgaCK4I
|
||||||
|
3tCDUGLIewHdUpkNbhnUpA3Gf7VM6T9j98XKKsP46V7XIj17Df/JiJpedHZuNx/DPSLqTfQvvTrG5
|
||||||
|
rn7/89oJ0eigWfeHO2hRjCISVMsVehOmUhE1wkoMfpEm5G/BzWJNdlwuPzegSfZnccchyIKdq1PN9
|
||||||
|
h7Fhfo+pbL5gnZstZm3+mhEr2Y+ur3VXXmxOrAWSeXP5xRbJve1U1zaSaoD8rc+L9dbm0dhlRGAVA
|
||||||
|
mhMT8TybXsatw5i8jrnfbK+YsIVOv577yFX0GMgTOSrOAxF6ytNaX4ldeK6/W7vGYU0ccvfWzfpRu
|
||||||
|
BKj7NHjw==;
|
||||||
|
Received: from localhost ([::1] helo=bombadil.infradead.org)
|
||||||
|
by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux))
|
||||||
|
id 1sR8VF-00000006tmp-1e7G;
|
||||||
|
Tue, 09 Jul 2024 10:55:21 +0000
|
||||||
|
Received: from mail.eh5.me ([45.76.111.223])
|
||||||
|
by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux))
|
||||||
|
id 1sR8Uz-00000006tkF-2pOb;
|
||||||
|
Tue, 09 Jul 2024 10:55:07 +0000
|
||||||
|
From: Huang-Huang Bao <i@eh5.me>
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eh5.me; s=dkim;
|
||||||
|
t=1720522497;
|
||||||
|
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
|
||||||
|
to:to:cc:cc:mime-version:mime-version:
|
||||||
|
content-transfer-encoding:content-transfer-encoding;
|
||||||
|
bh=f/I3Vjm8cEq2ZeTlVvfzwsec4AJR5wa4TlSZ79HvmRk=;
|
||||||
|
b=hXXnOM5pURRKMcaz1BuylPpxtLsSgiW29cfj5UI9EfWqUgfbHBWDipLEsXQxkHZajqgq/9
|
||||||
|
/z4O6xvH/jZiofPvAKDzi4j0wC1RJUypDGeIuo3XKhOH7aBM2SB5RLnfffkwTiQ7VA0i8q
|
||||||
|
N58KAUdO386ccj+s9wqtXiJNkAc72PA=
|
||||||
|
To: Heiko Stuebner <heiko@sntech.de>,
|
||||||
|
Linus Walleij <linus.walleij@linaro.org>
|
||||||
|
Cc: Richard Kojedzinszky <richard@kojedz.in>,
|
||||||
|
linux-gpio@vger.kernel.org,
|
||||||
|
linux-arm-kernel@lists.infradead.org,
|
||||||
|
linux-rockchip@lists.infradead.org,
|
||||||
|
linux-kernel@vger.kernel.org,
|
||||||
|
Huang-Huang Bao <i@eh5.me>,
|
||||||
|
stable@vger.kernel.org
|
||||||
|
Subject: [PATCH] pinctrl: rockchip: correct RK3328 iomux width flag for
|
||||||
|
GPIO2-B pins
|
||||||
|
Date: Tue, 9 Jul 2024 18:54:28 +0800
|
||||||
|
Message-ID: <20240709105428.1176375-1-i@eh5.me>
|
||||||
|
MIME-Version: 1.0
|
||||||
|
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
|
||||||
|
X-CRM114-CacheID: sfid-20240709_035505_855152_0F43EA17
|
||||||
|
X-CRM114-Status: GOOD ( 11.90 )
|
||||||
|
X-BeenThere: linux-arm-kernel@lists.infradead.org
|
||||||
|
X-Mailman-Version: 2.1.34
|
||||||
|
Precedence: list
|
||||||
|
List-Id: <linux-arm-kernel.lists.infradead.org>
|
||||||
|
List-Unsubscribe:
|
||||||
|
<http://lists.infradead.org/mailman/options/linux-arm-kernel>,
|
||||||
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
|
||||||
|
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
|
||||||
|
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
|
||||||
|
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
|
||||||
|
List-Subscribe:
|
||||||
|
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
|
||||||
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
|
||||||
|
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
|
||||||
|
Errors-To:
|
||||||
|
linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org
|
||||||
|
|
||||||
|
The base iomux offsets for each GPIO pin line are accumulatively
|
||||||
|
calculated based off iomux width flag in rockchip_pinctrl_get_soc_data.
|
||||||
|
If the iomux width flag is one of IOMUX_WIDTH_4BIT, IOMUX_WIDTH_3BIT or
|
||||||
|
IOMUX_WIDTH_2BIT, the base offset for next pin line would increase by 8
|
||||||
|
bytes, otherwise it would increase by 4 bytes.
|
||||||
|
|
||||||
|
Despite most of GPIO2-B iomux have 2-bit data width, which can be fit
|
||||||
|
into 4 bytes space with write mask, it actually take 8 bytes width for
|
||||||
|
whole GPIO2-B line.
|
||||||
|
|
||||||
|
Commit e8448a6c817c ("pinctrl: rockchip: fix pinmux bits for RK3328
|
||||||
|
GPIO2-B pins") wrongly set iomux width flag to 0, causing all base
|
||||||
|
iomux offset for line after GPIO2-B to be calculated wrong. Fix the
|
||||||
|
iomux width flag to IOMUX_WIDTH_2BIT so the offset after GPIO2-B is
|
||||||
|
correctly increased by 8, matching the actual width of GPIO2-B iomux.
|
||||||
|
|
||||||
|
Fixes: e8448a6c817c ("pinctrl: rockchip: fix pinmux bits for RK3328 GPIO2-B pins")
|
||||||
|
Cc: stable@vger.kernel.org
|
||||||
|
Reported-by: Richard Kojedzinszky <richard@kojedz.in>
|
||||||
|
Closes: https://lore.kernel.org/linux-rockchip/4f29b743202397d60edfb3c725537415@kojedz.in/
|
||||||
|
Tested-by: Richard Kojedzinszky <richard@kojedz.in>
|
||||||
|
Signed-off-by: Huang-Huang Bao <i@eh5.me>
|
||||||
|
---
|
||||||
|
|
||||||
|
I have double checked the iomux offsets in debug message match iomux
|
||||||
|
register definitions in "GRF Register Description" section in RK3328
|
||||||
|
TRM[1].
|
||||||
|
|
||||||
|
[1]: https://opensource.rock-chips.com/images/9/97/Rockchip_RK3328TRM_V1.1-Part1-20170321.pdf
|
||||||
|
|
||||||
|
Kernel pinctrl debug message with dyndbg="file pinctrl-rockchip.c +p":
|
||||||
|
rockchip-pinctrl pinctrl: bank 0, iomux 0 has iom_offset 0x0 drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 0, iomux 1 has iom_offset 0x4 drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 0, iomux 2 has iom_offset 0x8 drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 0, iomux 3 has iom_offset 0xc drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 1, iomux 0 has iom_offset 0x10 drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 1, iomux 1 has iom_offset 0x14 drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 1, iomux 2 has iom_offset 0x18 drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 1, iomux 3 has iom_offset 0x1c drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 2, iomux 0 has iom_offset 0x20 drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 2, iomux 1 has iom_offset 0x24 drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 2, iomux 2 has iom_offset 0x2c drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 2, iomux 3 has iom_offset 0x34 drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 3, iomux 0 has iom_offset 0x38 drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 3, iomux 1 has iom_offset 0x40 drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 3, iomux 2 has iom_offset 0x48 drv_offset 0x0
|
||||||
|
rockchip-pinctrl pinctrl: bank 3, iomux 3 has iom_offset 0x4c drv_offset 0x0
|
||||||
|
|
||||||
|
The "Closes" links to test report from original reporter with original
|
||||||
|
issue contained, which was not delivered to any mailing list thus not
|
||||||
|
available on the web.
|
||||||
|
|
||||||
|
Added CC stable as the problematic e8448a6c817c fixed by this patch was
|
||||||
|
recently merged to stable kernels.
|
||||||
|
|
||||||
|
Sorry for the inconvenience caused,
|
||||||
|
Huang-Huang
|
||||||
|
|
||||||
|
drivers/pinctrl/pinctrl-rockchip.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
|
||||||
|
base-commit: 4376e966ecb78c520b0faf239d118ecfab42a119
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
||||||
|
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
|
||||||
|
index 3f56991f5b89..f6da91941fbd 100644
|
||||||
|
--- a/drivers/pinctrl/pinctrl-rockchip.c
|
||||||
|
+++ b/drivers/pinctrl/pinctrl-rockchip.c
|
||||||
|
@@ -3813,7 +3813,7 @@ static struct rockchip_pin_bank rk3328_pin_banks[] = {
|
||||||
|
PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", 0, 0, 0, 0),
|
||||||
|
PIN_BANK_IOMUX_FLAGS(1, 32, "gpio1", 0, 0, 0, 0),
|
||||||
|
PIN_BANK_IOMUX_FLAGS(2, 32, "gpio2", 0,
|
||||||
|
- 0,
|
||||||
|
+ IOMUX_WIDTH_2BIT,
|
||||||
|
IOMUX_WIDTH_3BIT,
|
||||||
|
0),
|
||||||
|
PIN_BANK_IOMUX_FLAGS(3, 32, "gpio3",
|
||||||
Loading…
Reference in a new issue