Skip to content

L
linux
Commit aaf42142 authored by Ansuel Smith's avatar Ansuel Smith Committed by David S. Miller
Browse files
Options

net: dsa: qca8k: handle error with qca8k_rmw operation 

qca8k_rmw can fail. Rework any user to handle error values and
correctly return. Change qca8k_rmw to return the error code or 0 instead
of the reg value. The reg returned by qca8k_rmw wasn't used anywhere,
so this doesn't cause any functional change.
Signed-off-by: default avatarAnsuel Smith <ansuelsmth@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7805757
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 50 deletions
drivers/net/dsa/qca8k.c
View file @ aaf42142
...@@ -190,12 +190,13 @@ qca8k_write(struct qca8k_priv *priv, u32 reg, u32 val) ...@@ -190,12 +190,13 @@ qca8k_write(struct qca8k_priv *priv, u32 reg, u32 val)
return ret; return ret;
} }
static u32 static int
qca8k_rmw(struct qca8k_priv *priv, u32 reg, u32 mask, u32 val) qca8k_rmw(struct qca8k_priv *priv, u32 reg, u32 mask, u32 write_val)
{ {
struct mii_bus *bus = priv->bus; struct mii_bus *bus = priv->bus;
u16 r1, r2, page; u16 r1, r2, page;
u32 ret; u32 val;
int ret;
qca8k_split_addr(reg, &r1, &r2, &page); qca8k_split_addr(reg, &r1, &r2, &page);
...@@ -205,10 +206,15 @@ qca8k_rmw(struct qca8k_priv *priv, u32 reg, u32 mask, u32 val) ...@@ -205,10 +206,15 @@ qca8k_rmw(struct qca8k_priv *priv, u32 reg, u32 mask, u32 val)
if (ret < 0) if (ret < 0)
goto exit; goto exit;
ret = qca8k_mii_read32(bus, 0x10 | r2, r1); val = qca8k_mii_read32(bus, 0x10 | r2, r1);
ret &= ~mask; if (val < 0) {
ret |= val; ret = val;
qca8k_mii_write32(bus, 0x10 | r2, r1, ret); goto exit;
}
val &= ~mask;
val |= write_val;
qca8k_mii_write32(bus, 0x10 | r2, r1, val);
exit: exit:
mutex_unlock(&bus->mdio_lock); mutex_unlock(&bus->mdio_lock);
...@@ -216,16 +222,16 @@ qca8k_rmw(struct qca8k_priv *priv, u32 reg, u32 mask, u32 val) ...@@ -216,16 +222,16 @@ qca8k_rmw(struct qca8k_priv *priv, u32 reg, u32 mask, u32 val)
return ret; return ret;
} }
static void static int
qca8k_reg_set(struct qca8k_priv *priv, u32 reg, u32 val) qca8k_reg_set(struct qca8k_priv *priv, u32 reg, u32 val)
{ {
qca8k_rmw(priv, reg, 0, val); return qca8k_rmw(priv, reg, 0, val);
} }
static void static int
qca8k_reg_clear(struct qca8k_priv *priv, u32 reg, u32 val) qca8k_reg_clear(struct qca8k_priv *priv, u32 reg, u32 val)
{ {
qca8k_rmw(priv, reg, val, 0); return qca8k_rmw(priv, reg, val, 0);
} }
static int static int
...@@ -570,12 +576,19 @@ qca8k_mib_init(struct qca8k_priv *priv) ...@@ -570,12 +576,19 @@ qca8k_mib_init(struct qca8k_priv *priv)
int ret; int ret;
mutex_lock(&priv->reg_mutex); mutex_lock(&priv->reg_mutex);
qca8k_reg_set(priv, QCA8K_REG_MIB, QCA8K_MIB_FLUSH | QCA8K_MIB_BUSY); ret = qca8k_reg_set(priv, QCA8K_REG_MIB, QCA8K_MIB_FLUSH | QCA8K_MIB_BUSY);
if (ret)
goto exit;
qca8k_busy_wait(priv, QCA8K_REG_MIB, QCA8K_MIB_BUSY); qca8k_busy_wait(priv, QCA8K_REG_MIB, QCA8K_MIB_BUSY);
qca8k_reg_set(priv, QCA8K_REG_MIB, QCA8K_MIB_CPU_KEEP);
ret = qca8k_reg_set(priv, QCA8K_REG_MIB, QCA8K_MIB_CPU_KEEP);
if (ret)
goto exit;
ret = qca8k_write(priv, QCA8K_REG_MODULE_EN, QCA8K_MODULE_EN_MIB); ret = qca8k_write(priv, QCA8K_REG_MODULE_EN, QCA8K_MODULE_EN_MIB);
exit:
mutex_unlock(&priv->reg_mutex); mutex_unlock(&priv->reg_mutex);
return ret; return ret;
} }
...@@ -747,9 +760,8 @@ qca8k_setup_mdio_bus(struct qca8k_priv *priv) ...@@ -747,9 +760,8 @@ qca8k_setup_mdio_bus(struct qca8k_priv *priv)
* a dt-overlay and driver reload changed the configuration * a dt-overlay and driver reload changed the configuration
*/ */
qca8k_reg_clear(priv, QCA8K_MDIO_MASTER_CTRL, return qca8k_reg_clear(priv, QCA8K_MDIO_MASTER_CTRL,
QCA8K_MDIO_MASTER_EN); QCA8K_MDIO_MASTER_EN);
return 0;
} }
priv->ops.phy_read = qca8k_phy_read; priv->ops.phy_read = qca8k_phy_read;
...@@ -782,8 +794,12 @@ qca8k_setup(struct dsa_switch *ds) ...@@ -782,8 +794,12 @@ qca8k_setup(struct dsa_switch *ds)
return ret; return ret;
/* Enable CPU Port */ /* Enable CPU Port */
qca8k_reg_set(priv, QCA8K_REG_GLOBAL_FW_CTRL0, ret = qca8k_reg_set(priv, QCA8K_REG_GLOBAL_FW_CTRL0,
QCA8K_GLOBAL_FW_CTRL0_CPU_PORT_EN); QCA8K_GLOBAL_FW_CTRL0_CPU_PORT_EN);
if (ret) {
dev_err(priv->dev, "failed enabling CPU port");
return ret;
}
/* Enable MIB counters */ /* Enable MIB counters */
ret = qca8k_mib_init(priv); ret = qca8k_mib_init(priv);
...@@ -800,9 +816,12 @@ qca8k_setup(struct dsa_switch *ds) ...@@ -800,9 +816,12 @@ qca8k_setup(struct dsa_switch *ds)
} }
/* Disable forwarding by default on all ports */ /* Disable forwarding by default on all ports */
for (i = 0; i < QCA8K_NUM_PORTS; i++) for (i = 0; i < QCA8K_NUM_PORTS; i++) {
qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(i), ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(i),
QCA8K_PORT_LOOKUP_MEMBER, 0); QCA8K_PORT_LOOKUP_MEMBER, 0);
if (ret)
return ret;
}
/* Disable MAC by default on all ports */ /* Disable MAC by default on all ports */
for (i = 1; i < QCA8K_NUM_PORTS; i++) for (i = 1; i < QCA8K_NUM_PORTS; i++)
...@@ -821,28 +840,37 @@ qca8k_setup(struct dsa_switch *ds) ...@@ -821,28 +840,37 @@ qca8k_setup(struct dsa_switch *ds)
for (i = 0; i < QCA8K_NUM_PORTS; i++) { for (i = 0; i < QCA8K_NUM_PORTS; i++) {
/* CPU port gets connected to all user ports of the switch */ /* CPU port gets connected to all user ports of the switch */
if (dsa_is_cpu_port(ds, i)) { if (dsa_is_cpu_port(ds, i)) {
qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(QCA8K_CPU_PORT), ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(QCA8K_CPU_PORT),
QCA8K_PORT_LOOKUP_MEMBER, dsa_user_ports(ds)); QCA8K_PORT_LOOKUP_MEMBER, dsa_user_ports(ds));
if (ret)
return ret;
} }
/* Individual user ports get connected to CPU port only */ /* Individual user ports get connected to CPU port only */
if (dsa_is_user_port(ds, i)) { if (dsa_is_user_port(ds, i)) {
int shift = 16 * (i % 2); int shift = 16 * (i % 2);
qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(i), ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(i),
QCA8K_PORT_LOOKUP_MEMBER, QCA8K_PORT_LOOKUP_MEMBER,
BIT(QCA8K_CPU_PORT)); BIT(QCA8K_CPU_PORT));
if (ret)
return ret;
/* Enable ARP Auto-learning by default */ /* Enable ARP Auto-learning by default */
qca8k_reg_set(priv, QCA8K_PORT_LOOKUP_CTRL(i), ret = qca8k_reg_set(priv, QCA8K_PORT_LOOKUP_CTRL(i),
QCA8K_PORT_LOOKUP_LEARN); QCA8K_PORT_LOOKUP_LEARN);
if (ret)
return ret;
/* For port based vlans to work we need to set the /* For port based vlans to work we need to set the
* default egress vid * default egress vid
*/ */
qca8k_rmw(priv, QCA8K_EGRESS_VLAN(i), ret = qca8k_rmw(priv, QCA8K_EGRESS_VLAN(i),
0xfff << shift, 0xfff << shift,
QCA8K_PORT_VID_DEF << shift); QCA8K_PORT_VID_DEF << shift);
if (ret)
return ret;
ret = qca8k_write(priv, QCA8K_REG_PORT_VLAN_CTRL0(i), ret = qca8k_write(priv, QCA8K_REG_PORT_VLAN_CTRL0(i),
QCA8K_PORT_VLAN_CVID(QCA8K_PORT_VID_DEF) | QCA8K_PORT_VLAN_CVID(QCA8K_PORT_VID_DEF) |
QCA8K_PORT_VLAN_SVID(QCA8K_PORT_VID_DEF)); QCA8K_PORT_VLAN_SVID(QCA8K_PORT_VID_DEF));
...@@ -1234,7 +1262,7 @@ qca8k_port_bridge_join(struct dsa_switch *ds, int port, struct net_device *br) ...@@ -1234,7 +1262,7 @@ qca8k_port_bridge_join(struct dsa_switch *ds, int port, struct net_device *br)
{ {
struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv; struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
int port_mask = BIT(QCA8K_CPU_PORT); int port_mask = BIT(QCA8K_CPU_PORT);
int i; int i, ret;
for (i = 1; i < QCA8K_NUM_PORTS; i++) { for (i = 1; i < QCA8K_NUM_PORTS; i++) {
if (dsa_to_port(ds, i)->bridge_dev != br) if (dsa_to_port(ds, i)->bridge_dev != br)
...@@ -1242,17 +1270,20 @@ qca8k_port_bridge_join(struct dsa_switch *ds, int port, struct net_device *br) ...@@ -1242,17 +1270,20 @@ qca8k_port_bridge_join(struct dsa_switch *ds, int port, struct net_device *br)
/* Add this port to the portvlan mask of the other ports /* Add this port to the portvlan mask of the other ports
* in the bridge * in the bridge
*/ */
qca8k_reg_set(priv, ret = qca8k_reg_set(priv,
QCA8K_PORT_LOOKUP_CTRL(i), QCA8K_PORT_LOOKUP_CTRL(i),
BIT(port)); BIT(port));
if (ret)
return ret;
if (i != port) if (i != port)
port_mask |= BIT(i); port_mask |= BIT(i);
} }
/* Add all other ports to this ports portvlan mask */ /* Add all other ports to this ports portvlan mask */
qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port), ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
QCA8K_PORT_LOOKUP_MEMBER, port_mask); QCA8K_PORT_LOOKUP_MEMBER, port_mask);
return 0; return ret;
} }
static void static void
...@@ -1389,18 +1420,19 @@ qca8k_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering, ...@@ -1389,18 +1420,19 @@ qca8k_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
struct qca8k_priv *priv = ds->priv; struct qca8k_priv *priv = ds->priv;
int ret;
if (vlan_filtering) { if (vlan_filtering) {
qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port), ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
QCA8K_PORT_LOOKUP_VLAN_MODE, QCA8K_PORT_LOOKUP_VLAN_MODE,
QCA8K_PORT_LOOKUP_VLAN_MODE_SECURE); QCA8K_PORT_LOOKUP_VLAN_MODE_SECURE);
} else { } else {
qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port), ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
QCA8K_PORT_LOOKUP_VLAN_MODE, QCA8K_PORT_LOOKUP_VLAN_MODE,
QCA8K_PORT_LOOKUP_VLAN_MODE_NONE); QCA8K_PORT_LOOKUP_VLAN_MODE_NONE);
} }
return 0; return ret;
} }
static int static int
...@@ -1422,16 +1454,17 @@ qca8k_port_vlan_add(struct dsa_switch *ds, int port, ...@@ -1422,16 +1454,17 @@ qca8k_port_vlan_add(struct dsa_switch *ds, int port,
if (pvid) { if (pvid) {
int shift = 16 * (port % 2); int shift = 16 * (port % 2);
qca8k_rmw(priv, QCA8K_EGRESS_VLAN(port), ret = qca8k_rmw(priv, QCA8K_EGRESS_VLAN(port),
0xfff << shift, vlan->vid << shift); 0xfff << shift, vlan->vid << shift);
if (ret)
return ret;
ret = qca8k_write(priv, QCA8K_REG_PORT_VLAN_CTRL0(port), ret = qca8k_write(priv, QCA8K_REG_PORT_VLAN_CTRL0(port),
QCA8K_PORT_VLAN_CVID(vlan->vid) | QCA8K_PORT_VLAN_CVID(vlan->vid) |
QCA8K_PORT_VLAN_SVID(vlan->vid)); QCA8K_PORT_VLAN_SVID(vlan->vid));
if (ret)
return ret;
} }
return 0; return ret;
} }
static int static int
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7