net: dsa: qca8k: improve mdio master read/write by using single lo/hi

Improve mdio master read/write by using singe mii read/write lo/hi.

In a read and write we need to poll the mdio master regs in a busy loop
to check for a specific bit present in the upper half of the reg. We can
ignore the other half since it won't contain useful data. This will save
an additional useless read for each read and write operation.

In a read operation the returned data is present in the mdio master reg
lower half. We can ignore the other half since it won't contain useful
data. This will save an additional useless read for each read operation.

In a read operation it's needed to just set the hi half of the mdio
master reg as the lo half will be replaced by the result. This will save
an additional useless write for each read operation.

Tested-by: Ronald Wahl <ronald.wahl@raritan.com>
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/qca/qca8k-8xxx.c b/drivers/net/dsa/qca/qca8k-8xxx.c
index 92c4bfef7c974adc15aa0a699424ae2f6b567e6a..2f224b166bbb32dc583ed9f65a41cf72742afc04 100644 (file)
--- a/drivers/net/dsa/qca/qca8k-8xxx.c
+++ b/drivers/net/dsa/qca/qca8k-8xxx.c
@@ -740,9 +740,9 @@ qca8k_mdio_busy_wait(struct mii_bus *bus, u32 reg, u32 mask)
 
        qca8k_split_addr(reg, &r1, &r2, &page);
 
-       ret = read_poll_timeout(qca8k_mii_read32, ret1, !(val & mask), 0,
+       ret = read_poll_timeout(qca8k_mii_read_hi, ret1, !(val & mask), 0,
                                QCA8K_BUSY_WAIT_TIMEOUT * USEC_PER_MSEC, false,
-                               bus, 0x10 | r2, r1, &val);
+                               bus, 0x10 | r2, r1 + 1, &val);
 
        /* Check if qca8k_read has failed for a different reason
         * before returnting -ETIMEDOUT
@@ -784,7 +784,7 @@ qca8k_mdio_write(struct qca8k_priv *priv, int phy, int regnum, u16 data)
 
 exit:
        /* even if the busy_wait timeouts try to clear the MASTER_EN */
-       qca8k_mii_write32(bus, 0x10 | r2, r1, 0);
+       qca8k_mii_write_hi(bus, 0x10 | r2, r1 + 1, 0);
 
        mutex_unlock(&bus->mdio_lock);
 
@@ -814,18 +814,18 @@ qca8k_mdio_read(struct qca8k_priv *priv, int phy, int regnum)
        if (ret)
                goto exit;
 
-       qca8k_mii_write32(bus, 0x10 | r2, r1, val);
+       qca8k_mii_write_hi(bus, 0x10 | r2, r1 + 1, val);
 
        ret = qca8k_mdio_busy_wait(bus, QCA8K_MDIO_MASTER_CTRL,
                                   QCA8K_MDIO_MASTER_BUSY);
        if (ret)
                goto exit;
 
-       ret = qca8k_mii_read32(bus, 0x10 | r2, r1, &val);
+       ret = qca8k_mii_read_lo(bus, 0x10 | r2, r1, &val);
 
 exit:
        /* even if the busy_wait timeouts try to clear the MASTER_EN */
-       qca8k_mii_write32(bus, 0x10 | r2, r1, 0);
+       qca8k_mii_write_hi(bus, 0x10 | r2, r1 + 1, 0);
 
        mutex_unlock(&bus->mdio_lock);