mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-14 04:14:56 +08:00
bcm4908: backport BCM4908 integrated switch initial support
Upstream driver supports bridging ports. There is no support for crossbar setup or CPU port(s) yet. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki
parent
56d64d8b5a
commit
7e4f055990
@ -35,6 +35,11 @@ CONFIG_ARM_GIC_V3=y
|
||||
CONFIG_ARM_GIC_V3_ITS=y
|
||||
CONFIG_ARM_PSCI_FW=y
|
||||
CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
|
||||
CONFIG_B53=y
|
||||
# CONFIG_B53_MDIO_DRIVER is not set
|
||||
# CONFIG_B53_MMAP_DRIVER is not set
|
||||
# CONFIG_B53_SERDES is not set
|
||||
# CONFIG_B53_SRAB_DRIVER is not set
|
||||
CONFIG_BCM7XXX_PHY=y
|
||||
CONFIG_BCM_NET_PHYLIB=y
|
||||
CONFIG_BCM_PMB=y
|
||||
@ -92,6 +97,7 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_GPIO_GENERIC=y
|
||||
CONFIG_GPIO_GENERIC_PLATFORM=y
|
||||
CONFIG_GRO_CELLS=y
|
||||
CONFIG_HANDLE_DOMAIN_IRQ=y
|
||||
CONFIG_HARDEN_BRANCH_PREDICTOR=y
|
||||
CONFIG_HARDIRQS_SW_RESEND=y
|
||||
@ -125,7 +131,14 @@ CONFIG_MTD_RAW_NAND=y
|
||||
CONFIG_MUTEX_SPIN_ON_OWNER=y
|
||||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
CONFIG_NEED_SG_DMA_LENGTH=y
|
||||
CONFIG_NET_DEVLINK=y
|
||||
CONFIG_NET_DSA=y
|
||||
CONFIG_NET_DSA_BCM_SF2=y
|
||||
CONFIG_NET_DSA_TAG_BRCM=y
|
||||
CONFIG_NET_DSA_TAG_BRCM_COMMON=y
|
||||
CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
|
||||
CONFIG_NET_FLOW_LIMIT=y
|
||||
CONFIG_NET_SWITCHDEV=y
|
||||
CONFIG_NO_IOPORT_MAP=y
|
||||
CONFIG_NR_CPUS=4
|
||||
CONFIG_OF=y
|
||||
@ -141,6 +154,7 @@ CONFIG_PADATA=y
|
||||
CONFIG_PARTITION_PERCPU=y
|
||||
CONFIG_PGTABLE_LEVELS=3
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_PHYLINK=y
|
||||
CONFIG_PHYS_ADDR_T_64BIT=y
|
||||
CONFIG_PM=y
|
||||
CONFIG_PM_CLK=y
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
From 3b33438c52def0de4a5577ad541e50923bcc2596 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Barker <pbarker@konsulko.com>
|
||||
Date: Thu, 3 Sep 2020 12:26:20 +0100
|
||||
Subject: [PATCH] net: dsa: b53: Use dev_{err,info} instead of pr_*
|
||||
|
||||
This change allows us to see which device the err or info messages are
|
||||
referring to if we have multiple b53 compatible devices on a board.
|
||||
|
||||
As this removes the only pr_*() calls in this file we can drop the
|
||||
definition of pr_fmt().
|
||||
|
||||
Signed-off-by: Paul Barker <pbarker@konsulko.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/dsa/b53/b53_common.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
--- a/drivers/net/dsa/b53/b53_common.c
|
||||
+++ b/drivers/net/dsa/b53/b53_common.c
|
||||
@@ -17,8 +17,6 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
-
|
||||
#include <linux/delay.h>
|
||||
#include <linux/export.h>
|
||||
#include <linux/gpio.h>
|
||||
@@ -2458,8 +2456,9 @@ int b53_switch_detect(struct b53_device
|
||||
dev->chip_id = id32;
|
||||
break;
|
||||
default:
|
||||
- pr_err("unsupported switch detected (BCM53%02x/BCM%x)\n",
|
||||
- id8, id32);
|
||||
+ dev_err(dev->dev,
|
||||
+ "unsupported switch detected (BCM53%02x/BCM%x)\n",
|
||||
+ id8, id32);
|
||||
return -ENODEV;
|
||||
}
|
||||
}
|
||||
@@ -2489,7 +2488,8 @@ int b53_switch_register(struct b53_devic
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
- pr_info("found switch: %s, rev %i\n", dev->name, dev->core_rev);
|
||||
+ dev_info(dev->dev, "found switch: %s, rev %i\n",
|
||||
+ dev->name, dev->core_rev);
|
||||
|
||||
return dsa_register_switch(dev->ds);
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
From 434d2312cd8057aa6972f2b39aa0b359d02af9f4 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Barker <pbarker@konsulko.com>
|
||||
Date: Thu, 3 Sep 2020 12:26:21 +0100
|
||||
Subject: [PATCH] net: dsa: b53: Print err message on SW_RST timeout
|
||||
|
||||
This allows us to differentiate between the possible failure modes of
|
||||
b53_switch_reset() by looking at the dmesg output.
|
||||
|
||||
Signed-off-by: Paul Barker <pbarker@konsulko.com>
|
||||
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/dsa/b53/b53_common.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/net/dsa/b53/b53_common.c
|
||||
+++ b/drivers/net/dsa/b53/b53_common.c
|
||||
@@ -740,8 +740,11 @@ static int b53_switch_reset(struct b53_d
|
||||
usleep_range(1000, 2000);
|
||||
} while (timeout-- > 0);
|
||||
|
||||
- if (timeout == 0)
|
||||
+ if (timeout == 0) {
|
||||
+ dev_err(dev->dev,
|
||||
+ "Timeout waiting for SW_RST to clear!\n");
|
||||
return -ETIMEDOUT;
|
||||
+ }
|
||||
}
|
||||
|
||||
b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, &mgmt);
|
||||
@ -0,0 +1,131 @@
|
||||
From 73b7a6047971aa6ce4a70fc4901964d14f077171 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Wed, 6 Jan 2021 22:32:02 +0100
|
||||
Subject: [PATCH] net: dsa: bcm_sf2: support BCM4908's integrated switch
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
BCM4908 family SoCs come with integrated Starfighter 2 switch. Its
|
||||
registers layout it a mix of BCM7278 and BCM7445. It has 5 integrated
|
||||
PHYs and 8 ports. It also supports RGMII and SerDes.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Link: https://lore.kernel.org/r/20210106213202.17459-3-zajec5@gmail.com
|
||||
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
---
|
||||
drivers/net/dsa/b53/b53_common.c | 14 +++++++++++++
|
||||
drivers/net/dsa/b53/b53_priv.h | 1 +
|
||||
drivers/net/dsa/bcm_sf2.c | 36 +++++++++++++++++++++++++++++---
|
||||
drivers/net/dsa/bcm_sf2_regs.h | 1 +
|
||||
4 files changed, 49 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/drivers/net/dsa/b53/b53_common.c
|
||||
+++ b/drivers/net/dsa/b53/b53_common.c
|
||||
@@ -2260,6 +2260,22 @@ static const struct b53_chip_data b53_sw
|
||||
.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
|
||||
.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
|
||||
},
|
||||
+ /* Starfighter 2 */
|
||||
+ {
|
||||
+ .chip_id = BCM4908_DEVICE_ID,
|
||||
+ .dev_name = "BCM4908",
|
||||
+ .vlans = 4096,
|
||||
+ .enabled_ports = 0x1bf,
|
||||
+#if 0
|
||||
+ .arl_bins = 4,
|
||||
+ .arl_buckets = 256,
|
||||
+#endif
|
||||
+ .cpu_port = 8, /* TODO: ports 4, 5, 8 */
|
||||
+ .vta_regs = B53_VTA_REGS,
|
||||
+ .duplex_reg = B53_DUPLEX_STAT_GE,
|
||||
+ .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
|
||||
+ .jumbo_size_reg = B53_JUMBO_MAX_SIZE,
|
||||
+ },
|
||||
{
|
||||
.chip_id = BCM7445_DEVICE_ID,
|
||||
.dev_name = "BCM7445",
|
||||
--- a/drivers/net/dsa/b53/b53_priv.h
|
||||
+++ b/drivers/net/dsa/b53/b53_priv.h
|
||||
@@ -64,6 +64,7 @@ struct b53_io_ops {
|
||||
#define B53_INVALID_LANE 0xff
|
||||
|
||||
enum {
|
||||
+ BCM4908_DEVICE_ID = 0x4908,
|
||||
BCM5325_DEVICE_ID = 0x25,
|
||||
BCM5365_DEVICE_ID = 0x65,
|
||||
BCM5389_DEVICE_ID = 0x89,
|
||||
--- a/drivers/net/dsa/bcm_sf2.c
|
||||
+++ b/drivers/net/dsa/bcm_sf2.c
|
||||
@@ -61,7 +61,8 @@ static void bcm_sf2_imp_setup(struct dsa
|
||||
b53_brcm_hdr_setup(ds, port);
|
||||
|
||||
if (port == 8) {
|
||||
- if (priv->type == BCM7445_DEVICE_ID)
|
||||
+ if (priv->type == BCM4908_DEVICE_ID ||
|
||||
+ priv->type == BCM7445_DEVICE_ID)
|
||||
offset = CORE_STS_OVERRIDE_IMP;
|
||||
else
|
||||
offset = CORE_STS_OVERRIDE_IMP2;
|
||||
@@ -542,7 +543,8 @@ static void bcm_sf2_sw_mac_config(struct
|
||||
if (port == core_readl(priv, CORE_IMP0_PRT_ID))
|
||||
return;
|
||||
|
||||
- if (priv->type == BCM7445_DEVICE_ID)
|
||||
+ if (priv->type == BCM4908_DEVICE_ID ||
|
||||
+ priv->type == BCM7445_DEVICE_ID)
|
||||
offset = CORE_STS_OVERRIDE_GMIIP_PORT(port);
|
||||
else
|
||||
offset = CORE_STS_OVERRIDE_GMIIP2_PORT(port);
|
||||
@@ -984,6 +986,30 @@ struct bcm_sf2_of_data {
|
||||
unsigned int num_cfp_rules;
|
||||
};
|
||||
|
||||
+static const u16 bcm_sf2_4908_reg_offsets[] = {
|
||||
+ [REG_SWITCH_CNTRL] = 0x00,
|
||||
+ [REG_SWITCH_STATUS] = 0x04,
|
||||
+ [REG_DIR_DATA_WRITE] = 0x08,
|
||||
+ [REG_DIR_DATA_READ] = 0x0c,
|
||||
+ [REG_SWITCH_REVISION] = 0x10,
|
||||
+ [REG_PHY_REVISION] = 0x14,
|
||||
+ [REG_SPHY_CNTRL] = 0x24,
|
||||
+ [REG_CROSSBAR] = 0xc8,
|
||||
+ [REG_RGMII_0_CNTRL] = 0xe0,
|
||||
+ [REG_RGMII_1_CNTRL] = 0xec,
|
||||
+ [REG_RGMII_2_CNTRL] = 0xf8,
|
||||
+ [REG_LED_0_CNTRL] = 0x40,
|
||||
+ [REG_LED_1_CNTRL] = 0x4c,
|
||||
+ [REG_LED_2_CNTRL] = 0x58,
|
||||
+};
|
||||
+
|
||||
+static const struct bcm_sf2_of_data bcm_sf2_4908_data = {
|
||||
+ .type = BCM4908_DEVICE_ID,
|
||||
+ .core_reg_align = 0,
|
||||
+ .reg_offsets = bcm_sf2_4908_reg_offsets,
|
||||
+ .num_cfp_rules = 0, /* FIXME */
|
||||
+};
|
||||
+
|
||||
/* Register offsets for the SWITCH_REG_* block */
|
||||
static const u16 bcm_sf2_7445_reg_offsets[] = {
|
||||
[REG_SWITCH_CNTRL] = 0x00,
|
||||
@@ -1032,6 +1058,9 @@ static const struct bcm_sf2_of_data bcm_
|
||||
};
|
||||
|
||||
static const struct of_device_id bcm_sf2_of_match[] = {
|
||||
+ { .compatible = "brcm,bcm4908-switch",
|
||||
+ .data = &bcm_sf2_4908_data
|
||||
+ },
|
||||
{ .compatible = "brcm,bcm7445-switch-v4.0",
|
||||
.data = &bcm_sf2_7445_data
|
||||
},
|
||||
--- a/drivers/net/dsa/bcm_sf2_regs.h
|
||||
+++ b/drivers/net/dsa/bcm_sf2_regs.h
|
||||
@@ -17,6 +17,7 @@ enum bcm_sf2_reg_offs {
|
||||
REG_SWITCH_REVISION,
|
||||
REG_PHY_REVISION,
|
||||
REG_SPHY_CNTRL,
|
||||
+ REG_CROSSBAR,
|
||||
REG_RGMII_0_CNTRL,
|
||||
REG_RGMII_1_CNTRL,
|
||||
REG_RGMII_2_CNTRL,
|
||||
Loading…
Reference in New Issue
Block a user