From: Ansuel Smith <ansuelsmth@gmail.com>
To: Florian Fainelli <f.fainelli@gmail.com>
Cc: Ansuel Smith <ansuelsmth@gmail.com>, Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Russell King <linux@armlinux.org.uk>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFC PATCH net-next v4 08/28] net: dsa: qca8k: handle error with qca8k_read operation
Date: Sat, 8 May 2021 02:28:58 +0200 [thread overview]
Message-ID: <20210508002920.19945-8-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20210508002920.19945-1-ansuelsmth@gmail.com>
qca8k_read can fail. Rework any user to handle error values and
correctly return.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/net/dsa/qca8k.c | 76 +++++++++++++++++++++++++++++++++--------
1 file changed, 61 insertions(+), 15 deletions(-)
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 1c52d1b262f1..5087ee8ecebb 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -231,8 +231,13 @@ static int
qca8k_regmap_read(void *ctx, uint32_t reg, uint32_t *val)
{
struct qca8k_priv *priv = (struct qca8k_priv *)ctx;
+ int ret;
+
+ ret = qca8k_read(priv, reg);
+ if (ret < 0)
+ return ret;
- *val = qca8k_read(priv, reg);
+ *val = ret;
return 0;
}
@@ -300,15 +305,20 @@ qca8k_busy_wait(struct qca8k_priv *priv, u32 reg, u32 mask)
return ret;
}
-static void
+static int
qca8k_fdb_read(struct qca8k_priv *priv, struct qca8k_fdb *fdb)
{
- u32 reg[4];
+ u32 reg[4], val;
int i;
/* load the ARL table into an array */
- for (i = 0; i < 4; i++)
- reg[i] = qca8k_read(priv, QCA8K_REG_ATU_DATA0 + (i * 4));
+ for (i = 0; i < 4; i++) {
+ val = qca8k_read(priv, QCA8K_REG_ATU_DATA0 + (i * 4));
+ if (val < 0)
+ return val;
+
+ reg[i] = val;
+ }
/* vid - 83:72 */
fdb->vid = (reg[2] >> QCA8K_ATU_VID_S) & QCA8K_ATU_VID_M;
@@ -323,6 +333,8 @@ qca8k_fdb_read(struct qca8k_priv *priv, struct qca8k_fdb *fdb)
fdb->mac[3] = (reg[0] >> QCA8K_ATU_ADDR3_S) & 0xff;
fdb->mac[4] = (reg[0] >> QCA8K_ATU_ADDR4_S) & 0xff;
fdb->mac[5] = reg[0] & 0xff;
+
+ return 0;
}
static void
@@ -374,6 +386,8 @@ qca8k_fdb_access(struct qca8k_priv *priv, enum qca8k_fdb_cmd cmd, int port)
/* Check for table full violation when adding an entry */
if (cmd == QCA8K_FDB_LOAD) {
reg = qca8k_read(priv, QCA8K_REG_ATU_FUNC);
+ if (reg < 0)
+ return reg;
if (reg & QCA8K_ATU_FUNC_FULL)
return -1;
}
@@ -384,12 +398,15 @@ qca8k_fdb_access(struct qca8k_priv *priv, enum qca8k_fdb_cmd cmd, int port)
static int
qca8k_fdb_next(struct qca8k_priv *priv, struct qca8k_fdb *fdb, int port)
{
- int ret;
+ int ret, ret_read;
qca8k_fdb_write(priv, fdb->vid, fdb->port_mask, fdb->mac, fdb->aging);
ret = qca8k_fdb_access(priv, QCA8K_FDB_NEXT, port);
- if (ret >= 0)
- qca8k_fdb_read(priv, fdb);
+ if (ret >= 0) {
+ ret_read = qca8k_fdb_read(priv, fdb);
+ if (ret_read < 0)
+ return ret_read;
+ }
return ret;
}
@@ -449,6 +466,8 @@ qca8k_vlan_access(struct qca8k_priv *priv, enum qca8k_vlan_cmd cmd, u16 vid)
/* Check for table full violation when adding an entry */
if (cmd == QCA8K_VLAN_LOAD) {
reg = qca8k_read(priv, QCA8K_REG_VTU_FUNC1);
+ if (reg < 0)
+ return reg;
if (reg & QCA8K_VTU_FUNC1_FULL)
return -ENOMEM;
}
@@ -475,6 +494,8 @@ qca8k_vlan_add(struct qca8k_priv *priv, u8 port, u16 vid, bool untagged)
goto out;
reg = qca8k_read(priv, QCA8K_REG_VTU_FUNC0);
+ if (reg < 0)
+ return reg;
reg |= QCA8K_VTU_FUNC0_VALID | QCA8K_VTU_FUNC0_IVL_EN;
reg &= ~(QCA8K_VTU_FUNC0_EG_MODE_MASK << QCA8K_VTU_FUNC0_EG_MODE_S(port));
if (untagged)
@@ -506,6 +527,8 @@ qca8k_vlan_del(struct qca8k_priv *priv, u8 port, u16 vid)
goto out;
reg = qca8k_read(priv, QCA8K_REG_VTU_FUNC0);
+ if (reg < 0)
+ return reg;
reg &= ~(3 << QCA8K_VTU_FUNC0_EG_MODE_S(port));
reg |= QCA8K_VTU_FUNC0_EG_MODE_NOT <<
QCA8K_VTU_FUNC0_EG_MODE_S(port);
@@ -621,8 +644,11 @@ qca8k_mdio_read(struct qca8k_priv *priv, int port, u32 regnum)
QCA8K_MDIO_MASTER_BUSY))
return -ETIMEDOUT;
- val = (qca8k_read(priv, QCA8K_MDIO_MASTER_CTRL) &
- QCA8K_MDIO_MASTER_DATA_MASK);
+ val = qca8k_read(priv, QCA8K_MDIO_MASTER_CTRL);
+ if (val < 0)
+ return val;
+
+ val &= QCA8K_MDIO_MASTER_DATA_MASK;
return val;
}
@@ -978,6 +1004,8 @@ qca8k_phylink_mac_link_state(struct dsa_switch *ds, int port,
u32 reg;
reg = qca8k_read(priv, QCA8K_REG_PORT_STATUS(port));
+ if (reg < 0)
+ return reg;
state->link = !!(reg & QCA8K_PORT_STATUS_LINK_UP);
state->an_complete = state->link;
@@ -1078,18 +1106,26 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port,
{
struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
const struct qca8k_mib_desc *mib;
- u32 reg, i;
+ u32 reg, i, val;
u64 hi;
for (i = 0; i < ARRAY_SIZE(ar8327_mib); i++) {
mib = &ar8327_mib[i];
reg = QCA8K_PORT_MIB_COUNTER(port) + mib->offset;
- data[i] = qca8k_read(priv, reg);
+ val = qca8k_read(priv, reg);
+ if (val < 0)
+ continue;
+
if (mib->size == 2) {
hi = qca8k_read(priv, reg + 4);
- data[i] |= hi << 32;
+ if (hi < 0)
+ continue;
}
+
+ data[i] = val;
+ if (mib->size == 2)
+ data[i] |= hi << 32;
}
}
@@ -1107,18 +1143,25 @@ qca8k_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *eee)
{
struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
u32 lpi_en = QCA8K_REG_EEE_CTRL_LPI_EN(port);
+ int ret = 0;
u32 reg;
mutex_lock(&priv->reg_mutex);
reg = qca8k_read(priv, QCA8K_REG_EEE_CTRL);
+ if (reg < 0) {
+ ret = reg;
+ goto exit;
+ }
+
if (eee->eee_enabled)
reg |= lpi_en;
else
reg &= ~lpi_en;
qca8k_write(priv, QCA8K_REG_EEE_CTRL, reg);
- mutex_unlock(&priv->reg_mutex);
- return 0;
+exit:
+ mutex_unlock(&priv->reg_mutex);
+ return ret;
}
static int
@@ -1443,6 +1486,9 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
/* read the switches ID register */
id = qca8k_read(priv, QCA8K_REG_MASK_CTRL);
+ if (id < 0)
+ return id;
+
id >>= QCA8K_MASK_CTRL_ID_S;
id &= QCA8K_MASK_CTRL_ID_M;
if (id != QCA8K_ID_QCA8337)
--
2.30.2
next prev parent reply other threads:[~2021-05-08 0:29 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-08 0:28 [RFC PATCH net-next v4 01/28] net: mdio: ipq8064: clean whitespaces in define Ansuel Smith
2021-05-08 0:28 ` [RFC PATCH net-next v4 02/28] net: mdio: ipq8064: add regmap config to disable REGCACHE Ansuel Smith
2021-05-08 15:46 ` Florian Fainelli
2021-05-08 0:28 ` [RFC PATCH net-next v4 03/28] net: mdio: ipq8064: enlarge sleep after read/write operation Ansuel Smith
2021-05-08 15:53 ` Florian Fainelli
2021-05-08 0:28 ` [RFC PATCH net-next v4 04/28] net: dsa: qca8k: change simple print to dev variant Ansuel Smith
2021-05-08 15:47 ` Florian Fainelli
2021-05-08 0:28 ` [RFC PATCH net-next v4 05/28] net: dsa: qca8k: use iopoll macro for qca8k_busy_wait Ansuel Smith
2021-05-08 17:38 ` Andrew Lunn
2021-05-08 0:28 ` [RFC PATCH net-next v4 06/28] net: dsa: qca8k: improve qca8k read/write/rmw bus access Ansuel Smith
2021-05-08 17:39 ` Andrew Lunn
2021-05-08 0:28 ` [RFC PATCH net-next v4 07/28] net: dsa: qca8k: handle qca8k_set_page errors Ansuel Smith
2021-05-08 17:40 ` Andrew Lunn
2021-05-08 0:28 ` Ansuel Smith [this message]
2021-05-08 17:46 ` [RFC PATCH net-next v4 08/28] net: dsa: qca8k: handle error with qca8k_read operation Andrew Lunn
2021-05-08 0:28 ` [RFC PATCH net-next v4 09/28] net: dsa: qca8k: handle error with qca8k_write operation Ansuel Smith
2021-05-08 17:47 ` Andrew Lunn
2021-05-08 0:29 ` [RFC PATCH net-next v4 10/28] net: dsa: qca8k: handle error with qca8k_rmw operation Ansuel Smith
2021-05-08 17:59 ` Andrew Lunn
2021-05-08 0:29 ` [RFC PATCH net-next v4 11/28] net: dsa: qca8k: handle error from qca8k_busy_wait Ansuel Smith
2021-05-08 17:59 ` Andrew Lunn
2021-05-08 0:29 ` [RFC PATCH net-next v4 12/28] net: dsa: qca8k: add support for qca8327 switch Ansuel Smith
2021-05-08 15:47 ` Florian Fainelli
2021-05-08 0:29 ` [RFC PATCH net-next v4 13/28] devicetree: net: dsa: qca8k: Document new compatible qca8327 Ansuel Smith
2021-05-08 15:47 ` Florian Fainelli
2021-05-08 0:29 ` [RFC PATCH net-next v4 14/28] net: dsa: qca8k: add priority tweak to qca8337 switch Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 15/28] net: dsa: qca8k: limit port5 delay to qca8337 Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 16/28] net: dsa: qca8k: add GLOBAL_FC settings needed for qca8327 Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 17/28] net: dsa: qca8k: add support for switch rev Ansuel Smith
2021-05-08 15:48 ` Florian Fainelli
2021-05-08 0:29 ` [RFC PATCH net-next v4 18/28] net: dsa: qca8k: add ethernet-ports fallback to setup_mdio_bus Ansuel Smith
2021-05-08 18:07 ` Andrew Lunn
2021-05-08 0:29 ` [RFC PATCH net-next v4 19/28] net: dsa: qca8k: make rgmii delay configurable Ansuel Smith
2021-05-08 18:12 ` Andrew Lunn
2021-05-08 23:58 ` Ansuel Smith
2021-05-09 1:07 ` Andrew Lunn
2021-05-09 1:17 ` Ansuel Smith
2021-05-09 1:27 ` Andrew Lunn
2021-05-08 0:29 ` [RFC PATCH net-next v4 20/28] net: dsa: qca8k: clear MASTER_EN after phy read/write Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 21/28] net: dsa: qca8k: dsa: qca8k: protect MASTER busy_wait with mdio mutex Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 22/28] net: dsa: qca8k: enlarge mdio delay and timeout Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 23/28] net: dsa: register of_mdiobus if a mdio node is declared Ansuel Smith
2021-05-08 4:36 ` Florian Fainelli
2021-05-08 0:29 ` [RFC PATCH net-next v4 24/28] devicetree: net: dsa: Document use of mdio node inside switch node Ansuel Smith
2021-05-10 14:01 ` Rob Herring
2021-05-08 0:29 ` [RFC PATCH net-next v4 25/28] net: dsa: qca8k: add support for internal phy Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 26/28] net: dsa: permit driver to provide custom phy_mii_mask for slave mdiobus Ansuel Smith
2021-05-08 15:52 ` Florian Fainelli
2021-05-08 16:29 ` Ansuel Smith
2021-05-08 0:29 ` [RFC PATCH net-next v4 27/28] net: dsa: qca8k: pass switch_revision info to phy dev_flags Ansuel Smith
2021-05-08 15:49 ` Florian Fainelli
2021-05-08 0:29 ` [RFC PATCH net-next v4 28/28] net: phy: add qca8k driver for qca8k switch internal PHY Ansuel Smith
2021-05-08 4:35 ` DENG Qingfang
2021-05-08 11:30 ` Ansuel Smith
2021-05-08 15:45 ` Florian Fainelli
2021-05-08 15:45 ` [RFC PATCH net-next v4 01/28] net: mdio: ipq8064: clean whitespaces in define Florian Fainelli
2021-05-08 15:57 ` Joe Perches
2021-05-08 18:02 ` Andrew Lunn
2021-05-08 18:05 ` Ansuel Smith
2021-05-15 17:00 ` Jonathan McDowell
2021-05-15 17:03 ` Florian Fainelli
2021-05-15 17:30 ` Ansuel Smith
2021-05-15 18:08 ` Jonathan McDowell
2021-05-15 18:20 ` Ansuel Smith
2021-05-15 19:40 ` Jonathan McDowell
2021-05-15 19:47 ` Ansuel Smith
2021-05-15 23:52 ` Andrew Lunn
2021-05-16 0:23 ` Ansuel Smith
2021-05-16 9:37 ` Jonathan McDowell
2021-05-16 9:49 ` Jonathan McDowell
2021-05-16 10:12 ` Jonathan McDowell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210508002920.19945-8-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=vivien.didelot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).