From patchwork Fri Jul 10 16:31:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1326996 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=fY+2sVkI; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B3JTl6M4wz9sRN for ; Sat, 11 Jul 2020 02:31:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728337AbgGJQby (ORCPT ); Fri, 10 Jul 2020 12:31:54 -0400 Received: from mail-eopbgr70059.outbound.protection.outlook.com ([40.107.7.59]:61635 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728317AbgGJQbw (ORCPT ); Fri, 10 Jul 2020 12:31:52 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mj4lBU1rp7brwVMaY8xNpMssN80dGOYY69m6lP0ojKJo6oNHG5UYAyppETqUR0eNKg7BlJM7m2gCV35ZSMTnhMoYupIJwmECrGC+w76usqAoA6ICurg/r7/bxZTXefz/390nfsBD5m3owc5k9FwcJlrGL5FTMF7p6w7PjWugp/4zLW+GybZXf8DBEQCazcG6Upk34c5rKjGc+bNHldRasjDIodGvVxyd5N1dd2zXBYeGqvPhut+kHZGCyfxEmWowTzbfHEmdkBmFLu0Lz9x0p7CGDx+CO+XZbhitIJdHimzwKkljGx2OgTr/ZmS77CF8NFx7vaSiyyh2AzlJaRVPNg== 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-SenderADCheck; bh=8imj06fEf6do6x+EnLOlhJiUSVSeYxf8zTMi2DJt9q4=; b=OHnTwEpfOozuZzSMpWSUHgWjlnyLfTk5n3JFbBAB0SdBP7YMKzlod57kNsC0Vd81yg+9zcbGPz1TKhISmE10r3VwLPCzw97/gllLO4EO3IfEo3KWwVc4/1IIEKDLQqdiXRuXYiMH0VYPKs4QBfITHL13xOrNKwEuBv9ehSyQYDe+CVdIV+bLnh+4SWpu4diF1tiJNwaIdBz+1vDpv4TW3j7NfHzUHo+tHt1C7hGNstVt2wyQctSFd7fbVzcUYO5rHOOc8lpsI6G+bX3GGreUWTrUF3zP7y16eVFL1TmsnIChW0Ks3iBs0AnRb8K1MOh9sqXNyh7CaO/CUqR2dkAMgA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8imj06fEf6do6x+EnLOlhJiUSVSeYxf8zTMi2DJt9q4=; b=fY+2sVkI3h2U0kX57feiUeHyJbpuyOFyDtsapYgemv8e7RgwL0uXbLgPaV2F8osEzQfz3zWYEdLeWcs4eqDr8WAT+K0cncWtKV8iX4Z0nWCKXLpc8Mca/Z2OD/MTK342QVBU7gx+kfjKV6uujoEE9jZQclVZbogAiUL1G7a30tg= Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=oss.nxp.com; Received: from AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) by AM0PR0402MB3908.eurprd04.prod.outlook.com (2603:10a6:208:f::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20; Fri, 10 Jul 2020 16:31:47 +0000 Received: from AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::7dda:a30:6b25:4d45]) by AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::7dda:a30:6b25:4d45%7]) with mapi id 15.20.3174.023; Fri, 10 Jul 2020 16:31:47 +0000 From: Calvin Johnson To: Jeremy Linton , Russell King - ARM Linux admin , Jon , Cristi Sovaiala , Ioana Ciornei , Andrew Lunn , Andy Shevchenko , Florian Fainelli , Madalin Bucur Cc: netdev@vger.kernel.org, linux.cj@gmail.com, linux-acpi@vger.kernel.org, Calvin Johnson Subject: [net-next PATCH v5 1/6] Documentation: ACPI: DSD: Document MDIO PHY Date: Fri, 10 Jul 2020 22:01:10 +0530 Message-Id: <20200710163115.2740-2-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200710163115.2740-1-calvin.johnson@oss.nxp.com> References: <20200710163115.2740-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR06CA0137.apcprd06.prod.outlook.com (2603:1096:1:1f::15) To AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv03152.swis.in-blr01.nxp.com (14.142.151.118) by SG2PR06CA0137.apcprd06.prod.outlook.com (2603:1096:1:1f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20 via Frontend Transport; Fri, 10 Jul 2020 16:31:44 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [14.142.151.118] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 04967d99-1ada-4347-1c17-08d824eebd9f X-MS-TrafficTypeDiagnostic: AM0PR0402MB3908: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u9eh8jycCptHC23zGljya4mltMKbQCAkKzO6gEqSnhXV4NJR8n8Aiac035mlxV8JU1tob7YeHLF4h1GKRqd7MP3qpqdgXJinDo13ca0LWUak6rMqgV8+9+WZqc4FtAtg2huXbwS1PAg43EiQEJLv8miL33uLXeoMA70pjRjqo2DukXFecgKUIOVkGShgG5pibAuNEXCm84m4gzd5ZYqhvdVGhfLCiSIKEysbIlL1Fgf77tiN4g1uexI6/tIQA9h6C6Kc/nhO9pcfqkYTeu/0cgTh5PhbUMn8gOwqtzMFC7vq8arOduD4firv8fArVm1RbRH50ZYulj9zOw1qFSwtakQSPdIO2OMlhmz+N2Z/V+7AsEHSfJyljilO/RmU0okY X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5636.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(346002)(39860400002)(136003)(376002)(396003)(4326008)(8676002)(2906002)(8936002)(86362001)(26005)(6512007)(52116002)(1076003)(6486002)(316002)(16526019)(110136005)(1006002)(66476007)(66556008)(6666004)(478600001)(956004)(66946007)(44832011)(5660300002)(186003)(6506007)(6636002)(55236004)(2616005)(110426005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: DhHiIIPfOli2DqhR2Q9rK8M0nUsnLyFxUKg2QlzNxchCpre+ArTuPTMjHR/ACkQcNKt1C3qTTHyxaIiiGB70B4BCrkkX34K4vEkIPVTCkR4mTrPec1XaxIwWbwQ9TdQC5hjYQcxKamJsATlsjgCwE7QojLC7slfr3AFz8EYdw2DWwYFkm39TUkMJV9y4V4zMmtBJ1deMgsjQMXX1WqCybv/YCtwJDP1SSh/GIa04cdsfVViTDKOcRVKua9O8kMzIi/wYVWPGpUcQVYtdn4ldR7Xmt4ji20oZPss8/G6gogDuOpy82VpUau16YsLAPYFhs5hGSh23sCs+10GO5A3vmsi9/b97SCT4FFEmozVBmouPBQCBllmxAF7v75Bzc1acdSAnfqkcM8120+exJGWvJHAxEyB33Suwgll8HMCwlStpNGiYClgmgdC9THSToVEv2tdFkR+8dM0R8689V46yUvY59STvwgr5eGeFXWxkBiGwR5I0BWnVYd6ZF0RBkxwo X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04967d99-1ada-4347-1c17-08d824eebd9f X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2020 16:31:47.6611 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nmw9nzSNOUyrqHgiFyTsM91YKWRWQbCsxMa/+OxvX0aonnCXQFCs7GIs+yo6VXpYKHBKFnxUutnNPdGJXqXW6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3908 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Introduce ACPI mechanism to get PHYs registered on a MDIO bus and provide them to be connected to MAC. An ACPI node property "mdio-handle" is introduced to reference the MDIO bus on which PHYs are registered with autoprobing method used by mdiobus_register(). Describe properties "phy-channel" and "phy-mode" Signed-off-by: Calvin Johnson --- Changes in v5: None Changes in v4: None Changes in v3: - cleanup based on v2 comments - Added description for more properties - Added MDIO node DSDT entry Changes in v2: None Documentation/firmware-guide/acpi/dsd/phy.rst | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 Documentation/firmware-guide/acpi/dsd/phy.rst diff --git a/Documentation/firmware-guide/acpi/dsd/phy.rst b/Documentation/firmware-guide/acpi/dsd/phy.rst new file mode 100644 index 000000000000..0132fee10b45 --- /dev/null +++ b/Documentation/firmware-guide/acpi/dsd/phy.rst @@ -0,0 +1,90 @@ +.. SPDX-License-Identifier: GPL-2.0 + +========================= +MDIO bus and PHYs in ACPI +========================= + +The PHYs on an mdiobus are probed and registered using mdiobus_register(). +Later, for connecting these PHYs to MAC, the PHYs registered on the +mdiobus have to be referenced. + +mdio-handle +----------- +For each MAC node, a property "mdio-handle" is used to reference the +MDIO bus on which the PHYs are registered. On getting hold of the MDIO +bus, use find_phy_device() to get the PHY connected to the MAC. + +phy-channel +----------- +Property "phy-channel" defines the address of the PHY on the mdiobus. + +phy-mode +-------- +Property "phy-mode" defines the type of PHY interface. + +An example of this is shown below:: + +DSDT entry for MAC where MDIO node is referenced +------------------------------------------------ + Scope(\_SB.MCE0.PR17) // 1G + { + Name (_DSD, Package () { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () {"phy-channel", 1}, + Package () {"phy-mode", "rgmii-id"}, + Package () {"mdio-handle", Package (){\_SB.MDI0}} + } + }) + } + + Scope(\_SB.MCE0.PR18) // 1G + { + Name (_DSD, Package () { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () {"phy-channel", 2}, + Package () {"phy-mode", "rgmii-id"}, + Package () {"mdio-handle", Package (){\_SB.MDI0}} + } + }) + } + +DSDT entry for MDIO node +------------------------ +a) Silicon Component +-------------------- + Scope(_SB) + { + Device(MDI0) { + Name(_HID, "NXP0006") + Name(_CCA, 1) + Name(_UID, 0) + Name(_CRS, ResourceTemplate() { + Memory32Fixed(ReadWrite, MDI0_BASE, MDI_LEN) + Interrupt(ResourceConsumer, Level, ActiveHigh, Shared) + { + MDI0_IT + } + }) // end of _CRS for MDI0 + Name (_DSD, Package () { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () {"little-endian", 1}, + } + }) + } // end of MDI0 + } + +b) Platform Component +--------------------- + Scope(\_SB.MDI0) + { + Device(PHY1) { + Name (_ADR, 0x1) + } // end of PHY1 + + Device(PHY2) { + Name (_ADR, 0x2) + } // end of PHY2 + } From patchwork Fri Jul 10 16:31:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1326997 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=YULuQgLj; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B3JTn66h6z9sRR for ; Sat, 11 Jul 2020 02:31:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728371AbgGJQb5 (ORCPT ); Fri, 10 Jul 2020 12:31:57 -0400 Received: from mail-eopbgr70059.outbound.protection.outlook.com ([40.107.7.59]:61635 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726942AbgGJQbz (ORCPT ); Fri, 10 Jul 2020 12:31:55 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e+xfqUJas4gvmtnF53hVf1CpfWySdcM/1EcU5iZ5tXo0yLTayA0BVj1Eqtos3d5F7l+Mu9RaBunVZuvkzwiucdYJFQtEOA5VnNWNLhr6UOxs/waHQXVHAh+/c4c3+clVtHv/b0YpiOFU2ImKWMoZ3zwBlx3in7KiTciGNFe1orbcDVrbdSaQXJ302XENxXSRVg7QdZtfddDmS4IYf84hU1np9wetpDPnKdxsmfPGoKKEcQ6Xn04rU9hHhx6mC1oUYjXMZQ8u235MZvBzRmkR3WrFWfd4dfFTQSdnb5A+90+nkaNhzydnWDvAOMUu9VYtOScJcz0zHU7VcNDH4BzIfg== 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-SenderADCheck; bh=swYb784uXNNedaZdomPeA3PvhwR1PJcZt5VTKLNVVq8=; b=N6Fk31y6BBfV0RBrcIHFMlpk6Gnij/jYv/xq6bTpjzVnp2LjTmYbsadi5RmsBqSa8x/9akjf8LYN4lIUsSg54xBugG2hIAXiqKHShp7XN1YsNRezkgCAWBW2sRFy+BkG1Pepwb0jgRZf24bstXDVriBXypfFhH5QLjcOGqrOfY7iIRK+KWWWlAr8wpBsPpsiHoMry11GCyZnR1KNGMAekdTbOzxO24HnauSA9yb0YXnQ1J1tLjYfAbPkzt/3vzG60fEAYsYVPAgPwt774y4IBQD4xZKlEXihAiT/4FHjJNQxzRuD33mF6c09GdIl1HA6QwzFOaPev9p3c7Si+K7nQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=swYb784uXNNedaZdomPeA3PvhwR1PJcZt5VTKLNVVq8=; b=YULuQgLj9w2EuySJEz5GQfq73QFuYIo67IEOMe0Ea4U2BI5IapdUuC7sitYTLdMZliTiM6YfQunpI6VC6/z/e9fFwH63pL+mUa610meeNErIC5STop2/BTeyDbSYfHjknDWBMU+RsIv0v3ZjjToXgDFY4SsT8YrfxR8B06kxYMQ= Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=oss.nxp.com; Received: from AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) by AM0PR0402MB3908.eurprd04.prod.outlook.com (2603:10a6:208:f::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20; Fri, 10 Jul 2020 16:31:51 +0000 Received: from AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::7dda:a30:6b25:4d45]) by AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::7dda:a30:6b25:4d45%7]) with mapi id 15.20.3174.023; Fri, 10 Jul 2020 16:31:51 +0000 From: Calvin Johnson To: Jeremy Linton , Russell King - ARM Linux admin , Jon , Cristi Sovaiala , Ioana Ciornei , Andrew Lunn , Andy Shevchenko , Florian Fainelli , Madalin Bucur Cc: netdev@vger.kernel.org, linux.cj@gmail.com, linux-acpi@vger.kernel.org, Calvin Johnson Subject: [net-next PATCH v5 2/6] net: phy: introduce device_mdiobus_register() Date: Fri, 10 Jul 2020 22:01:11 +0530 Message-Id: <20200710163115.2740-3-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200710163115.2740-1-calvin.johnson@oss.nxp.com> References: <20200710163115.2740-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR06CA0137.apcprd06.prod.outlook.com (2603:1096:1:1f::15) To AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv03152.swis.in-blr01.nxp.com (14.142.151.118) by SG2PR06CA0137.apcprd06.prod.outlook.com (2603:1096:1:1f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20 via Frontend Transport; Fri, 10 Jul 2020 16:31:48 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [14.142.151.118] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 3dac5870-9951-4457-b180-08d824eebfbf X-MS-TrafficTypeDiagnostic: AM0PR0402MB3908: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wqrgrDoP93iuc5ADDFgJhvSoRmDO7yq+3b92TGyzf17pMdEluDttnwYQkQubW68NlvK88JqY8iyfkHnkRacYfA6mUma+F42+Ji+yJkNL/7XJHtURKwAKptKBn3Aqwr6QyR0vHZhCpDlaxJ1ELEFrhJidQ7B39+IF0oR13zxwwQF/qKCWOfaT7p4+rFhEplcxd+TGtkkoU1fZkF0zWWJi+7McHko1ma6AkH5ikekloDK5ykFsDqkH8RtEWPVhs1JbjIVKnUJ6oVaDbGhogzi+L8vTQ5VR2puZI5ENXkfyHP8vM7eQZ7zSL+sWKTu5+PaLpcYAKoXjLa1K/o3eiHuyI0Hs/Ol68pFRuHe3+KmvidYK1g70TTTKWwiojliBMBUN X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5636.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(346002)(39860400002)(136003)(376002)(396003)(4326008)(8676002)(2906002)(8936002)(86362001)(26005)(6512007)(52116002)(83380400001)(1076003)(6486002)(316002)(16526019)(110136005)(1006002)(66476007)(66556008)(6666004)(478600001)(956004)(66946007)(44832011)(5660300002)(186003)(6506007)(6636002)(55236004)(2616005)(110426005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: j1Ki6x1fYhV+iie9TLLjX6WRD5LgPVkO5c7u0Q0G8BSVUvg0bD4EpzKrwJV4aJek8DLERwAKHi1i6CkMvs/vUaXvrJB6X0itjbbdroE9bcaEVlvaDP8pWTvV+sIrfQzP1bHUkHbGS0uxKS3bFl3n2E1yf7KkGcerBJ+22ejrl8viKUVtjkf73xaB8pV19dltFA0lyoZwyuCoXtIKC3p9rfGAY0Yipy5uKFaofaHHqt2SVijuEnDLNcuDm+DgrCjYpncrdDt4ZBJgX4oL8OTjR+rF8cLnfmOd6MIwM8FRJs8rz2wTV8fJhiR2M3Fi+7S+Z78LQVFCqiYDu8qjcUAOh7W20I4H7DdMNrtX9wZz/mFQS1fo4JCt4/PbonS9rhWn4YYsayIbnwJcQhfC83iB4soyt4lGmosLRkduGqeYc04P62WwEDNvHocFraQciebSmBnZ+hqqU+MhiSqogsRKVcwUtI2dUdKhlShhDas2vL/Y9z2yxOBVWrDPKzOi7dF3 X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3dac5870-9951-4457-b180-08d824eebfbf X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2020 16:31:51.2441 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: F0M/ZHnFVMbwbDHoXvzrM1kBgfcZv6y9xuXBeXe3OlMruC2IhcXRHIrLJjmvMHXUjJIUmdf9CjPe/ZMAuuBlAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3908 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Introduce device_mdiobus_register() to register mdiobus in cases of either DT or ACPI. Signed-off-by: Calvin Johnson --- Changes in v5: - add description - clean up if else Changes in v4: None Changes in v3: None Changes in v2: None drivers/net/phy/mdio_bus.c | 27 +++++++++++++++++++++++++++ include/linux/mdio.h | 1 + 2 files changed, 28 insertions(+) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 46b33701ad4b..2b6f22e64ad1 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -501,6 +501,33 @@ static int mdiobus_create_device(struct mii_bus *bus, return ret; } +/** + * device_mdiobus_register - bring up all the PHYs on a given bus and + * attach them to bus. This handles both DT and ACPI methods. + * @bus: target mii_bus + * @dev: given MDIO device + * + * Description: Given an MDIO device and target mii bus, this function + * calls of_mdiobus_register() for DT node and mdiobus_register() in + * case of ACPI. + * + * Returns 0 on success or negative error code on failure. + */ +int device_mdiobus_register(struct mii_bus *bus, + struct device *dev) +{ + struct fwnode_handle *fwnode = dev_fwnode(dev); + + if (is_of_node(fwnode)) + return of_mdiobus_register(bus, to_of_node(fwnode)); + if (fwnode) { + bus->dev.fwnode = fwnode; + return mdiobus_register(bus); + } + return -ENODEV; +} +EXPORT_SYMBOL(device_mdiobus_register); + /** * __mdiobus_register - bring up all the PHYs on a given bus and attach them to bus * @bus: target mii_bus diff --git a/include/linux/mdio.h b/include/linux/mdio.h index 898cbf00332a..f78c6a7f8eb7 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h @@ -358,6 +358,7 @@ static inline int mdiobus_c45_read(struct mii_bus *bus, int prtad, int devad, return mdiobus_read(bus, prtad, mdiobus_c45_addr(devad, regnum)); } +int device_mdiobus_register(struct mii_bus *bus, struct device *dev); int mdiobus_register_device(struct mdio_device *mdiodev); int mdiobus_unregister_device(struct mdio_device *mdiodev); bool mdiobus_is_registered_device(struct mii_bus *bus, int addr); From patchwork Fri Jul 10 16:31:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1326998 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=SukknYOO; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B3JTv521Qz9sRR for ; Sat, 11 Jul 2020 02:32:03 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728399AbgGJQcC (ORCPT ); Fri, 10 Jul 2020 12:32:02 -0400 Received: from mail-eopbgr70059.outbound.protection.outlook.com ([40.107.7.59]:61635 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728339AbgGJQb7 (ORCPT ); Fri, 10 Jul 2020 12:31:59 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FaXTKWSCwWlNqOz12LbkiVl+uV3gmfQMMJvSEKLwP3niOvjdCtAOk3t4Ikj6bPe5dXQvpy84WQEwtlQDt32Klh6AZsWZdlDMnzk3q3Ef2uPVsT0jBSfjlbFC4drhROPkI9U/uflJVQJg+eMxBfi/XhtlSnQ349k7VxaZUwA9c4KnUTLA2gK2mnNzMbeYaGGks2Gu9F0AhuqKULs/uX0GTKnzo3wyTeBZE1AEmMnEhqYuszvfy0KUsOCWPI/ZyU2ANZeLofsu+CeA6pELWNugHKnsncRox+3mDCFaEPWuhzoR1OI1bq8tuEyLaDkhb9r+nEKEtVmX6Qo5SYkLUc1xHA== 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-SenderADCheck; bh=lr0w6vAVKJ8tSVDykP9arTecbJqmiA5fXMFZT9aXetM=; b=lA+wErUGsD0NbC++JPsDvwtmNBJJgQDJndtkCST+ZxfC+kg+st54a5AmD9e1eZ0UhbeVNK9FmjSYs+zDhHS7DX8+9PiKqH1sp9Jiawf0zOg8ye8qMO4G6F6haLan86eJ8OGCIXTlFlpUdfGndYYPV458/Y3htaDgFqWaeFFkw46av+te1T9X3IIdTDw1YASxroZbsj9q+ENy+o24CGO0kZJApd/dd5L2jRC4bJT8D6hr3X+8dt6QWAtCCDMOnhX+136nbbUsu/nkBcezH9Djh3WsdwUCx8nrWQIAczQwuOjct7EqxtR+2Nxo+cZLcjM3ib0JTxENyfiPFo76YrnrWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lr0w6vAVKJ8tSVDykP9arTecbJqmiA5fXMFZT9aXetM=; b=SukknYOOC+noKpUbehUoXlFNMFF5+fPzqkN/5pNo6ddZC4QtUTnLjQbqMd2lEN3wFmwcoL3ctVqJOswxU48HTb0Qrf/LOtp9itnOCApK0Csq2fdGUzpcwssSoXoCy8muIcuX1zJ898gnBPV8U3IsmxV6OV7zCRUtSVpI1dqsAdc= Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=oss.nxp.com; Received: from AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) by AM0PR0402MB3908.eurprd04.prod.outlook.com (2603:10a6:208:f::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20; Fri, 10 Jul 2020 16:31:55 +0000 Received: from AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::7dda:a30:6b25:4d45]) by AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::7dda:a30:6b25:4d45%7]) with mapi id 15.20.3174.023; Fri, 10 Jul 2020 16:31:55 +0000 From: Calvin Johnson To: Jeremy Linton , Russell King - ARM Linux admin , Jon , Cristi Sovaiala , Ioana Ciornei , Andrew Lunn , Andy Shevchenko , Florian Fainelli , Madalin Bucur Cc: netdev@vger.kernel.org, linux.cj@gmail.com, linux-acpi@vger.kernel.org, Calvin Johnson Subject: [net-next PATCH v5 3/6] net/fsl: use device_mdiobus_register() Date: Fri, 10 Jul 2020 22:01:12 +0530 Message-Id: <20200710163115.2740-4-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200710163115.2740-1-calvin.johnson@oss.nxp.com> References: <20200710163115.2740-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR06CA0137.apcprd06.prod.outlook.com (2603:1096:1:1f::15) To AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv03152.swis.in-blr01.nxp.com (14.142.151.118) by SG2PR06CA0137.apcprd06.prod.outlook.com (2603:1096:1:1f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20 via Frontend Transport; Fri, 10 Jul 2020 16:31:51 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [14.142.151.118] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5b405f2a-e6bf-494a-b79b-08d824eec1e2 X-MS-TrafficTypeDiagnostic: AM0PR0402MB3908: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2089; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wZreKNnWeoYfcKL79Ot7V5JIed0l3OOi0aZxv42mLEmp64uDLFKoDMfClcSCckLxHVz6y3E6mHKKDSotH9Kf5nO3+pHlczxUpHmGHKTkXX1D8d6CZH7o8E3X2KrBmx7fvmysm9WPVYUNJaQTwdaQfkBJEWRQLo0aA5221kiNScS+qHFDP8YBEv47JRR5rj+RQBIZxoKsdbd1I3khyn3gdaxHm/cH/BA2gJhdHEC0R/5Zwo9bo+JIHQEYVjHjQpspexnOhlShUpMOWzZuhtVMYK7lWC9EoHpk6W9+7zfFj2iBQ0u7SIVMovNK3zwQuxZ0Stvp/pIKrPEtzLQN7KWVu58CWZ9Tx9fmHccIxAdpQ3wCmYy12vMC/Q4U9Mz/3n95 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5636.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(346002)(39860400002)(136003)(376002)(396003)(4326008)(8676002)(2906002)(8936002)(86362001)(26005)(6512007)(52116002)(83380400001)(1076003)(6486002)(316002)(16526019)(110136005)(1006002)(66476007)(66556008)(6666004)(478600001)(956004)(66946007)(44832011)(5660300002)(186003)(6506007)(6636002)(55236004)(2616005)(110426005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: NKNzBxAvGq0vtUnE+7MtcmQoAuji1Z/uIV96RRxhqxOd4hObA/6JeZo424KDwb1bl852LRGcvzy58rmrfr6L5E7jUCZjxnEX6sDA4WVWv4yG/njpjdVbQkvZwSxt0Femm3H/HkMCj3VI7lSbEL17OWgh6HNcCkXcVeBaEUH99F+rLkBYR6gjISfnKSEIvl8HOPy629659HcGBnPvhKZ2ZMe4HySs7mZs94TtsHjLW5o59TrQ7g7q0Erv//m3k56evcYocnrYeviWoB4lN2fIDRo9wIHFdHSU26LaHUzAHu+omcQXENwGmWzRzkCcjL/bkUPxhrTwAJqrSpKGBjAWkZEn914QiUAz9m+HYmNb3uIYojqo+KD/9hIen/AfSvwb+/hzOBwBgqHj7lTebyop4mT7HzX1OP7LbOFsBrt7UWTt5m8m+4/4oziv3Er2VOoog/kpitNKxJniL3VwM8jZ1G3Kvwlheqa3knIUjecl5T4PTbckxDObHp3dfbQ6+KuF X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b405f2a-e6bf-494a-b79b-08d824eec1e2 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2020 16:31:54.9670 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vKVlm3GleWDqYsvW/Mg+tQkrsIXauM1O9+1J+zLmXglMVKHg6HLoHm4OJ+WUi76nCwnWHyl/ErppgFkNdUHRFA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3908 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace of_mdiobus_register() with device_mdiobus_register() to take care of both DT and ACPI mdiobus_register. Remove unused device_node pointer. Signed-off-by: Calvin Johnson --- Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None drivers/net/ethernet/freescale/xgmac_mdio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/xgmac_mdio.c b/drivers/net/ethernet/freescale/xgmac_mdio.c index 98be51d8b08c..51a77a29c563 100644 --- a/drivers/net/ethernet/freescale/xgmac_mdio.c +++ b/drivers/net/ethernet/freescale/xgmac_mdio.c @@ -243,7 +243,6 @@ static int xgmac_mdio_read(struct mii_bus *bus, int phy_id, int regnum) static int xgmac_mdio_probe(struct platform_device *pdev) { - struct device_node *np = pdev->dev.of_node; struct mii_bus *bus; struct resource *res; struct mdio_fsl_priv *priv; @@ -285,7 +284,7 @@ static int xgmac_mdio_probe(struct platform_device *pdev) priv->has_a011043 = device_property_read_bool(&pdev->dev, "fsl,erratum-a011043"); - ret = of_mdiobus_register(bus, np); + ret = device_mdiobus_register(bus, &pdev->dev); if (ret) { dev_err(&pdev->dev, "cannot register MDIO bus\n"); goto err_registration; From patchwork Fri Jul 10 16:31:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1327000 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=lJuT581U; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B3JV14LCjz9sRN for ; Sat, 11 Jul 2020 02:32:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728411AbgGJQcG (ORCPT ); Fri, 10 Jul 2020 12:32:06 -0400 Received: from mail-eopbgr70059.outbound.protection.outlook.com ([40.107.7.59]:61635 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728317AbgGJQcD (ORCPT ); Fri, 10 Jul 2020 12:32:03 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L/nog/8k+L1YQa05tzGq4k2LxhJ1lUvOF0EqlWPGLP7ZfTGidMPFkFUtdcFJIXN676ZMfFjH8sL6zFaPixevnicShFQz76cktn00+RiqHhkUmND7hZ8rJ8UQQNlpCZHCEDEBM4AhPAzSL5QT+SLTMrMlDppOBbKLyoYZO3gIaNQ/8nH2rEpdIolQjKGs0VbNQPsMn2sABmkzSfx2LDxRLFvdQj3JHn7WKMdJRTGbxt4S7wNjBuFlr/1hpj9NVtL6dgC7euj1WnpP4ea8vf4rCsPB2knjcfwCbcI/WkEqE1bneua1OSt2U2NjatYlEqS8OtPcjg3a9OCY9JL74wumOw== 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-SenderADCheck; bh=KAP1FSM8UbZ7E+Yk+SxIt3zesPC4XgBjnFn4USSUQUw=; b=XpdUXOFa5dVYF0OEbc0mThXBizR8fDyEu47pzNzCdrw+Rj0xlsOf9/EERTsUBW+WQvX7jtevE+ZpKbiWuXeZhv891skS0glsG/9T9dPGev5WE5locTqe/76iJ2aBqIx3CehixNv1lSh2ZLThkJNU1ni+Usb7ZPS1cSzQgSnIcU2IbxwvPmKs2vhScV3FWOmII1ZVlg7J8V6+dgbJ8bk5+jS6BTmwQHUhTH585TLk7SaVMxkCeZsjVTs2kr8jj5VtQYGt1JrmbYARR0aiCSkMQNg20sQcdBciqSOiTt8JUqLDSFV4UmhSN5/u3JdpEc492dw7HcLDlBSU/94fEF/zbA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KAP1FSM8UbZ7E+Yk+SxIt3zesPC4XgBjnFn4USSUQUw=; b=lJuT581UddlrGPbvNJXbPv8IDgme2A6jhHsj9acRtXu781tinGvqkEOrAS6q3DqePbsGE/HPChJd3L22+UQwLDoMS6Qb/UHDlKSaBrNkb12DBjD8CIN+rjkDkFQnggDfuXC5TtoL3zzBEg5nXZAv0HiqB3hXKSpXbdJlStWL014= Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=oss.nxp.com; Received: from AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) by AM0PR0402MB3908.eurprd04.prod.outlook.com (2603:10a6:208:f::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20; Fri, 10 Jul 2020 16:31:58 +0000 Received: from AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::7dda:a30:6b25:4d45]) by AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::7dda:a30:6b25:4d45%7]) with mapi id 15.20.3174.023; Fri, 10 Jul 2020 16:31:58 +0000 From: Calvin Johnson To: Jeremy Linton , Russell King - ARM Linux admin , Jon , Cristi Sovaiala , Ioana Ciornei , Andrew Lunn , Andy Shevchenko , Florian Fainelli , Madalin Bucur Cc: netdev@vger.kernel.org, linux.cj@gmail.com, linux-acpi@vger.kernel.org, Calvin Johnson Subject: [net-next PATCH v5 4/6] net: phy: introduce phy_find_by_mdio_handle() Date: Fri, 10 Jul 2020 22:01:13 +0530 Message-Id: <20200710163115.2740-5-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200710163115.2740-1-calvin.johnson@oss.nxp.com> References: <20200710163115.2740-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR06CA0137.apcprd06.prod.outlook.com (2603:1096:1:1f::15) To AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv03152.swis.in-blr01.nxp.com (14.142.151.118) by SG2PR06CA0137.apcprd06.prod.outlook.com (2603:1096:1:1f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20 via Frontend Transport; Fri, 10 Jul 2020 16:31:55 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [14.142.151.118] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c179e68f-e1ed-419f-41a4-08d824eec42b X-MS-TrafficTypeDiagnostic: AM0PR0402MB3908: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: asb/k2XvAtzhqZzFj0XXg/Lu+938BBDXWWS7ytAJtnokYk4Vj8RpgpXvzCqML3ZkO5cjpEgavHlcEhcNYamHz4HyKORrpt4Q8RLeOC7yieXZeLDSM87RxlvIrNMf7afbdUUXT6tcxDaoWOnA5uK+84l6i+u9GkDChgpv/TAS5sWN8JaArSG19L9B8HELd/8k3zftt10ZFVSsAetSugORFFGI1iK1YrJBoc5Au3AtEO0uYzngVm7DAL+JYic6jAAG949hbBwUaxXdJheEpWb8rlezxo4+VkxjzEbKwUBffatb8kr9YPNBinFV8AX/72VsCO+EJt3omVe37p5dyQ4rSf7G4qTFjA9D+LA6cNyk2mSoomIbY/UK/KlXHrND701h X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5636.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(346002)(39860400002)(136003)(376002)(396003)(4326008)(8676002)(2906002)(8936002)(86362001)(26005)(6512007)(52116002)(83380400001)(1076003)(6486002)(316002)(16526019)(110136005)(1006002)(66476007)(66556008)(6666004)(478600001)(956004)(66946007)(44832011)(5660300002)(186003)(6506007)(6636002)(55236004)(2616005)(110426005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: YtBi9HnxeIj6Q+sjQtdhgdmd8id6r3gp8jYJNSTCaXr1hCdPrQIffO2DiU692VnaBLsQI2/FEc3o/zS1OAGiWA5bweH/inJR1056pAqn8T3DanlVdDEzufpXRdyUdVjjDRd2F2P3K1H+LAoHw9oIj1ldpA1BXreYXbeDV/jGsrUrp97z8KfEkvGWsnlMlQ5Jx5HRHJp+wPe7AlfFfjgH+TOu8DXi/mxhUnKD3Nnoddt462izP0NLadvlfuVKclr2WkKlOvbbbVQHcg/hFt/AKYBVk2aAbVA8kx8nuAr8P7WUMq8NgCUZxxV+zi9Ss6UwidopQWDQTf2sGCiM5lpSgw+iSvLSi9hnSDtx+hN5NSQSQqb0aMxKeifzH2e1YcL18ZfsQVdQBXnEmQG34zOiCe774ipYPDAtf57hiu/9GeM3siN7y3ZDEqr3Dh/25xcYO3Nu1M2wb2VAIcAy0J8j2OD+h6Idksm7yLl5gka8T3Y3hc7MVj+/P3wROEsFUVRw X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c179e68f-e1ed-419f-41a4-08d824eec42b X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2020 16:31:58.6669 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tDBuPn65VUs7Dbb+i4MAmxNRIQrXJjIr7RKrpiut1whOMc8uQalejofB0XHSdwbG4z+qw17em2wKzKBvadSqVw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3908 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The PHYs on an mdiobus are probed and registered using mdiobus_register(). Later, for connecting these PHYs to MAC, the PHYs registered on the mdiobus have to be referenced. For each MAC node, a property "mdio-handle" is used to reference the MDIO bus on which the PHYs are registered. On getting hold of the MDIO bus, use phy_find_by_fwnode() to get the PHY connected to the MAC. Introduce fwnode_mdio_find_bus() to find the mii_bus that corresponds to given mii_bus fwnode. Signed-off-by: Calvin Johnson --- Changes in v5: - rename phy_find_by_fwnode() to phy_find_by_mdio_handle() - add docment for phy_find_by_mdio_handle() - error out DT in phy_find_by_mdio_handle() - clean up err return Changes in v4: - release fwnode_mdio after use - return ERR_PTR instead of NULL Changes in v3: - introduce fwnode_mdio_find_bus() - renamed and improved phy_find_by_fwnode() Changes in v2: None drivers/net/phy/mdio_bus.c | 25 ++++++++++++++++++++++ drivers/net/phy/phy_device.c | 40 ++++++++++++++++++++++++++++++++++++ include/linux/phy.h | 2 ++ 3 files changed, 67 insertions(+) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 2b6f22e64ad1..e87da427fdcd 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -435,6 +435,31 @@ struct mii_bus *of_mdio_find_bus(struct device_node *mdio_bus_np) } EXPORT_SYMBOL(of_mdio_find_bus); +/** + * fwnode_mdio_find_bus - Given an mii_bus fwnode, find the mii_bus. + * @mdio_bus_fwnode: fwnode of the mii_bus. + * + * Returns a reference to the mii_bus, or NULL if none found. The + * embedded struct device will have its reference count incremented, + * and this must be put once the bus is finished with. + * + * Because the association of a fwnode and mii_bus is made via + * mdiobus_register(), the mii_bus cannot be found before it is + * registered with mdiobus_register(). + * + */ +struct mii_bus *fwnode_mdio_find_bus(struct fwnode_handle *mdio_bus_fwnode) +{ + struct device *d; + + if (!mdio_bus_fwnode) + return NULL; + + d = class_find_device_by_fwnode(&mdio_bus_class, mdio_bus_fwnode); + return d ? to_mii_bus(d) : NULL; +} +EXPORT_SYMBOL(fwnode_mdio_find_bus); + /* Walk the list of subnodes of a mdio bus and look for a node that * matches the mdio device's address with its 'reg' property. If * found, set the of_node pointer for the mdio device. This allows diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 7cda95330aea..00b2ade9714f 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -23,8 +23,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -964,6 +966,44 @@ struct phy_device *phy_find_first(struct mii_bus *bus) } EXPORT_SYMBOL(phy_find_first); +/** + * phy_find_by_mdio_handle - get phy device from mdio-handle and phy-channel + * @fwnode: a pointer to a &struct fwnode_handle to get mdio-handle and + * phy-channel + * + * Find fwnode_mdio using mdio-handle reference. Using fwnode_mdio get the + * mdio bus. Property phy-channel provides the phy address on the mdio bus. + * Pass mdio bus and phy address to mdiobus_get_phy() and get corresponding + * phy_device. This method is used for ACPI and not for DT. + * + * Returns pointer to the phy device on success, else ERR_PTR. + */ +struct phy_device *phy_find_by_mdio_handle(struct fwnode_handle *fwnode) +{ + struct fwnode_handle *fwnode_mdio; + struct mii_bus *mdio; + int addr; + int err; + + if (is_of_node(fwnode)) + return ERR_PTR(-EINVAL); + + fwnode_mdio = fwnode_find_reference(fwnode, "mdio-handle", 0); + mdio = fwnode_mdio_find_bus(fwnode_mdio); + fwnode_handle_put(fwnode_mdio); + if (!mdio) + return ERR_PTR(-ENODEV); + + err = fwnode_property_read_u32(fwnode, "phy-channel", &addr); + if (err) + return ERR_PTR(err); + if (addr < 0 || addr >= PHY_MAX_ADDR) + return ERR_PTR(-EINVAL); + + return mdiobus_get_phy(mdio, addr); +} +EXPORT_SYMBOL(phy_find_by_mdio_handle); + static void phy_link_change(struct phy_device *phydev, bool up) { struct net_device *netdev = phydev->attached_dev; diff --git a/include/linux/phy.h b/include/linux/phy.h index 0403eb799913..fd383a22eb61 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -334,6 +334,7 @@ static inline struct mii_bus *devm_mdiobus_alloc(struct device *dev) } struct mii_bus *mdio_find_bus(const char *mdio_name); +struct mii_bus *fwnode_mdio_find_bus(struct fwnode_handle *mdio_bus_fwnode); struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr); #define PHY_INTERRUPT_DISABLED false @@ -1245,6 +1246,7 @@ int phy_sfp_probe(struct phy_device *phydev, struct phy_device *phy_attach(struct net_device *dev, const char *bus_id, phy_interface_t interface); struct phy_device *phy_find_first(struct mii_bus *bus); +struct phy_device *phy_find_by_mdio_handle(struct fwnode_handle *fwnode); int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, u32 flags, phy_interface_t interface); int phy_connect_direct(struct net_device *dev, struct phy_device *phydev, From patchwork Fri Jul 10 16:31:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1327001 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=HVfJ2YwH; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B3JV53GxGz9sRN for ; Sat, 11 Jul 2020 02:32:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728421AbgGJQcL (ORCPT ); Fri, 10 Jul 2020 12:32:11 -0400 Received: from mail-eopbgr70059.outbound.protection.outlook.com ([40.107.7.59]:61635 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728339AbgGJQcG (ORCPT ); Fri, 10 Jul 2020 12:32:06 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ch3fc9/vjWZg5n1o88wQRjQebC8nIxqopZAvFOEo5UPutDFrL1Uu6DbYYbBW46kHeTkjsFLjn8VyC1Lln7T8Hk/KtpAN4mo8HW2Q5hgUEyaxE4m9oCmAxgScUuZEI/2aRKnYTjDlhNeIC6lpSEBp2xQL351XtlTA2Fp7cBFIPq4CYwN1wMN0deUo7KLqNveo6tkKF9q+zCjoxUJHX2lo2L+SPovvMysNbzfAXLQiU1xcXkflH0pzbJhPitHKe+aaE0ryHbcMyNU8JaFsf5c+GAL7WOt6tev6PCERq1wNRtUpcF3/j02hu6lyupBiuHH8m88Vb9nY553B3qZkk/Vdtg== 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-SenderADCheck; bh=BH7d5di8jh7O6rh9DUWCVSFi5M0AUpUv8cdPDI1FvIA=; b=M7/msdJeKsW7OeH1SRDQqD6SMj4aOFosVqnL8SHVbwvODPBXg9MKUAehMGJTToPFWkRfimijo2AClMLY8C4iih1avGJCzbO/jyYsgBr78SRytzfEWmqoEX6zbfMo683GuL1A7Z8OsqopQKx3FYhjM+h0diFQYgZMS6fVbG+AaA+tmM/41NTXgKGoqdHn+DdZ7Jc44BKUsTtpnBXMJDvbDUNK6IvwfFAhyKilZXXb08zS8fNJRKf0WzrC8VLw+aOhDXOlgWHgfkOVUgal8bZdEWi5OIc5dCP0B08nvxeQQt6uW/Ss2bUR3nmnGVSQvcqqQrNGICfAfDgw2ZsXAS01jA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BH7d5di8jh7O6rh9DUWCVSFi5M0AUpUv8cdPDI1FvIA=; b=HVfJ2YwHTdfGZoAsRuheGt8wpq1AM2ce70j/vyK0hUfiOg9TwZWZI+Q/5t1gW4codfHIeoYHXlvUl1JpROfRMYZR8k5GMvfxkzOr5clxZq1/f+KUmj1UEqlnVWlpCZ+nXF99usSc7sHFydqmy/FWZdJoTxZOuUNulU9+HaVOv10= Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=oss.nxp.com; Received: from AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) by AM0PR0402MB3908.eurprd04.prod.outlook.com (2603:10a6:208:f::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20; Fri, 10 Jul 2020 16:32:03 +0000 Received: from AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::7dda:a30:6b25:4d45]) by AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::7dda:a30:6b25:4d45%7]) with mapi id 15.20.3174.023; Fri, 10 Jul 2020 16:32:02 +0000 From: Calvin Johnson To: Jeremy Linton , Russell King - ARM Linux admin , Jon , Cristi Sovaiala , Ioana Ciornei , Andrew Lunn , Andy Shevchenko , Florian Fainelli , Madalin Bucur Cc: netdev@vger.kernel.org, linux.cj@gmail.com, linux-acpi@vger.kernel.org, Calvin Johnson Subject: [net-next PATCH v5 5/6] phylink: introduce phylink_fwnode_phy_connect() Date: Fri, 10 Jul 2020 22:01:14 +0530 Message-Id: <20200710163115.2740-6-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200710163115.2740-1-calvin.johnson@oss.nxp.com> References: <20200710163115.2740-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR06CA0137.apcprd06.prod.outlook.com (2603:1096:1:1f::15) To AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv03152.swis.in-blr01.nxp.com (14.142.151.118) by SG2PR06CA0137.apcprd06.prod.outlook.com (2603:1096:1:1f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20 via Frontend Transport; Fri, 10 Jul 2020 16:31:59 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [14.142.151.118] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4d2fc518-0b64-496e-09b4-08d824eec661 X-MS-TrafficTypeDiagnostic: AM0PR0402MB3908: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dGDoTl0oLrGJN3xHYtHKUNylMuxY5t3WRWjZw0pw4FML65B+ciQBtfhF1L55zS96qXkmwT9bNtQIS+EfXIutOonXsRJ3ApeRhDqTWrzcFTRyIyns33KRU7tK6251h19WPHI47J5zhq0NtoKXOlLhuM8TCNXhNPJBl7yQlToCVthXv5NCMck2Sw4EdjoNXA9w/YSNAY9aX+qcIoXIkqTtZlioWctnyk5fsY+J/x0UT++0DPWsiabolhQpqAq8AAtrL84UlBWs75Q+r73xgvHPSb61bEXONc0wuakmq/zQoy6sqec2JGPY37sD3uJslZsKDLfrkN1H/z5UMg9kEq+2jp69rT8J2tBnRxGP/3VEoKPA2SXrtsMno5+Uxx8yx7r1 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5636.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(346002)(39860400002)(136003)(376002)(396003)(4326008)(8676002)(2906002)(8936002)(86362001)(26005)(6512007)(52116002)(1076003)(6486002)(316002)(16526019)(110136005)(1006002)(66476007)(66556008)(6666004)(478600001)(956004)(66946007)(44832011)(5660300002)(186003)(6506007)(6636002)(55236004)(2616005)(110426005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 3gPOYExidBXsKt1CwRTiT//Hs7O+RqmqnJa5ITRuiupAgGqKrQOtboMnKypyHuypuo2Zc/lvKeQfMJlfGMhRzDOCxCIiIE8C2jcFmQt5GMSoSI8E2hh102jy1h9Bh7TbzoC8Cuh17nB18mGxH3QXRqEWkCIj+5VAYur59BwAjddjBsBd67qH/l7DfiI+/Mx7ZNFc9zj9oeysDx8b/bGOMyYB98xRmUqty8yXZgaV3CVw7olSwDlqw15D35Y8aZduYKnmaYn2Tk3tpQfvOVdbSCC8AQmgackr7i7mY2dPxnMqGQSdidq57YEjt22TOTqvOJJnXXDvueZM7MhBo73G94aAzGGqSyW3Er/Fx3wLnUgac9gazEMl1qXQLSiwsGtpcW4BVN8hQJ5LfuJwXm5UpJRhCCNl2iGguo4uJdhLhIiA4BGBsqg2d/FuOek1xykpSCvsnmcI7Fpo4sU1tyGEcCFG5VakQaEx56g1/oSD0bLYW7Wi66a8Nn4ZGlaywG05 X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d2fc518-0b64-496e-09b4-08d824eec661 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2020 16:32:02.4648 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OwTSmo4StZAjiMKHOGopHwNeOun0KtmkSdTWQ3VV+4DWZWMWETivOhBu2lGtzZRJHV7JcRNB7tB6LYkVh5YFsA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3908 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Define phylink_fwnode_phy_connect() to connect phy specified by a fwnode to a phylink instance. Signed-off-by: Calvin Johnson --- Changes in v5: - return -EINVAL for invalid fwnode Changes in v4: None Changes in v3: None Changes in v2: None drivers/net/phy/phylink.c | 35 +++++++++++++++++++++++++++++++++++ include/linux/phylink.h | 3 +++ 2 files changed, 38 insertions(+) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index dae6c8b51d7f..44095e02d18e 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -5,6 +5,7 @@ * * Copyright (C) 2015 Russell King */ +#include #include #include #include @@ -1017,6 +1018,40 @@ int phylink_of_phy_connect(struct phylink *pl, struct device_node *dn, } EXPORT_SYMBOL_GPL(phylink_of_phy_connect); +/** + * phylink_fwnode_phy_connect() - connect the PHY specified in the fwnode. + * @pl: a pointer to a &struct phylink returned from phylink_create() + * @fwnode: a pointer to a &struct fwnode_handle. + * @flags: PHY-specific flags to communicate to the PHY device driver + * + * Connect the phy specified @fwnode to the phylink instance specified + * by @pl. Actions specified in phylink_connect_phy() will be + * performed. + * + * Returns 0 on success or a negative errno. + */ +int phylink_fwnode_phy_connect(struct phylink *pl, + struct fwnode_handle *fwnode, + u32 flags) +{ + struct phy_device *phy_dev; + int ret = 0; + + if (is_of_node(fwnode)) { + ret = phylink_of_phy_connect(pl, to_of_node(fwnode), flags); + } else if (is_acpi_device_node(fwnode)) { + phy_dev = phy_find_by_mdio_handle(fwnode); + if (!phy_dev) + return -ENODEV; + ret = phylink_connect_phy(pl, phy_dev); + } else { + ret = -EINVAL; + } + + return ret; +} +EXPORT_SYMBOL_GPL(phylink_fwnode_phy_connect); + /** * phylink_disconnect_phy() - disconnect any PHY attached to the phylink * instance. diff --git a/include/linux/phylink.h b/include/linux/phylink.h index b32b8b45421b..b27eed5e49a9 100644 --- a/include/linux/phylink.h +++ b/include/linux/phylink.h @@ -368,6 +368,9 @@ void phylink_destroy(struct phylink *); int phylink_connect_phy(struct phylink *, struct phy_device *); int phylink_of_phy_connect(struct phylink *, struct device_node *, u32 flags); +int phylink_fwnode_phy_connect(struct phylink *pl, + struct fwnode_handle *fwnode, + u32 flags); void phylink_disconnect_phy(struct phylink *); void phylink_mac_change(struct phylink *, bool up); From patchwork Fri Jul 10 16:31:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1327002 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=G98mkjfl; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B3JVB3rzzz9sRR for ; Sat, 11 Jul 2020 02:32:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728441AbgGJQcR (ORCPT ); Fri, 10 Jul 2020 12:32:17 -0400 Received: from mail-eopbgr70059.outbound.protection.outlook.com ([40.107.7.59]:61635 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727065AbgGJQcO (ORCPT ); Fri, 10 Jul 2020 12:32:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eG7KTnpYU8rbMhresZigpE9P4NljIsMCabnEbYHifziOMn/zaQES+O02+frOl7k9Wr4QA7xRtUje/ytOuYiKgE3aU8QVWl2qryYPNS9wKCsROlcTZUUwtq/7zCHCfdkB9CtylqsQOWU2JnTB6rpOiWLqBr8NCV1Uxnwy23RQI1nGjQhJ1Up6NPGiQQNWsVsOXK0dPvEsb70jyD8fix78IE8o0aLOEHV+rnNR7K2FR+wUftyNFpIZwIFsK9XD+EjVsxrQI9I3dxpvxNCQp+yYaaolT/dkalldJDrZPqSCAj6FVzExSekfNXf3p57xIyvM9qbwT5E3RYwa0nSehuRLlQ== 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-SenderADCheck; bh=7jD6wzL+Ox42uosACvyWOy+0bWlltFD2XjLP/2Nlpbo=; b=PXn2ZHvyd+7aVcCzuypO0MT+UEFpOfpSE8acZ4qQY9kBLKhIew4IkvoBLKG26H4d2rCNwwc324O6JN37Ng3IXxIE7btxvWTRlq0gUDWiTRAix3pWSTGviWTVBhXuvFGiHGkPerhmU+2RS0f2jCZTUWHD4wzVtyjIYr+yxkllQVTrCZZG6I0Xhvphps/Pu+E949ZWAvLD44Ocv8BDJCJ49B8vE6MCUSlvPYF8cZuog0t81RzH+Z62Bo5yYLJW+evlQpAVDQ/k9tw/8YQmKyyHa+uk2nDeeRBs8go8rWiKX56Hv+yY91jZrG+nhkzmtB9TqhfPYKpoIjnVeNt5b3D/MA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7jD6wzL+Ox42uosACvyWOy+0bWlltFD2XjLP/2Nlpbo=; b=G98mkjflMfWoNA1gNAGSkfPWwxWHPO4TanKvkvCM80jcYAEAmRaaDaOWluw4RqybIGrHmxCFsn5CK6Ux1pFsdh4kg8ON+GFH71l3PvtVbN8dToV1WB7N4+tE5I5174rTDH+Szsa3xTo3wLRHiXyi5x+g6btnVpNh7o8t6VS8JIw= Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=oss.nxp.com; Received: from AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) by AM0PR0402MB3908.eurprd04.prod.outlook.com (2603:10a6:208:f::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20; Fri, 10 Jul 2020 16:32:06 +0000 Received: from AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::7dda:a30:6b25:4d45]) by AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::7dda:a30:6b25:4d45%7]) with mapi id 15.20.3174.023; Fri, 10 Jul 2020 16:32:06 +0000 From: Calvin Johnson To: Jeremy Linton , Russell King - ARM Linux admin , Jon , Cristi Sovaiala , Ioana Ciornei , Andrew Lunn , Andy Shevchenko , Florian Fainelli , Madalin Bucur Cc: netdev@vger.kernel.org, linux.cj@gmail.com, linux-acpi@vger.kernel.org, Calvin Johnson Subject: [net-next PATCH v5 6/6] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver Date: Fri, 10 Jul 2020 22:01:15 +0530 Message-Id: <20200710163115.2740-7-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200710163115.2740-1-calvin.johnson@oss.nxp.com> References: <20200710163115.2740-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR06CA0137.apcprd06.prod.outlook.com (2603:1096:1:1f::15) To AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv03152.swis.in-blr01.nxp.com (14.142.151.118) by SG2PR06CA0137.apcprd06.prod.outlook.com (2603:1096:1:1f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20 via Frontend Transport; Fri, 10 Jul 2020 16:32:02 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [14.142.151.118] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7c2fb665-9aba-4d4c-a984-08d824eec8a8 X-MS-TrafficTypeDiagnostic: AM0PR0402MB3908: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b0+JN3Fp5j2CU5+FCspJjxb/CcixObgCMnG73X0C6qeuGWwo3N6OR1Y2Ae9Q5lpiWYA1odtbpcmvPNYgIwgKQZPF9k71KKHlPGWX2ce/SSyM/Padm5/a7rXVQAWLu11rXoodBNYmurKSS130lOEYuqvEG+tiEfc6AJSYFbx1fl+vBQrN59CH/Q7llrBjUoT+/D1FVzYdzKx3kaz3cmuNyp7CZkZ2MGaMZheBpVTCS7pjFGGXPj0qvEcHqtBQUX05HXV1msih/jlUASiiAWv5uVkEHyJdI+DcppEk2R4nez7DpJhc2QwSxlTw12EciaReObr6Wj+8K8A4dTxYUBNy+fu76ZFc2VeT+06HNFmEArifFiawuA8SIEfzeZa08XRI X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5636.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(346002)(39860400002)(136003)(376002)(396003)(4326008)(8676002)(2906002)(8936002)(86362001)(26005)(6512007)(52116002)(83380400001)(1076003)(6486002)(316002)(16526019)(110136005)(1006002)(66476007)(66556008)(6666004)(478600001)(956004)(66946007)(44832011)(5660300002)(186003)(6506007)(6636002)(55236004)(2616005)(110426005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: r/aWSD61mgJg6VxSsNAWGJFLKdqEfpgHljeNmbTC2aip9ECLTBWmZ1elDGOCDgQvjlOXqF8mZJihsB2ZswnUloU++c0WpEhbxMAdy8waT22HS6RGlOGXdLb3qzRFe90ZD27jWF5CKETfOdwcMK3ycXaV8hv3cshaKRgKUibtIjHXqIqsc+Rq45CcF4pNTXVJEvjwUE+OxT6J26Ukj1qxXsQNfCt+966om4uhAN54PPIB9GaUbum2z3qzn0yFxhoGEAOIB76g5AqBdXisxFmSk6h3s7eRcNCBDtDz4ZJEIe6BSsjrlMklCwaJZuVct8X0EDyAbeNDkuZ2/sR7deE1ZDP86toYM7eqjswb279loDCSwZDxw6c55NCchyYjCjs6hyw0gJNiul3mvzpEc6k5HhuCs3whxIoX8tDCBXhGfMDnsPp+SGPKaKC5uWHthDjQuXfY6vxHKl1SsvSMe7U0/GILa0wgsAFjgd1wtXp33jfW29gncjCE+1kqtId74ivq X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c2fb665-9aba-4d4c-a984-08d824eec8a8 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2020 16:32:06.2117 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PJV0LEaypQ/HrbBpCgGQeX8Egm32MnZ6OAtJRrmK0effTrNJ3uuB98FVz1S3ugw44TYYlwsE+ef9fzWHK2LUGQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3908 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Modify dpaa2_mac_connect() to support ACPI along with DT. Modify dpaa2_mac_get_node() to get the dpmac fwnode from either DT or ACPI. Replace of_get_phy_mode with fwnode_get_phy_mode to get phy-mode for a dpmac_node. Define and use helper function find_phy_device() to find phy_dev that is later connected to mac->phylink. Signed-off-by: Calvin Johnson --- Changes in v5: None Changes in v4: - introduce device_mdiobus_register() Changes in v3: - cleanup based on v2 comments - move code into phylink_fwnode_phy_connect() Changes in v2: - clean up dpaa2_mac_get_node() - introduce find_phy_device() - use acpi_find_child_device() .../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 70 +++++++++++-------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c index 3ee236c5fc37..297d2dab9e97 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c @@ -1,6 +1,9 @@ // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) /* Copyright 2019 NXP */ +#include +#include + #include "dpaa2-eth.h" #include "dpaa2-mac.h" @@ -23,38 +26,46 @@ static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode) } /* Caller must call of_node_put on the returned value */ -static struct device_node *dpaa2_mac_get_node(u16 dpmac_id) +static struct fwnode_handle *dpaa2_mac_get_node(struct device *dev, + u16 dpmac_id) { - struct device_node *dpmacs, *dpmac = NULL; - u32 id; + struct fwnode_handle *fsl_mc_fwnode = dev_fwnode(dev->parent->parent); + struct fwnode_handle *dpmacs, *dpmac = NULL; + struct acpi_device *adev; int err; + u32 id; - dpmacs = of_find_node_by_name(NULL, "dpmacs"); - if (!dpmacs) - return NULL; - - while ((dpmac = of_get_next_child(dpmacs, dpmac)) != NULL) { - err = of_property_read_u32(dpmac, "reg", &id); - if (err) - continue; - if (id == dpmac_id) - break; + if (is_of_node(fsl_mc_fwnode)) { + dpmacs = fwnode_get_named_child_node(fsl_mc_fwnode, "dpmacs"); + if (!dpmacs) + return NULL; + + while ((dpmac = fwnode_get_next_child_node(dpmacs, dpmac))) { + err = fwnode_property_read_u32(dpmac, "reg", &id); + if (err) + continue; + if (id == dpmac_id) + return dpmac; + } + fwnode_handle_put(dpmacs); + } else if (is_acpi_device_node(fsl_mc_fwnode)) { + adev = acpi_find_child_device(ACPI_COMPANION(dev->parent), + dpmac_id, false); + if (adev) + return acpi_fwnode_handle(adev); } - - of_node_put(dpmacs); - - return dpmac; + return NULL; } -static int dpaa2_mac_get_if_mode(struct device_node *node, +static int dpaa2_mac_get_if_mode(struct fwnode_handle *dpmac_node, struct dpmac_attr attr) { phy_interface_t if_mode; int err; - err = of_get_phy_mode(node, &if_mode); - if (!err) - return if_mode; + err = fwnode_get_phy_mode(dpmac_node); + if (err > 0) + return err; err = phy_mode(attr.eth_if, &if_mode); if (!err) @@ -231,7 +242,7 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac) { struct fsl_mc_device *dpmac_dev = mac->mc_dev; struct net_device *net_dev = mac->net_dev; - struct device_node *dpmac_node; + struct fwnode_handle *dpmac_node = NULL; struct phylink *phylink; struct dpmac_attr attr; int err; @@ -251,7 +262,7 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac) mac->if_link_type = attr.link_type; - dpmac_node = dpaa2_mac_get_node(attr.id); + dpmac_node = dpaa2_mac_get_node(&dpmac_dev->dev, attr.id); if (!dpmac_node) { netdev_err(net_dev, "No dpmac@%d node found.\n", attr.id); err = -ENODEV; @@ -269,7 +280,7 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac) * error out if the interface mode requests them and there is no PHY * to act upon them */ - if (of_phy_is_fixed_link(dpmac_node) && + if (of_phy_is_fixed_link(to_of_node(dpmac_node)) && (mac->if_mode == PHY_INTERFACE_MODE_RGMII_ID || mac->if_mode == PHY_INTERFACE_MODE_RGMII_RXID || mac->if_mode == PHY_INTERFACE_MODE_RGMII_TXID)) { @@ -282,7 +293,7 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac) mac->phylink_config.type = PHYLINK_NETDEV; phylink = phylink_create(&mac->phylink_config, - of_fwnode_handle(dpmac_node), mac->if_mode, + dpmac_node, mac->if_mode, &dpaa2_mac_phylink_ops); if (IS_ERR(phylink)) { err = PTR_ERR(phylink); @@ -290,20 +301,19 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac) } mac->phylink = phylink; - err = phylink_of_phy_connect(mac->phylink, dpmac_node, 0); + err = phylink_fwnode_phy_connect(mac->phylink, dpmac_node, 0); if (err) { - netdev_err(net_dev, "phylink_of_phy_connect() = %d\n", err); + netdev_err(net_dev, "phylink_fwnode_phy_connect() = %d\n", err); goto err_phylink_destroy; } - of_node_put(dpmac_node); - + fwnode_handle_put(dpmac_node); return 0; err_phylink_destroy: phylink_destroy(mac->phylink); err_put_node: - of_node_put(dpmac_node); + fwnode_handle_put(dpmac_node); err_close_dpmac: dpmac_close(mac->mc_io, 0, dpmac_dev->mc_handle); return err;