linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 17/28] net: dsa: qca8k: add support for switch rev
Date: Sat,  8 May 2021 02:29:07 +0200	[thread overview]
Message-ID: <20210508002920.19945-17-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20210508002920.19945-1-ansuelsmth@gmail.com>

qca8k internal phy driver 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.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
 drivers/net/dsa/qca8k.c | 53 ++++++++++++++++++++++++++---------------
 drivers/net/dsa/qca8k.h |  7 ++++--
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 301bb94aba84..9905a2631420 100644
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -1591,12 +1591,40 @@ static const struct dsa_switch_ops qca8k_switch_ops = {
 	.phylink_mac_link_up	= qca8k_phylink_mac_link_up,
 };
 
+static int qca8k_read_switch_id(struct qca8k_priv *priv)
+{
+	const struct qca8k_match_data *data;
+	u32 val;
+	u8 id;
+
+	/* get the switches ID from the compatible */
+	data = of_device_get_match_data(priv->dev);
+	if (!data)
+		return -ENODEV;
+
+	val = qca8k_read(priv, QCA8K_REG_MASK_CTRL);
+	if (val < 0)
+		return -ENODEV;
+
+	id = QCA8K_MASK_CTRL_DEVICE_ID(val & QCA8K_MASK_CTRL_DEVICE_ID_MASK);
+	if (id != data->id) {
+		dev_err(priv->dev, "Switch id detected %x but expected %x", id, data->id);
+		return -ENODEV;
+	}
+
+	priv->switch_id = id;
+
+	/* Save revision to communicate to the internal PHY driver */
+	priv->switch_revision = (val & QCA8K_MASK_CTRL_REV_ID_MASK);
+
+	return 0;
+}
+
 static int
 qca8k_sw_probe(struct mdio_device *mdiodev)
 {
-	const struct qca8k_match_data *data;
 	struct qca8k_priv *priv;
-	u32 id;
+	int ret;
 
 	/* allocate the private data struct so that we can probe the switches
 	 * ID register
@@ -1622,24 +1650,11 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
 		gpiod_set_value_cansleep(priv->reset_gpio, 0);
 	}
 
-	/* get the switches ID from the compatible */
-	data = of_device_get_match_data(&mdiodev->dev);
-	if (!data)
-		return -ENODEV;
-
-	/* 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 != data->id) {
-		dev_err(&mdiodev->dev, "Switch id detected %x but expected %x", id, data->id);
-		return -ENODEV;
-	}
+	/* Check the detected switch id */
+	ret = qca8k_read_switch_id(priv);
+	if (ret)
+		return ret;
 
-	priv->switch_id = id;
 	priv->ds = devm_kzalloc(&mdiodev->dev, sizeof(*priv->ds), GFP_KERNEL);
 	if (!priv->ds)
 		return -ENOMEM;
diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
index eceeacfe2c5d..338277978ec0 100644
--- a/drivers/net/dsa/qca8k.h
+++ b/drivers/net/dsa/qca8k.h
@@ -30,8 +30,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
@@ -251,6 +253,7 @@ struct qca8k_match_data {
 
 struct qca8k_priv {
 	u8 switch_id;
+	u8 switch_revision;
 	struct regmap *regmap;
 	struct mii_bus *bus;
 	struct ar8xxx_port_status port_sts[QCA8K_NUM_PORTS];
-- 
2.30.2


  parent reply	other threads:[~2021-05-08  0:30 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 ` [RFC PATCH net-next v4 08/28] net: dsa: qca8k: handle error with qca8k_read operation Ansuel Smith
2021-05-08 17:46   ` 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 ` Ansuel Smith [this message]
2021-05-08 15:48   ` [RFC PATCH net-next v4 17/28] net: dsa: qca8k: add support for switch rev 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-17-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).