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>,
Rob Herring <robh+dt@kernel.org>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 09/14] drivers: net: dsa: qca8k: add support for switch rev
Date: Fri, 23 Apr 2021 03:47:35 +0200 [thread overview]
Message-ID: <20210423014741.11858-10-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20210423014741.11858-1-ansuelsmth@gmail.com>
qca8k switch require some special debug value to be set based on the
switch revision. Rework the switch id read function to also read the
chip revision and make it accessible to the switch data.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/net/dsa/qca8k.c | 17 ++++++++++++-----
drivers/net/dsa/qca8k.h | 7 +++++--
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index d469620e9344..20b507a35191 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -1459,12 +1459,22 @@ static const struct dsa_switch_ops qca8k_switch_ops = {
.phylink_mac_link_up = qca8k_phylink_mac_link_up,
};
+static u8 qca8k_read_switch_id(struct qca8k_priv *priv)
+{
+ u32 val;
+
+ val = qca8k_read(priv, QCA8K_REG_MASK_CTRL);
+
+ priv->switch_revision = (val & QCA8K_MASK_CTRL_REV_ID_MASK);
+
+ return QCA8K_MASK_CTRL_DEVICE_ID(val & QCA8K_MASK_CTRL_DEVICE_ID_MASK);
+}
+
static int
qca8k_sw_probe(struct mdio_device *mdiodev)
{
const struct qca8k_match_data *data;
struct qca8k_priv *priv;
- u32 id;
/* allocate the private data struct so that we can probe the switches
* ID register
@@ -1496,10 +1506,7 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
return -ENODEV;
/* read the switches ID register */
- id = qca8k_read(priv, QCA8K_REG_MASK_CTRL);
- id >>= QCA8K_MASK_CTRL_ID_S;
- id &= QCA8K_MASK_CTRL_ID_M;
- if (id != data->id)
+ if (qca8k_read_switch_id(priv) != data->id)
return -ENODEV;
priv->ds = devm_kzalloc(&mdiodev->dev, sizeof(*priv->ds), GFP_KERNEL);
diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
index 308d8410fdb6..dbd54d870a30 100644
--- a/drivers/net/dsa/qca8k.h
+++ b/drivers/net/dsa/qca8k.h
@@ -28,8 +28,10 @@
/* Global control registers */
#define QCA8K_REG_MASK_CTRL 0x000
-#define QCA8K_MASK_CTRL_ID_M 0xff
-#define QCA8K_MASK_CTRL_ID_S 8
+#define QCA8K_MASK_CTRL_REV_ID_MASK GENMASK(7, 0)
+#define QCA8K_MASK_CTRL_REV_ID(x) ((x) >> 0)
+#define QCA8K_MASK_CTRL_DEVICE_ID_MASK GENMASK(15, 8)
+#define QCA8K_MASK_CTRL_DEVICE_ID(x) ((x) >> 8)
#define QCA8K_REG_PORT0_PAD_CTRL 0x004
#define QCA8K_REG_PORT5_PAD_CTRL 0x008
#define QCA8K_REG_PORT6_PAD_CTRL 0x00c
@@ -247,6 +249,7 @@ struct qca8k_match_data {
};
struct qca8k_priv {
+ u8 switch_revision;
struct regmap *regmap;
struct mii_bus *bus;
struct ar8xxx_port_status port_sts[QCA8K_NUM_PORTS];
--
2.30.2
next prev parent reply other threads:[~2021-04-23 1:48 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 1:47 [PATCH 00/14] Multiple improvement to qca8k stability Ansuel Smith
2021-04-23 1:47 ` [PATCH 01/14] drivers: net: dsa: qca8k: handle error with set_page Ansuel Smith
2021-04-23 1:52 ` Florian Fainelli
2021-04-23 1:47 ` [PATCH 02/14] drivers: net: dsa: qca8k: tweak internal delay to oem spec Ansuel Smith
2021-04-23 1:53 ` Florian Fainelli
2021-04-23 1:57 ` Ansuel Smith
2021-04-23 1:58 ` Florian Fainelli
2021-04-23 12:25 ` Andrew Lunn
2021-04-23 1:47 ` [PATCH 03/14] drivers: net: mdio: mdio-ip8064: improve busy wait delay Ansuel Smith
2021-04-23 1:56 ` Florian Fainelli
2021-04-23 2:03 ` Ansuel Smith
2021-04-23 12:38 ` Andrew Lunn
2021-04-23 1:47 ` [PATCH 04/14] drivers: net: dsa: qca8k: apply suggested packet priority Ansuel Smith
2021-04-23 1:47 ` [PATCH 05/14] drivers: net: dsa: qca8k: add support for qca8327 switch Ansuel Smith
2021-04-23 12:42 ` Andrew Lunn
2021-04-23 1:47 ` [PATCH 06/14] devicetree: net: dsa: qca8k: Document new compatible qca8327 Ansuel Smith
2021-04-23 1:47 ` [PATCH 07/14] drivers: net: dsa: qca8k: limit priority tweak to qca8337 switch Ansuel Smith
2021-04-23 1:59 ` Florian Fainelli
2021-04-23 1:47 ` [PATCH 08/14] drivers: net: dsa: qca8k: add GLOBAL_FC settings needed for qca8327 Ansuel Smith
2021-04-23 1:47 ` Ansuel Smith [this message]
2021-04-23 1:47 ` [PATCH 10/14] drivers: net: dsa: qca8k: add support for specific QCA access function Ansuel Smith
2021-04-23 12:47 ` Andrew Lunn
2021-04-23 1:47 ` [PATCH 11/14] drivers: net: dsa: qca8k: apply switch revision fix Ansuel Smith
2021-04-23 2:02 ` Florian Fainelli
2021-04-24 21:18 ` Ansuel Smith
2021-04-24 21:49 ` Heiner Kallweit
2021-04-25 1:09 ` Florian Fainelli
2021-04-25 1:19 ` Ansuel Smith
2021-04-25 4:45 ` DENG Qingfang
2021-04-25 11:59 ` Ansuel Smith
2021-04-25 14:33 ` Andrew Lunn
2021-04-23 1:47 ` [PATCH 12/14] drivers: net: dsa: qca8k: clear MASTER_EN after phy read/write Ansuel Smith
2021-04-23 1:47 ` [PATCH 13/14] drivers: net: dsa: qca8k: protect MASTER busy_wait with mdio mutex Ansuel Smith
2021-04-23 12:53 ` Andrew Lunn
2021-04-23 1:47 ` [PATCH 14/14] drivers: net: dsa: qca8k: enlarge mdio delay and timeout Ansuel Smith
2021-04-23 1:51 ` [PATCH 00/14] Multiple improvement to qca8k stability Florian Fainelli
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=20210423014741.11858-10-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).