From f0af468abfe7b137fa2a7729967035cd9d61a63d Mon Sep 17 00:00:00 2001 From: Vyacheslav <64684523+adeepn@users.noreply.github.com> Date: Tue, 28 Feb 2023 11:57:01 +0300 Subject: [PATCH] Update meson64 edge branch to linux-6.2.y (#4876) Reallign patches --- .../families/include/meson64_common.inc | 2 +- ...c-Make-mmc-host-controller-interrupt.patch | 110 ------------------ ...c-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch | 13 ++- 3 files changed, 8 insertions(+), 117 deletions(-) delete mode 100644 patch/kernel/archive/meson64-6.2/general-arm64-dts-amlogic-Make-mmc-host-controller-interrupt.patch diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc index a852c8761c..072d53eccb 100644 --- a/config/sources/families/include/meson64_common.inc +++ b/config/sources/families/include/meson64_common.inc @@ -31,7 +31,7 @@ case $BRANCH in edge) export KERNEL_MAJOR_MINOR="6.2" # Major and minor versions of this kernel. For mainline caching. - KERNELBRANCH='tag:v6.2-rc7' # @TODO: soon-to-be 'branch:linux-6.2.y' when it is released + KERNELBRANCH='branch:linux-6.2.y' KERNELPATCHDIR='meson64-edge' ;; diff --git a/patch/kernel/archive/meson64-6.2/general-arm64-dts-amlogic-Make-mmc-host-controller-interrupt.patch b/patch/kernel/archive/meson64-6.2/general-arm64-dts-amlogic-Make-mmc-host-controller-interrupt.patch deleted file mode 100644 index 91f341294d..0000000000 --- a/patch/kernel/archive/meson64-6.2/general-arm64-dts-amlogic-Make-mmc-host-controller-interrupt.patch +++ /dev/null @@ -1,110 +0,0 @@ -From ff5377753d6c681d58547353122cfbec894ec0fa Mon Sep 17 00:00:00 2001 -From: Heiner Kallweit -Date: Thu, 26 Jan 2023 15:03:17 +0100 -Subject: [PATCH] arm64: dts: amlogic: Make mmc host controller interrupts - level-sensitive - -The usage of edge-triggered interrupts lead to lost interrupts under load, -see [0]. This was confirmed to be fixed by using level-triggered -interrupts. -The report was about SDIO. However, as the host controller is the same -for SD and MMC, apply the change to all mmc controller instances. - -[0] https://www.spinics.net/lists/linux-mmc/msg73991.html - -Fixes: 1499218c80c9 ("arm64: dts: move common G12A & G12B modes to meson-g12-common.dtsi") -Reported-by: Peter Suti -Tested-by: Peter Suti -Cc: stable@vger.kernel.org -Signed-off-by: Heiner Kallweit ---- - arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++-- - arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 +++--- - arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 +++--- - 3 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi -index 1648e67afbb6..417523dc4cc0 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi -@@ -1886,7 +1886,7 @@ apb: bus@ffe00000 { - sd_emmc_b: sd@5000 { - compatible = "amlogic,meson-axg-mmc"; - reg = <0x0 0x5000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - clocks = <&clkc CLKID_SD_EMMC_B>, - <&clkc CLKID_SD_EMMC_B_CLK0>, -@@ -1898,7 +1898,7 @@ sd_emmc_b: sd@5000 { - sd_emmc_c: mmc@7000 { - compatible = "amlogic,meson-axg-mmc"; - reg = <0x0 0x7000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - clocks = <&clkc CLKID_SD_EMMC_C>, - <&clkc CLKID_SD_EMMC_C_CLK0>, -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 9dbd50820b1c..7f55d97f6c28 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -@@ -2324,7 +2324,7 @@ uart_A: serial@24000 { - sd_emmc_a: sd@ffe03000 { - compatible = "amlogic,meson-axg-mmc"; - reg = <0x0 0xffe03000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - clocks = <&clkc CLKID_SD_EMMC_A>, - <&clkc CLKID_SD_EMMC_A_CLK0>, -@@ -2336,7 +2336,7 @@ sd_emmc_a: sd@ffe03000 { - sd_emmc_b: sd@ffe05000 { - compatible = "amlogic,meson-axg-mmc"; - reg = <0x0 0xffe05000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - clocks = <&clkc CLKID_SD_EMMC_B>, - <&clkc CLKID_SD_EMMC_B_CLK0>, -@@ -2348,7 +2348,7 @@ sd_emmc_b: sd@ffe05000 { - sd_emmc_c: mmc@ffe07000 { - compatible = "amlogic,meson-axg-mmc"; - reg = <0x0 0xffe07000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - clocks = <&clkc CLKID_SD_EMMC_C>, - <&clkc CLKID_SD_EMMC_C_CLK0>, -diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -index e3c12e0be99d..5eed15035b67 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -@@ -603,21 +603,21 @@ apb: apb@d0000000 { - sd_emmc_a: mmc@70000 { - compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; - reg = <0x0 0x70000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - }; - - sd_emmc_b: mmc@72000 { - compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; - reg = <0x0 0x72000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - }; - - sd_emmc_c: mmc@74000 { - compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; - reg = <0x0 0x74000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - }; - }; --- -2.30.2 - diff --git a/patch/kernel/archive/meson64-6.2/general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch b/patch/kernel/archive/meson64-6.2/general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch index e285f0bac0..f04dc04bbb 100644 --- a/patch/kernel/archive/meson64-6.2/general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch +++ b/patch/kernel/archive/meson64-6.2/general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch @@ -11,12 +11,13 @@ device-tree file. Signed-off-by: Vyacheslav Bocharov --- - drivers/mmc/host/meson-gx-mmc.c | 19 +++-- - include/dt-bindings/mmc/meson-gx-mmc.h | 35 ++++++++++ + drivers/mmc/host/meson-gx-mmc.c | 19 +++++++++----- + include/dt-bindings/mmc/meson-gx-mmc.h | 35 ++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 6 deletions(-) + create mode 100644 include/dt-bindings/mmc/meson-gx-mmc.h diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c -index 03d313a27a7a..9f632e46c487 100644 +index 64a1520321b0..fa9ec777e4a2 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -27,6 +27,7 @@ @@ -59,9 +60,9 @@ index 03d313a27a7a..9f632e46c487 100644 + clk_reg |= FIELD_PREP(CLK_CORE_PHASE_MASK, phase[0]); + clk_reg |= FIELD_PREP(CLK_TX_PHASE_MASK, phase[1]); + clk_reg |= FIELD_PREP(CLK_RX_PHASE_MASK, phase[2]); - clk_reg |= CLK_IRQ_SDIO_SLEEP(host); + if (host->mmc->caps & MMC_CAP_SDIO_IRQ) + clk_reg |= CLK_IRQ_SDIO_SLEEP(host); writel(clk_reg, host->regs + SD_EMMC_CLOCK); - diff --git a/include/dt-bindings/mmc/meson-gx-mmc.h b/include/dt-bindings/mmc/meson-gx-mmc.h new file mode 100644 index 000000000000..cfc4a9d75b2b @@ -104,5 +105,5 @@ index 000000000000..cfc4a9d75b2b + +#endif -- -Armbian +2.34.1