From patchwork Sat Jul 11 06:55:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1327221 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=JFvu80jg; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B3ggY50mPz9sRW for ; Sat, 11 Jul 2020 16:56:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728198AbgGKG4k (ORCPT ); Sat, 11 Jul 2020 02:56:40 -0400 Received: from mail-vi1eur05on2070.outbound.protection.outlook.com ([40.107.21.70]:33732 "EHLO EUR05-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728086AbgGKG4i (ORCPT ); Sat, 11 Jul 2020 02:56:38 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mucZXGceOCXQy7TuwPCf2Oh1SSNUsfHFutb0giCJ9GZGPsKVYBo+MRbbdJmDP5+oGlXUQE21O0xva+3YbqSJYJzDS7f62zQWvKnA54tsZzD10EqGNp/c5AWkJ1XEAJGiQKpz2LE4kstopZ2YGuHgdSeZVIrUUVjnxyo2YoGCJtK/KeXya9AvTLS5ppA6aCGGou9BSiyRcua70hjGzHC8mMVvEyiaHp/H8rDzzEcjhBVa082SvvvV+ONtUyBPH2/S7ORz+r/kCK0jkRQxKfgghstJRVme3a9uJUhTrENWBihm8v2677H2B+1+ck+NxGHzdoDv5DwCUCMZnl33iJ0TkA== 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=YiY8l12SZLqO1UlXDq0SQvbRvbu7GKT9Z72GXeUaEeo=; b=m3hsdR8y6XDfCKOWEWrqw1cIz4Bo7/TMo7/aBdVZANFGQYa9CFf4MJO6HqQcXp/UqGUcYVDFqtLJPfPZAprQ60FsxrQWzgEO7CNJpqd2e+Vpw3X540kcoBkd5e9uvQNjwpXCrFtET5WiyD8pHZcA4RdYubDzIkeUuyf4knczDRZess27Z63GVE9lPlZ6oZmaakC1iH09ljL65PaY/6h0oA+HnUA8ey8KUvobL7g5Z9GhXqtvvOHzsLaPf1Y6x6097KvvUo0pbWLR8gxwtKZCs2CaFeEkQwbqxCts7OXg1oLESFZTVEhXEp/uVtAFOs8ndz5w4yj1VBERvffgal1DuA== 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=YiY8l12SZLqO1UlXDq0SQvbRvbu7GKT9Z72GXeUaEeo=; b=JFvu80jgDA1mbNZp4vfK4I506Wciiv9LUfOq2PvSi0SbWHDcAS52fYBvy9GYFHzkQ5HoD2bhq7lsXqyx3td92dR8K9t4rZelwiTG2RO9mewweZF3Wlkz5/D8J3lRPqTf85Oqz4OcUOzVo+Ie18bPms/KhhsqZBHMVKEwAKyiYws= 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 AM0PR04MB6961.eurprd04.prod.outlook.com (2603:10a6:208:180::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Sat, 11 Jul 2020 06:56:35 +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; Sat, 11 Jul 2020 06:56:35 +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 v6 1/6] Documentation: ACPI: DSD: Document MDIO PHY Date: Sat, 11 Jul 2020 12:25:55 +0530 Message-Id: <20200711065600.9448-2-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200711065600.9448-1-calvin.johnson@oss.nxp.com> References: <20200711065600.9448-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR06CA0132.apcprd06.prod.outlook.com (2603:1096:1:1d::34) 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 SG2PR06CA0132.apcprd06.prod.outlook.com (2603:1096:1:1d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21 via Frontend Transport; Sat, 11 Jul 2020 06:56:32 +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: a190828c-2b26-46bd-739c-08d825678d4d X-MS-TrafficTypeDiagnostic: AM0PR04MB6961: 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: aNpe1crDu3noWp7ku99y9tkLolozMuKIKMUX1QNWzJctNw4c7sxe1+el2jumgiSye8iKGive6g/3PTag7zQK3ZjthlP8hkMt77HJ3/5sE9s3jwPXpbCAxweRDQhvDzZXnuJnSbg/XpbXltfYNokavLKI2oOj0DdqG9BK7o/tcEreoLVft4+ZF3XIU4w4TT5iFQpdlEW355iMkCEAJV2DaBUq+P+/uaDH+DK/K8mhwQcgQTVRTTEVe9ZHtiVYDqniBoVyQIRCR+/jBk/uM2aOzh8BFS90wmpn9AWcOWzDW33crXxV7S7wJDVP5XN3KPuiFI9Q9lHfLip1/NI5cgG5hVvK6fA7FqJfLrNzJ7YRcTjdY+QiZm/pEGy5ckQmVtgj 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)(39860400002)(396003)(376002)(366004)(136003)(346002)(26005)(6636002)(16526019)(186003)(110136005)(55236004)(66476007)(44832011)(6666004)(66946007)(66556008)(5660300002)(2616005)(8676002)(52116002)(1006002)(6512007)(316002)(6486002)(6506007)(956004)(1076003)(4326008)(2906002)(478600001)(8936002)(86362001)(110426005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: L/15utOBep16o9nv6HziFyOllN8d4am5XJOLdVnIEgA08qP57PA8NmliqnZRB7YoiCjyGFO3zbg48ooHb4BFewaIApBuGC08fk0JEd1d7ECJt6eHgq3l0Q8rAaSuLv1o4Vz6qZ4uzwB/hSvWsqnPJHc5jLumsxPFRT2If0vkzVwjtUxGakqD3K+9/H61iuj1DwZBdoJ6KCStsP+wqYKvIjmUIqlgSh7jFLRUWmCu5Af5Pt4bJWgjWhGtVU3xd3mGT61FV+y/4J1bP9PyrZNzQjrzO4u2F90rCsTaN9bRy9ZRJkJxuzuNhX9PjBIBQIMMlVWRurXpL0sai2mbmS6dZWtAb8dtbIydT+arVMfO+9SsXTpp5etW5THc/4PrdmFstm9aWLVct7WT286W7wbYWOD6gRxbRD+hmLwLoqJ3BZAIajcflFMGlyGvLoDfck1xSHQ5D8Bn+jCvy9++/AznhUVFuXnxGx4e/IJpEG01YPCxGTysSHAk+5xGGqFc58S4 X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a190828c-2b26-46bd-739c-08d825678d4d X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2020 06:56:35.7186 (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: StCChTJBzU/mfg6mcfR8Xyz6J2zZv9ei0TmiGfwRpXt7CbG+UgusAFoSHSKWEWr95jg/EJwx25sNPZGl5Ehz3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6961 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 v6: None 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 Sat Jul 11 06:55:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1327222 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=foBcYbtm; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B3ggc5tBqz9sRR for ; Sat, 11 Jul 2020 16:56:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728202AbgGKG4n (ORCPT ); Sat, 11 Jul 2020 02:56:43 -0400 Received: from mail-eopbgr40081.outbound.protection.outlook.com ([40.107.4.81]:21075 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728197AbgGKG4n (ORCPT ); Sat, 11 Jul 2020 02:56:43 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZRxK6ZVeD5WPum2Vrp1Sx0rDaLFpx9ia53y/YAlqFwxIxCBIfSU3OuKbYFI0rzQ+Wi0wEufZYJ/gD3tyfZZ1tR3Ph0KSQ93IHDCrpBRzUFIDhLmtzxyHSSjxK3rErjDYIkxEySBmvseHs9aCcDPVHaSzFD3qSpWnTTPuXzgLOgEjnvLlAFML4OryRZbjYiY1uc4I6OFhHVvR9OlK8pv+0eXbnjZHCcuoYaxN0rK5XuIHYt+1LdyUByh1JNXtqRqy1d+KnWuWMBt+gxEbyHE0IZAheS2eg0h3WVElJHiZ6hYoRZugQeSmCQRGtD7kdFSSVhTc06+jGprzQlG5GQTLFQ== 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=Rd9pjwtQykPg77RQKXK1jd95xsuDQdncec7PnQTk6no=; b=c8hSR66ze1Hy9QzCjm7rQ5xwevFJksvLZ4h2n7ZX7oS79nwPNiWSESb9P0i1CTdWkCvKaY+kDDheYNPAEZYZz7hYrVA+jQgCkKqNIbPnsKHcPM/BpUKjEJCKUw0itXwngR4FwZdsMQggJgN/NDEJXWjdSPwgdZhliHZWGE2KJ52G/A52CMUnDVTFbPSNv/hgWrxsVAyQr9Gk4zp3mqwtHbogzTahsiRwnygRxWwJYlfU8v8S3mhuQZYJZq5zDDRWSM6QchorL5YvHprwUmDCvhtjBE2lVpHZCAw9L3RPjBdWKRmJic9kCGHjlghTeeGtEDFjIYCAGDFQ9ZCqCHPB2w== 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=Rd9pjwtQykPg77RQKXK1jd95xsuDQdncec7PnQTk6no=; b=foBcYbtmP/GdjXgdDPoogM7wmg3E1PUFwpRn0CqXSsd3UKvlgFjoQSAHX5y3AtD98nqMoLd/VLZEqBs2ykYbixDfSrAcVX4hdt0PjSIY0p2kNormiwikNoy4Pm2b6NIECJVtGFiMwlGGNsbYGg4RQCKQBHf5701y6jsUlCu/vHw= 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 AM0PR04MB6961.eurprd04.prod.outlook.com (2603:10a6:208:180::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Sat, 11 Jul 2020 06:56:39 +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; Sat, 11 Jul 2020 06:56:39 +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 v6 2/6] net: phy: introduce device_mdiobus_register() Date: Sat, 11 Jul 2020 12:25:56 +0530 Message-Id: <20200711065600.9448-3-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200711065600.9448-1-calvin.johnson@oss.nxp.com> References: <20200711065600.9448-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR06CA0132.apcprd06.prod.outlook.com (2603:1096:1:1d::34) 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 SG2PR06CA0132.apcprd06.prod.outlook.com (2603:1096:1:1d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21 via Frontend Transport; Sat, 11 Jul 2020 06:56:36 +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: 7c009677-9c1d-43be-4514-08d825678f76 X-MS-TrafficTypeDiagnostic: AM0PR04MB6961: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tRqYrF8v9mFQGjAJ+WwWLIzXciEGT1rJIRs7lu7tpimUc4yw6Ld9aRbR4zQrYvlMyAuJWNcXDUpOOXnuRW59t/S1h04QSzVVxWcMEPbP3cvxEI3AOIJyt+6H0AmF2Lqslh0NPSzg8QvBeli8BomQOKhPOrnb3OxaRDs/7jIyeIGZqdZJFcVeT+Um+YuPEvsL2dHCQirjwedQunE84GdhiMUsByZVJA0xGo+V2LMAsbFV5xbLYgrnnDpoJT/muXiJWdUmrFLDxSP8Wl4FIQvP7S0PYzVZbxj6kV8Rfd1lmA6XaFbVZLoy8XZXC2WtpQqweXbOPckvY7L7PWmfwBAd5VWE167wBw24WW8Cx+k8I3vQCydGvvPJENvoR7AU5C1N 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)(39860400002)(396003)(376002)(366004)(136003)(346002)(26005)(6636002)(16526019)(186003)(110136005)(55236004)(66476007)(44832011)(6666004)(66946007)(66556008)(5660300002)(2616005)(8676002)(52116002)(1006002)(6512007)(316002)(6486002)(6506007)(956004)(1076003)(4326008)(2906002)(83380400001)(478600001)(8936002)(86362001)(110426005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: rv4YzlaPSNNygLNMUaMUFBUFeoFu3eeiQzN/XrK46iOvQ8gQBkaZydewOvtsSw9hRmAj7j16gLFJKGLyblsagyYs9wzfaIvii+XIPPw0AuIvXXEUokDyxxiSmDNMIOoRRMKkMhRXEYfSupIs4NJm31Iw8OMdoJozhsuJ7hq6cRaAGfuMdXsPyjspLX8+izREY5QcUILxrqtXsuMTV3JOxz4DssSEycW06rBRn74Ryz7pb8p9erwBU+m8F+GKZiKNfURcYfDCqzdRMXh8fIEnMeI4vwMNSF1xmMCYyvczRHeyVE87IqsUjP8zXYmNa5Zn4RPar0GWeg55SipgUxcnBCDteV9Hq4yknH3p3IyRuE72cIKEgX7TK+h5QGYXNNsEFXkUwRYfcCpRdtncB8iVpKXK6Uca15tivaI/GKHfzu8SRXUYLGtOYulYtBsJ6mmHaRauc1KGKKgldqGEcVEw6sHdMVX1G6Oe7XBPx4IrXKC23fysn58swIdOJdKJ2+4p X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c009677-9c1d-43be-4514-08d825678f76 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2020 06:56:39.4605 (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: t1l53Y4TMdxePpSjFLkR2gY6u7QlSN2DWbQz4Q4v3D2lLSVm1Tv+1oUsWBP1ylVI8fWC+7hrfU9nCs785J6p2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6961 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 v6: - change device_mdiobus_register() parameter position - improve documentation 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 | 26 ++++++++++++++++++++++++++ include/linux/mdio.h | 1 + 2 files changed, 27 insertions(+) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 46b33701ad4b..8610f938f81f 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -501,6 +501,32 @@ static int mdiobus_create_device(struct mii_bus *bus, return ret; } +/** + * device_mdiobus_register - register mdiobus for either DT or ACPI + * @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 device *dev, + struct mii_bus *bus) +{ + 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..f454c5435101 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 device *dev, struct mii_bus *bus); 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 Sat Jul 11 06:55:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1327223 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=B5/SzBCG; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B3ggg5nnBz9sRR for ; Sat, 11 Jul 2020 16:56:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728225AbgGKG4q (ORCPT ); Sat, 11 Jul 2020 02:56:46 -0400 Received: from mail-eopbgr40089.outbound.protection.outlook.com ([40.107.4.89]:8821 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728197AbgGKG4q (ORCPT ); Sat, 11 Jul 2020 02:56:46 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EeY5zqLxiX3ujrSQlqDg0LKUZ+DCDSu/1mlb38jbd1f970H2fjtF2bZSXWQ3Es9cLgyLtqI0jFAHpAfvWs45SQP3/ht6qGBopFEc3BD85JEdhTI0xX8duRLNl88iysj3pcp5ByNQyx33fsXewMuo9CJzQAXMn6PrTfnkFXmqAKPQH15NAY5exUYbCI1shflZe5BGRwlAB9FBgIna7UEQ0H7G2TBA4AOZAbf6RZdJAwiI6x2KmTi9UihdR1p86IEm7A9VXO4qyxyq4Z8OlBDEwaIS8dJrcUaFj/WM0MccP8CVJvqnwGaGmgjoWNFejGBGx9a4+lkN31zUrI0fA7+sWA== 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=pPPQW4Rp0PLYQkuqIMMhE8S1diTmD6CrXAKmGOpP81Y=; b=gg2HcYlyMyvP1pk2ZHc7ohn6XxaVDGzup4wNGBwG8kpn11InH5x3gCD1NIuAs8kclxuvUDSQKfMptZf8HTACeFf+0ztDjIQNIyHDLqoyddsB6ifN4oTag//lo0PGVryyCTmMoc4O/9QzxkyGCKXNGcBs52KPfSaGzu7PH/IfdUDB2RhYcxFBrrkW/bjSCqlaSELfpqClSTxevlxxu8+sKL7LOVrF0GHAMVMvlZCZZlVfudCA0UN6n7KW7baVslKscOLTQsKqAInePKEg/yEFOtjfINpFvnseMnHYXx8LiXVlrM0l3FFcI8ko0UEjbOfIeqyUWH56hWuJ9VDIo/ZffA== 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=pPPQW4Rp0PLYQkuqIMMhE8S1diTmD6CrXAKmGOpP81Y=; b=B5/SzBCGBO10ptmX0h9kkpXp/J0kRTYsNVk2aK1cJu5W84h/HoR9Df4ygLaponw/idKzb1+M30iclfBqpzAVFiL5EGSse3XMIkD+aRBSiXogJHpLI6NxNuToAStL3b1/G3VnrhA2B+VH1JlI3Ge1pzTLoNxmJtr+M44LfIIs934= 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 AM0PR04MB6961.eurprd04.prod.outlook.com (2603:10a6:208:180::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Sat, 11 Jul 2020 06:56:43 +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; Sat, 11 Jul 2020 06:56:43 +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 v6 3/6] net/fsl: use device_mdiobus_register() Date: Sat, 11 Jul 2020 12:25:57 +0530 Message-Id: <20200711065600.9448-4-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200711065600.9448-1-calvin.johnson@oss.nxp.com> References: <20200711065600.9448-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR06CA0132.apcprd06.prod.outlook.com (2603:1096:1:1d::34) 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 SG2PR06CA0132.apcprd06.prod.outlook.com (2603:1096:1:1d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21 via Frontend Transport; Sat, 11 Jul 2020 06:56:39 +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: 9576baf4-7f68-4ec8-fdba-08d8256791cc X-MS-TrafficTypeDiagnostic: AM0PR04MB6961: 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: y8tDWugm+xMfYUfpMM2e+7trGA7EX8UmOZJ7qJ96rwz5/1I6VGubT02h47xlewYPGJfDeC2WzAAeRYb2YaDjBAOo79pEY06aXT6ckk5jcsLILOOzg9rxPnghsR+Ti47Ji409UKZwGUq6druNzYS56fOX7iUxreBDekUh8Ep9UYTHHpDu2HmsXI/eTb3zHsRO/cooQDL0QEt5Nz2gnMIcV0hP/Stfg0cfzPHo7Md0hEZXZX4faui623S+IKI3fO65hllbLTELFkEX8y2bvvRRwo44nyrv5rY3QKMKVkvgHgRCJKnudjCZXDNrYkN08uGXcsoXHgZvFD1eC5imSvLj0MCl/Xc3t7XJBpRIM7RTLYYI+OGFy8+fCLtkMLoypxbp 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)(39860400002)(396003)(376002)(366004)(136003)(346002)(26005)(6636002)(16526019)(186003)(110136005)(55236004)(66476007)(44832011)(6666004)(66946007)(66556008)(5660300002)(2616005)(8676002)(52116002)(1006002)(6512007)(316002)(6486002)(6506007)(956004)(1076003)(4326008)(2906002)(83380400001)(478600001)(8936002)(86362001)(110426005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: IRL0/fpmWMVl7v8PiQt9iBWnpOEYGFTIX2J64Fo744+o/PSLvJbDxMTnGoN/BSqpn6p7lJuMckSuEtpYS6ablYSvd0SSRtnrsJhjXOi0EaKPXJYL34kfBQGP+uwhrXyZX0y9686IlGYSmYG7abMFtSw5cWgmVU2702E3IKJ2K4t0D0kwJz7S6/F9ZOKmvnaTWMIk1yCEDT/bJhrjLhLr0PxoFb3yT6K6k4z4oiiaWVqh9kG0d9tgaPlBOhRjR/UU9NgPXeoPZucJCjV5LkeIpvUl2y5NPIwUBPiwXY0Ldb1z67diBnFYRzpQFktGMI3rWoGvASAgQ1TRiC/2+mPeLBkdaohw9S3PqAcOSfYa9BUj92hH9almPa3nTVsiVO0cEPZ3eiiMHaTs+6RNr3sFrUYgWHmAgsq2TeE6yoYHyucylLAAjWZ5Hk04jsdPjU6wyT59aCdhp/7g9HcU9fMhK9EfMebTotqVfSvIfG+EtMs= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9576baf4-7f68-4ec8-fdba-08d8256791cc X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2020 06:56:43.3163 (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: dsTXRGRDlUwO9NeFkLbpDddsYaWctBtq/DHNVaOYM2OAJOXWHR0a2C2FSvqmbEucJPDzgOPjdaqVGdXfqsPoWw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6961 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 v6: - change device_mdiobus_register() parameter position 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..704f2b166d0a 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(&pdev->dev, bus); if (ret) { dev_err(&pdev->dev, "cannot register MDIO bus\n"); goto err_registration; From patchwork Sat Jul 11 06:55:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1327226 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=N5wEjEsl; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B3gk44XJKz9sRR for ; Sat, 11 Jul 2020 16:58:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728146AbgGKG6v (ORCPT ); Sat, 11 Jul 2020 02:58:51 -0400 Received: from mail-eopbgr40081.outbound.protection.outlook.com ([40.107.4.81]:51726 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728197AbgGKG4v (ORCPT ); Sat, 11 Jul 2020 02:56:51 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JIdv+ZFZ/7FvQcdacnglNRZvOOs087KNqD/ORxpkE2vBE+zm4zSif2HuKm8fzlQBoHiB9ksyMvurYbY0Icn51E1jRUQYzk5a7JA7DUnV6vCIQJ+RehG657/Zn2C6/ayyNJKDiOOJoVgOheHYwseYyzGLmsm8knU3lNoGU97W7/QL04OCaFv6NBJvbCECLtKYsSLQVJCWJyrp2T3VIreQOKxjfGhJcw0ouqoUaB2q2YuMpk5aYAWI7zb67tkssvnFuCwznTD0wOEvTWCYkj8m+n493Z87yVhV5VIv8Vu9eLbJ6ADJ2H4KfmrAz+w+UKQ7Arn2HRuzpYgf9gb4RzEd0w== 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=CWpOmph+hOXmXgo4TMusFprOlcfKEK97ciLlrhFjueU=; b=GbN2pByOMB0HZ5vyB+vghpzTMZDjkvyGxr5qoLGKcanwkj435zzbk+U3UDCliVZBIa7Eypy/k8Iefo+WtROYVeH4kzTtnU8U6choG59RLqjB+OtzQL+vlGqJnzK/hPUwyi02z4zZXZNtMZRyLOri6tYyWIw/EWaSX9oOyFXezhCd8YP5i1Ywrg/E2H7A/94+uJoiUwtg8aFaOOu0POPe5QGxrzYlAszIXKgnlKMyoOdWVqDpjV8cn4Ak+uyTiV2ApcZgIZkLNbX15vELK2UOqNNIu0601jBQZN+RjbwA0agJtTj/JhKQv3yYT/kiMLDq7x1AUaeyG87cLRLPTeRpwA== 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=CWpOmph+hOXmXgo4TMusFprOlcfKEK97ciLlrhFjueU=; b=N5wEjEsl0WrnKkUMFhQq5fShsKAeYOM95KB9KrydwZH6Xdd9yymTsz4h+dxB/2KVarjyx+DbwwZZawj424c49KD0XLX8POKJlxuUO2R25dcqrT/MYXa0VjXVSBBxMsoiIcB/BmO2q4W/u4s8sQqBqyNh31GmLg/waq7lBQIg7tA= 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 AM0PR04MB6961.eurprd04.prod.outlook.com (2603:10a6:208:180::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Sat, 11 Jul 2020 06:56: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; Sat, 11 Jul 2020 06:56: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 v6 4/6] net: phy: introduce phy_find_by_mdio_handle() Date: Sat, 11 Jul 2020 12:25:58 +0530 Message-Id: <20200711065600.9448-5-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200711065600.9448-1-calvin.johnson@oss.nxp.com> References: <20200711065600.9448-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR06CA0132.apcprd06.prod.outlook.com (2603:1096:1:1d::34) 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 SG2PR06CA0132.apcprd06.prod.outlook.com (2603:1096:1:1d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21 via Frontend Transport; Sat, 11 Jul 2020 06:56:43 +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: 156be293-57fc-4f3b-a316-08d825679400 X-MS-TrafficTypeDiagnostic: AM0PR04MB6961: 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: PaGe2uu3LVmSqBP8HOaeOfR1MiRFfFoLZxUAPaI8Q2fmDHlTsUpLNNg2fARluoZhLBxZF913/EvxqcsqQjjUIl2havbih3WiLQrEqy2lyTvnsD5iAJoKfa/vi0QBYEfMGmXLbD1NSqf+gKGsToMUBgMMT8Ondll2dV/eQrQ/jJKLBb+iGCn2Thc8rLALN31KYpgHm5M7FO3ydPxBjtBpZS8ZxhGmTTsaBVF5nF3IUKHFdTkJHQSXbccQ3gVzBPgKdMrOnFah7LCWRyIpkYy6p0Bw65I8RF21tRKyHw/9WBDR7w5VPuBMaphNgUHAJ5pr0ez9ZkQNnmOedefu5c00y44fYNZSbRK2wlIgM00IRhmUkGwaPxjognoa52nFOF6D 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)(39860400002)(396003)(376002)(366004)(136003)(346002)(26005)(6636002)(16526019)(186003)(110136005)(55236004)(66476007)(44832011)(6666004)(66946007)(66556008)(5660300002)(2616005)(8676002)(52116002)(1006002)(6512007)(316002)(6486002)(6506007)(956004)(1076003)(4326008)(2906002)(83380400001)(478600001)(8936002)(86362001)(110426005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: zueZvxALeD1fxG/vqJ4mF3+RhVFV2RMUfrVHD7XTJCw7GG308vyvK2FESZMpbOBOoHAdtt19eml5zo3rIRziwwkz5RtH7kbcszDxuzbXgEJZh+000K0ZvBjY1PgkLeBHJ/nAr3LmlXtuibyYH4pHkUGJek2PKDBZoexFXQC/B6DHco+bjXghc0ABazEKb7uZwAqOoqzbUJr71T4aWlq4aMECO5MbjlA32CTcA/66dZ/+shLI4XxxhkqomTHM6PMFnYbd4+Xzay0em/HydTBiBpTg/ANrVKbEWD5Rv0iZ4Ys22Uij1G3zMfzoiVD4y+Z1E1hlYqJfKmqURtEgDDWK52x5RkiJOrc4iaKGTGRMqyK0adH0tDTBByB2bX21goOFRxCRL8CwN9TwjA7coF3TOEkMVbeZ1w0b4EeEh5HQHzeSHvI4yFkn1QT7TGlYkYDK/1d+JzClubnr2xTsPQAvXQ4BpLdJgqAAGRThHi2lmwE= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 156be293-57fc-4f3b-a316-08d825679400 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2020 06:56:46.9942 (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: x9fz6x6YbhuwvyXJFlle0xratxEEfyp4xqo/g+EBv66CXzymuRFoN4fTv2zgWjBxES83QaNfTOawK5yRTMw7eg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6961 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 v6: None 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 8610f938f81f..d9597c5b55ae 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 Sat Jul 11 06:55:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1327224 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=WLtWcS0f; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B3ggr0MP2z9sRR for ; Sat, 11 Jul 2020 16:56:56 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728233AbgGKG4z (ORCPT ); Sat, 11 Jul 2020 02:56:55 -0400 Received: from mail-eopbgr40081.outbound.protection.outlook.com ([40.107.4.81]:51726 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728259AbgGKG4y (ORCPT ); Sat, 11 Jul 2020 02:56:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VgTMCZr1sZsX1nnCkt7O8fW8QGj3uS316rqtCQraaid/BC/Ckhc+0ePZq/etaF1o7rfL3FRyT1ew/EPTFlI5oGnq+dranLjwKL03+u1hghNfM4jh0TQF0C/t52MQ08K8vzzFXlGYSNuAtsazrejyD6IpZQ4x+U4tCmNIM+/1/shwth9dugGqoG4B+EotcK491p0OLMoVOo+k6gzwVNPOGEbr4hfqK4VcuGderc/be9Pg5IY3eyRF3PmlIwsF/5Og+qhyJuPd6L13LivRxtWHKmv9ibYR6wjfn1+FkREhrFHvT4Dp9Tvq+ChqQBiiwTvUa2efZUm30/FGZARVL1zK5Q== 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=m2IS6AsiEWh85PPUnoRq7b6YyFrYgIiEbKDhahDL3ZU=; b=NrynFMNT87JVbyrwly1qf5FtZIPA8cD6heZVyB8srrkWP9TsHrHTuV5KekKxHi++893TOjQ37fth5LblW1NdIVz+trbxJA9fxaZa2kkFKAq7uMV54r9iGoeTw1EqF2IpfUI4A8RnHt56y2BUsr19UpyFdyi8i4DsK4XMP7gENzbuPscqrTxt6r2PY9LGvPZnoY0lf1ElcKYKNFtIB41zP7FbVOv9sqoJdEMH88rc9VBJCGOU9HxnlaPsRrmz+1X5VV6y1KcK0OrVKVT7m3JdH4EIa3P7GLaw0D+fjXf7rRUOlCZ96ks1z1F2qF5ZRlAWetbJg2oixAOMmGh6+fxJLQ== 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=m2IS6AsiEWh85PPUnoRq7b6YyFrYgIiEbKDhahDL3ZU=; b=WLtWcS0fr6ywFooqHsJsBxODLfChtgke5O+EdQ6POxaiU0rIRHlPogD+QwK6QGkjH75qyQRyAMcgIeOYpuRdnjSQInHVI27NUBJcEXh4B8HUKt/LqKBqv8+goiJ8j+LH5nA3I+U4vXLgftE+k7bUx3/js8oVn0hpTiq4DSQRpLE= 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 AM0PR04MB6961.eurprd04.prod.outlook.com (2603:10a6:208:180::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Sat, 11 Jul 2020 06:56:50 +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; Sat, 11 Jul 2020 06:56:50 +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 v6 5/6] phylink: introduce phylink_fwnode_phy_connect() Date: Sat, 11 Jul 2020 12:25:59 +0530 Message-Id: <20200711065600.9448-6-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200711065600.9448-1-calvin.johnson@oss.nxp.com> References: <20200711065600.9448-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR06CA0132.apcprd06.prod.outlook.com (2603:1096:1:1d::34) 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 SG2PR06CA0132.apcprd06.prod.outlook.com (2603:1096:1:1d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21 via Frontend Transport; Sat, 11 Jul 2020 06:56:47 +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: b113733f-c376-4388-5167-08d825679630 X-MS-TrafficTypeDiagnostic: AM0PR04MB6961: 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: i2QwmbWQ7Rq1DatjWbr3yrE/A3Fbmu44YPL6UglVdgWIftY7s64+Wyco55Zgk/h/QDjS5rwD5XL0attgFWjz2lq88WhK4/Z/I7XNwlrYlONBn8W+avwsUBFCGH0qdM017nfstkIP7TcM0H6RZH+7TFG6NZQhQ8t/duT0nSCWxMhfgQdESHr5EGRYjteqkRU3SqjYX/zhnQcYpXXyfy++Fd2I2L3l0lEaZj7/zaV5ngwN79c2fumeKOxi3y3QolFpsGBOPmjGS1acMt660OJ50AFgGwOORtSNP9oUMM1dzUVbZ8vIBsG/3sa87uv0AaPFEIcjbfAUCpz0pJ/yZAVlLPY192yFdvexEMk91OidionFVBASbcR8+JDVFJWw1kVH 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)(39860400002)(396003)(376002)(366004)(136003)(346002)(26005)(6636002)(16526019)(186003)(110136005)(55236004)(66476007)(44832011)(6666004)(66946007)(66556008)(5660300002)(2616005)(8676002)(52116002)(1006002)(6512007)(316002)(6486002)(6506007)(956004)(1076003)(4326008)(2906002)(478600001)(8936002)(86362001)(110426005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: PsEPscP3nsXs7SsWuF2mo0ebW92bHpLqAmlgsUr+yAcSLdJkdQKQ/9/Soz9GjagSYrQh86q5fkTjS15iWY1eYCwNFIO7vE975aKH6FEhjAAM8z1MoZ42kH8LyyiFl/mcll9AQ5vp9rCaZhAb43PnPzrLGaAZoLo5hsw4By/6JDg3qL1rMtKkQ4YMjC1mxROC5WTg4DRizihaLd+fDgcQvnon2wxVh1z++5vQHTWC/QpGYjIIexIqfm8miR9m2Gnq9PmdJOTnPap5GMOQQYwpX0eXOkzVHjenfHtol/1AKTXT1rOAEc2gOJQNsqKXDCqKbm6uxKYGnUEWUSrl7OdtDIl4VRIEBy61txo5OODIDvJRC5dMAh0AocV2FtQYXvaJ8pojvW8YAbWgJuUKP1GjdcvoeQXTA422oEX5P9Rz9LBrht6bwB0l7by/5HrBvwF82LH9r902TUP1HNj4jbZ39TRRpsk5PLEjhdpRiVFPS9U= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b113733f-c376-4388-5167-08d825679630 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2020 06:56:50.6482 (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: 0hEe6Q0pRxJUFCRVST6QlU5Y5VqFfBpFm3a6o3sIEWy2huHFiOdsJQDorDQMKKN7MkOohkVmciADX3t1ekBwGg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6961 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 Reviewed-by: Florian Fainelli --- Changes in v6: - clean up phylink_fwnode_phy_connect() 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 | 31 +++++++++++++++++++++++++++++++ include/linux/phylink.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index dae6c8b51d7f..c59a0b8ff349 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,36 @@ 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; + + if (is_of_node(fwnode)) + return phylink_of_phy_connect(pl, to_of_node(fwnode), flags); + if (is_acpi_device_node(fwnode)) { + phy_dev = phy_find_by_mdio_handle(fwnode); + if (!phy_dev) + return -ENODEV; + return phylink_connect_phy(pl, phy_dev); + } + return -EINVAL; +} +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 Sat Jul 11 06:56:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1327225 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=SpkqwJ1M; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B3ggy567Jz9sRR for ; Sat, 11 Jul 2020 16:57:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728258AbgGKG5B (ORCPT ); Sat, 11 Jul 2020 02:57:01 -0400 Received: from mail-eopbgr40081.outbound.protection.outlook.com ([40.107.4.81]:13001 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728234AbgGKG5B (ORCPT ); Sat, 11 Jul 2020 02:57:01 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HeYpRbRGNnIY/kRuBuxEWfaeIEqmoHRUw2O6tDfZKRgkWUhB3NV3EXiYzum0wHsx0cuU610rEbnVUwfSrxR4QcCPHK35Uq8IxpO6Jr2Grc6OLxHtXgqLwzicf/owf79opHpReKweDD2AOtYAaIVytEIhXDEHcCMUv14JOY9a+MR73Y9QgfFNnrhFRiZ9JNF/pb5zjihLhKba8zhw9VTNM0zIHkgogq/431XBEg4yCdjXf8fE/o461Qa6jqY3vU45cbjBxrjCH2AaIz90+oD/yz7G84p7Ih+2C0rgPuHWL/jDkMKVyp8lhbvy41y5Tr8chAEKY8ahte1/ywpEkMdjlQ== 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=xBgdmu5fO41p3LivQNJ6elULbbmmy9Ca7KJAMiLfKy0=; b=XCCl53HoWwMetsPmQlino4vEbVU0ow6lO6yP/rhX87lBot3fSmbO8TZylcMbnGP7vracqEuzhqa7Y0ZRTZdJuATmlh/F4yzQmxU1p3XnIiNAbmMgwfFi7/GvEr5O6jWPwZftgpqcfktv9fuJBWRte7EeobspDT+UsX5cA+/m3VxMEccJnWoo5ZRk9xHhB84T+3zcUrjIn1aJNtADklCByCLH9fw7TYWyZvx2PaETNAIcC4ZOcsJO1I8rLoYiIDw/a6V+qm5DH97KgxCEx1CWS95VezyEhEwt/uXBe8gXunXvg4DbfINCxCmlG1KTLm9kdMeGujsDF0oVsIWo431e8A== 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=xBgdmu5fO41p3LivQNJ6elULbbmmy9Ca7KJAMiLfKy0=; b=SpkqwJ1MoJ01hm2WEvxtZ37xf6fr4hUBlWU6jVxT/eHSF/nMCDA5PeLz8oY/5E2sgjMUHP/XOZ2TyN8VsmUFqELW2QodSylmGlvUDqcJA7/jtLaVTZi4ZnzmAPkFgHKD4/KFaIUn8dJKhFdaEVv2OJWRG03G1WUrI5quuJAYeoc= 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 AM0PR04MB6961.eurprd04.prod.outlook.com (2603:10a6:208:180::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Sat, 11 Jul 2020 06:56:54 +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; Sat, 11 Jul 2020 06:56:54 +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 v6 6/6] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver Date: Sat, 11 Jul 2020 12:26:00 +0530 Message-Id: <20200711065600.9448-7-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200711065600.9448-1-calvin.johnson@oss.nxp.com> References: <20200711065600.9448-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR06CA0132.apcprd06.prod.outlook.com (2603:1096:1:1d::34) 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 SG2PR06CA0132.apcprd06.prod.outlook.com (2603:1096:1:1d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21 via Frontend Transport; Sat, 11 Jul 2020 06:56: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: a35bfa07-e13e-45bd-56ed-08d825679899 X-MS-TrafficTypeDiagnostic: AM0PR04MB6961: 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: 022s+QQiDwQSXFl9crLTAEN8EHJ95goSz1/VtgKoM6oxjR2K4e8OYS6iQczFcj/HlrSpjrnIJBjFxlQc7hCcpjdSkGEeOyjBjSAyb28TuHmtoWlLj/4y3axM76PDkr2ANga6Kmkm5huQOieDlzxAjUCNoixNYxDL51DGVC9D9lyYeujiZ3xFCBNyrS9GsvDpI6CKfSZIoeIJC3lFNjuQuVFsSuLR+NwxHe+LUtJrSinrPFPxPdFRYO4rGMBmPTszu3TwHsrXTRxGqpZCxwZa+cfG/6u652fQtqcnTKv1zwLXIUNHxAm5NNsVhBAMc8T2c66nMEMElhgFNbohe5NYODROSsbvnxvEj9lyBGeUBfv0MXzhKN1cUJumQtOhgkQQ 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)(39860400002)(396003)(376002)(366004)(136003)(346002)(26005)(6636002)(16526019)(186003)(110136005)(55236004)(66476007)(44832011)(6666004)(66946007)(66556008)(5660300002)(2616005)(8676002)(52116002)(1006002)(6512007)(316002)(6486002)(6506007)(956004)(1076003)(4326008)(2906002)(83380400001)(478600001)(8936002)(86362001)(110426005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: aTrEPg7CJ9LOGuu2EhTJGOdLbrCN+kx6/Sbv+brENHpj4Dzeaxhsq0Jo6EPJNdRCb24L2nArKNhnVbSzGtLjruANYEV5b9C6eH92nTMOsY3T5eDTwZxP5DFskujCSXTXbDbhgwGAbMRVc8Xb078A0mLgp/ECQtZmW1vI2JSoTNV+IIfma+jCwMT6kt5AtHbcnCCF7Cxoh1aABNu5MpkTSOsW0XurIQlKnfX7JxJxGqogs+u296VmAcNe1XJQJYqJyv4VDv1ajbXAUasb78qxmcnhFOEdaIkluDtK6EjrIvaM3NEy8ElykDkHxZy5UuOpBrEJmLT64UGcQ2iWMUOFWveePQpiIXd+z9KrGXi80eIoW18QrpEg4kpqZ/dWtSvfbD2AjVr+0aXN006bYFVwOE6+lwCBxMyleQNjKiYuyjydGfTbmYuf9UcSRZEFdEAaD0pb10BMAB0jBtgc+IGCJgLGz0su5n5y2TxRb2XN2EU= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a35bfa07-e13e-45bd-56ed-08d825679899 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2020 06:56:54.7169 (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: q8qXGulF10GgYNefzGd/f0IOebE0thMIqHWmCng6nnA3Ne8rrCOgdI3+sdMUBsv6uFZCgZtpPVVBySTX9xyToQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6961 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 v6: None 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;