leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: dsa: microchip: ksz8795: use phy_port_cnt where possible

Browse Source 
The driver is currently hard coded to SWITCH_PORT_NUM being
(TOTAL_PORT_NUM - 1) which is limited to 4 user ports for the ksz8795.
The phy_port_cnt is referring to its user ports. The patch removes the
extra define and use the assigned variable phy_port_cnt instead so the
driver can be used on different switches.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Michael Grzeschik 2020-12-01 21:45:01 +01:00 committed by Jakub Kicinski
parent 65fe1acf07
commit 4ce2a984ab
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/dsa/microchip/ksz8795.c
View File

@ -418,8 +418,8 @@ static void ksz8795_r_vlan_entries(struct ksz_device *dev, u16 addr)
int i; int i;
ksz8795_r_table(dev, TABLE_VLAN, addr, &data); ksz8795_r_table(dev, TABLE_VLAN, addr, &data);
addr *= 4; addr *= dev->phy_port_cnt;
for (i = 0; i < 4; i++) { for (i = 0; i < dev->phy_port_cnt; i++) {
dev->vlan_cache[addr + i].table[0] = (u16)data; dev->vlan_cache[addr + i].table[0] = (u16)data;
data >>= VLAN_TABLE_S; data >>= VLAN_TABLE_S;
} }
@ -433,7 +433,7 @@ static void ksz8795_r_vlan_table(struct ksz_device *dev, u16 vid, u16 *vlan)
u64 buf; u64 buf;
data = (u16 *)&buf; data = (u16 *)&buf;
addr = vid / 4; addr = vid / dev->phy_port_cnt;
index = vid & 3; index = vid & 3;
ksz8795_r_table(dev, TABLE_VLAN, addr, &buf); ksz8795_r_table(dev, TABLE_VLAN, addr, &buf);
*vlan = data[index]; *vlan = data[index];
@ -447,7 +447,7 @@ static void ksz8795_w_vlan_table(struct ksz_device *dev, u16 vid, u16 vlan)
u64 buf; u64 buf;
data = (u16 *)&buf; data = (u16 *)&buf;
addr = vid / 4; addr = vid / dev->phy_port_cnt;
index = vid & 3; index = vid & 3;
ksz8795_r_table(dev, TABLE_VLAN, addr, &buf); ksz8795_r_table(dev, TABLE_VLAN, addr, &buf);
data[index] = vlan; data[index] = vlan;
@ -692,12 +692,12 @@ static void ksz8795_port_stp_state_set(struct dsa_switch *ds, int port,
switch (state) { switch (state) {
case BR_STATE_DISABLED: case BR_STATE_DISABLED:
data |= PORT_LEARN_DISABLE; data |= PORT_LEARN_DISABLE;
if (port < SWITCH_PORT_NUM) if (port < dev->phy_port_cnt)
member = 0; member = 0;
break; break;
case BR_STATE_LISTENING: case BR_STATE_LISTENING:
data |= (PORT_RX_ENABLE | PORT_LEARN_DISABLE); data |= (PORT_RX_ENABLE | PORT_LEARN_DISABLE);
if (port < SWITCH_PORT_NUM && if (port < dev->phy_port_cnt &&
p->stp_state == BR_STATE_DISABLED) p->stp_state == BR_STATE_DISABLED)
member = dev->host_mask | p->vid_member; member = dev->host_mask | p->vid_member;
break; break;
@ -721,7 +721,7 @@ static void ksz8795_port_stp_state_set(struct dsa_switch *ds, int port,
break; break;
case BR_STATE_BLOCKING: case BR_STATE_BLOCKING:
data |= PORT_LEARN_DISABLE; data |= PORT_LEARN_DISABLE;
if (port < SWITCH_PORT_NUM && if (port < dev->phy_port_cnt &&
p->stp_state == BR_STATE_DISABLED) p->stp_state == BR_STATE_DISABLED)
member = dev->host_mask | p->vid_member; member = dev->host_mask | p->vid_member;
break; break;
@ -1006,7 +1006,7 @@ static void ksz8795_config_cpu_port(struct dsa_switch *ds)
ksz8795_port_setup(dev, dev->cpu_port, true); ksz8795_port_setup(dev, dev->cpu_port, true);
dev->member = dev->host_mask; dev->member = dev->host_mask;
for (i = 0; i < SWITCH_PORT_NUM; i++) { for (i = 0; i < dev->phy_port_cnt; i++) {
p = &dev->ports[i]; p = &dev->ports[i];
/* Initialize to non-zero so that ksz_cfg_port_member() will /* Initialize to non-zero so that ksz_cfg_port_member() will
@ -1017,7 +1017,7 @@ static void ksz8795_config_cpu_port(struct dsa_switch *ds)
ksz8795_port_stp_state_set(ds, i, BR_STATE_DISABLED); ksz8795_port_stp_state_set(ds, i, BR_STATE_DISABLED);
/* Last port may be disabled. */ /* Last port may be disabled. */
if (i == dev->port_cnt) if (i == dev->phy_port_cnt)
break; break;
p->on = 1; p->on = 1;
p->phy = 1; p->phy = 1;
@ -1240,7 +1240,7 @@ static int ksz8795_switch_init(struct ksz_device *dev)
dev->mib_cnt = ARRAY_SIZE(mib_names); dev->mib_cnt = ARRAY_SIZE(mib_names);
dev->mib_port_cnt = TOTAL_PORT_NUM; dev->mib_port_cnt = TOTAL_PORT_NUM;
dev->phy_port_cnt = SWITCH_PORT_NUM; dev->phy_port_cnt = dev->port_cnt;
dev->cpu_port = dev->mib_port_cnt - 1; dev->cpu_port = dev->mib_port_cnt - 1;
dev->host_mask = BIT(dev->cpu_port); dev->host_mask = BIT(dev->cpu_port);

3
drivers/net/dsa/microchip/ksz8795_reg.h
View File

@ -848,9 +848,6 @@
#define TOTAL_PORT_NUM 5 #define TOTAL_PORT_NUM 5
/* Host port can only be last of them. */
#define SWITCH_PORT_NUM (TOTAL_PORT_NUM - 1)
#define KSZ8795_COUNTER_NUM 0x20 #define KSZ8795_COUNTER_NUM 0x20
/* Common names used by other drivers */ /* Common names used by other drivers */