projects / openwrt / staging / nbd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5323c45)
ipq40xx: 6.6: rework kernel patches for new kernel
authorChristian Marangi <ansuelsmth@gmail.com>
Wed, 20 Mar 2024 10:12:31 +0000 (11:12 +0100)
committerChristian Marangi <ansuelsmth@gmail.com>
Tue, 2 Apr 2024 21:45:20 +0000 (23:45 +0200)
Rework kernel patches for new kernel. Mainly adaptation for patch
related to DTS, OOB Tagger and SDHCI patch.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
target/linux/ipq40xx/patches-6.6/100-ARM-dts-qcom-ipq4019-add-label-to-SCM.patch patch | blob | history
target/linux/ipq40xx/patches-6.6/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch patch | blob | history
target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch patch | blob | history
target/linux/ipq40xx/patches-6.6/705-ARM-dts-qcom-ipq4019-Add-description-for-the-IPQESS-.patch patch | blob | history
target/linux/ipq40xx/patches-6.6/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch patch | blob | history
target/linux/ipq40xx/patches-6.6/707-arm-dts-ipq4019-add-switch-node.patch patch | blob | history
target/linux/ipq40xx/patches-6.6/709-ARM-dts-qcom-ipq4019-add-QCA8075-PHY-Package-nodes.patch patch | blob | history
target/linux/ipq40xx/patches-6.6/710-arm-dts-ipq4019-QCA807x-properties.patch patch | blob | history
target/linux/ipq40xx/patches-6.6/850-soc-add-qualcomm-syscon.patch patch | blob | history

diff --git a/target/linux/ipq40xx/patches-6.6/100-ARM-dts-qcom-ipq4019-add-label-to-SCM.patch b/target/linux/ipq40xx/patches-6.6/100-ARM-dts-qcom-ipq4019-add-label-to-SCM.patch
index 8b9352e6f1e55f39fa4be3b0bbbcb805f063a996..23d8745bdef15562e75c24d01f934e764926a815 100644 (file)
--- a/target/linux/ipq40xx/patches-6.6/100-ARM-dts-qcom-ipq4019-add-label-to-SCM.patch
+++ b/target/linux/ipq40xx/patches-6.6/100-ARM-dts-qcom-ipq4019-add-label-to-SCM.patch
@@ -8,11 +8,11 @@ SCM node, so lets make that easy by adding a label to the SCM node.
 
 Signed-off-by: Robert Marko <robimarko@gmail.com>
 ---
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +-
+ arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
+--- a/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
++++ b/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
 @@ -155,7 +155,7 @@
        };
  
diff --git a/target/linux/ipq40xx/patches-6.6/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch b/target/linux/ipq40xx/patches-6.6/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch
index bf36164aedecf6fe5bceb05a31c99a32325f8d43..9ce68d40aa14551bfd5b81e4cea049a3d2dae007 100644 (file)
--- a/target/linux/ipq40xx/patches-6.6/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch
+++ b/target/linux/ipq40xx/patches-6.6/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch
@@ -16,7 +16,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 @@ -2451,7 +2451,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat
  
  static const struct sdhci_ops sdhci_msm_ops = {
-       .reset = sdhci_msm_reset,
+       .reset = sdhci_and_cqhci_reset,
 -      .set_clock = sdhci_msm_set_clock,
 +      .set_clock = sdhci_set_clock,
        .get_min_clock = sdhci_msm_get_min_clock,
diff --git a/target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch b/target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch
index 68d1a2e23b5555062d1a40dd690069ecb34013de..6ed6fa75407fca24f3ddc3d81a115dca052eee76 100644 (file)
--- a/target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch
+++ b/target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch
@@ -146,16 +146,6 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
  };
  
  static __always_inline unsigned int skb_ext_total_length(void)
-@@ -4537,6 +4544,9 @@ static __always_inline unsigned int skb_
- #if IS_ENABLED(CONFIG_MCTP_FLOWS)
-               skb_ext_type_len[SKB_EXT_MCTP] +
- #endif
-+#if IS_ENABLED(CONFIG_NET_DSA_TAG_OOB)
-+              skb_ext_type_len[SKB_EXT_DSA_OOB] +
-+#endif
-               0;
- }
- 
 --- a/net/dsa/Kconfig
 +++ b/net/dsa/Kconfig
 @@ -113,6 +113,15 @@ config NET_DSA_TAG_OCELOT_8021Q
