From: Ansuel Smith <ansuelsmth@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
netdev@vger.kernel.org (open list:NETWORKING DRIVERS),
devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND
FLATTENED DEVICE TREE BINDINGS),
linux-kernel@vger.kernel.org (open list)
Cc: Ansuel Smith <ansuelsmth@gmail.com>
Subject: [RFC PATCH net-next v5 03/25] net: dsa: qca8k: improve qca8k read/write/rmw bus access
Date: Tue, 11 May 2021 04:04:38 +0200 [thread overview]
Message-ID: <20210511020500.17269-4-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20210511020500.17269-1-ansuelsmth@gmail.com>
Put bus in local variable to improve faster access to the mdio bus.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
---
drivers/net/dsa/qca8k.c | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 25fa7084e820..3c882d325fdf 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -142,17 +142,18 @@ qca8k_set_page(struct mii_bus *bus, u16 page)
static u32
qca8k_read(struct qca8k_priv *priv, u32 reg)
{
+ struct mii_bus *bus = priv->bus;
u16 r1, r2, page;
u32 val;
qca8k_split_addr(reg, &r1, &r2, &page);
- mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED);
+ mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
- qca8k_set_page(priv->bus, page);
- val = qca8k_mii_read32(priv->bus, 0x10 | r2, r1);
+ qca8k_set_page(bus, page);
+ val = qca8k_mii_read32(bus, 0x10 | r2, r1);
- mutex_unlock(&priv->bus->mdio_lock);
+ mutex_unlock(&bus->mdio_lock);
return val;
}
@@ -160,35 +161,37 @@ qca8k_read(struct qca8k_priv *priv, u32 reg)
static void
qca8k_write(struct qca8k_priv *priv, u32 reg, u32 val)
{
+ struct mii_bus *bus = priv->bus;
u16 r1, r2, page;
qca8k_split_addr(reg, &r1, &r2, &page);
- mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED);
+ mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
- qca8k_set_page(priv->bus, page);
- qca8k_mii_write32(priv->bus, 0x10 | r2, r1, val);
+ qca8k_set_page(bus, page);
+ qca8k_mii_write32(bus, 0x10 | r2, r1, val);
- mutex_unlock(&priv->bus->mdio_lock);
+ mutex_unlock(&bus->mdio_lock);
}
static u32
qca8k_rmw(struct qca8k_priv *priv, u32 reg, u32 mask, u32 val)
{
+ struct mii_bus *bus = priv->bus;
u16 r1, r2, page;
u32 ret;
qca8k_split_addr(reg, &r1, &r2, &page);
- mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED);
+ mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
- qca8k_set_page(priv->bus, page);
- ret = qca8k_mii_read32(priv->bus, 0x10 | r2, r1);
+ qca8k_set_page(bus, page);
+ ret = qca8k_mii_read32(bus, 0x10 | r2, r1);
ret &= ~mask;
ret |= val;
- qca8k_mii_write32(priv->bus, 0x10 | r2, r1, ret);
+ qca8k_mii_write32(bus, 0x10 | r2, r1, ret);
- mutex_unlock(&priv->bus->mdio_lock);
+ mutex_unlock(&bus->mdio_lock);
return ret;
}
--
2.30.2
next prev parent reply other threads:[~2021-05-11 2:08 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-11 2:04 [RFC PATCH net-next v5 00/25] Multiple improvement to qca8k stability Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 01/25] net: dsa: qca8k: change simple print to dev variant Ansuel Smith
2021-05-14 16:35 ` Andrew Lunn
2021-05-11 2:04 ` [RFC PATCH net-next v5 02/25] net: dsa: qca8k: use iopoll macro for qca8k_busy_wait Ansuel Smith
2021-05-11 2:04 ` Ansuel Smith [this message]
2021-05-11 2:04 ` [RFC PATCH net-next v5 04/25] net: dsa: qca8k: handle qca8k_set_page errors Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 05/25] net: dsa: qca8k: handle error with qca8k_read operation Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 06/25] net: dsa: qca8k: handle error with qca8k_write operation Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 07/25] net: dsa: qca8k: handle error with qca8k_rmw operation Ansuel Smith
2021-05-14 16:43 ` Andrew Lunn
2021-05-11 2:04 ` [RFC PATCH net-next v5 08/25] net: dsa: qca8k: handle error from qca8k_busy_wait Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 09/25] net: dsa: qca8k: add support for qca8327 switch Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 10/25] devicetree: net: dsa: qca8k: Document new compatible qca8327 Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 11/25] net: dsa: qca8k: add priority tweak to qca8337 switch Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 12/25] net: dsa: qca8k: limit port5 delay to qca8337 Ansuel Smith
2021-05-14 16:45 ` Andrew Lunn
2021-05-11 2:04 ` [RFC PATCH net-next v5 13/25] net: dsa: qca8k: add GLOBAL_FC settings needed for qca8327 Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 14/25] net: dsa: qca8k: add support for switch rev Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 15/25] net: dsa: qca8k: add ethernet-ports fallback to setup_mdio_bus Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 16/25] net: dsa: qca8k: make rgmii delay configurable Ansuel Smith
2021-05-14 16:55 ` Andrew Lunn
2021-05-11 2:04 ` [RFC PATCH net-next v5 17/25] net: dsa: qca8k: clear MASTER_EN after phy read/write Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 18/25] net: dsa: qca8k: dsa: qca8k: protect MASTER busy_wait with mdio mutex Ansuel Smith
2021-05-14 16:58 ` Andrew Lunn
2021-05-11 2:04 ` [RFC PATCH net-next v5 19/25] net: dsa: qca8k: enlarge mdio delay and timeout Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 20/25] net: dsa: qca8k: add support for internal phy and internal mdio Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 21/25] devicetree: bindings: dsa: qca8k: Document internal mdio definition Ansuel Smith
2021-05-11 16:23 ` Rob Herring
2021-05-11 2:04 ` [RFC PATCH net-next v5 22/25] net: dsa: qca8k: improve internal mdio read/write bus access Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 23/25] net: dsa: qca8k: pass switch_revision info to phy dev_flags Ansuel Smith
2021-05-11 2:04 ` [RFC PATCH net-next v5 24/25] net: phy: at803x: clean whitespace errors Ansuel Smith
2021-05-11 2:05 ` [RFC PATCH net-next v5 25/25] net: phy: add support for qca8k switch internal PHY in at803x Ansuel Smith
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=20210511020500.17269-4-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@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=robh+dt@kernel.org \
--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).