layerscape: add patches-5.4

[openwrt/staging/wigyori.git] / target / linux / layerscape / patches-5.4 / 701-net-0257-net-mscc-ocelot-export-a-constant-for-the-tag-length.patch

diff --git a/target/linux/layerscape/patches-5.4/701-net-0257-net-mscc-ocelot-export-a-constant-for-the-tag-length.patch b/target/linux/layerscape/patches-5.4/701-net-0257-net-mscc-ocelot-export-a-constant-for-the-tag-length.patch
new file mode 100644 (file)
index 0000000..9a45bad
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/701-net-0257-net-mscc-ocelot-export-a-constant-for-the-tag-length.patch
@@ -0,0 +1,73 @@
+From f53826ed84b6ce7c588949263cc9dedf3c577aa6 Mon Sep 17 00:00:00 2001
+From: Vladimir Oltean <vladimir.oltean@nxp.com>
+Date: Thu, 14 Nov 2019 17:03:24 +0200
+Subject: [PATCH] net: mscc: ocelot: export a constant for the tag length in
+ bytes
+
+This constant will be used in a future patch to increase the MTU on NPI
+ports, and will also be used in the tagger driver for Felix.
+
+Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
+Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/ethernet/mscc/ocelot.c       | 4 ++--
+ drivers/net/ethernet/mscc/ocelot.h       | 4 ++--
+ drivers/net/ethernet/mscc/ocelot_board.c | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/drivers/net/ethernet/mscc/ocelot.c
++++ b/drivers/net/ethernet/mscc/ocelot.c
+@@ -576,11 +576,11 @@ static int ocelot_port_xmit(struct sk_bu
+       struct skb_shared_info *shinfo = skb_shinfo(skb);
+       struct ocelot_port *ocelot_port = &priv->port;
+       struct ocelot *ocelot = ocelot_port->ocelot;
++      u32 val, ifh[OCELOT_TAG_LEN / 4];
+       struct frame_info info = {};
+       u8 grp = 0; /* Send everything on CPU group 0 */
+       unsigned int i, count, last;
+       int port = priv->chip_port;
+-      u32 val, ifh[IFH_LEN];
+ 
+       val = ocelot_read(ocelot, QS_INJ_STATUS);
+       if (!(val & QS_INJ_STATUS_FIFO_RDY(BIT(grp))) ||
+@@ -603,7 +603,7 @@ static int ocelot_port_xmit(struct sk_bu
+ 
+       ocelot_gen_ifh(ifh, &info);
+ 
+-      for (i = 0; i < IFH_LEN; i++)
++      for (i = 0; i < OCELOT_TAG_LEN / 4; i++)
+               ocelot_write_rix(ocelot, (__force u32)cpu_to_be32(ifh[i]),
+                                QS_INJ_WR, grp);
+ 
+--- a/drivers/net/ethernet/mscc/ocelot.h
++++ b/drivers/net/ethernet/mscc/ocelot.h
+@@ -43,8 +43,6 @@
+ 
+ #define OCELOT_PTP_QUEUE_SZ   128
+ 
+-#define IFH_LEN 4
+-
+ struct frame_info {
+       u32 len;
+       u16 port;
+@@ -66,6 +64,8 @@ struct frame_info {
+ #define IFH_REW_OP_TWO_STEP_PTP               0x3
+ #define IFH_REW_OP_ORIGIN_PTP         0x5
+ 
++#define OCELOT_TAG_LEN                        16
++
+ #define OCELOT_SPEED_2500 0
+ #define OCELOT_SPEED_1000 1
+ #define OCELOT_SPEED_100  2
+--- a/drivers/net/ethernet/mscc/ocelot_board.c
++++ b/drivers/net/ethernet/mscc/ocelot_board.c
+@@ -105,7 +105,7 @@ static irqreturn_t ocelot_xtr_irq_handle
+               int sz, len, buf_len;
+               struct sk_buff *skb;
+ 
+-              for (i = 0; i < IFH_LEN; i++) {
++              for (i = 0; i < OCELOT_TAG_LEN / 4; i++) {
+                       err = ocelot_rx_frame_word(ocelot, grp, true, &ifh[i]);
+                       if (err != 4)
+                               break;