Patch "net: dsa: b53: Include IMP/CPU port in dumb forwarding mode" has been added to the 4.9-stable tree
This is a note to let you know that I've just added the patch titled
net: dsa: b53: Include IMP/CPU port in dumb forwarding mode
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-dsa-b53-include-imp-cpu-port-in-dumb-forwarding-mode.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Thu Oct 5 10:28:31 CEST 2017
From: Florian Fainelli <[email protected]>
Date: Mon, 24 Apr 2017 14:27:21 -0700
Subject: net: dsa: b53: Include IMP/CPU port in dumb forwarding mode
From: Florian Fainelli <[email protected]>
[ Upstream commit a424f0de61638cbb5047e0a888c54da9cf471f90 ]
Since Broadcom tags are not enabled in b53 (DSA_PROTO_TAG_NONE), we need to make sure that the IMP/CPU port is included in the forwarding decision.
Without this change, switching between non-management ports would work, but not between management ports and non-management ports thus breaking the default state in which DSA switch are brought up.
--- drivers/net/dsa/b53/b53_common.c | 10 ++++++++++ drivers/net/dsa/b53/b53_regs.h | 4 ++++ 2 files changed, 14 insertions(+)
drivers/net/dsa/b53/b53_common.c +10 -0
@@ -326,6 +326,7 @@ static void b53_get_vlan_entry(struct b5static void b53_set_forwarding (struct b53_device *dev,int enable) { +struct dsa_switch *ds = dev->ds;u8 mgmt;b53_read8 (dev,B53_CTRL_PAGE ,B53_SWITCH_MODE , &mgmt);
@@ -336,6 +337,15 @@ static void b53_set_forwarding(struct b5 mgmt &= ~SM_SW_FWD_EN ;b53_write8 (dev,B53_CTRL_PAGE ,B53_SWITCH_MODE , mgmt); + +/* Include IMP port in dumb forwarding mode when no tagging protocol is +* set +*/ +if (ds->ops->get_tag_protocol (ds) ==DSA_TAG_PROTO_NONE ) { +b53_read8 (dev,B53_CTRL_PAGE ,B53_SWITCH_CTRL , &mgmt); + mgmt |=B53_MII_DUMB_FWDG_EN ; +b53_write8 (dev,B53_CTRL_PAGE ,B53_SWITCH_CTRL , mgmt); + } }static void b53_enable_vlan (struct b53_device *dev,bool enable)
drivers/net/dsa/b53/b53_regs.h +4 -0
@@ -104,6 +104,10 @@#define B53_UC_FWD_EN BIT(6)#define B53_MC_FWD_EN BIT(7) +/* Switch control (8 bit) */ +#define B53_SWITCH_CTRL 0x22 +#define B53_MII_DUMB_FWDG_EN BIT(6) +/* (16 bit) */ #define B53_UC_FLOOD_MASK 0x32#define B53_MC_FLOOD_MASK 0x34
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/net-dsa-b53-include-imp-cpu-port-in-dumb-forwarding-mode.patch queue-4.9/arm-dts-bcm5301x-fix-memory-start-address.patch