dt-bindings: net: convert Broadcom Starfighter 2 binding to the json-schema
Subsystems (5)
PATCH v2 1/3 dt-bindings: net: convert Broadcom Starfighter 2 binding to the json-schema
From: Rafał Miłecki <[email protected]>
This helps validating DTS files. Only the current (not deprecated one) binding was converted.
Minor changes:
1. Dropped dsa/dsa.txt references
2. Updated node name to match dsa.yaml requirement
3. Fixed 2 typos in examples
The new binding was validated using the dt_binding_check.
---
V2: "compatible" based "clocks" and "clock-names" validation
Include "clocks" and "clock-names" in the example
NOTE:
This patch purposefully doesn't add *global* "clocks" and "clock-names" requirement. It's to prepare YAML for the next patch that follows (the one adding "brcm,bcm4908-switch").
--- .../bindings/net/brcm,bcm7445-switch-v4.0.txt | 101 +--------- .../devicetree/bindings/net/dsa/brcm,sf2.yaml | 172 ++++++++++++++++++ 2 files changed, 175 insertions(+), 98 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/dsa/brcm,sf2.yaml
Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt +3 -98
@@ -1,108 +1,13 @@ * Broadcom Starfighter 2 integrated swich -Required properties: +See dsa/brcm,bcm7445-switch-v4.0.yaml for the documentation. -- compatible: should be one of - "brcm,bcm7445-switch-v4.0" - "brcm,bcm7278-switch-v4.0" - "brcm,bcm7278-switch-v4.8" -- reg: addresses and length of the register sets for the device, must be 6 - pairs of register addresses and lengths -- interrupts: interrupts for the devices, must be two interrupts -- #address-cells: must be 1, see dsa/dsa.txt -- #size-cells: must be 0, see dsa/dsa.txt - -Deprecated binding required properties: +*Deprecated* binding required properties: - dsa,mii-bus: phandle to the MDIO bus controller, see dsa/dsa.txt - dsa,ethernet: phandle to the CPU network interface controller, see dsa/dsa.txt - #address-cells: must be 2, see dsa/dsa.txt -Subnodes: - -The integrated switch subnode should be specified according to the binding -described in dsa/dsa.txt. - -Optional properties: - -- reg-names: litteral names for the device base register addresses, when present - must be: "core", "reg", "intrl2_0", "intrl2_1", "fcb", "acb" - -- interrupt-names: litternal names for the device interrupt lines, when present - must be: "switch_0" and "switch_1" - -- brcm,num-gphy: specify the maximum number of integrated gigabit PHYs in the - switch - -- brcm,num-rgmii-ports: specify the maximum number of RGMII interfaces supported - by the switch - -- brcm,fcb-pause-override: boolean property, if present indicates that the switch - supports Failover Control Block pause override capability - -- brcm,acb-packets-inflight: boolean property, if present indicates that the switch - Admission Control Block supports reporting the number of packets in-flight in a - switch queue - -- resets: a single phandle and reset identifier pair. See - Documentation/devicetree/bindings/reset/reset.txt for details. - -- reset-names: If the "reset" property is specified, this property should have - the value "switch" to denote the switch reset line. - -- clocks: when provided, the first phandle is to the switch's main clock and - is valid for both BCM7445 and BCM7278. The second phandle is only applicable - to BCM7445 and is to support dividing the switch core clock. - -- clock-names: when provided, the first phandle must be "sw_switch", and the - second must be named "sw_switch_mdiv". - -Port subnodes: - -Optional properties: - -- brcm,use-bcm-hdr: boolean property, if present, indicates that the switch - port has Broadcom tags enabled (per-packet metadata) - -Example: - -switch_top@f0b00000 { - compatible = "simple-bus"; - #size-cells = <1>; - #address-cells = <1>; - ranges = <0 0xf0b00000 0x40804>; - - ethernet_switch@0 { - compatible = "brcm,bcm7445-switch-v4.0"; - #size-cells = <0>; - #address-cells = <1>; - reg = <0x0 0x40000 - 0x40000 0x110 - 0x40340 0x30 - 0x40380 0x30 - 0x40400 0x34 - 0x40600 0x208>; - reg-names = "core", "reg", intrl2_0", "intrl2_1", - "fcb, "acb"; - interrupts = <0 0x18 0 - 0 0x19 0>; - brcm,num-gphy = <1>; - brcm,num-rgmii-ports = <2>; - brcm,fcb-pause-override; - brcm,acb-packets-inflight; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - label = "gphy"; - reg = <0>; - }; - }; - }; -}; - Example using the old DSA DeviceTree binding: switch_top@f0b00000 {
@@ -132,7 +37,7 @@ switch_top@f0b00000 { switch@0 { reg = <0 0>; #size-cells = <0>; - #address-cells <1>; + #address-cells = <1>; port@0 { label = "gphy";
Documentation/devicetree/bindings/net/dsa/brcm,sf2.yaml new file +172 -0
172 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v2 2/3 dt-bindings: net: dsa: sf2: add BCM4908 switch binding
From: Rafał Miłecki <[email protected]>
BCM4908 family SoCs have integrated Starfighter 2 switch.
--- Documentation/devicetree/bindings/net/dsa/brcm,sf2.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/net/dsa/brcm,sf2.yaml +1 -0
@@ -13,6 +13,7 @@ properties: compatible: items: - enum: + - brcm,bcm4908-switch - brcm,bcm7278-switch-v4.0 - brcm,bcm7278-switch-v4.8 - brcm,bcm7445-switch-v4.0
Signature · 1 line
2.26.2
PATCH v2 3/3 net: dsa: bcm_sf2: support BCM4908's integrated switch
In reply to Rafał MiłeckiFrom: Rafał Miłecki <[email protected]>
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.
--- 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(-)
drivers/net/dsa/b53/b53_common.c +14 -0
@@ -2459,6 +2459,20 @@ static const struct b53_chip_data b53_switch_chips[] = { .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, + .arl_bins = 4, + .arl_buckets = 256, + .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",
drivers/net/dsa/b53/b53_priv.h +1 -0
@@ -64,6 +64,7 @@ struct b53_io_ops {#define B53_INVALID_LANE 0xffenum { +BCM4908_DEVICE_ID =0x4908 ,BCM5325_DEVICE_ID =0x25 ,BCM5365_DEVICE_ID =0x65 ,BCM5389_DEVICE_ID =0x89 ,
drivers/net/dsa/bcm_sf2.c +33 -3
@@ -105,7 +105,8 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)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 ;
@@ -715,7 +716,8 @@ static void bcm_sf2_sw_mac_link_down(struct dsa_switch *ds, int port,u32 reg, offset;if (port !=core_readl (priv,CORE_IMP0_PRT_ID )) { -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);
@@ -742,7 +744,8 @@ static void bcm_sf2_sw_mac_link_up(struct dsa_switch *ds, int port,bcm_sf2_sw_mac_link_set (ds, port, interface, true);if (port !=core_readl (priv,CORE_IMP0_PRT_ID )) { -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);
@@ -1135,6 +1138,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 ,
@@ -1183,6 +1210,9 @@ static const struct bcm_sf2_of_data bcm_sf2_7278_data = { };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 },
drivers/net/dsa/bcm_sf2_regs.h +1 -0
@@ -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,
Signature · 1 line
2.26.2
Quoted 5 lines · On Wed, 6 Jan 2021 22:32:00 +0100 Rafał Miłecki wrote:
From: Rafał Miłecki <[email protected]>
This helps validating DTS files. Only the current (not deprecated one) binding was converted.
Quoted 8 lines
Minor changes:
1. Droppeddsa/dsa.txtreferences
2. Updated node name to matchdsa.yamlrequirement
3. Fixed 2 typos in examplesThe new binding was validated using the
dt_binding_check.Signed-off-by Rafał Miłecki <[email protected]>
Applied, I trust you'll follow up promptly if Rob finds anything wrong with the DT parts :)
Quoted 11 lines · Jakub Kicinski
Quoted 10 lines · On Wed, 6 Jan 2021 22:32:00 +0100 Rafał Miłecki wrote:
From: Rafał Miłecki <[email protected]>
This helps validating DTS files. Only the current (not deprecated one) binding was converted.
Minor changes:
1. Droppeddsa/dsa.txtreferences
2. Updated node name to matchdsa.yamlrequirement
3. Fixed 2 typos in examples
Quoted 6 lines
Quoted 3 lines
The new binding was validated using the
dt_binding_check.Signed-off-by Rafał Miłecki <[email protected]>Applied, I trust you'll follow up promptly if Rob finds anything wrong with the DT parts :)
Promise! :)
This series was applied to netdev/net-next.git (refs/heads/master):
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
Quoted 11 lines · On Wed, 6 Jan 2021 22:32:00 +0100 you wrote:
From: Rafał Miłecki <[email protected]>
This helps validating DTS files. Only the current (not deprecated one) binding was converted.
Minor changes:
1. Droppeddsa/dsa.txtreferences
2. Updated node name to matchdsa.yamlrequirement
3. Fixed 2 typos in examples[...]
Here is the summary with links:
- [V2,net-next,1/3] dt-bindings: net: convert Broadcom Starfighter 2 binding to the json-schema
https://git.kernel.org/netdev/net-next/c/c7ee3a40e76c - [V2,net-next,2/3] dt-bindings: net: dsa: sf2: add BCM4908 switch binding https://git.kernel.org/netdev/net-next/c/41bb4b087783 - [V2,net-next,3/3] net: dsa: bcm_sf2: support BCM4908's integrated switch https://git.kernel.org/netdev/net-next/c/73b7a6047971
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html