Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Potin Lai <potin.lai@quantatw.com>
To:     Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>, davem@davemloft.net,
        Jakub Kicinski <kuba@kernel.org>,
        Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>
Cc:     netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org,
        Patrick Williams <patrick@stwcx.xyz>,
        Potin Lai <potin.lai@quantatw.com>
Subject: [PATCH net-next v3 3/3] net: mdio: aspeed: Add c45 support
Date:   Thu,  7 Apr 2022 09:17:38 +0800
Message-Id: <20220407011738.7189-4-potin.lai@quantatw.com>
In-Reply-To: <20220407011738.7189-1-potin.lai@quantatw.com>
References: <20220407011738.7189-1-potin.lai@quantatw.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kL7yhs7Vq8YON2C1j1MVjhMZ8177WhcilITifQN1ZoE6NzbHZza7OsBBPj8M?=
 =?us-ascii?Q?0DC/gvv6fJ73prNls3cUIeebLP176bz/bKGzGN2Pfi1nN+juInl/x5WdSQUZ?=
 =?us-ascii?Q?NX2QSNTUD3jmJAlZdxI8UKbT2XZkN2DFd5zjTB2/ZUsmLeZ9ClZpxO4+lGrv?=
 =?us-ascii?Q?EXj7sK/RiOSs3dBztBkH1hFMfxuaCJjLNRBmnaOHmNzaWBek3curGAy0QyFS?=
 =?us-ascii?Q?RWfhRrbgMQ894KC/if1PxQSCSGrINMXW0cWnDNSTZoZV5xmhMZ1MMAfgOsyd?=
 =?us-ascii?Q?xIpn/1/VAdgF4F0JkDP81YiU0c5NQzgCcI25XibTXqBeTpwOZiJG/BuwQ6sx?=
 =?us-ascii?Q?+lEHq7jqlkIYejEGjN7xBBX2ZIqYb1DWVZkdGfsHkzwVQPuPVpYu6V43UprR?=
 =?us-ascii?Q?+ESePNW2a+dMwRJVT7wS2CFpyTGvIctKgdvm57Bm6f4eEu6vmSG51Yik/00D?=
 =?us-ascii?Q?/yqbSARxUMk7JfdQ8U/ww3oUCbxG51HNHohjHdDozJTzTHgTNSd/HjelaGcx?=
 =?us-ascii?Q?j9MiomKMOPGPj/rxzdg7mJdIIlsyycJozTTxbrxumUytQGS+OwUK1aHzRUWk?=
 =?us-ascii?Q?7dnngIf9Pf8NtZkxMliLqn222Xrwo/gT9xf0jiJJQfql2VVVAI1Cpvn4rQV7?=
 =?us-ascii?Q?ymbHr4ef5GKxf3s72G61PxSEiaW00xnkQNJVIr3HjWKzQ/zYPp5aoPjYDReJ?=
 =?us-ascii?Q?BaWcxH3esg8Uoe3Gh3kHjKslXX/o8kX5yl7BiqPHkPYOXCEokR/V9t/8qDng?=
 =?us-ascii?Q?fhv5ztGs97BeeqviaLUyIejKNCPuCs5V6Lx7ytW9C65D2rm2Ha6yyOizypXS?=
 =?us-ascii?Q?fHwTvyOmAFJjkQOsSISsSUzCGwe6Gu3LoqmOI2PgHh4wt1w5hDh7yDHKy753?=
 =?us-ascii?Q?LVLtBqCm72t8Gbdb/aAWY3bGGjucDKcCRxyXL+8A97oM1i7Vbl8dygr1MWIH?=
 =?us-ascii?Q?k3eZ2KMffL5C3TuvcQtTp1WeoCmTm+i5o28WMS5fHxss5LitKyRCFgGxpW/5?=
 =?us-ascii?Q?5MkNeNIkt9OMNaqd5YcO2tVsdndvaPLgEYAgwpiWQsuTOGRHeswbYH93CSyh?=
 =?us-ascii?Q?qQd95s8TplRUK9S7jHg9L5tMISaexf8vDV3HOgEUqi5JY3DWT6e1yYtsp/oz?=
 =?us-ascii?Q?z15t6Ca0HuF1+sb9G81BF7eenkbrza41r6AP/wNNljjFW8SO/UBnumotRxvk?=
 =?us-ascii?Q?oQQk0uhwE9gtGUog5qiKc4RcV/bgn5mKpfY/UcotbRliqOnG86QQMDJppoql?=
 =?us-ascii?Q?brt84pfVstFoL1jYf//feN3rbUV3Jdp3hmNwFV2rC8r005XTfqarsRUPKLI5?=
 =?us-ascii?Q?ls9AsyLAGkGmPmcGUp1HTZl0fpfEMdFNJdcrf5ZZny/u0eUomI2BDH1SWuLG?=
 =?us-ascii?Q?ZnB39EvKR5WTR1KjTYFFaOPm0K4UvQleKmC1GtEoRpBXpra2SJTAs1AYMx3V?=
 =?us-ascii?Q?3+3jnzAr81d8/oDtdlox6Hvj2OLxhx0/juhoGxqZSt1hIzpPMbCHJcaPDEHM?=
 =?us-ascii?Q?ds6RyVFTe0r4fK7fv/FMpZEX0IoloLAD1NHAFGXxhwVyyr9tKREZkXY9Zscp?=
 =?us-ascii?Q?lTjFx8voiVZC3uN152HaOiHRH4xR/biblDvNz0mhcdtjf6dhllO8mNHIG7cT?=
 =?us-ascii?Q?x+T6gScHWjaUx2HlABTxd+rUe4YoN+5PT22eX748OgiUqvOchDpZNXUuVQsG?=
 =?us-ascii?Q?u36ht+AM5bU20Zrma61Q2hkyFqrf8rJoMH29hEA6OcQsVjQykO/sx3S33ERk?=
 =?us-ascii?Q?MSiXjXvkF62x0x9K/xNbered0PkMCE0=3D?=
