Commit 983d96a9 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Jakub Kicinski
Browse files

net: dsa: b53: Include all ports in "enabled_ports" 



Make "enabled_ports" bitfield contain all available switch ports
including a CPU port. This way there is no need for fixup during
initialization.

For BCM53010, BCM53018 and BCM53019 include also other available ports.

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Tested-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 561bed68

drivers/net/dsa/b53/b53_common.c

+11 −12
Original line number Diff line number Diff line
@@ -2302,7 +2302,7 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.chip_id = BCM5325_DEVICE_ID,

		.dev_name = "BCM5325",

		.vlans = 16,

		.enabled_ports = 0x1f,

		.enabled_ports = 0x3f,

		.arl_bins = 2,

		.arl_buckets = 1024,

		.imp_port = 5,
@@ -2313,7 +2313,7 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.chip_id = BCM5365_DEVICE_ID,

		.dev_name = "BCM5365",

		.vlans = 256,

		.enabled_ports = 0x1f,

		.enabled_ports = 0x3f,

		.arl_bins = 2,

		.arl_buckets = 1024,

		.imp_port = 5,
@@ -2324,7 +2324,7 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.chip_id = BCM5389_DEVICE_ID,

		.dev_name = "BCM5389",

		.vlans = 4096,

		.enabled_ports = 0x1f,

		.enabled_ports = 0x11f,

		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,
@@ -2338,7 +2338,7 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.chip_id = BCM5395_DEVICE_ID,

		.dev_name = "BCM5395",

		.vlans = 4096,

		.enabled_ports = 0x1f,

		.enabled_ports = 0x11f,

		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,
@@ -2352,7 +2352,7 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.chip_id = BCM5397_DEVICE_ID,

		.dev_name = "BCM5397",

		.vlans = 4096,

		.enabled_ports = 0x1f,

		.enabled_ports = 0x11f,

		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,
@@ -2366,7 +2366,7 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.chip_id = BCM5398_DEVICE_ID,

		.dev_name = "BCM5398",

		.vlans = 4096,

		.enabled_ports = 0x7f,

		.enabled_ports = 0x17f,

		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,
@@ -2380,7 +2380,7 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.chip_id = BCM53115_DEVICE_ID,

		.dev_name = "BCM53115",

		.vlans = 4096,

		.enabled_ports = 0x1f,

		.enabled_ports = 0x11f,

		.arl_bins = 4,

		.arl_buckets = 1024,

		.vta_regs = B53_VTA_REGS,
@@ -2394,7 +2394,7 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.chip_id = BCM53125_DEVICE_ID,

		.dev_name = "BCM53125",

		.vlans = 4096,

		.enabled_ports = 0xff,

		.enabled_ports = 0x1ff,

		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,
@@ -2436,7 +2436,7 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.chip_id = BCM53010_DEVICE_ID,

		.dev_name = "BCM53010",

		.vlans = 4096,

		.enabled_ports = 0x1f,

		.enabled_ports = 0x1bf,

		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,
@@ -2478,7 +2478,7 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.chip_id = BCM53018_DEVICE_ID,

		.dev_name = "BCM53018",

		.vlans = 4096,

		.enabled_ports = 0x1f,

		.enabled_ports = 0x1bf,

		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,
@@ -2492,7 +2492,7 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.chip_id = BCM53019_DEVICE_ID,

		.dev_name = "BCM53019",

		.vlans = 4096,

		.enabled_ports = 0x1f,

		.enabled_ports = 0x1bf,

		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,
@@ -2634,7 +2634,6 @@ static int b53_switch_init(struct b53_device *dev) 
			dev->cpu_port = 5;

	}



	dev->enabled_ports |= BIT(dev->cpu_port);

	dev->num_ports = fls(dev->enabled_ports);



	dev->ds->num_ports = min_t(unsigned int, dev->num_ports, DSA_MAX_PORTS);