1 From ba5707ec58cfb6853dff41c2aae72deb6a03d389 Mon Sep 17 00:00:00 2001
2 From: Ansuel Smith <ansuelsmth@gmail.com>
3 Date: Fri, 14 May 2021 22:59:54 +0200
4 Subject: [PATCH] net: dsa: qca8k: handle qca8k_set_page errors
6 With a remote possibility, the set_page function can fail. Since this is
7 a critical part of the write/read qca8k regs, propagate the error and
8 terminate any read/write operation.
10 Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
11 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
12 Signed-off-by: David S. Miller <davem@davemloft.net>
14 drivers/net/dsa/qca8k.c | 33 ++++++++++++++++++++++++++-------
15 1 file changed, 26 insertions(+), 7 deletions(-)
17 --- a/drivers/net/dsa/qca8k.c
18 +++ b/drivers/net/dsa/qca8k.c
19 @@ -127,16 +127,23 @@ qca8k_mii_write32(struct mii_bus *bus, i
20 "failed to write qca8k 32bit register\n");
25 qca8k_set_page(struct mii_bus *bus, u16 page)
29 if (page == qca8k_current_page)
33 - if (bus->write(bus, 0x18, 0, page) < 0)
34 + ret = bus->write(bus, 0x18, 0, page);
36 dev_err_ratelimited(&bus->dev,
37 "failed to set qca8k page\n");
41 qca8k_current_page = page;
46 @@ -150,11 +157,14 @@ qca8k_read(struct qca8k_priv *priv, u32
48 mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
50 - qca8k_set_page(bus, page);
51 + val = qca8k_set_page(bus, page);
55 val = qca8k_mii_read32(bus, 0x10 | r2, r1);
58 mutex_unlock(&bus->mdio_lock);
63 @@ -163,14 +173,19 @@ qca8k_write(struct qca8k_priv *priv, u32
65 struct mii_bus *bus = priv->bus;
69 qca8k_split_addr(reg, &r1, &r2, &page);
71 mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
73 - qca8k_set_page(bus, page);
74 + ret = qca8k_set_page(bus, page);
78 qca8k_mii_write32(bus, 0x10 | r2, r1, val);
81 mutex_unlock(&bus->mdio_lock);
84 @@ -185,12 +200,16 @@ qca8k_rmw(struct qca8k_priv *priv, u32 r
86 mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
88 - qca8k_set_page(bus, page);
89 + ret = qca8k_set_page(bus, page);
93 ret = qca8k_mii_read32(bus, 0x10 | r2, r1);
96 qca8k_mii_write32(bus, 0x10 | r2, r1, ret);
99 mutex_unlock(&bus->mdio_lock);