aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/patches-5.4/301-arch-0002-arm64-add-support-to-remap-kernel-cacheable-memory-t.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/301-arch-0003-arm64-pgtable-add-support-to-map-cacheable-and-non-s.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/302-dts-0011-ARM-dts-accumulated-change.patch14
-rw-r--r--target/linux/layerscape/patches-5.4/302-dts-0046-ARM-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-LS1021A.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch7
-rw-r--r--target/linux/layerscape/patches-5.4/302-dts-0087-arm-dts-ls1021a-fix-that-FlexTimer-cannot-wakeup-sys.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/302-dts-0098-LF-403-ARM64-dts-fsl-Add-clock-names-mclk0-for-SAI-n.patch4
-rw-r--r--target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch4
-rw-r--r--target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch4
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0238-net-mscc-ocelot-break-apart-ocelot_vlan_port_apply.patch12
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0240-net-mscc-ocelot-break-out-fdb-operations-into-abstra.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0241-net-mscc-ocelot-change-prototypes-of-hwtstamping-ioc.patch4
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0242-net-mscc-ocelot-change-prototypes-of-switchdev-port-.patch10
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0243-net-mscc-ocelot-refactor-struct-ocelot_port-out-of-f.patch14
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0244-net-mscc-ocelot-separate-net_device-related-items-ou.patch28
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0245-net-mscc-ocelot-refactor-ethtool-callbacks.patch10
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch6
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0249-net-mscc-ocelot-initialize-list-of-multicast-address.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0251-net-mscc-ocelot-split-assignment-of-the-cpu-port-int.patch6
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0252-net-mscc-ocelot-don-t-hardcode-the-number-of-the-CPU.patch4
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0255-net-mscc-ocelot-move-invariant-configs-out-of-adjust.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0256-net-mscc-ocelot-create-a-helper-for-changing-the-por.patch6
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0258-net-mscc-ocelot-adjust-MTU-on-the-CPU-port-in-NPI-mo.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0259-net-mscc-ocelot-separate-the-implementation-of-switc.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0260-net-mscc-ocelot-publish-structure-definitions-to-inc.patch30
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0265-net-mscc-ocelot-export-ocelot_hwstamp_get-set-functi.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0271-net-mscc-ocelot-use-skb-queue-instead-of-skbs-list.patch6
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0272-net-mscc-ocelot-tsn-configuration-support.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0341-LF-368-net-mscc-ocelot-add-VCAP-IS2-rule-to-trap-PTP.patch6
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0367-net-mscc-ocelot-Workaround-to-allow-traffic-to-CPU-i.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0394-drivers-net-mscc_ocelot-don-t-flood-unicast-traffic-.patch4
-rw-r--r--target/linux/layerscape/patches-5.4/804-crypto-0012-MLK-19053-crypto-caam-RNG4-TRNG-errata.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch12
-rw-r--r--target/linux/layerscape/patches-5.4/804-crypto-0020-MLKU-25-3-crypto-caam-add-Secure-Memory-support.patch10
-rw-r--r--target/linux/layerscape/patches-5.4/804-crypto-0024-MLK-19449-crypto-caam-Change-structure-type-represen.patch4
-rw-r--r--target/linux/layerscape/patches-5.4/804-crypto-0041-LF-292-2-crypto-caam-add-power-management.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/812-pcie-0004-pci-add-support-aer-pme-interrupts-with-none-MSI-MSI.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch2
41 files changed, 122 insertions, 121 deletions
diff --git a/target/linux/layerscape/patches-5.4/301-arch-0002-arm64-add-support-to-remap-kernel-cacheable-memory-t.patch b/target/linux/layerscape/patches-5.4/301-arch-0002-arm64-add-support-to-remap-kernel-cacheable-memory-t.patch
index 4c2c487ac0..e6c96a052a 100644
--- a/target/linux/layerscape/patches-5.4/301-arch-0002-arm64-add-support-to-remap-kernel-cacheable-memory-t.patch
+++ b/target/linux/layerscape/patches-5.4/301-arch-0002-arm64-add-support-to-remap-kernel-cacheable-memory-t.patch
@@ -13,7 +13,7 @@ Reviewed-by: Stuart Yoder <stuart.yoder@freescale.com>
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
-@@ -422,6 +422,9 @@ static inline pmd_t pmd_mkdevmap(pmd_t p
+@@ -428,6 +428,9 @@ static inline pmd_t pmd_mkdevmap(pmd_t p
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRnE) | PTE_PXN | PTE_UXN)
#define pgprot_writecombine(prot) \
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN)
diff --git a/target/linux/layerscape/patches-5.4/301-arch-0003-arm64-pgtable-add-support-to-map-cacheable-and-non-s.patch b/target/linux/layerscape/patches-5.4/301-arch-0003-arm64-pgtable-add-support-to-map-cacheable-and-non-s.patch
index 63366ee221..bd39eb7e14 100644
--- a/target/linux/layerscape/patches-5.4/301-arch-0003-arm64-pgtable-add-support-to-map-cacheable-and-non-s.patch
+++ b/target/linux/layerscape/patches-5.4/301-arch-0003-arm64-pgtable-add-support-to-map-cacheable-and-non-s.patch
@@ -11,7 +11,7 @@ Signed-off-by: Haiying Wang <Haiying.wang@freescale.com>
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
-@@ -425,6 +425,8 @@ static inline pmd_t pmd_mkdevmap(pmd_t p
+@@ -431,6 +431,8 @@ static inline pmd_t pmd_mkdevmap(pmd_t p
#define pgprot_cached(prot) \
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL) | \
PTE_PXN | PTE_UXN)
diff --git a/target/linux/layerscape/patches-5.4/302-dts-0011-ARM-dts-accumulated-change.patch b/target/linux/layerscape/patches-5.4/302-dts-0011-ARM-dts-accumulated-change.patch
index c49c4db2a7..6f3181d65a 100644
--- a/target/linux/layerscape/patches-5.4/302-dts-0011-ARM-dts-accumulated-change.patch
+++ b/target/linux/layerscape/patches-5.4/302-dts-0011-ARM-dts-accumulated-change.patch
@@ -75,7 +75,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
big-endian;
};
-@@ -371,7 +372,7 @@
+@@ -338,7 +339,7 @@
};
i2c0: i2c@2180000 {
@@ -84,7 +84,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
#address-cells = <1>;
#size-cells = <0>;
reg = <0x0 0x2180000 0x0 0x10000>;
-@@ -380,11 +381,12 @@
+@@ -347,11 +348,12 @@
clocks = <&clockgen 4 1>;
dma-names = "tx", "rx";
dmas = <&edma0 1 39>, <&edma0 1 38>;
@@ -98,7 +98,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
#address-cells = <1>;
#size-cells = <0>;
reg = <0x0 0x2190000 0x0 0x10000>;
-@@ -393,6 +395,7 @@
+@@ -360,6 +362,7 @@
clocks = <&clockgen 4 1>;
dma-names = "tx", "rx";
dmas = <&edma0 1 37>, <&edma0 1 36>;
@@ -106,7 +106,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
status = "disabled";
};
-@@ -579,6 +582,16 @@
+@@ -546,6 +549,16 @@
status = "disabled";
};
@@ -123,7 +123,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
pwm1: pwm@29e0000 {
compatible = "fsl,vf610-ftm-pwm";
#pwm-cells = <3>;
-@@ -861,6 +874,8 @@
+@@ -828,6 +841,8 @@
dr_mode = "host";
snps,quirk-frame-length-adjustment = <0x20>;
snps,dis_rxdet_inp3_quirk;
@@ -132,7 +132,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
};
-@@ -869,7 +884,9 @@
+@@ -836,7 +851,9 @@
reg = <0x00 0x03400000 0x0 0x00010000 /* controller registers */
0x40 0x00000000 0x0 0x00002000>; /* configuration space */
reg-names = "regs", "config";
@@ -143,7 +143,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
fsl,pcie-scfg = <&scfg 0>;
#address-cells = <3>;
#size-cells = <2>;
-@@ -893,7 +910,9 @@
+@@ -860,7 +877,9 @@
reg = <0x00 0x03500000 0x0 0x00010000 /* controller registers */
0x48 0x00000000 0x0 0x00002000>; /* configuration space */
reg-names = "regs", "config";
diff --git a/target/linux/layerscape/patches-5.4/302-dts-0046-ARM-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-LS1021A.patch b/target/linux/layerscape/patches-5.4/302-dts-0046-ARM-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-LS1021A.patch
index de9de09913..e80fe0a45e 100644
--- a/target/linux/layerscape/patches-5.4/302-dts-0046-ARM-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-LS1021A.patch
+++ b/target/linux/layerscape/patches-5.4/302-dts-0046-ARM-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-LS1021A.patch
@@ -10,7 +10,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
-@@ -877,6 +877,7 @@
+@@ -844,6 +844,7 @@
usb3-lpm-capable;
snps,dis-u1u2-when-u3-quirk;
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
diff --git a/target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch b/target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch
index d8412c2b50..2d63cc0b55 100644
--- a/target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch
+++ b/target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch
@@ -24,7 +24,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
};
cpus {
-@@ -582,16 +583,6 @@
+@@ -549,16 +550,6 @@
status = "disabled";
};
@@ -41,7 +41,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
pwm1: pwm@29e0000 {
compatible = "fsl,vf610-ftm-pwm";
#pwm-cells = <3>;
-@@ -1003,5 +994,18 @@
+@@ -970,6 +961,19 @@
big-endian;
};
@@ -59,4 +59,5 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
+ big-endian;
+ };
};
- };
+
+ thermal-zones {
diff --git a/target/linux/layerscape/patches-5.4/302-dts-0087-arm-dts-ls1021a-fix-that-FlexTimer-cannot-wakeup-sys.patch b/target/linux/layerscape/patches-5.4/302-dts-0087-arm-dts-ls1021a-fix-that-FlexTimer-cannot-wakeup-sys.patch
index f677abad87..cebd74524b 100644
--- a/target/linux/layerscape/patches-5.4/302-dts-0087-arm-dts-ls1021a-fix-that-FlexTimer-cannot-wakeup-sys.patch
+++ b/target/linux/layerscape/patches-5.4/302-dts-0087-arm-dts-ls1021a-fix-that-FlexTimer-cannot-wakeup-sys.patch
@@ -14,7 +14,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
-@@ -998,6 +998,12 @@
+@@ -965,6 +965,12 @@
compatible = "fsl,ls1021a-rcpm", "fsl,qoriq-rcpm-2.1+";
reg = <0x0 0x1ee2140 0x0 0x8>;
#fsl,rcpm-wakeup-cells = <2>;
diff --git a/target/linux/layerscape/patches-5.4/302-dts-0098-LF-403-ARM64-dts-fsl-Add-clock-names-mclk0-for-SAI-n.patch b/target/linux/layerscape/patches-5.4/302-dts-0098-LF-403-ARM64-dts-fsl-Add-clock-names-mclk0-for-SAI-n.patch
index a6611b0b12..2cb3cfd7d8 100644
--- a/target/linux/layerscape/patches-5.4/302-dts-0098-LF-403-ARM64-dts-fsl-Add-clock-names-mclk0-for-SAI-n.patch
+++ b/target/linux/layerscape/patches-5.4/302-dts-0098-LF-403-ARM64-dts-fsl-Add-clock-names-mclk0-for-SAI-n.patch
@@ -15,7 +15,7 @@ Signed-off-by: Alison Wang <alison.wang@nxp.com>
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
-@@ -682,8 +682,9 @@
+@@ -649,8 +649,9 @@
reg = <0x0 0x2b50000 0x0 0x10000>;
interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
@@ -27,7 +27,7 @@ Signed-off-by: Alison Wang <alison.wang@nxp.com>
dma-names = "tx", "rx";
dmas = <&edma0 1 47>,
<&edma0 1 46>;
-@@ -696,8 +697,9 @@
+@@ -663,8 +664,9 @@
reg = <0x0 0x2b60000 0x0 0x10000>;
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 1>, <&clockgen 4 1>,
diff --git a/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch b/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
index 58a7be7f7d..f7edb7411d 100644
--- a/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
+++ b/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
@@ -87,7 +87,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
}
/**
-@@ -3873,6 +3889,7 @@ static int cgroup_add_file(struct cgroup
+@@ -3896,6 +3912,7 @@ static int cgroup_add_file(struct cgroup
{
char name[CGROUP_FILE_NAME_MAX];
struct kernfs_node *kn;
@@ -95,7 +95,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
struct lock_class_key *key = NULL;
int ret;
-@@ -3903,6 +3920,14 @@ static int cgroup_add_file(struct cgroup
+@@ -3926,6 +3943,14 @@ static int cgroup_add_file(struct cgroup
spin_unlock_irq(&cgroup_file_kn_lock);
}
diff --git a/target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch b/target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch
index 26d64e9b60..469bbfdffa 100644
--- a/target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch
+++ b/target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch
@@ -89,7 +89,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
}
/**
-@@ -3889,7 +3873,6 @@ static int cgroup_add_file(struct cgroup
+@@ -3912,7 +3896,6 @@ static int cgroup_add_file(struct cgroup
{
char name[CGROUP_FILE_NAME_MAX];
struct kernfs_node *kn;
@@ -97,7 +97,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
struct lock_class_key *key = NULL;
int ret;
-@@ -3920,14 +3903,6 @@ static int cgroup_add_file(struct cgroup
+@@ -3943,14 +3926,6 @@ static int cgroup_add_file(struct cgroup
spin_unlock_irq(&cgroup_file_kn_lock);
}
diff --git a/target/linux/layerscape/patches-5.4/701-net-0238-net-mscc-ocelot-break-apart-ocelot_vlan_port_apply.patch b/target/linux/layerscape/patches-5.4/701-net-0238-net-mscc-ocelot-break-apart-ocelot_vlan_port_apply.patch
index bb34e5db2c..f3db7da458 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0238-net-mscc-ocelot-break-apart-ocelot_vlan_port_apply.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0238-net-mscc-ocelot-break-apart-ocelot_vlan_port_apply.patch
@@ -226,7 +226,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return 0;
}
-@@ -1306,6 +1331,7 @@ static int ocelot_port_attr_set(struct n
+@@ -1303,6 +1328,7 @@ static int ocelot_port_attr_set(struct n
struct switchdev_trans *trans)
{
struct ocelot_port *ocelot_port = netdev_priv(dev);
@@ -234,7 +234,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int err = 0;
switch (attr->id) {
-@@ -1317,8 +1343,8 @@ static int ocelot_port_attr_set(struct n
+@@ -1314,8 +1340,8 @@ static int ocelot_port_attr_set(struct n
ocelot_port_attr_ageing_set(ocelot_port, attr->u.ageing_time);
break;
case SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING:
@@ -245,7 +245,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
break;
case SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED:
ocelot_port_attr_mc_set(ocelot_port, !attr->u.mc_disabled);
-@@ -1520,20 +1546,20 @@ static int ocelot_port_bridge_join(struc
+@@ -1517,20 +1543,20 @@ static int ocelot_port_bridge_join(struc
return 0;
}
@@ -273,7 +273,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
static void ocelot_set_aggr_pgids(struct ocelot *ocelot)
-@@ -1687,11 +1713,8 @@ static int ocelot_netdevice_port_event(s
+@@ -1684,11 +1710,8 @@ static int ocelot_netdevice_port_event(s
err = ocelot_port_bridge_join(ocelot_port,
info->upper_dev);
else
@@ -287,7 +287,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
if (netif_is_lag_master(info->upper_dev)) {
if (info->linking)
-@@ -2009,6 +2032,7 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2006,6 +2029,7 @@ int ocelot_probe_port(struct ocelot *oce
{
struct ocelot_port *ocelot_port;
struct net_device *dev;
@@ -295,7 +295,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int err;
dev = alloc_etherdev(sizeof(struct ocelot_port));
-@@ -2044,7 +2068,15 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2041,7 +2065,15 @@ int ocelot_probe_port(struct ocelot *oce
}
/* Basic L2 initialization */
diff --git a/target/linux/layerscape/patches-5.4/701-net-0240-net-mscc-ocelot-break-out-fdb-operations-into-abstra.patch b/target/linux/layerscape/patches-5.4/701-net-0240-net-mscc-ocelot-break-out-fdb-operations-into-abstra.patch
index 118b91e700..a6f81ba84b 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0240-net-mscc-ocelot-break-out-fdb-operations-into-abstra.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0240-net-mscc-ocelot-break-out-fdb-operations-into-abstra.patch
@@ -236,7 +236,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return ret;
}
-@@ -1129,9 +1161,9 @@ static const struct net_device_ops ocelo
+@@ -1123,9 +1155,9 @@ static const struct net_device_ops ocelo
.ndo_get_phys_port_name = ocelot_port_get_phys_port_name,
.ndo_set_mac_address = ocelot_port_set_mac_address,
.ndo_get_stats64 = ocelot_get_stats64,
diff --git a/target/linux/layerscape/patches-5.4/701-net-0241-net-mscc-ocelot-change-prototypes-of-hwtstamping-ioc.patch b/target/linux/layerscape/patches-5.4/701-net-0241-net-mscc-ocelot-change-prototypes-of-hwtstamping-ioc.patch
index f5f1452cd6..730e6a72ce 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0241-net-mscc-ocelot-change-prototypes-of-hwtstamping-ioc.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0241-net-mscc-ocelot-change-prototypes-of-hwtstamping-ioc.patch
@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
break;
default:
return -ERANGE;
-@@ -1136,8 +1136,9 @@ static int ocelot_hwstamp_set(struct oce
+@@ -1130,8 +1130,9 @@ static int ocelot_hwstamp_set(struct oce
static int ocelot_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
@@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* The function is only used for PTP operations for now */
if (!ocelot->ptp)
-@@ -1145,9 +1146,9 @@ static int ocelot_ioctl(struct net_devic
+@@ -1139,9 +1140,9 @@ static int ocelot_ioctl(struct net_devic
switch (cmd) {
case SIOCSHWTSTAMP:
diff --git a/target/linux/layerscape/patches-5.4/701-net-0242-net-mscc-ocelot-change-prototypes-of-switchdev-port-.patch b/target/linux/layerscape/patches-5.4/701-net-0242-net-mscc-ocelot-change-prototypes-of-switchdev-port-.patch
index 5cf09039df..dc5847c528 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0242-net-mscc-ocelot-change-prototypes-of-switchdev-port-.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0242-net-mscc-ocelot-change-prototypes-of-switchdev-port-.patch
@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -1285,26 +1285,20 @@ static const struct ethtool_ops ocelot_e
+@@ -1282,26 +1282,20 @@ static const struct ethtool_ops ocelot_e
.get_ts_info = ocelot_get_ts_info,
};
@@ -53,7 +53,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Fallthrough */
case BR_STATE_LEARNING:
port_cfg |= ANA_PORT_PORT_CFG_LEARN_ENA;
-@@ -1312,19 +1306,18 @@ static int ocelot_port_attr_stp_state_se
+@@ -1309,19 +1303,18 @@ static int ocelot_port_attr_stp_state_se
default:
port_cfg &= ~ANA_PORT_PORT_CFG_LEARN_ENA;
@@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
for (i = 0; i < ocelot->num_phys_ports; i++) {
unsigned long bond_mask = ocelot->lags[i];
-@@ -1332,7 +1325,7 @@ static int ocelot_port_attr_stp_state_se
+@@ -1329,7 +1322,7 @@ static int ocelot_port_attr_stp_state_se
if (!bond_mask)
continue;
@@ -87,7 +87,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mask &= ~bond_mask;
break;
}
-@@ -1340,47 +1333,55 @@ static int ocelot_port_attr_stp_state_se
+@@ -1337,47 +1330,55 @@ static int ocelot_port_attr_stp_state_se
ocelot_write_rix(ocelot,
BIT(ocelot->num_phys_ports) | mask,
@@ -162,7 +162,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
static int ocelot_port_attr_set(struct net_device *dev,
-@@ -1389,22 +1390,23 @@ static int ocelot_port_attr_set(struct n
+@@ -1386,22 +1387,23 @@ static int ocelot_port_attr_set(struct n
{
struct ocelot_port *ocelot_port = netdev_priv(dev);
struct ocelot *ocelot = ocelot_port->ocelot;
diff --git a/target/linux/layerscape/patches-5.4/701-net-0243-net-mscc-ocelot-refactor-struct-ocelot_port-out-of-f.patch b/target/linux/layerscape/patches-5.4/701-net-0243-net-mscc-ocelot-refactor-struct-ocelot_port-out-of-f.patch
index 2e05090c7c..8850f57103 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0243-net-mscc-ocelot-refactor-struct-ocelot_port-out-of-f.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0243-net-mscc-ocelot-refactor-struct-ocelot_port-out-of-f.patch
@@ -83,7 +83,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return 0;
}
-@@ -1586,11 +1586,9 @@ static int ocelot_port_obj_del(struct ne
+@@ -1583,11 +1583,9 @@ static int ocelot_port_obj_del(struct ne
return ret;
}
@@ -96,7 +96,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (!ocelot->bridge_mask) {
ocelot->hw_bridge_dev = bridge;
} else {
-@@ -1600,17 +1598,14 @@ static int ocelot_port_bridge_join(struc
+@@ -1597,17 +1595,14 @@ static int ocelot_port_bridge_join(struc
return -ENODEV;
}
@@ -116,7 +116,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
ocelot->bridge_mask &= ~BIT(port);
if (!ocelot->bridge_mask)
-@@ -1679,14 +1674,12 @@ static void ocelot_setup_lag(struct ocel
+@@ -1676,14 +1671,12 @@ static void ocelot_setup_lag(struct ocel
}
}
@@ -133,7 +133,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
rcu_read_lock();
for_each_netdev_in_bond_rcu(bond, ndev) {
-@@ -1701,17 +1694,17 @@ static int ocelot_port_lag_join(struct o
+@@ -1698,17 +1691,17 @@ static int ocelot_port_lag_join(struct o
/* If the new port is the lowest one, use it as the logical port from
* now on
*/
@@ -156,7 +156,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
ocelot_setup_lag(ocelot, lag);
-@@ -1720,34 +1713,32 @@ static int ocelot_port_lag_join(struct o
+@@ -1717,34 +1710,32 @@ static int ocelot_port_lag_join(struct o
return 0;
}
@@ -200,7 +200,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
ocelot_set_aggr_pgids(ocelot);
}
-@@ -1763,24 +1754,26 @@ static int ocelot_netdevice_port_event(s
+@@ -1760,24 +1751,26 @@ static int ocelot_netdevice_port_event(s
struct netdev_notifier_changeupper_info *info)
{
struct ocelot_port *ocelot_port = netdev_priv(dev);
@@ -231,7 +231,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
info->upper_dev);
}
break;
-@@ -2138,7 +2131,7 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2135,7 +2128,7 @@ int ocelot_probe_port(struct ocelot *oce
REW_PORT_VLAN_CFG, port);
/* Enable vcap lookups */
diff --git a/target/linux/layerscape/patches-5.4/701-net-0244-net-mscc-ocelot-separate-net_device-related-items-ou.patch b/target/linux/layerscape/patches-5.4/701-net-0244-net-mscc-ocelot-separate-net_device-related-items-ou.patch
index f582cb43cd..774e8d0bfe 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0244-net-mscc-ocelot-separate-net_device-related-items-ou.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0244-net-mscc-ocelot-separate-net_device-related-items-ou.patch
@@ -518,7 +518,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
ppid->id_len = sizeof(ocelot->base_mac);
memcpy(&ppid->id, &ocelot->base_mac, ppid->id_len);
-@@ -1136,9 +1154,9 @@ static int ocelot_hwstamp_set(struct oce
+@@ -1130,9 +1148,9 @@ static int ocelot_hwstamp_set(struct oce
static int ocelot_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
@@ -531,7 +531,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* The function is only used for PTP operations for now */
if (!ocelot->ptp)
-@@ -1175,8 +1193,8 @@ static const struct net_device_ops ocelo
+@@ -1169,8 +1187,8 @@ static const struct net_device_ops ocelo
static void ocelot_get_strings(struct net_device *netdev, u32 sset, u8 *data)
{
@@ -542,7 +542,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int i;
if (sset != ETH_SS_STATS)
-@@ -1230,8 +1248,9 @@ static void ocelot_check_stats_work(stru
+@@ -1224,8 +1242,9 @@ static void ocelot_check_stats_work(stru
static void ocelot_get_ethtool_stats(struct net_device *dev,
struct ethtool_stats *stats, u64 *data)
{
@@ -554,7 +554,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int i;
/* check and update now */
-@@ -1239,13 +1258,13 @@ static void ocelot_get_ethtool_stats(str
+@@ -1233,13 +1252,13 @@ static void ocelot_get_ethtool_stats(str
/* Copy all counters */
for (i = 0; i < ocelot->num_stats; i++)
@@ -571,7 +571,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (sset != ETH_SS_STATS)
return -EOPNOTSUPP;
-@@ -1255,8 +1274,8 @@ static int ocelot_get_sset_count(struct
+@@ -1249,8 +1268,8 @@ static int ocelot_get_sset_count(struct
static int ocelot_get_ts_info(struct net_device *dev,
struct ethtool_ts_info *info)
{
@@ -582,7 +582,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (!ocelot->ptp)
return ethtool_op_get_ts_info(dev, info);
-@@ -1388,9 +1407,9 @@ static int ocelot_port_attr_set(struct n
+@@ -1385,9 +1404,9 @@ static int ocelot_port_attr_set(struct n
const struct switchdev_attr *attr,
struct switchdev_trans *trans)
{
@@ -595,7 +595,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int err = 0;
switch (attr->id) {
-@@ -1402,8 +1421,8 @@ static int ocelot_port_attr_set(struct n
+@@ -1399,8 +1418,8 @@ static int ocelot_port_attr_set(struct n
ocelot_port_attr_ageing_set(ocelot, port, attr->u.ageing_time);
break;
case SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING:
@@ -606,7 +606,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
break;
case SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED:
ocelot_port_attr_mc_set(ocelot, port, !attr->u.mc_disabled);
-@@ -1468,15 +1487,17 @@ static int ocelot_port_obj_add_mdb(struc
+@@ -1465,15 +1484,17 @@ static int ocelot_port_obj_add_mdb(struc
const struct switchdev_obj_port_mdb *mdb,
struct switchdev_trans *trans)
{
@@ -628,7 +628,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mc = ocelot_multicast_get(ocelot, mdb->addr, vid);
if (!mc) {
-@@ -1500,7 +1521,7 @@ static int ocelot_port_obj_add_mdb(struc
+@@ -1497,7 +1518,7 @@ static int ocelot_port_obj_add_mdb(struc
ocelot_mact_forget(ocelot, addr, vid);
}
@@ -637,7 +637,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
addr[2] = mc->ports << 0;
addr[1] = mc->ports << 8;
-@@ -1510,14 +1531,16 @@ static int ocelot_port_obj_add_mdb(struc
+@@ -1507,14 +1528,16 @@ static int ocelot_port_obj_add_mdb(struc
static int ocelot_port_obj_del_mdb(struct net_device *dev,
const struct switchdev_obj_port_mdb *mdb)
{
@@ -658,7 +658,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mc = ocelot_multicast_get(ocelot, mdb->addr, vid);
if (!mc)
-@@ -1529,7 +1552,7 @@ static int ocelot_port_obj_del_mdb(struc
+@@ -1526,7 +1549,7 @@ static int ocelot_port_obj_del_mdb(struc
addr[0] = 0;
ocelot_mact_forget(ocelot, addr, vid);
@@ -667,7 +667,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (!mc->ports) {
list_del(&mc->list);
devm_kfree(ocelot->dev, mc);
-@@ -1683,9 +1706,9 @@ static int ocelot_port_lag_join(struct o
+@@ -1680,9 +1703,9 @@ static int ocelot_port_lag_join(struct o
rcu_read_lock();
for_each_netdev_in_bond_rcu(bond, ndev) {
@@ -679,7 +679,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
rcu_read_unlock();
-@@ -1753,20 +1776,23 @@ static int ocelot_netdevice_port_event(s
+@@ -1750,20 +1773,23 @@ static int ocelot_netdevice_port_event(s
unsigned long event,
struct netdev_notifier_changeupper_info *info)
{
@@ -707,7 +707,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
if (netif_is_lag_master(info->upper_dev)) {
if (info->linking)
-@@ -2082,21 +2108,23 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2079,21 +2105,23 @@ int ocelot_probe_port(struct ocelot *oce
void __iomem *regs,
struct phy_device *phy)
{
diff --git a/target/linux/layerscape/patches-5.4/701-net-0245-net-mscc-ocelot-refactor-ethtool-callbacks.patch b/target/linux/layerscape/patches-5.4/701-net-0245-net-mscc-ocelot-refactor-ethtool-callbacks.patch
index 655f60b6d9..7b979d556b 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0245-net-mscc-ocelot-refactor-ethtool-callbacks.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0245-net-mscc-ocelot-refactor-ethtool-callbacks.patch
@@ -13,7 +13,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -1191,10 +1191,9 @@ static const struct net_device_ops ocelo
+@@ -1185,10 +1185,9 @@ static const struct net_device_ops ocelo
.ndo_do_ioctl = ocelot_ioctl,
};
@@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int i;
if (sset != ETH_SS_STATS)
-@@ -1205,6 +1204,16 @@ static void ocelot_get_strings(struct ne
+@@ -1199,6 +1198,16 @@ static void ocelot_get_strings(struct ne
ETH_GSTRING_LEN);
}
@@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void ocelot_update_stats(struct ocelot *ocelot)
{
int i, j;
-@@ -1245,12 +1254,8 @@ static void ocelot_check_stats_work(stru
+@@ -1239,12 +1248,8 @@ static void ocelot_check_stats_work(stru
OCELOT_STATS_CHECK_DELAY);
}
@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int i;
/* check and update now */
-@@ -1261,25 +1266,37 @@ static void ocelot_get_ethtool_stats(str
+@@ -1255,25 +1260,37 @@ static void ocelot_get_ethtool_stats(str
*data++ = ocelot->stats[port * ocelot->num_stats + i];
}
@@ -100,7 +100,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
info->phc_index = ocelot->ptp_clock ?
ptp_clock_index(ocelot->ptp_clock) : -1;
info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE |
-@@ -1295,13 +1312,26 @@ static int ocelot_get_ts_info(struct net
+@@ -1292,13 +1309,26 @@ static int ocelot_get_ts_info(struct net
return 0;
}
diff --git a/target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch b/target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch
index 2df6afb20b..a6bbdd67fe 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch
@@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -2135,6 +2135,28 @@ static int ocelot_init_timestamp(struct
+@@ -2132,6 +2132,28 @@ static int ocelot_init_timestamp(struct
return 0;
}
@@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int ocelot_probe_port(struct ocelot *ocelot, u8 port,
void __iomem *regs,
struct phy_device *phy)
-@@ -2142,7 +2164,6 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2139,7 +2161,6 @@ int ocelot_probe_port(struct ocelot *oce
struct ocelot_port_private *priv;
struct ocelot_port *ocelot_port;
struct net_device *dev;
@@ -52,7 +52,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int err;
dev = alloc_etherdev(sizeof(struct ocelot_port_private));
-@@ -2170,32 +2191,14 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2167,32 +2188,14 @@ int ocelot_probe_port(struct ocelot *oce
ocelot_mact_learn(ocelot, PGID_CPU, dev->dev_addr, ocelot_port->pvid,
ENTRYTYPE_LOCKED);
diff --git a/target/linux/layerscape/patches-5.4/701-net-0249-net-mscc-ocelot-initialize-list-of-multicast-address.patch b/target/linux/layerscape/patches-5.4/701-net-0249-net-mscc-ocelot-initialize-list-of-multicast-address.patch
index ea01c8b542..b0c349ec37 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0249-net-mscc-ocelot-initialize-list-of-multicast-address.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0249-net-mscc-ocelot-initialize-list-of-multicast-address.patch
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -2245,6 +2245,7 @@ int ocelot_init(struct ocelot *ocelot)
+@@ -2242,6 +2242,7 @@ int ocelot_init(struct ocelot *ocelot)
if (!ocelot->stats_queue)
return -ENOMEM;
diff --git a/target/linux/layerscape/patches-5.4/701-net-0251-net-mscc-ocelot-split-assignment-of-the-cpu-port-int.patch b/target/linux/layerscape/patches-5.4/701-net-0251-net-mscc-ocelot-split-assignment-of-the-cpu-port-int.patch
index 4f5ab9ad5b..8fa0bca935 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0251-net-mscc-ocelot-split-assignment-of-the-cpu-port-int.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0251-net-mscc-ocelot-split-assignment-of-the-cpu-port-int.patch
@@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Set vlan ingress filter mask to all ports but the CPU port by
* default.
*/
-@@ -2226,11 +2220,52 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2223,11 +2217,52 @@ int ocelot_probe_port(struct ocelot *oce
}
EXPORT_SYMBOL(ocelot_probe_port);
@@ -87,7 +87,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
ocelot->lags = devm_kcalloc(ocelot->dev, ocelot->num_phys_ports,
sizeof(u32), GFP_KERNEL);
-@@ -2310,13 +2345,6 @@ int ocelot_init(struct ocelot *ocelot)
+@@ -2307,13 +2342,6 @@ int ocelot_init(struct ocelot *ocelot)
ocelot_write_rix(ocelot, 0, ANA_PGID_PGID, PGID_SRC + port);
}
@@ -101,7 +101,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Allow broadcast MAC frames. */
for (i = ocelot->num_phys_ports + 1; i < PGID_CPU; i++) {
u32 val = ANA_PGID_PGID_PGID(GENMASK(ocelot->num_phys_ports - 1, 0));
-@@ -2329,13 +2357,6 @@ int ocelot_init(struct ocelot *ocelot)
+@@ -2326,13 +2354,6 @@ int ocelot_init(struct ocelot *ocelot)
ocelot_write_rix(ocelot, 0, ANA_PGID_PGID, PGID_MCIPV4);
ocelot_write_rix(ocelot, 0, ANA_PGID_PGID, PGID_MCIPV6);
diff --git a/target/linux/layerscape/patches-5.4/701-net-0252-net-mscc-ocelot-don-t-hardcode-the-number-of-the-CPU.patch b/target/linux/layerscape/patches-5.4/701-net-0252-net-mscc-ocelot-don-t-hardcode-the-number-of-the-CPU.patch
index aec70e6d6f..7ddc5753f6 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0252-net-mscc-ocelot-don-t-hardcode-the-number-of-the-CPU.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0252-net-mscc-ocelot-don-t-hardcode-the-number-of-the-CPU.patch
@@ -30,7 +30,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -1383,7 +1383,7 @@ static void ocelot_bridge_stp_state_set(
+@@ -1380,7 +1380,7 @@ static void ocelot_bridge_stp_state_set(
* a source for the other ports.
*/
for (p = 0; p < ocelot->num_phys_ports; p++) {
@@ -39,7 +39,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
unsigned long mask = ocelot->bridge_fwd_mask & ~BIT(p);
for (i = 0; i < ocelot->num_phys_ports; i++) {
-@@ -1398,15 +1398,18 @@ static void ocelot_bridge_stp_state_set(
+@@ -1395,15 +1395,18 @@ static void ocelot_bridge_stp_state_set(
}
}
diff --git a/target/linux/layerscape/patches-5.4/701-net-0255-net-mscc-ocelot-move-invariant-configs-out-of-adjust.patch b/target/linux/layerscape/patches-5.4/701-net-0255-net-mscc-ocelot-move-invariant-configs-out-of-adjust.patch
index 8cb8a831ae..f0f4aeae5d 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0255-net-mscc-ocelot-move-invariant-configs-out-of-adjust.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0255-net-mscc-ocelot-move-invariant-configs-out-of-adjust.patch
@@ -98,7 +98,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
static void ocelot_port_adjust_link(struct net_device *dev)
-@@ -2143,11 +2102,53 @@ static int ocelot_init_timestamp(struct
+@@ -2140,11 +2099,53 @@ static int ocelot_init_timestamp(struct
static void ocelot_init_port(struct ocelot *ocelot, int port)
{
struct ocelot_port *ocelot_port = ocelot->ports[port];
diff --git a/target/linux/layerscape/patches-5.4/701-net-0256-net-mscc-ocelot-create-a-helper-for-changing-the-por.patch b/target/linux/layerscape/patches-5.4/701-net-0256-net-mscc-ocelot-create-a-helper-for-changing-the-por.patch
index 0a1299dd38..13fe784f24 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0256-net-mscc-ocelot-create-a-helper-for-changing-the-por.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0256-net-mscc-ocelot-create-a-helper-for-changing-the-por.patch
@@ -20,7 +20,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -2099,11 +2099,32 @@ static int ocelot_init_timestamp(struct
+@@ -2096,11 +2096,32 @@ static int ocelot_init_timestamp(struct
return 0;
}
@@ -54,7 +54,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
INIT_LIST_HEAD(&ocelot_port->skbs);
/* Basic L2 initialization */
-@@ -2124,8 +2145,7 @@ static void ocelot_init_port(struct ocel
+@@ -2121,8 +2142,7 @@ static void ocelot_init_port(struct ocel
DEV_MAC_HDX_CFG);
/* Set Max Length and maximum tags allowed */
@@ -64,7 +64,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
ocelot_port_writel(ocelot_port, DEV_MAC_TAGS_CFG_TAG_ID(ETH_P_8021AD) |
DEV_MAC_TAGS_CFG_VLAN_AWR_ENA |
DEV_MAC_TAGS_CFG_VLAN_LEN_AWR_ENA,
-@@ -2135,20 +2155,6 @@ static void ocelot_init_port(struct ocel
+@@ -2132,20 +2152,6 @@ static void ocelot_init_port(struct ocel
ocelot_port_writel(ocelot_port, 0, DEV_MAC_FC_MAC_HIGH_CFG);
ocelot_port_writel(ocelot_port, 0, DEV_MAC_FC_MAC_LOW_CFG);
diff --git a/target/linux/layerscape/patches-5.4/701-net-0258-net-mscc-ocelot-adjust-MTU-on-the-CPU-port-in-NPI-mo.patch b/target/linux/layerscape/patches-5.4/701-net-0258-net-mscc-ocelot-adjust-MTU-on-the-CPU-port-in-NPI-mo.patch
index 3c9d0336a4..667be87db0 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0258-net-mscc-ocelot-adjust-MTU-on-the-CPU-port-in-NPI-mo.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0258-net-mscc-ocelot-adjust-MTU-on-the-CPU-port-in-NPI-mo.patch
@@ -22,7 +22,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -2232,9 +2232,18 @@ void ocelot_set_cpu_port(struct ocelot *
+@@ -2229,9 +2229,18 @@ void ocelot_set_cpu_port(struct ocelot *
* Only one port can be an NPI at the same time.
*/
if (cpu < ocelot->num_phys_ports) {
diff --git a/target/linux/layerscape/patches-5.4/701-net-0259-net-mscc-ocelot-separate-the-implementation-of-switc.patch b/target/linux/layerscape/patches-5.4/701-net-0259-net-mscc-ocelot-separate-the-implementation-of-switc.patch
index 50a37e5500..3a8e9d6b11 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0259-net-mscc-ocelot-separate-the-implementation-of-switc.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0259-net-mscc-ocelot-separate-the-implementation-of-switc.patch
@@ -20,7 +20,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -2271,6 +2271,14 @@ int ocelot_init(struct ocelot *ocelot)
+@@ -2268,6 +2268,14 @@ int ocelot_init(struct ocelot *ocelot)
int i, ret;
u32 port;
diff --git a/target/linux/layerscape/patches-5.4/701-net-0260-net-mscc-ocelot-publish-structure-definitions-to-inc.patch b/target/linux/layerscape/patches-5.4/701-net-0260-net-mscc-ocelot-publish-structure-definitions-to-inc.patch
index 6fbc091739..8529e9825c 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0260-net-mscc-ocelot-publish-structure-definitions-to-inc.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0260-net-mscc-ocelot-publish-structure-definitions-to-inc.patch
@@ -195,7 +195,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int ocelot_port_fdb_dump(struct sk_buff *skb,
struct netlink_callback *cb,
-@@ -1153,8 +1160,7 @@ static const struct net_device_ops ocelo
+@@ -1147,8 +1154,7 @@ static const struct net_device_ops ocelo
.ndo_do_ioctl = ocelot_ioctl,
};
@@ -205,7 +205,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
{
int i;
-@@ -1165,6 +1171,7 @@ static void ocelot_get_strings(struct oc
+@@ -1159,6 +1165,7 @@ static void ocelot_get_strings(struct oc
memcpy(data + i * ETH_GSTRING_LEN, ocelot->stats_layout[i].name,
ETH_GSTRING_LEN);
}
@@ -213,7 +213,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void ocelot_port_get_strings(struct net_device *netdev, u32 sset,
u8 *data)
-@@ -1216,7 +1223,7 @@ static void ocelot_check_stats_work(stru
+@@ -1210,7 +1217,7 @@ static void ocelot_check_stats_work(stru
OCELOT_STATS_CHECK_DELAY);
}
@@ -222,7 +222,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
{
int i;
-@@ -1227,6 +1234,7 @@ static void ocelot_get_ethtool_stats(str
+@@ -1221,6 +1228,7 @@ static void ocelot_get_ethtool_stats(str
for (i = 0; i < ocelot->num_stats; i++)
*data++ = ocelot->stats[port * ocelot->num_stats + i];
}
@@ -230,7 +230,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void ocelot_port_get_ethtool_stats(struct net_device *dev,
struct ethtool_stats *stats,
-@@ -1239,13 +1247,14 @@ static void ocelot_port_get_ethtool_stat
+@@ -1233,13 +1241,14 @@ static void ocelot_port_get_ethtool_stat
ocelot_get_ethtool_stats(ocelot, port, data);
}
@@ -246,7 +246,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int ocelot_port_get_sset_count(struct net_device *dev, int sset)
{
-@@ -1256,8 +1265,8 @@ static int ocelot_port_get_sset_count(st
+@@ -1250,8 +1259,8 @@ static int ocelot_port_get_sset_count(st
return ocelot_get_sset_count(ocelot, port, sset);
}
@@ -257,7 +257,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
{
info->phc_index = ocelot->ptp_clock ?
ptp_clock_index(ocelot->ptp_clock) : -1;
-@@ -1273,6 +1282,7 @@ static int ocelot_get_ts_info(struct oce
+@@ -1270,6 +1279,7 @@ static int ocelot_get_ts_info(struct oce
return 0;
}
@@ -265,7 +265,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int ocelot_port_get_ts_info(struct net_device *dev,
struct ethtool_ts_info *info)
-@@ -1296,8 +1306,7 @@ static const struct ethtool_ops ocelot_e
+@@ -1293,8 +1303,7 @@ static const struct ethtool_ops ocelot_e
.get_ts_info = ocelot_port_get_ts_info,
};
@@ -275,7 +275,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
{
u32 port_cfg;
int p, i;
-@@ -1358,6 +1367,7 @@ static void ocelot_bridge_stp_state_set(
+@@ -1355,6 +1364,7 @@ static void ocelot_bridge_stp_state_set(
}
}
}
@@ -283,7 +283,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void ocelot_port_attr_stp_state_set(struct ocelot *ocelot, int port,
struct switchdev_trans *trans,
-@@ -1369,11 +1379,12 @@ static void ocelot_port_attr_stp_state_s
+@@ -1366,11 +1376,12 @@ static void ocelot_port_attr_stp_state_s
ocelot_bridge_stp_state_set(ocelot, port, state);
}
@@ -297,7 +297,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void ocelot_port_attr_ageing_set(struct ocelot *ocelot, int port,
unsigned long ageing_clock_t)
-@@ -1604,8 +1615,8 @@ static int ocelot_port_obj_del(struct ne
+@@ -1601,8 +1612,8 @@ static int ocelot_port_obj_del(struct ne
return ret;
}
@@ -308,7 +308,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
{
if (!ocelot->bridge_mask) {
ocelot->hw_bridge_dev = bridge;
-@@ -1620,9 +1631,10 @@ static int ocelot_port_bridge_join(struc
+@@ -1617,9 +1628,10 @@ static int ocelot_port_bridge_join(struc
return 0;
}
@@ -321,7 +321,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
{
ocelot->bridge_mask &= ~BIT(port);
-@@ -1633,6 +1645,7 @@ static int ocelot_port_bridge_leave(stru
+@@ -1630,6 +1642,7 @@ static int ocelot_port_bridge_leave(stru
ocelot_port_set_pvid(ocelot, port, 0);
return ocelot_port_set_native_vlan(ocelot, port, 0);
}
@@ -329,7 +329,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void ocelot_set_aggr_pgids(struct ocelot *ocelot)
{
-@@ -2121,7 +2134,7 @@ static void ocelot_port_set_mtu(struct o
+@@ -2118,7 +2131,7 @@ static void ocelot_port_set_mtu(struct o
ocelot_write(ocelot, ocelot_wm_enc(atop_wm), SYS_ATOP_TOT_CFG);
}
@@ -338,7 +338,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
{
struct ocelot_port *ocelot_port = ocelot->ports[port];
-@@ -2168,6 +2181,7 @@ static void ocelot_init_port(struct ocel
+@@ -2165,6 +2178,7 @@ static void ocelot_init_port(struct ocel
/* Enable vcap lookups */
ocelot_vcap_enable(ocelot, port);
}
diff --git a/target/linux/layerscape/patches-5.4/701-net-0265-net-mscc-ocelot-export-ocelot_hwstamp_get-set-functi.patch b/target/linux/layerscape/patches-5.4/701-net-0265-net-mscc-ocelot-export-ocelot_hwstamp_get-set-functi.patch
index 469eea25d5..d6b4e2bc13 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0265-net-mscc-ocelot-export-ocelot_hwstamp_get-set-functi.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0265-net-mscc-ocelot-export-ocelot_hwstamp_get-set-functi.patch
@@ -36,7 +36,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
{
struct ocelot_port *ocelot_port = ocelot->ports[port];
struct hwtstamp_config cfg;
-@@ -1120,6 +1119,7 @@ static int ocelot_hwstamp_set(struct oce
+@@ -1114,6 +1113,7 @@ static int ocelot_hwstamp_set(struct oce
return copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)) ? -EFAULT : 0;
}
diff --git a/target/linux/layerscape/patches-5.4/701-net-0271-net-mscc-ocelot-use-skb-queue-instead-of-skbs-list.patch b/target/linux/layerscape/patches-5.4/701-net-0271-net-mscc-ocelot-use-skb-queue-instead-of-skbs-list.patch
index 2163c57ac2..4ed7c26770 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0271-net-mscc-ocelot-use-skb-queue-instead-of-skbs-list.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0271-net-mscc-ocelot-use-skb-queue-instead-of-skbs-list.patch
@@ -96,7 +96,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
}
EXPORT_SYMBOL(ocelot_get_txtstamp);
-@@ -2208,7 +2199,7 @@ void ocelot_init_port(struct ocelot *oce
+@@ -2205,7 +2196,7 @@ void ocelot_init_port(struct ocelot *oce
{
struct ocelot_port *ocelot_port = ocelot->ports[port];
@@ -105,7 +105,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Basic L2 initialization */
-@@ -2493,9 +2484,7 @@ EXPORT_SYMBOL(ocelot_init);
+@@ -2490,9 +2481,7 @@ EXPORT_SYMBOL(ocelot_init);
void ocelot_deinit(struct ocelot *ocelot)
{
@@ -115,7 +115,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int i;
cancel_delayed_work(&ocelot->stats_work);
-@@ -2507,14 +2496,7 @@ void ocelot_deinit(struct ocelot *ocelot
+@@ -2504,14 +2493,7 @@ void ocelot_deinit(struct ocelot *ocelot
for (i = 0; i < ocelot->num_phys_ports; i++) {
port = ocelot->ports[i];
diff --git a/target/linux/layerscape/patches-5.4/701-net-0272-net-mscc-ocelot-tsn-configuration-support.patch b/target/linux/layerscape/patches-5.4/701-net-0272-net-mscc-ocelot-tsn-configuration-support.patch
index 2bd7dfbfc7..953b479a20 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0272-net-mscc-ocelot-tsn-configuration-support.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0272-net-mscc-ocelot-tsn-configuration-support.patch
@@ -41,7 +41,7 @@ Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
ocelot_write_rix(ocelot, val, ANA_PGID_PGID, i);
__dev_mc_sync(dev, ocelot_mc_sync, ocelot_mc_unsync);
-@@ -2410,10 +2410,11 @@ int ocelot_init(struct ocelot *ocelot)
+@@ -2407,10 +2407,11 @@ int ocelot_init(struct ocelot *ocelot)
SYS_FRM_AGING_MAX_AGE(307692), SYS_FRM_AGING);
/* Setup flooding PGIDs */
diff --git a/target/linux/layerscape/patches-5.4/701-net-0341-LF-368-net-mscc-ocelot-add-VCAP-IS2-rule-to-trap-PTP.patch b/target/linux/layerscape/patches-5.4/701-net-0341-LF-368-net-mscc-ocelot-add-VCAP-IS2-rule-to-trap-PTP.patch
index 18754172a5..817d449e01 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0341-LF-368-net-mscc-ocelot-add-VCAP-IS2-rule-to-trap-PTP.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0341-LF-368-net-mscc-ocelot-add-VCAP-IS2-rule-to-trap-PTP.patch
@@ -14,7 +14,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -2340,6 +2340,20 @@ void ocelot_set_cpu_port(struct ocelot *
+@@ -2337,6 +2337,20 @@ void ocelot_set_cpu_port(struct ocelot *
}
EXPORT_SYMBOL(ocelot_set_cpu_port);
@@ -35,7 +35,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
int ocelot_init(struct ocelot *ocelot)
{
char queue_name[32];
-@@ -2477,6 +2491,13 @@ int ocelot_init(struct ocelot *ocelot)
+@@ -2474,6 +2488,13 @@ int ocelot_init(struct ocelot *ocelot)
"Timestamp initialization failed\n");
return ret;
}
@@ -49,7 +49,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
}
return 0;
-@@ -2491,6 +2512,8 @@ void ocelot_deinit(struct ocelot *ocelot
+@@ -2488,6 +2509,8 @@ void ocelot_deinit(struct ocelot *ocelot
cancel_delayed_work(&ocelot->stats_work);
destroy_workqueue(ocelot->stats_queue);
mutex_destroy(&ocelot->stats_lock);
diff --git a/target/linux/layerscape/patches-5.4/701-net-0367-net-mscc-ocelot-Workaround-to-allow-traffic-to-CPU-i.patch b/target/linux/layerscape/patches-5.4/701-net-0367-net-mscc-ocelot-Workaround-to-allow-traffic-to-CPU-i.patch
index 4e24fecfdf..8d10202ac9 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0367-net-mscc-ocelot-Workaround-to-allow-traffic-to-CPU-i.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0367-net-mscc-ocelot-Workaround-to-allow-traffic-to-CPU-i.patch
@@ -128,7 +128,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -2294,6 +2294,18 @@ void ocelot_set_cpu_port(struct ocelot *
+@@ -2291,6 +2291,18 @@ void ocelot_set_cpu_port(struct ocelot *
enum ocelot_tag_prefix injection,
enum ocelot_tag_prefix extraction)
{
diff --git a/target/linux/layerscape/patches-5.4/701-net-0394-drivers-net-mscc_ocelot-don-t-flood-unicast-traffic-.patch b/target/linux/layerscape/patches-5.4/701-net-0394-drivers-net-mscc_ocelot-don-t-flood-unicast-traffic-.patch
index 12a03b0d7b..a37cf66def 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0394-drivers-net-mscc_ocelot-don-t-flood-unicast-traffic-.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0394-drivers-net-mscc_ocelot-don-t-flood-unicast-traffic-.patch
@@ -15,7 +15,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -1680,6 +1680,8 @@ static int ocelot_port_obj_del(struct ne
+@@ -1677,6 +1677,8 @@ static int ocelot_port_obj_del(struct ne
int ocelot_port_bridge_join(struct ocelot *ocelot, int port,
struct net_device *bridge)
{
@@ -24,7 +24,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
if (!ocelot->bridge_mask) {
ocelot->hw_bridge_dev = bridge;
} else {
-@@ -1691,6 +1693,12 @@ int ocelot_port_bridge_join(struct ocelo
+@@ -1688,6 +1690,12 @@ int ocelot_port_bridge_join(struct ocelo
ocelot->bridge_mask |= BIT(port);
diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0012-MLK-19053-crypto-caam-RNG4-TRNG-errata.patch b/target/linux/layerscape/patches-5.4/804-crypto-0012-MLK-19053-crypto-caam-RNG4-TRNG-errata.patch
index 52d15b71a6..761652ab71 100644
--- a/target/linux/layerscape/patches-5.4/804-crypto-0012-MLK-19053-crypto-caam-RNG4-TRNG-errata.patch
+++ b/target/linux/layerscape/patches-5.4/804-crypto-0012-MLK-19053-crypto-caam-RNG4-TRNG-errata.patch
@@ -51,7 +51,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
static int caam_get_era_from_hw(struct caam_ctrl __iomem *ctrl)
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
-@@ -492,7 +492,8 @@ struct rngtst {
+@@ -495,7 +495,8 @@ struct rngtst {
/* RNG4 TRNG test registers */
struct rng4tst {
diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch b/target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
index f062276254..106255449c 100644
--- a/target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
+++ b/target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
@@ -103,16 +103,16 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
@@ -1099,10 +1099,10 @@ int caam_pkc_init(struct device *ctrldev
/* Determine public key hardware accelerator presence. */
- if (priv->era < 10)
+ if (priv->era < 10) {
- pk_inst = (rd_reg32(&priv->ctrl->perfmon.cha_num_ls) &
+ pk_inst = (rd_reg32(&priv->jr[0]->perfmon.cha_num_ls) &
CHA_ID_LS_PK_MASK) >> CHA_ID_LS_PK_SHIFT;
- else
-- pk_inst = rd_reg32(&priv->ctrl->vreg.pkha) & CHA_VER_NUM_MASK;
-+ pk_inst = rd_reg32(&priv->jr[0]->vreg.pkha) & CHA_VER_NUM_MASK;
+ } else {
+- pkha = rd_reg32(&priv->ctrl->vreg.pkha);
++ pkha = rd_reg32(&priv->jr[0]->vreg.pkha);
+ pk_inst = pkha & CHA_VER_NUM_MASK;
- /* Do not register algorithms if PKHA is not present. */
- if (!pk_inst)
+ /*
--- a/drivers/crypto/caam/caamrng.c
+++ b/drivers/crypto/caam/caamrng.c
@@ -363,10 +363,10 @@ int caam_rng_init(struct device *ctrldev
diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0020-MLKU-25-3-crypto-caam-add-Secure-Memory-support.patch b/target/linux/layerscape/patches-5.4/804-crypto-0020-MLKU-25-3-crypto-caam-add-Secure-Memory-support.patch
index 91f1cebd55..db0e256ded 100644
--- a/target/linux/layerscape/patches-5.4/804-crypto-0020-MLKU-25-3-crypto-caam-add-Secure-Memory-support.patch
+++ b/target/linux/layerscape/patches-5.4/804-crypto-0020-MLKU-25-3-crypto-caam-add-Secure-Memory-support.patch
@@ -261,7 +261,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
-@@ -382,6 +382,12 @@ struct version_regs {
+@@ -385,6 +385,12 @@ struct version_regs {
#define CHA_VER_VID_MD_LP512 0x1ull
#define CHA_VER_VID_MD_HP 0x2ull
@@ -274,7 +274,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
struct sec_vid {
u16 ip_id;
u8 maj_rev;
-@@ -412,17 +418,22 @@ struct caam_perfmon {
+@@ -415,17 +421,22 @@ struct caam_perfmon {
#define CTPR_MS_PG_SZ_SHIFT 4
u32 comp_parms_ms; /* CTPR - Compile Parameters Register */
u32 comp_parms_ls; /* CTPR - Compile Parameters Register */
@@ -300,7 +300,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
/* Component Instantiation Parameters fe0-fff */
u32 rtic_id; /* RVID - RTIC Version ID */
-@@ -441,6 +452,62 @@ struct caam_perfmon {
+@@ -444,6 +455,62 @@ struct caam_perfmon {
u32 caam_id_ls; /* CAAMVID - CAAM Version ID LS */
};
@@ -363,7 +363,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
/* LIODN programming for DMA configuration */
#define MSTRID_LOCK_LIODN 0x80000000
#define MSTRID_LOCK_MAKETRUSTED 0x00010000 /* only for JR masterid */
-@@ -645,6 +712,35 @@ struct caam_ctrl {
+@@ -648,6 +715,35 @@ struct caam_ctrl {
#define JRSTART_JR2_START 0x00000004 /* Start Job ring 2 */
#define JRSTART_JR3_START 0x00000008 /* Start Job ring 3 */
@@ -399,7 +399,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
/*
* caam_job_ring - direct job ring setup
* 1-4 possible per instantiation, base + 1000/2000/3000/4000
-@@ -815,6 +911,62 @@ struct caam_job_ring {
+@@ -818,6 +914,62 @@ struct caam_job_ring {
#define JRCR_RESET 0x01
diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0024-MLK-19449-crypto-caam-Change-structure-type-represen.patch b/target/linux/layerscape/patches-5.4/804-crypto-0024-MLK-19449-crypto-caam-Change-structure-type-represen.patch
index 0fb3847fda..2914f010a4 100644
--- a/target/linux/layerscape/patches-5.4/804-crypto-0024-MLK-19449-crypto-caam-Change-structure-type-represen.patch
+++ b/target/linux/layerscape/patches-5.4/804-crypto-0024-MLK-19449-crypto-caam-Change-structure-type-represen.patch
@@ -21,7 +21,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
-@@ -518,12 +518,6 @@ struct masterid {
+@@ -521,12 +521,6 @@ struct masterid {
u32 liodn_ls; /* LIODN for non-sequence and seq access */
};
@@ -34,7 +34,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
/* RNGB test mode (replicated twice in some configurations) */
/* Padded out to 0x100 */
struct rngtst {
-@@ -637,7 +631,7 @@ struct caam_ctrl {
+@@ -640,7 +634,7 @@ struct caam_ctrl {
u32 deco_rsr; /* DECORSR - Deco Request Source */
u32 rsvd11;
u32 deco_rq; /* DECORR - DECO Request */
diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0041-LF-292-2-crypto-caam-add-power-management.patch b/target/linux/layerscape/patches-5.4/804-crypto-0041-LF-292-2-crypto-caam-add-power-management.patch
index f3ebbccd58..2a518790ed 100644
--- a/target/linux/layerscape/patches-5.4/804-crypto-0041-LF-292-2-crypto-caam-add-power-management.patch
+++ b/target/linux/layerscape/patches-5.4/804-crypto-0041-LF-292-2-crypto-caam-add-power-management.patch
@@ -558,7 +558,7 @@ Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
},
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
-@@ -631,8 +631,7 @@ struct caam_ctrl {
+@@ -634,8 +634,7 @@ struct caam_ctrl {
u32 deco_rsr; /* DECORSR - Deco Request Source */
u32 rsvd11;
u32 deco_rq; /* DECORR - DECO Request */
diff --git a/target/linux/layerscape/patches-5.4/812-pcie-0004-pci-add-support-aer-pme-interrupts-with-none-MSI-MSI.patch b/target/linux/layerscape/patches-5.4/812-pcie-0004-pci-add-support-aer-pme-interrupts-with-none-MSI-MSI.patch
index bb26cd3441..9c359d24b9 100644
--- a/target/linux/layerscape/patches-5.4/812-pcie-0004-pci-add-support-aer-pme-interrupts-with-none-MSI-MSI.patch
+++ b/target/linux/layerscape/patches-5.4/812-pcie-0004-pci-add-support-aer-pme-interrupts-with-none-MSI-MSI.patch
@@ -229,7 +229,7 @@ Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
* fall back to INTx or other interrupts, e.g., a system shared
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
-@@ -2022,6 +2022,7 @@ static inline void pcibios_penalize_isa_
+@@ -2024,6 +2024,7 @@ static inline void pcibios_penalize_isa_
int pcibios_alloc_irq(struct pci_dev *dev);
void pcibios_free_irq(struct pci_dev *dev);
resource_size_t pcibios_default_alignment(void);
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch b/target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
index d43626577b..f5bf467154 100644
--- a/target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
+++ b/target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
@@ -163,7 +163,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1245,6 +1245,10 @@ static const struct hc_driver ehci_hc_dr
+@@ -1254,6 +1254,10 @@ static const struct hc_driver ehci_hc_dr
* device support
*/
.free_dev = ehci_remove_device,
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch b/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
index 361328cf05..9dd1cf5ff5 100644
--- a/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
+++ b/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
@@ -24,7 +24,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
-@@ -1420,6 +1420,15 @@ int xhci_hub_control(struct usb_hcd *hcd
+@@ -1421,6 +1421,15 @@ int xhci_hub_control(struct usb_hcd *hcd
/* 4.19.6 Port Test Modes (USB2 Test Mode) */
if (hcd->speed != HCD_USB2)
goto error;
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch b/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch
index e02f08579c..6111197263 100644
--- a/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch
+++ b/target/linux/layerscape/patches-5.4/820-usb-0019-MLK-9829-usb-core-print-suggested-message-if-failed-.patch
@@ -20,7 +20,7 @@ Signed-off-by: Li Jun <jun.li@freescale.com>
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -4779,7 +4779,8 @@ hub_port_init(struct usb_hub *hub, struc
+@@ -4777,7 +4777,8 @@ hub_port_init(struct usb_hub *hub, struc
}
if (r) {
if (r != -ENODEV)
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch b/target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch
index 00034e38f3..26c6c007fb 100644
--- a/target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch
+++ b/target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch
@@ -16,7 +16,7 @@ Signed-off-by: Li Jun <jun.li@nxp.com>
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
-@@ -1738,7 +1738,8 @@ static bool xhci_port_missing_cas_quirk(
+@@ -1739,7 +1739,8 @@ static bool xhci_port_missing_cas_quirk(
return false;
if (((portsc & PORT_PLS_MASK) != XDEV_POLLING) &&