@@ -186,7 +176,7 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
  obj-$(CONFIG_NET_DSA_TAG_RTL8_4) += tag_rtl8_4.o
 --- /dev/null
 +++ b/net/dsa/tag_oob.c
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,51 @@
 +// SPDX-License-Identifier: GPL-2.0-only
 +
 +/* Copyright (c) 2022, Maxime Chevallier <maxime.chevallier@bootlin.com> */
@@ -195,7 +185,9 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
 +#include <linux/dsa/oob.h>
 +#include <linux/skbuff.h>
 +
-+#include "dsa_priv.h"
++#include "tag.h"
++
++#define OOB_NAME "oob"
 +
 +static struct sk_buff *oob_tag_xmit(struct sk_buff *skb,
 +                                  struct net_device *dev)
@@ -224,7 +216,7 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
 +}
 +
 +static const struct dsa_device_ops oob_tag_dsa_ops = {
-+      .name   = "oob",
++      .name   = OOB_NAME,
 +      .proto  = DSA_TAG_PROTO_OOB,
 +      .xmit   = oob_tag_xmit,
 +      .rcv    = oob_tag_rcv,
@@ -233,6 +225,6 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("DSA tag driver for out-of-band tagging");
 +MODULE_AUTHOR("Maxime Chevallier <maxime.chevallier@bootlin.com>");
-+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_OOB);
++MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_OOB, OOB_NAME);
 +
 +module_dsa_tag_driver(oob_tag_dsa_ops);
diff --git a/target/linux/ipq40xx/patches-6.6/705-ARM-dts-qcom-ipq4019-Add-description-for-the-IPQESS-.patch b/target/linux/ipq40xx/patches-6.6/705-ARM-dts-qcom-ipq4019-Add-description-for-the-IPQESS-.patch
index 27bdebdb93bf1c8fded3db066c72eb3370cc3004..4f9e7f2f9a5e7d26fadf41d028dd9cc4f29f352a 100644 (file)
--- a/target/linux/ipq40xx/patches-6.6/705-ARM-dts-qcom-ipq4019-Add-description-for-the-IPQESS-.patch
+++ b/target/linux/ipq40xx/patches-6.6/705-ARM-dts-qcom-ipq4019-Add-description-for-the-IPQESS-.patch
@@ -16,11 +16,11 @@ for connection to the switch.
 Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
 Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 ---
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 48 +++++++++++++++++++++++++++++
+ arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 48 +++++++++++++++++++++++++++++
  1 file changed, 48 insertions(+)
 
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
+--- a/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
++++ b/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
 @@ -594,6 +594,54 @@
                        status = "disabled";
                };
diff --git a/target/linux/ipq40xx/patches-6.6/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch b/target/linux/ipq40xx/patches-6.6/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch
index 992884cf31dccccf0da3b2eae0066c881eee6a46..c82626eefd6bd4f122d5792fea7d51f9de325df9 100644 (file)
--- a/target/linux/ipq40xx/patches-6.6/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch
+++ b/target/linux/ipq40xx/patches-6.6/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch
@@ -87,7 +87,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
                if (!dsa_port_offloads_bridge(dsa_to_port(ds, i), &bridge))
 --- /dev/null
 +++ b/drivers/net/dsa/qca/qca8k-ipq4019.c
-@@ -0,0 +1,948 @@
+@@ -0,0 +1,946 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
@@ -256,8 +256,6 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 +
 +      config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
 +              MAC_10 | MAC_100 | MAC_1000FD;
-+
-+      config->legacy_pre_march2020 = false;
 +}
 +
 +static void
