Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9292f2c authored by Egil Hjelmeland's avatar Egil Hjelmeland Committed by David S. Miller
Browse files

net: dsa: lan9303: Add STP ALR entry on port 0 



STP BPDUs arriving on user ports must sent to CPU port only,
for processing by the SW bridge.

Add an ALR entry with STP state override to fix that.

Signed-off-by: default avatarEgil Hjelmeland <privat@egil-hjelmeland.no>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 909fb9ae

drivers/net/dsa/lan9303-core.c

+2 −0
Original line number Diff line number Diff line
@@ -773,6 +773,7 @@ static int lan9303_separate_ports(struct lan9303 *chip) 
{

	int ret;



	lan9303_alr_del_port(chip, eth_stp_addr, 0);

	ret = lan9303_write_switch_reg(chip, LAN9303_SWE_PORT_MIRROR,

				LAN9303_SWE_PORT_MIRROR_SNIFFER_PORT0 |

				LAN9303_SWE_PORT_MIRROR_MIRRORED_PORT1 |
@@ -797,6 +798,7 @@ static void lan9303_bridge_ports(struct lan9303 *chip) 


	lan9303_write_switch_reg(chip, LAN9303_SWE_PORT_STATE,

				 chip->swe_port_state);

	lan9303_alr_add_port(chip, eth_stp_addr, 0, true);

}



static int lan9303_handle_reset(struct lan9303 *chip)

include/linux/dsa/lan9303.h

+2 −0
Original line number Diff line number Diff line
@@ -34,3 +34,5 @@ struct lan9303 { 
	 **/

	struct lan9303_alr_cache_entry alr_cache[LAN9303_NUM_ALR_RECORDS];

};



#define eth_stp_addr eth_reserved_addr_base

net/dsa/tag_lan9303.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#define LAN9303_TAG_LEN 4

# define LAN9303_TAG_TX_USE_ALR BIT(3)

# define LAN9303_TAG_TX_STP_OVERRIDE BIT(4)

#define eth_stp_addr eth_reserved_addr_base



/* Decide whether to transmit using ALR lookup, or transmit directly to

 * port using tag. ALR learning is performed only when using ALR lookup.