X-OriginatorOrg: quantatw.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 148f32e5-9dc8-451d-67fb-08da183476bd
X-MS-Exchange-CrossTenant-AuthSource: SG2PR04MB3285.apcprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2022 01:18:03.8024
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 179b0327-07fc-4973-ac73-8de7313561b2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: XT9efBGI7JWweR9zfH0RFJoBie+hME06jE1AObn7ew2dLLgkjfNDzxft/Wqa1X//dyo2XFY9LrLmkBoPq0fcJA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PR04MB3167
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE,
	SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add Clause 45 support for Aspeed mdio driver.

Signed-off-by: Potin Lai <potin.lai@quantatw.com>
---
 drivers/net/mdio/mdio-aspeed.c | 37 +++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/drivers/net/mdio/mdio-aspeed.c b/drivers/net/mdio/mdio-aspeed.c
index 5becddb56117..7aa49827196f 100644
--- a/drivers/net/mdio/mdio-aspeed.c
+++ b/drivers/net/mdio/mdio-aspeed.c
@@ -21,6 +21,10 @@
 #define   ASPEED_MDIO_CTRL_OP		GENMASK(27, 26)
 #define     MDIO_C22_OP_WRITE		0b01
 #define     MDIO_C22_OP_READ		0b10
+#define     MDIO_C45_OP_ADDR		0b00
+#define     MDIO_C45_OP_WRITE		0b01
+#define     MDIO_C45_OP_PREAD		0b10
+#define     MDIO_C45_OP_READ		0b11
 #define   ASPEED_MDIO_CTRL_PHYAD	GENMASK(25, 21)
 #define   ASPEED_MDIO_CTRL_REGAD	GENMASK(20, 16)
 #define   ASPEED_MDIO_CTRL_MIIWDATA	GENMASK(15, 0)
@@ -66,8 +70,8 @@ static int aspeed_mdio_op(struct mii_bus *bus, u8 st, u8 op, u8 phyad, u8 regad,
 static int aspeed_mdio_get_data(struct mii_bus *bus)
 {
 	struct aspeed_mdio *ctx = bus->priv;
-	int rc;
 	u32 data;
+	int rc;
 
 	rc = readl_poll_timeout(ctx->base + ASPEED_MDIO_DATA, data,
 				data & ASPEED_MDIO_DATA_IDLE,
@@ -100,15 +104,37 @@ static int aspeed_mdio_write_c22(struct mii_bus *bus, int addr, int regnum,
 
 static int aspeed_mdio_read_c45(struct mii_bus *bus, int addr, int regnum)
 {
-	/* TODO: add c45 support */
-	return -EOPNOTSUPP;
+	u8 c45_dev = (regnum >> 16) & 0x1F;
+	u16 c45_addr = regnum & 0xFFFF;
+	int rc;
+
+	rc = aspeed_mdio_op(bus, ASPEED_MDIO_CTRL_ST_C45, MDIO_C45_OP_ADDR,
+			    addr, c45_dev, c45_addr);
+	if (rc < 0)
+		return rc;
+
+	rc = aspeed_mdio_op(bus, ASPEED_MDIO_CTRL_ST_C45, MDIO_C45_OP_READ,
+			    addr, c45_dev, 0);
+	if (rc < 0)
+		return rc;
+
+	return aspeed_mdio_get_data(bus);
 }
 
 static int aspeed_mdio_write_c45(struct mii_bus *bus, int addr, int regnum,
 				 u16 val)
 {
-	/* TODO: add c45 support */
-	return -EOPNOTSUPP;
+	u8 c45_dev = (regnum >> 16) & 0x1F;
+	u16 c45_addr = regnum & 0xFFFF;
+	int rc;
+
+	rc = aspeed_mdio_op(bus, ASPEED_MDIO_CTRL_ST_C45, MDIO_C45_OP_ADDR,
+			    addr, c45_dev, c45_addr);
+	if (rc < 0)
+		return rc;
+
+	return aspeed_mdio_op(bus, ASPEED_MDIO_CTRL_ST_C45, MDIO_C45_OP_WRITE,
+			      addr, c45_dev, val);
 }
 
 static int aspeed_mdio_read(struct mii_bus *bus, int addr, int regnum)
@@ -153,6 +179,7 @@ static int aspeed_mdio_probe(struct platform_device *pdev)
 	bus->parent = &pdev->dev;
 	bus->read = aspeed_mdio_read;
 	bus->write = aspeed_mdio_write;
+	bus->probe_capabilities = MDIOBUS_C22_C45;
 
 	rc = of_mdiobus_register(bus, pdev->dev.of_node);
 	if (rc) {
-- 
2.17.1