aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0404-LF-457-ocelot-tsn-clean-preempt-interrupt-status.patch
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2020-04-10 10:47:05 +0800
committerPetr Štetiar <ynezz@true.cz>2020-05-07 12:53:06 +0200
commitcddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch)
tree392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/701-net-0404-LF-457-ocelot-tsn-clean-preempt-interrupt-status.patch
parentd1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff)
downloadupstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0404-LF-457-ocelot-tsn-clean-preempt-interrupt-status.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0404-LF-457-ocelot-tsn-clean-preempt-interrupt-status.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0404-LF-457-ocelot-tsn-clean-preempt-interrupt-status.patch b/target/linux/layerscape/patches-5.4/701-net-0404-LF-457-ocelot-tsn-clean-preempt-interrupt-status.patch
new file mode 100644
index 0000000000..96897b5e2a
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/701-net-0404-LF-457-ocelot-tsn-clean-preempt-interrupt-status.patch
@@ -0,0 +1,61 @@
+From 5d246e343440ee4915109dac66543d02d71ca900 Mon Sep 17 00:00:00 2001
+From: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
+Date: Tue, 11 Feb 2020 15:33:46 +0800
+Subject: [PATCH] LF-457: ocelot: tsn: clean preempt interrupt status
+
+The INTB interrupt is used both for 1588 interrupt and preemption status
+change interrupt on each port. So clean preempt status interrupt in IRQ
+handle function. Without handling it, driver may get interrupt storm.
+
+Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
+Reviewed-by: Po Liu <Po.Liu@nxp.com>
+---
+ drivers/net/dsa/ocelot/felix.c | 5 +----
+ drivers/net/ethernet/mscc/ocelot_tsn.c | 14 ++++++++++++++
+ include/soc/mscc/ocelot.h | 1 +
+ 3 files changed, 16 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/dsa/ocelot/felix.c
++++ b/drivers/net/dsa/ocelot/felix.c
+@@ -688,12 +688,9 @@ static irqreturn_t felix_irq_handler(int
+
+ /* The INTB interrupt is used for both PTP TX timestamp interrupt
+ * and preemption status change interrupt on each port.
+- *
+- * - Get txtstamp if have
+- * - TODO: handle preemption. Without handling it, driver may get
+- * interrupt storm.
+ */
+
++ ocelot_preempt_irq_clean(ocelot);
+ ocelot_get_txtstamp(ocelot);
+
+ return IRQ_HANDLED;
+--- a/drivers/net/ethernet/mscc/ocelot_tsn.c
++++ b/drivers/net/ethernet/mscc/ocelot_tsn.c
+@@ -1570,3 +1570,17 @@ int ocelot_dscp_set(struct ocelot *ocelo
+
+ return 0;
+ }
++
++void ocelot_preempt_irq_clean(struct ocelot *ocelot)
++{
++ struct ocelot_port *ocelot_port;
++ int port;
++ u32 val;
++
++ val = DEV_GMII_MM_STATISTICS_MM_STATUS_PRMPT_ACTIVE_STICKY;
++ for (port = 0; port < ocelot->num_phys_ports; port++) {
++ ocelot_port = ocelot->ports[port];
++ ocelot_port_rmwl(ocelot_port, val, val,
++ DEV_GMII_MM_STATISTICS_MM_STATUS);
++ }
++}
+--- a/include/soc/mscc/ocelot.h
++++ b/include/soc/mscc/ocelot.h
+@@ -592,4 +592,5 @@ int ocelot_rtag_parse_enable(struct ocel
+ int ocelot_dscp_set(struct ocelot *ocelot, int port,
+ bool enable, const u8 dscp_ix,
+ struct tsn_qos_switch_dscp_conf *c);
++void ocelot_preempt_irq_clean(struct ocelot *ocelot);
+ #endif