linux: update b53 upstream driver

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

6 files changed, 4 insertions, 401 deletions

diff --git a/target/linux/bmips/patches-5.10/045-v5.13-net-dsa-b53-spi-allow-device-tree-probing.patch b/target/linux/bmips/patches-5.10/045-v5.13-net-dsa-b53-spi-allow-device-tree-probing.patch
deleted file mode 100644
index 56579b2d36..0000000000
--- a/target/linux/bmips/patches-5.10/045-v5.13-net-dsa-b53-spi-allow-device-tree-probing.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6d16eadab6db0c1d61e59fee7ed1ecc2d10269be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Mon, 15 Mar 2021 15:14:23 +0100
-Subject: [PATCH] net: dsa: b53: spi: allow device tree probing
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add missing of_match_table to allow device tree probing.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/dsa/b53/b53_spi.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/drivers/net/dsa/b53/b53_spi.c
-+++ b/drivers/net/dsa/b53/b53_spi.c
-@@ -324,9 +324,22 @@ static int b53_spi_remove(struct spi_dev
- 	return 0;
- }
- 
-+static const struct of_device_id b53_spi_of_match[] = {
-+	{ .compatible = "brcm,bcm5325" },
-+	{ .compatible = "brcm,bcm5365" },
-+	{ .compatible = "brcm,bcm5395" },
-+	{ .compatible = "brcm,bcm5397" },
-+	{ .compatible = "brcm,bcm5398" },
-+	{ .compatible = "brcm,bcm53115" },
-+	{ .compatible = "brcm,bcm53125" },
-+	{ .compatible = "brcm,bcm53128" },
-+	{ /* sentinel */ }
-+};
-+
- static struct spi_driver b53_spi_driver = {
- 	.driver = {
- 		.name	= "b53-switch",
-+		.of_match_table = b53_spi_of_match,
- 	},
- 	.probe	= b53_spi_probe,
- 	.remove	= b53_spi_remove,
diff --git a/target/linux/bmips/patches-5.10/048-v5.13-net-dsa-b53-relax-is63xx-condition.patch b/target/linux/bmips/patches-5.10/048-v5.13-net-dsa-b53-relax-is63xx-condition.patch
deleted file mode 100644
index ef5522ad33..0000000000
--- a/target/linux/bmips/patches-5.10/048-v5.13-net-dsa-b53-relax-is63xx-condition.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ad426d7d966b525b73ed5a1842dd830312bbba71 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Wed, 17 Mar 2021 09:42:01 +0100
-Subject: [PATCH] net: dsa: b53: relax is63xx() condition
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-BCM63xx switches are present on bcm63xx and bmips devices.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/dsa/b53/b53_priv.h | 4 ----
- 1 file changed, 4 deletions(-)
-
---- a/drivers/net/dsa/b53/b53_priv.h
-+++ b/drivers/net/dsa/b53/b53_priv.h
-@@ -185,11 +185,7 @@ static inline int is531x5(struct b53_dev
- 
- static inline int is63xx(struct b53_device *dev)
- {
--#ifdef CONFIG_BCM63XX
- 	return dev->chip_id == BCM63XX_DEVICE_ID;
--#else
--	return 0;
--#endif
- }
- 
- static inline int is5301x(struct b53_device *dev)
diff --git a/target/linux/bmips/patches-5.10/049-v5.13-net-dsa-tag_brcm-add-support-for-legacy-tags.patch b/target/linux/bmips/patches-5.10/049-v5.13-net-dsa-tag_brcm-add-support-for-legacy-tags.patch
deleted file mode 100644
index c689bc84d1..0000000000
--- a/target/linux/bmips/patches-5.10/049-v5.13-net-dsa-tag_brcm-add-support-for-legacy-tags.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From 964dbf186eaa84d409c359ddf09c827a3fbe8228 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Wed, 17 Mar 2021 11:29:26 +0100
-Subject: [PATCH 1/2] net: dsa: tag_brcm: add support for legacy tags
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add support for legacy Broadcom tags, which are similar to DSA_TAG_PROTO_BRCM.
-These tags are used on BCM5325, BCM5365 and BCM63xx switches.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- include/net/dsa.h  |   2 +
- net/dsa/Kconfig    |   7 +++
- net/dsa/tag_brcm.c | 107 +++++++++++++++++++++++++++++++++++++++++++--
- 3 files changed, 113 insertions(+), 3 deletions(-)
-
---- a/include/net/dsa.h
-+++ b/include/net/dsa.h
-@@ -45,10 +45,12 @@ struct phylink_link_state;
- #define DSA_TAG_PROTO_OCELOT_VALUE		15
- #define DSA_TAG_PROTO_AR9331_VALUE		16
- #define DSA_TAG_PROTO_RTL4_A_VALUE		17
-+#define DSA_TAG_PROTO_BRCM_LEGACY_VALUE		22
- 
- enum dsa_tag_protocol {
- 	DSA_TAG_PROTO_NONE		= DSA_TAG_PROTO_NONE_VALUE,
- 	DSA_TAG_PROTO_BRCM		= DSA_TAG_PROTO_BRCM_VALUE,
-+	DSA_TAG_PROTO_BRCM_LEGACY	= DSA_TAG_PROTO_BRCM_LEGACY_VALUE,
- 	DSA_TAG_PROTO_BRCM_PREPEND	= DSA_TAG_PROTO_BRCM_PREPEND_VALUE,
- 	DSA_TAG_PROTO_DSA		= DSA_TAG_PROTO_DSA_VALUE,
- 	DSA_TAG_PROTO_EDSA		= DSA_TAG_PROTO_EDSA_VALUE,
---- a/net/dsa/Kconfig
-+++ b/net/dsa/Kconfig
-@@ -47,6 +47,13 @@ config NET_DSA_TAG_BRCM
- 	  Say Y if you want to enable support for tagging frames for the
- 	  Broadcom switches which place the tag after the MAC source address.
- 
-+config NET_DSA_TAG_BRCM_LEGACY
-+	tristate "Tag driver for Broadcom legacy switches using in-frame headers"
-+	select NET_DSA_TAG_BRCM_COMMON
-+	help
-+	  Say Y if you want to enable support for tagging frames for the
-+	  Broadcom legacy switches which place the tag after the MAC source
-+	  address.
- 
- config NET_DSA_TAG_BRCM_PREPEND
- 	tristate "Tag driver for Broadcom switches using prepended headers"
---- a/net/dsa/tag_brcm.c
-+++ b/net/dsa/tag_brcm.c
-@@ -11,9 +11,26 @@
- 
- #include "dsa_priv.h"
- 
--/* This tag length is 4 bytes, older ones were 6 bytes, we do not
-- * handle them
-- */
-+/* Legacy Broadcom tag (6 bytes) */
-+#define BRCM_LEG_TAG_LEN	6
-+
-+/* Type fields */
-+/* 1st byte in the tag */
-+#define BRCM_LEG_TYPE_HI	0x88
-+/* 2nd byte in the tag */
-+#define BRCM_LEG_TYPE_LO	0x74
-+
-+/* Tag fields */
-+/* 3rd byte in the tag */
-+#define BRCM_LEG_UNICAST	(0 << 5)
-+#define BRCM_LEG_MULTICAST	(1 << 5)
-+#define BRCM_LEG_EGRESS		(2 << 5)
-+#define BRCM_LEG_INGRESS	(3 << 5)
-+
-+/* 6th byte in the tag */
-+#define BRCM_LEG_PORT_ID	(0xf)
-+
-+/* Newer Broadcom tag (4 bytes) */
- #define BRCM_TAG_LEN	4
- 
- /* Tag is constructed and desconstructed using byte by byte access
-@@ -194,6 +211,87 @@ DSA_TAG_DRIVER(brcm_netdev_ops);
- MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_BRCM);
- #endif
- 
-+#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_LEGACY)
-+static struct sk_buff *brcm_leg_tag_xmit(struct sk_buff *skb,
-+					 struct net_device *dev)
-+{
-+	struct dsa_port *dp = dsa_slave_to_port(dev);
-+	u8 *brcm_tag;
-+
-+	/* The Ethernet switch we are interfaced with needs packets to be at
-+	 * least 64 bytes (including FCS) otherwise they will be discarded when
-+	 * they enter the switch port logic. When Broadcom tags are enabled, we
-+	 * need to make sure that packets are at least 70 bytes
-+	 * (including FCS and tag) because the length verification is done after
-+	 * the Broadcom tag is stripped off the ingress packet.
-+	 *
-+	 * Let dsa_slave_xmit() free the SKB
-+	 */
-+	if (__skb_put_padto(skb, ETH_ZLEN + BRCM_LEG_TAG_LEN, false))
-+		return NULL;
-+
-+	skb_push(skb, BRCM_LEG_TAG_LEN);
-+
-+	memmove(skb->data, skb->data + BRCM_LEG_TAG_LEN, 2 * ETH_ALEN);
-+
-+	brcm_tag = skb->data + 2 * ETH_ALEN;
-+
-+	/* Broadcom tag type */
-+	brcm_tag[0] = BRCM_LEG_TYPE_HI;
-+	brcm_tag[1] = BRCM_LEG_TYPE_LO;
-+
-+	/* Broadcom tag value */
-+	brcm_tag[2] = BRCM_LEG_EGRESS;
-+	brcm_tag[3] = 0;
-+	brcm_tag[4] = 0;
-+	brcm_tag[5] = dp->index & BRCM_LEG_PORT_ID;
-+
-+	return skb;
-+}
-+
-+static struct sk_buff *brcm_leg_tag_rcv(struct sk_buff *skb,
-+					struct net_device *dev,
-+					struct packet_type *pt)
-+{
-+	int source_port;
-+	u8 *brcm_tag;
-+
-+	if (unlikely(!pskb_may_pull(skb, BRCM_LEG_PORT_ID)))
-+		return NULL;
-+
-+	brcm_tag = skb->data - 2;
-+
-+	source_port = brcm_tag[5] & BRCM_LEG_PORT_ID;
-+
-+	skb->dev = dsa_master_find_slave(dev, 0, source_port);
-+	if (!skb->dev)
-+		return NULL;
-+
-+	/* Remove Broadcom tag and update checksum */
-+	skb_pull_rcsum(skb, BRCM_LEG_TAG_LEN);
-+
-+	skb->offload_fwd_mark = 1;
-+
-+	/* Move the Ethernet DA and SA */
-+	memmove(skb->data - ETH_HLEN,
-+		skb->data - ETH_HLEN - BRCM_LEG_TAG_LEN,
-+		2 * ETH_ALEN);
-+
-+	return skb;
-+}
-+
-+static const struct dsa_device_ops brcm_legacy_netdev_ops = {
-+	.name = "brcm-legacy",
-+	.proto = DSA_TAG_PROTO_BRCM_LEGACY,
-+	.xmit = brcm_leg_tag_xmit,
-+	.rcv = brcm_leg_tag_rcv,
-+	.overhead = BRCM_LEG_TAG_LEN,
-+};
-+
-+DSA_TAG_DRIVER(brcm_legacy_netdev_ops);
-+MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_BRCM_LEGACY);
-+#endif /* CONFIG_NET_DSA_TAG_BRCM_LEGACY */
-+
- #if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_PREPEND)
- static struct sk_buff *brcm_tag_xmit_prepend(struct sk_buff *skb,
- 					     struct net_device *dev)
-@@ -226,6 +324,9 @@ static struct dsa_tag_driver *dsa_tag_dr
- #if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM)
- 	&DSA_TAG_DRIVER_NAME(brcm_netdev_ops),
- #endif
-+#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_LEGACY)
-+	&DSA_TAG_DRIVER_NAME(brcm_legacy_netdev_ops),
-+#endif
- #if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_PREPEND)
- 	&DSA_TAG_DRIVER_NAME(brcm_prepend_netdev_ops),
- #endif
diff --git a/target/linux/bmips/patches-5.10/050-v5.13-net-dsa-b53-support-legacy-tags.patch b/target/linux/bmips/patches-5.10/050-v5.13-net-dsa-b53-support-legacy-tags.patch
deleted file mode 100644
index 18cd09ff0e..0000000000
--- a/target/linux/bmips/patches-5.10/050-v5.13-net-dsa-b53-support-legacy-tags.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 46c5176c586c81306bf9e7024c13b95da775490f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Wed, 17 Mar 2021 11:29:27 +0100
-Subject: [PATCH 2/2] net: dsa: b53: support legacy tags
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-These tags are used on BCM5325, BCM5365 and BCM63xx switches.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/dsa/b53/Kconfig      |  1 +
- drivers/net/dsa/b53/b53_common.c | 12 +++++++-----
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
---- a/drivers/net/dsa/b53/Kconfig
-+++ b/drivers/net/dsa/b53/Kconfig
-@@ -3,6 +3,7 @@ menuconfig B53
- 	tristate "Broadcom BCM53xx managed switch support"
- 	depends on NET_DSA
- 	select NET_DSA_TAG_BRCM
-+	select NET_DSA_TAG_BRCM_LEGACY
- 	select NET_DSA_TAG_BRCM_PREPEND
- 	help
- 	  This driver adds support for Broadcom managed switch chips. It supports
---- a/drivers/net/dsa/b53/b53_common.c
-+++ b/drivers/net/dsa/b53/b53_common.c
-@@ -2021,15 +2021,17 @@ enum dsa_tag_protocol b53_get_tag_protoc
- {
- 	struct b53_device *dev = ds->priv;
- 
--	/* Older models (5325, 5365) support a different tag format that we do
--	 * not support in net/dsa/tag_brcm.c yet.
--	 */
--	if (is5325(dev) || is5365(dev) ||
--	    !b53_can_enable_brcm_tags(ds, port, mprot)) {
-+	if (!b53_can_enable_brcm_tags(ds, port, mprot)) {
- 		dev->tag_protocol = DSA_TAG_PROTO_NONE;
- 		goto out;
- 	}
- 
-+	/* Older models require a different 6 byte tag */
-+	if (is5325(dev) || is5365(dev) || is63xx(dev)) {
-+		dev->tag_protocol = DSA_TAG_PROTO_BRCM_LEGACY;
-+		goto out;
-+	}
-+
- 	/* Broadcom BCM58xx chips have a flow accelerator on Port 8
- 	 * which requires us to use the prepended Broadcom tag type
- 	 */
diff --git a/target/linux/bmips/patches-5.10/051-v5.13-net-dsa-b53-mmap-Add-device-tree-support.patch b/target/linux/bmips/patches-5.10/051-v5.13-net-dsa-b53-mmap-Add-device-tree-support.patch
deleted file mode 100644
index c1014b20bc..0000000000
--- a/target/linux/bmips/patches-5.10/051-v5.13-net-dsa-b53-mmap-Add-device-tree-support.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From a5538a777b73b35750ed1ffff8c1ef539e861624 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Wed, 17 Mar 2021 10:23:17 +0100
-Subject: [PATCH] net: dsa: b53: mmap: Add device tree support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add device tree support to b53_mmap.c while keeping platform devices support.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/dsa/b53/b53_mmap.c | 55 ++++++++++++++++++++++++++++++++++
- 1 file changed, 55 insertions(+)
-
---- a/drivers/net/dsa/b53/b53_mmap.c
-+++ b/drivers/net/dsa/b53/b53_mmap.c
-@@ -16,6 +16,7 @@
-  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#include <linux/bits.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/io.h>
-@@ -228,11 +229,65 @@ static const struct b53_io_ops b53_mmap_
- 	.write64 = b53_mmap_write64,
- };
- 
-+static int b53_mmap_probe_of(struct platform_device *pdev,
-+			     struct b53_platform_data **ppdata)
-+{
-+	struct device_node *np = pdev->dev.of_node;
-+	struct device_node *of_ports, *of_port;
-+	struct device *dev = &pdev->dev;
-+	struct b53_platform_data *pdata;
-+	void __iomem *mem;
-+
-+	mem = devm_platform_ioremap_resource(pdev, 0);
-+	if (IS_ERR(mem))
-+		return PTR_ERR(mem);
-+
-+	pdata = devm_kzalloc(dev, sizeof(struct b53_platform_data),
-+			     GFP_KERNEL);
-+	if (!pdata)
-+		return -ENOMEM;
-+
-+	pdata->regs = mem;
-+	pdata->chip_id = BCM63XX_DEVICE_ID;
-+	pdata->big_endian = of_property_read_bool(np, "big-endian");
-+
-+	of_ports = of_get_child_by_name(np, "ports");
-+	if (!of_ports) {
-+		dev_err(dev, "no ports child node found\n");
-+		return -EINVAL;
-+	}
-+
-+	for_each_available_child_of_node(of_ports, of_port) {
-+		u32 reg;
-+
-+		if (of_property_read_u32(of_port, "reg", &reg))
-+			continue;
-+
-+		if (reg < B53_CPU_PORT)
-+			pdata->enabled_ports |= BIT(reg);
-+	}
-+
-+	of_node_put(of_ports);
-+	*ppdata = pdata;
-+
-+	return 0;
-+}
-+
- static int b53_mmap_probe(struct platform_device *pdev)
- {
-+	struct device_node *np = pdev->dev.of_node;
- 	struct b53_platform_data *pdata = pdev->dev.platform_data;
- 	struct b53_mmap_priv *priv;
- 	struct b53_device *dev;
-+	int ret;
-+
-+	if (!pdata && np) {
-+		ret = b53_mmap_probe_of(pdev, &pdata);
-+		if (ret) {
-+			dev_err(&pdev->dev, "OF probe error\n");
-+			return ret;
-+		}
-+	}
- 
- 	if (!pdata)
- 		return -EINVAL;
diff --git a/target/linux/bmips/patches-5.10/510-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch b/target/linux/bmips/patches-5.10/510-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch
index 41655231fa..c636e3a907 100644
--- a/target/linux/bmips/patches-5.10/510-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch
+++ b/target/linux/bmips/patches-5.10/510-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch
@@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
 
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -1148,6 +1148,36 @@ static void b53_force_port_config(struct
+@@ -1174,6 +1174,36 @@ static void b53_force_port_config(struct
  	b53_write8(dev, B53_CTRL_PAGE, off, reg);
  }
  
@@ -50,7 +50,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
  static void b53_adjust_link(struct dsa_switch *ds, int port,
  			    struct phy_device *phydev)
  {
-@@ -1174,6 +1204,9 @@ static void b53_adjust_link(struct dsa_s
+@@ -1200,6 +1230,9 @@ static void b53_adjust_link(struct dsa_s
  			      tx_pause, rx_pause);
  	b53_force_link(dev, port, phydev->link);
  
@@ -58,9 +58,9 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
 +		b53_adjust_63xx_rgmii(ds, port, phydev->interface);
 +
  	if (is531x5(dev) && phy_interface_is_rgmii(phydev)) {
- 		if (port == 8)
+ 		if (port == dev->imp_port)
  			off = B53_RGMII_CTRL_IMP;
-@@ -1366,6 +1399,9 @@ void b53_phylink_mac_link_up(struct dsa_
+@@ -1386,6 +1419,9 @@ void b53_phylink_mac_link_up(struct dsa_
  {
  	struct b53_device *dev = ds->priv;