aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0241-net-mscc-ocelot-change-prototypes-of-hwtstamping-ioc.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-0241-net-mscc-ocelot-change-prototypes-of-hwtstamping-ioc.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-0241-net-mscc-ocelot-change-prototypes-of-hwtstamping-ioc.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0241-net-mscc-ocelot-change-prototypes-of-hwtstamping-ioc.patch83
1 files changed, 83 insertions, 0 deletions
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
new file mode 100644
index 0000000000..f5f1452cd6
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/701-net-0241-net-mscc-ocelot-change-prototypes-of-hwtstamping-ioc.patch
@@ -0,0 +1,83 @@
+From 1ba674f7023761476dc39b7b112b780bb86f2f66 Mon Sep 17 00:00:00 2001
+From: Vladimir Oltean <vladimir.oltean@nxp.com>
+Date: Sat, 9 Nov 2019 15:02:50 +0200
+Subject: [PATCH] net: mscc: ocelot: change prototypes of hwtstamping ioctls
+
+This is needed in order to present a simpler prototype to the DSA
+front-end of ocelot.
+
+Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/ethernet/mscc/ocelot.c | 25 +++++++++++++------------
+ 1 file changed, 13 insertions(+), 12 deletions(-)
+
+--- a/drivers/net/ethernet/mscc/ocelot.c
++++ b/drivers/net/ethernet/mscc/ocelot.c
+@@ -1062,17 +1062,17 @@ static int ocelot_get_port_parent_id(str
+ return 0;
+ }
+
+-static int ocelot_hwstamp_get(struct ocelot_port *port, struct ifreq *ifr)
++static int ocelot_hwstamp_get(struct ocelot *ocelot, int port,
++ struct ifreq *ifr)
+ {
+- struct ocelot *ocelot = port->ocelot;
+-
+ return copy_to_user(ifr->ifr_data, &ocelot->hwtstamp_config,
+ sizeof(ocelot->hwtstamp_config)) ? -EFAULT : 0;
+ }
+
+-static int ocelot_hwstamp_set(struct ocelot_port *port, struct ifreq *ifr)
++static int ocelot_hwstamp_set(struct ocelot *ocelot, int port,
++ struct ifreq *ifr)
+ {
+- struct ocelot *ocelot = port->ocelot;
++ struct ocelot_port *ocelot_port = ocelot->ports[port];
+ struct hwtstamp_config cfg;
+
+ if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg)))
+@@ -1085,16 +1085,16 @@ static int ocelot_hwstamp_set(struct oce
+ /* Tx type sanity check */
+ switch (cfg.tx_type) {
+ case HWTSTAMP_TX_ON:
+- port->ptp_cmd = IFH_REW_OP_TWO_STEP_PTP;
++ ocelot_port->ptp_cmd = IFH_REW_OP_TWO_STEP_PTP;
+ break;
+ case HWTSTAMP_TX_ONESTEP_SYNC:
+ /* IFH_REW_OP_ONE_STEP_PTP updates the correctional field, we
+ * need to update the origin time.
+ */
+- port->ptp_cmd = IFH_REW_OP_ORIGIN_PTP;
++ ocelot_port->ptp_cmd = IFH_REW_OP_ORIGIN_PTP;
+ break;
+ case HWTSTAMP_TX_OFF:
+- port->ptp_cmd = 0;
++ ocelot_port->ptp_cmd = 0;
+ break;
+ default:
+ return -ERANGE;
+@@ -1136,8 +1136,9 @@ static int ocelot_hwstamp_set(struct oce
+
+ static int ocelot_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+ {
+- struct ocelot_port *port = netdev_priv(dev);
+- struct ocelot *ocelot = port->ocelot;
++ struct ocelot_port *ocelot_port = netdev_priv(dev);
++ struct ocelot *ocelot = ocelot_port->ocelot;
++ int port = ocelot_port->chip_port;
+
+ /* The function is only used for PTP operations for now */
+ if (!ocelot->ptp)
+@@ -1145,9 +1146,9 @@ static int ocelot_ioctl(struct net_devic
+
+ switch (cmd) {
+ case SIOCSHWTSTAMP:
+- return ocelot_hwstamp_set(port, ifr);
++ return ocelot_hwstamp_set(ocelot, port, ifr);
+ case SIOCGHWTSTAMP:
+- return ocelot_hwstamp_get(port, ifr);
++ return ocelot_hwstamp_get(ocelot, port, ifr);
+ default:
+ return -EOPNOTSUPP;
+ }