diff --git a/target/linux/ipq40xx/patches-6.6/707-arm-dts-ipq4019-add-switch-node.patch b/target/linux/ipq40xx/patches-6.6/707-arm-dts-ipq4019-add-switch-node.patch
index e7203a3ac99ecdf3efa84e7cd6e1f7d0e9bfb4c7..b49f08650bec0baaaa653909e53485b90be2da56 100644 (file)
--- a/target/linux/ipq40xx/patches-6.6/707-arm-dts-ipq4019-add-switch-node.patch
+++ b/target/linux/ipq40xx/patches-6.6/707-arm-dts-ipq4019-add-switch-node.patch
@@ -8,11 +8,11 @@ for it to work.
 
 Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 ---
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 76 +++++++++++++++++++++++++++++
+ arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 76 +++++++++++++++++++++++++++++
  1 file changed, 76 insertions(+)
 
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
+--- a/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
++++ b/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
 @@ -594,6 +594,82 @@
                        status = "disabled";
                };
diff --git a/target/linux/ipq40xx/patches-6.6/709-ARM-dts-qcom-ipq4019-add-QCA8075-PHY-Package-nodes.patch b/target/linux/ipq40xx/patches-6.6/709-ARM-dts-qcom-ipq4019-add-QCA8075-PHY-Package-nodes.patch
index e8b89647cebccc61c475696bf69fea1dce1f0dd4..afc8d920d74199801ba4a729217e5c4ad78cd694 100644 (file)
--- a/target/linux/ipq40xx/patches-6.6/709-ARM-dts-qcom-ipq4019-add-QCA8075-PHY-Package-nodes.patch
+++ b/target/linux/ipq40xx/patches-6.6/709-ARM-dts-qcom-ipq4019-add-QCA8075-PHY-Package-nodes.patch
@@ -14,8 +14,8 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  arch/arm/boot/dts//qcom-ipq4019.dtsi | 35 +++++++++++++++---------
  1 file changed, 22 insertions(+), 13 deletions(-)
 
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
+--- a/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
++++ b/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
 @@ -725,24 +725,33 @@
                        reg = <0x90000 0x64>;
                        status = "disabled";
diff --git a/target/linux/ipq40xx/patches-6.6/710-arm-dts-ipq4019-QCA807x-properties.patch b/target/linux/ipq40xx/patches-6.6/710-arm-dts-ipq4019-QCA807x-properties.patch
index a9ba70ff2f71fb06addb74772f56109141f73d10..2ea94d5c34e6026136aa263b97fd4f838308545c 100644 (file)
--- a/target/linux/ipq40xx/patches-6.6/710-arm-dts-ipq4019-QCA807x-properties.patch
+++ b/target/linux/ipq40xx/patches-6.6/710-arm-dts-ipq4019-QCA807x-properties.patch
@@ -7,11 +7,11 @@ This adds necessary DT properties for QCA807x PHY-s to IPQ4019 DTSI.
 
 Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 ---
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 17 +++++++++++++++++
+ arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
+--- a/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
++++ b/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
 @@ -752,6 +752,10 @@
                                ethphy4: ethernet-phy@4 {
                                        reg = <4>;
diff --git a/target/linux/ipq40xx/patches-6.6/850-soc-add-qualcomm-syscon.patch b/target/linux/ipq40xx/patches-6.6/850-soc-add-qualcomm-syscon.patch
index 6afb27b178d382c4cd9ef6c5fa46200553def83c..80dba5d686c8f5be1a32bab96250b7e34f43531b 100644 (file)
--- a/target/linux/ipq40xx/patches-6.6/850-soc-add-qualcomm-syscon.patch
+++ b/target/linux/ipq40xx/patches-6.6/850-soc-add-qualcomm-syscon.patch
@@ -17,9 +17,9 @@ Subject: SoC: add qualcomm syscon
 --- a/drivers/soc/qcom/Makefile
 +++ b/drivers/soc/qcom/Makefile
 @@ -29,3 +29,4 @@ obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o
- obj-$(CONFIG_QCOM_RPMPD) += rpmpd.o
- obj-$(CONFIG_QCOM_KRYO_L2_ACCESSORS) +=       kryo-l2-accessors.o
  obj-$(CONFIG_QCOM_ICC_BWMON)  += icc-bwmon.o
+ qcom_ice-objs                 += ice.o
+ obj-$(CONFIG_QCOM_INLINE_CRYPTO_ENGINE)       += qcom_ice.o
 +obj-$(CONFIG_QCOM_TCSR)               += qcom_tcsr.o
 --- /dev/null
 +++ b/drivers/soc/qcom/qcom_tcsr.c
Felix Fietkaus staging tree