From patchwork Wed Apr 6 01:20:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Potin Lai X-Patchwork-Id: 1613637 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=quantacorp.onmicrosoft.com header.i=@quantacorp.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-quantacorp-onmicrosoft-com header.b=B7Dcns8v; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KY6Cd0KfMz9sFk for ; Wed, 6 Apr 2022 11:21:01 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4KY6Cc6HMwz2yfm for ; Wed, 6 Apr 2022 11:21:00 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=quantacorp.onmicrosoft.com header.i=@quantacorp.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-quantacorp-onmicrosoft-com header.b=B7Dcns8v; dkim-atps=neutral X-Original-To: linux-aspeed@lists.ozlabs.org Delivered-To: linux-aspeed@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=quantatw.com (client-ip=2a01:111:f400:feab::71b; helo=apc01-sg2-obe.outbound.protection.outlook.com; envelope-from=potin.lai@quantatw.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=quantacorp.onmicrosoft.com header.i=@quantacorp.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-quantacorp-onmicrosoft-com header.b=B7Dcns8v; dkim-atps=neutral Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2071b.outbound.protection.outlook.com [IPv6:2a01:111:f400:feab::71b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4KY6CQ0vvLz2xnP for ; Wed, 6 Apr 2022 11:20:49 +1000 (AEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k7ZNi4j45yFW5d0AAVI4/9khcQiCmyIur4VHnHsMHHT6pLwmAmToFmQQsq2/sUaLcrCYv9KIj+3FrBW3RXO84qBWkRbgWMYJjbsJCTopfpFRFo/u4yxfSGH8kaf8Yfuq6QMZEYQs46P9917bgi8Z6KCHtw59v4FztYS576GeUjy0DPxbIrOR4cgUhJPffs7031bI6QTd+XtZRIpE6C8Hg8K5VGC/xHeYsgqMvA0NisIh/MgcOx3nzFj03bwu03FmNQHd6gIKUNw4IlsWKZCyTCN0aaoWEkE2N86h3l/pOjlLy5T0HEoUjx3Ti/Umm/QZvdB41Thnrj12Q/BpC014Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=edq+ryQ73PscVubk4QO6nQR8gN/3+Nc3wCNr3YSWrhI=; b=fNM4PAxkL4fK9DxhGasgL+RfUj+xySXSED5eBsLi9Euy58w5x473m/QYLVoqENB1TiqtZ7bu44USYv8SfKGayUWrqnJ55z1HwDuSlLPDnwzAVLIbckHIK4w0CBcp1YScE3ltaVBe2cPbIb9hTNajnRdIrmQr6uptC9iIVovqHNnt0N5DpibC2PZCR7XlMTjqJaLYJn0o00Fo4/k+mIlEYg/hZXHa54LQ7Gk2DVaMOFLyJjoGgSusMsYbLoLamfXIoxQci6ACeBmu+BXtdqSbuQqPs7p5SiBjuUbjcrMpqdS/jZhjho0WG0TUMR8MnoUGnhjXdzW0Suf5cGvEl5tybA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=quantatw.com; dmarc=pass action=none header.from=quantatw.com; dkim=pass header.d=quantatw.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantacorp.onmicrosoft.com; s=selector2-quantacorp-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=edq+ryQ73PscVubk4QO6nQR8gN/3+Nc3wCNr3YSWrhI=; b=B7Dcns8vhx8is3wsZxycpvT9pYkNwPVJT82DIl+VDGwOcOJr1AeshSU9my/0cRKz8Ij6pC/p4dmf01v2vKh0iL4T1bMHSycGs7aTazxcy5BI2Bs8ky4hbd8FCXloShh41Fz2UivTGYyEc6Vqu8gv2RC3pTThzj+TjadFKQ8xjkc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=quantatw.com; Received: from HK0PR04MB3282.apcprd04.prod.outlook.com (2603:1096:203:89::17) by TYZPR04MB4446.apcprd04.prod.outlook.com (2603:1096:400:4::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31; Wed, 6 Apr 2022 01:20:25 +0000 Received: from HK0PR04MB3282.apcprd04.prod.outlook.com ([fe80::9c61:c8e7:d1ad:c65f]) by HK0PR04MB3282.apcprd04.prod.outlook.com ([fe80::9c61:c8e7:d1ad:c65f%6]) with mapi id 15.20.5123.031; Wed, 6 Apr 2022 01:20:25 +0000 From: Potin Lai To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Jakub Kicinski , Joel Stanley , Andrew Jeffery Subject: [PATCH v2 3/3] net: mdio: aspeed: Add c45 support Date: Wed, 6 Apr 2022 09:20:02 +0800 Message-Id: <20220406012002.15128-4-potin.lai@quantatw.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220406012002.15128-1-potin.lai@quantatw.com> References: <20220406012002.15128-1-potin.lai@quantatw.com> X-ClientProxiedBy: HK2PR02CA0129.apcprd02.prod.outlook.com (2603:1096:202:16::13) To HK0PR04MB3282.apcprd04.prod.outlook.com (2603:1096:203:89::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4bc4b837-685e-4cdc-e62e-08da176ba0c5 X-MS-TrafficTypeDiagnostic: TYZPR04MB4446:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l27w00vS6yVVZ/7ijS5nikPbPHClKQaubFN7CcwTPWyy8ChGtCcsrYbUsSx4N1ILXUv9bL2Xv+66esAO2eo27frahEKTtbLUk9hl5AZXMFzTYW6SL/1z3j35dsMyxnBhvKJyE/4nvvUmYRxqpcSWe38CkLNuW4fwWIVenfZa64Mi0kgRfUqv37OLutFf02EDFJasayXmd08PKyPTpJkz379wmAPSJBV67igRzkvCdqZIU26hQz69OJmWq1SKD4OAODWXSanJrFr4LJPTo6Q1xstfKxiAkZJ9fa06YfykPFZxfY9zUViFpi9YPDPFxvDW+pasQfQk+U4Xt9IrWjaCSVIR3a8tD4X+Tm8To+NLScy/rDS8iWrWls4XtIOquk6pWE0FV5moc5u3al0zwdYjWF2qGPGCQn/sz12BMF6kNOpVUO1AaKjFfA1qjmDZS42rf+EQo/B1frc8Q/JYmgGJyJdGvif3osSvFPLGhiB6eZvX6HaksSGE21wJ5RAGtqrRV07/Io/R24MlI34mKPPowbpOOEZcTKX57ch+s5B7a3n8RoSpjxIVoHYfjuA186FsnHPHoOKzY9q1hflb9/9OJHdzwpLcXzt2XgvoThFOO8sVOTBWPrvRGxKGnMi92mIDBaLOLFDfCDViWJPHrFEbco+bEveRVpb9BQY4BZKMQYBwgwsE0WWNfn19AgMMgiM9 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:HK0PR04MB3282.apcprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(508600001)(66946007)(5660300002)(52116002)(38350700002)(38100700002)(6506007)(6666004)(8676002)(6512007)(66476007)(66556008)(2616005)(4326008)(110136005)(86362001)(8936002)(186003)(6486002)(26005)(7416002)(36756003)(44832011)(316002)(1076003)(2906002)(54906003)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vvGKYz9qgUU98IUqKKLiwoxDkta7GjuTCCWYXR1vS8MbwOdT3bpCk4d3/S/3/6uTmwV6QCzqAeXZ0mSUC6wQctAZhzvxR0zgOO3RuPiPvJCio2MX9CtcsIX73BFHWRzH0JGM4Xcm/vKEjC14yR/riu7rJic15S9yRt14AvrekdQOixVLHCIXsOMm2OM/VOabnfyGrv9aF/y8m8wktxJ1L93bA3QBcK78gUt/n8tcwcD7jdpjrfWg18HETFHPK2UvfqfAV5JiTQsCgG1vXglBaJdcPt2eLypbtBDiCda/jb35jilGDMJ+e2vUz4HPchCns98VCEquXuzrttlPJC1hycmV4p4/yjRmJhYhUs8G85v4PV9nFGbZtRhWlaDRi9WEhA+QDkJQKSUg+D6alu9Zbu1zO7dyKg4uwsvSTZsXqsTG4d70E0/p+cCPnPVSTbVTWlSJ2ptAF490hYaD/yusjEx3w6YWI62T3+3ooZmDz69ELSWgB48mdJIuEbaUvbcu574qydoiS+CneIKf/PB0G1yV38/UtNnwA2uO7KZSmoQGjuahUygKVM32edPgjmOnLOakqLi+/38lmiQxWk2eR5zKJPitvy5nYeJILhz4med1y8+vZBZiDKnLA15bDhEEo4KnskBMmDh7cwAJJqMY8hHh2NYJEJ4243qnN7Tim+FKeZzUXrjg4ZGDfQPP2SWPUpoGC5DFS62X9LLs9SdUm7w9mWkSEltmOt6Paf1kO7NHysmCwgWqrXzflEaSKWEbu9eRxRhxiT2/RHxfR8uWIu2Gji9bDcJpdJJK97xCIzXVdbrTwMYqBnti6QULZWUxDz4rSoUGMUxVBhwNpcxDDqZCJVX1YRtiUfurpzosmOOVphSXQlnhoDrCg74JIS5BmiyUsUd6dcsRb0A2EFKH0z1Ew34QIWVJ9gjJ2+ubUfPCxoqd6XYcghxz/jenyr3dpj9gFWR84ywHoKSS4MuaY8/W4kAg4vG+6Xto0LjeBTnu53KGeVq4fCq0zUWXxX72Sn21abInXseEPkAt9cgiCNQRY0/T+qtY+D7VRQcC3BODy5g+iB/TWTE9s5Gk3SqyD+wLXwcjYXqY/W/rLGEFnBeTg4HU1hNkf71gIHUxcfptFS6t+tKdW3t29PmSeZrhIYQBA9jFfn8NSEw6dUREQF4X00jlHYYqrHYmfqNqT576U7MzFINBTVRtT4YTyBBpE03E7wn9UrCnygTlE0/9Rib5HLeiSD+xD9+gVDfyJlXRjY5IT1P3yGJ83tQAvz7B/SXSYGFHHeGhetNZn5dq3wya0qKsoMroy1qstsZS2xxPBNzy3KtgKmst9kOqYi++Py2o2C1u0h/hMVtsh2VPfGh/t3pyYmBLhksww2P6lrNxJ9a2v6JmXl3szbf0sTj8sH5fxmqH3AAT4XeNSudHMq15XwWWFb5wEy5B17QAsnl+PwIlNo5tMTKW22dvqXMVnbWKiiBWJv8k68+AyGWdVbGglMe7/i7+/B0I/bi2Jy7BZlnzeH83P6TLgt02O+wNiIB0MKlPI2lDhy1FMStyYRHzc48aSQsELJXQthmF2A4wz82Vnd5tdi9uEKZZXNhZCofLfpMeoptIOXqSGdTZiezhiCDbzuGK+9z0mtSoiet4M0Ecpw7uRhMIJN4MWtp83FwW9+CtLNx4p567g0RQNeSiWQyFaHoaOQQh1ilen0LwBd5Sev7homJ6Kk+lb/uBUhG1Hs+F62Jmevmxdzbze3mmSznvZn446FzWNySp2No= X-OriginatorOrg: quantatw.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4bc4b837-685e-4cdc-e62e-08da176ba0c5 X-MS-Exchange-CrossTenant-AuthSource: HK0PR04MB3282.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2022 01:20:25.3703 (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: EPVieK2LhWptcX7nE3+/iKTY5pvANhWuh+VdJ2zfU+208XVIH7Hvya9+aiTQVEfkdJfpklLE7YUTK2FeGO8Beg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR04MB4446 X-BeenThere: linux-aspeed@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux ASPEED SoC development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-aspeed@lists.ozlabs.org, netdev@vger.kernel.org, Potin Lai , linux-kernel@vger.kernel.org, Patrick Williams , linux-arm-kernel@lists.infradead.org Errors-To: linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linux-aspeed" Add Clause 45 support for Aspeed mdio driver. Signed-off-by: Potin Lai --- drivers/net/mdio/mdio-aspeed.c | 35 ++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/drivers/net/mdio/mdio-aspeed.c b/drivers/net/mdio/mdio-aspeed.c index 5becddb56117..4236ba78aa65 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) @@ -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; + int rc; + u8 c45_dev = (regnum >> 16) & 0x1F; + u16 c45_addr = regnum & 0xFFFF; + + 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; + int rc; + u8 c45_dev = (regnum >> 16) & 0x1F; + u16 c45_addr = regnum & 0xFFFF; + + 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) {