ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-18 16:40:29 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

ipq40xx: 6.6: rework kernel patches for new kernel

Browse Source 
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>
This commit is contained in:
Christian Marangi 2024-03-20 11:12:31 +01:00
parent 5323c45d78
commit 82531764fe
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
9 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/ipq40xx/patches-6.6/100-ARM-dts-qcom-ipq4019-add-label-to-SCM.patch
View File

@ -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> 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(-) 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
}; };

2
target/linux/ipq40xx/patches-6.6/400-mmc-sdhci-sdhci-msm-use-sdhci_set_clock-instead-of-s.patch
View File

@ -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 @@ -2451,7 +2451,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat
static const struct sdhci_ops sdhci_msm_ops = { 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_msm_set_clock,
+ .set_clock = sdhci_set_clock, + .set_clock = sdhci_set_clock,
.get_min_clock = sdhci_msm_get_min_clock, .get_min_clock = sdhci_msm_get_min_clock,

20
target/linux/ipq40xx/patches-6.6/701-net-dsa-add-out-of-band-tagging-protocol.patch
View File

@ -146,16 +146,6 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
}; };
static __always_inline unsigned int skb_ext_total_length(void) 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 --- a/net/dsa/Kconfig
+++ b/net/dsa/Kconfig +++ b/net/dsa/Kconfig
@@ -113,6 +113,15 @@ config NET_DSA_TAG_OCELOT_8021Q @@ -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 obj-$(CONFIG_NET_DSA_TAG_RTL8_4) += tag_rtl8_4.o
--- /dev/null --- /dev/null
+++ b/net/dsa/tag_oob.c +++ b/net/dsa/tag_oob.c
@@ -0,0 +1,49 @@ @@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0-only +// SPDX-License-Identifier: GPL-2.0-only
+ +
+/* Copyright (c) 2022, Maxime Chevallier <maxime.chevallier@bootlin.com> */ +/* 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/dsa/oob.h>
+#include <linux/skbuff.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, +static struct sk_buff *oob_tag_xmit(struct sk_buff *skb,
+ struct net_device *dev) + 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 = { +static const struct dsa_device_ops oob_tag_dsa_ops = {
+ .name = "oob", + .name = OOB_NAME,
+ .proto = DSA_TAG_PROTO_OOB, + .proto = DSA_TAG_PROTO_OOB,
+ .xmit = oob_tag_xmit, + .xmit = oob_tag_xmit,
+ .rcv = oob_tag_rcv, + .rcv = oob_tag_rcv,
@ -233,6 +225,6 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("DSA tag driver for out-of-band tagging"); +MODULE_DESCRIPTION("DSA tag driver for out-of-band tagging");
+MODULE_AUTHOR("Maxime Chevallier <maxime.chevallier@bootlin.com>"); +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); +module_dsa_tag_driver(oob_tag_dsa_ops);

6
target/linux/ipq40xx/patches-6.6/705-ARM-dts-qcom-ipq4019-Add-description-for-the-IPQESS-.patch
View File

@ -16,11 +16,11 @@ for connection to the switch.
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> 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(+) 1 file changed, 48 insertions(+)
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
@@ -594,6 +594,54 @@ @@ -594,6 +594,54 @@
status = "disabled"; status = "disabled";
}; };

4
target/linux/ipq40xx/patches-6.6/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch
View File

@ -87,7 +87,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
if (!dsa_port_offloads_bridge(dsa_to_port(ds, i), &bridge)) if (!dsa_port_offloads_bridge(dsa_to_port(ds, i), &bridge))
--- /dev/null --- /dev/null
+++ b/drivers/net/dsa/qca/qca8k-ipq4019.c +++ b/drivers/net/dsa/qca/qca8k-ipq4019.c
@@ -0,0 +1,948 @@ @@ -0,0 +1,946 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name> + * 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 | + config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
+ MAC_10 | MAC_100 | MAC_1000FD; + MAC_10 | MAC_100 | MAC_1000FD;
+
+ config->legacy_pre_march2020 = false;
+} +}
+ +
+static void +static void

6
target/linux/ipq40xx/patches-6.6/707-arm-dts-ipq4019-add-switch-node.patch
View File

@ -8,11 +8,11 @@ for it to work.
Signed-off-by: Robert Marko <robert.marko@sartura.hr> 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(+) 1 file changed, 76 insertions(+)
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
@@ -594,6 +594,82 @@ @@ -594,6 +594,82 @@
status = "disabled"; status = "disabled";
}; };

4
target/linux/ipq40xx/patches-6.6/709-ARM-dts-qcom-ipq4019-add-QCA8075-PHY-Package-nodes.patch
View File

@ -14,8 +14,8 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
arch/arm/boot/dts//qcom-ipq4019.dtsi | 35 +++++++++++++++--------- arch/arm/boot/dts//qcom-ipq4019.dtsi | 35 +++++++++++++++---------
1 file changed, 22 insertions(+), 13 deletions(-) 1 file changed, 22 insertions(+), 13 deletions(-)
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
@@ -725,24 +725,33 @@ @@ -725,24 +725,33 @@
reg = <0x90000 0x64>; reg = <0x90000 0x64>;
status = "disabled"; status = "disabled";

6
target/linux/ipq40xx/patches-6.6/710-arm-dts-ipq4019-QCA807x-properties.patch
View File

@ -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> 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(+) 1 file changed, 17 insertions(+)
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
@@ -752,6 +752,10 @@ @@ -752,6 +752,10 @@
ethphy4: ethernet-phy@4 { ethphy4: ethernet-phy@4 {
reg = <4>; reg = <4>;

4
target/linux/ipq40xx/patches-6.6/850-soc-add-qualcomm-syscon.patch
View File

@ -17,9 +17,9 @@ Subject: SoC: add qualcomm syscon
--- a/drivers/soc/qcom/Makefile --- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile
@@ -29,3 +29,4 @@ obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o @@ -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 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 +obj-$(CONFIG_QCOM_TCSR) += qcom_tcsr.o
--- /dev/null --- /dev/null
+++ b/drivers/soc/qcom/qcom_tcsr.c +++ b/drivers/soc/qcom/qcom_tcsr.c