From patchwork Sat Jul 25 14:23: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: 1336246 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=YhpK8PnS; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BDSyL2LQPz9sRW for ; Sun, 26 Jul 2020 00:24:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727877AbgGYOY5 (ORCPT ); Sat, 25 Jul 2020 10:24:57 -0400 Received: from mail-eopbgr30079.outbound.protection.outlook.com ([40.107.3.79]:40165 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726944AbgGYOY4 (ORCPT ); Sat, 25 Jul 2020 10:24:56 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gcuNJJlEO97hAOw4zkeixS+3/coTA491kcvnVbABlNNhbob2VMQRabe0zL7eTvlL4X20ADLP784cULJkpnRlB8vOd+DIoaZPeM+R6+0Pcevm9MGGTqBD/fAZBvAL9fkNTdy4nlc9VNr1zEs/iiKTMoP3UNku6IOu7+0juCuoHfCAz4aqxOy03d1QCMFeZUikmE1S4HpBdZ5MAn6rvHuyFLQ/Wgn64glFixJIbR+Y3FtY35FdQRSvD75X2ZvcqlbFssRmgOx5fpjhfsrIlvG4q7NjvQ9IU5bFheSZ3dkgN+Q4uK6BfAqAsz+MHF+IQA8qSSEIXE3rXUJV5C2RfktPXA== 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=BJ5XZbCs8RAzB9lYlq+k6vXcMgO69MZn9141tCuCJnc=; b=i3NHEb3nlsd+LAkUbqvPzhzBjz6kV0BWE+x6P8dcCYWfUhDRSiCZSs7jkMDyX8XiZXCEsJZtCQ6BZqsTw/b+XPUZFWJXRtSSID2ly9soKfD2nmVCfp5zUGk+FZ0aFYG1nF7J7uY4AQ9YSA/L0rvA+SaEkIXOl93Deo5K9mvChwOrgayZl3FK3K8YZDjlXVMwvNllZ56u2JXNVogqARF2tsFwD3zTsXK4UDfnHrk8SckQxj9R4sDD+zslGrf9dlUumXPKR7h+GPxkvvPUsWIXVSDjW5GkHLdQr9fLBUtZFJM4/kHLR8bkrCVtX1hCcjxPmBRs4LvrlJeFLWJslpLgrw== 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=BJ5XZbCs8RAzB9lYlq+k6vXcMgO69MZn9141tCuCJnc=; b=YhpK8PnSk5YjIiGA1M+U/T1Hdd/fmET0xyO0OG10an/XowHklzrctdcXH3F6bvgmOV0UTsaREaGpBJ/xlGwAptTAfPjeAAJebcngrF5Cr7bxF0o2/xYr88w2vGkUeDUK3zefJgd6IaHzF1goGdNwwh2GUUffr+mzZ8E8Ku4m7ME= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=oss.nxp.com; Received: from AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) by AM0PR04MB4931.eurprd04.prod.outlook.com (2603:10a6:208:c1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.22; Sat, 25 Jul 2020 14:24:52 +0000 Received: from AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::b1ae:d2cd:6170:bf76]) by AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::b1ae:d2cd:6170:bf76%7]) with mapi id 15.20.3216.027; Sat, 25 Jul 2020 14:24:52 +0000 From: Calvin Johnson To: "Rafael J . Wysocki" , Len Brown , Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Al Stone , Jeremy Linton , Russell King - ARM Linux admin , Jon , Cristi Sovaiala , Ioana Ciornei , Andrew Lunn , Andy Shevchenko , Florian Fainelli , Madalin Bucur Cc: linux-acpi@vger.kernel.org, netdev@vger.kernel.org, linux.cj@gmail.com, Paul Yang , Calvin Johnson Subject: [net-next PATCH v7 1/6] Documentation: ACPI: DSD: Document MDIO PHY Date: Sat, 25 Jul 2020 19:53:59 +0530 Message-Id: <20200725142404.30634-2-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200725142404.30634-1-calvin.johnson@oss.nxp.com> References: <20200725142404.30634-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:3:2::28) 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 SG2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:3:2::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.9 via Frontend Transport; Sat, 25 Jul 2020 14:24: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: 7528a1fb-aeb2-4915-b731-08d830a67ecc X-MS-TrafficTypeDiagnostic: AM0PR04MB4931: 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: 0KSzN4liIv+V8qXiPMqVVS9Q2dl8+J9JzikUFvwLqrnLCiVWZb/Smjbpg3UMIih8x5ix5prK3x002l38AUfubbbM7ZWJyBSNOVgWMIhQOC3YrvW4/eR5Eq2rlEFAzsWBGb1CDjBJQVe6iibqBnufKpP0XB8OVcjo8KVL3okTY8TatnZ/4ERYloc3qM4Z/s89IXLrnEqC0TAHB2WZ5qVXJPRHTGMMsVMek7th+Bw+QUJz7J1VE5pLCCPS/stVIu6NPMP0JfR5/zBmQOPE/JKZAqEOIOz1W8QTIL0kBAY6eQqZd/yWOiaAjf/M0tKNRpEQHNeDmLIzzTl7p/aWK10/qjNPkMJ3eajKrrCANwPRSxOnPqA9uWhqgbl68EG4Aj4MsDvt8eE9XD67G1yt2SV9tw== 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)(366004)(346002)(396003)(376002)(136003)(66946007)(66476007)(5660300002)(6506007)(6512007)(86362001)(55236004)(52116002)(478600001)(44832011)(110136005)(8676002)(316002)(54906003)(1076003)(66556008)(4326008)(16526019)(956004)(2616005)(26005)(8936002)(6636002)(186003)(2906002)(6486002)(6666004)(1006002)(7416002)(110426005)(921003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: HnM0F4Xdfzp9dHtoBW+KH/1xnNx7asNQNi9js4vtW8N/sbQo9je6OKhlmItKOi58tfsSLGNboJ76vsOJZKwY6gliT86J4KBeYuWNekqPoIWhNzFwQqXX3VhhpllCOlh8DTW38lGOPZnM/i7usidpQ1U+bmQghH2qNb8VK0iQK40yOd+ZK8nwwQgwgzy04227svt4T4RgfBbMs1nGWWd84I6rUQVeQ72NyZZHUTPpCDChD9EWRV1sJAU4Y9t1GQWmXB/0Y/vYx6duEVapP7GjKUQOU3I9D3bkFzaSjRKOkYQAtpeqDodQMIwZ/rqedCEczcI7XvbX2L0SBxCO665IpWy0w89x323+FAfgiWqS0bDfwtst6SnQR2Z4IuR863c1y7vIXWFxhk8/DukPf9IwYwZ3Md3zMNPg753tzHDGXIzycY7QLDTsaL3UPu32jWLoynI1AcaASVlLKikfB7wNfSPIONm5zBm89ekXjXmQJLA= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7528a1fb-aeb2-4915-b731-08d830a67ecc X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2020 14:24:52.4574 (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: 7cHlp30Pg4TB1mxklaBS3qyMVLmA0aoGdxQTzNcUfE0DD556dutiJ+OqWVexcT2m5u4wJ4BZZF2uaenFHyi2lA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4931 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 v7: None 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 25 14:24: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: 1336247 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=IVjqZsG7; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BDSyQ1gZtz9sRR for ; Sun, 26 Jul 2020 00:25:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727892AbgGYOZB (ORCPT ); Sat, 25 Jul 2020 10:25:01 -0400 Received: from mail-eopbgr30053.outbound.protection.outlook.com ([40.107.3.53]:46987 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726944AbgGYOZA (ORCPT ); Sat, 25 Jul 2020 10:25:00 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UQCdhB4PCQB/XAttIT3s7zA5DJLWlB5wOTJDEUDCtFPZ9iELDwmn7fwJdTnHNSpemRrtC4zWpnUdrrySEPtOObCf6NoPZyun2YUk5WcQzQMmgqDhDI6m+WLcq9P8w7y0YNqRrIEGrzYT4UZe5MTKxl07mqlCP/W3nsQgnxzIW3ZuH1hf9Nj4xCm5NEpZ/oHh4UJdK/wsb2OyAO1fulMQBF7ECJ8SLqwfhiEaB3mRpeWpBtNaR6j47sFPXEyUMIDs7UVq0Rkwqau8IxsJGnDtjViXMAaljJhVf3o2mKq0GWn65Qv+0bw6QVad1AqHhw7PfOX66s/3I88V7IrVDlQRKw== 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=s3kdm1lDYjdzIJwkMrYd/NBbXanHVS+ZY/kzco22Wpw=; b=WL8KdW89bjoIbfK8Her5uPZ9jHqpOREzq7zxPQEWwMDjp/j/E6rDCdCEJ3cWGA2u80+XtS2sm3z1l/7Sbfnf4pVYGkeyuvDeYZibpEDWBEP9OnYRR+sgnDYX7T0ekdV0X6drj8V+oFwJk+mfdohk2+3Iu368YW+9gEC0RSUp4DIWjn412mBSn/mOkR9hN8bi1DmKQDQsE03eeyoXteC4cFLGomYtsVs+6OplGa5Rqzv5FpTD2o5MLCc4u+qGogsXdjkdmkqop8LyWImZva2B3mtIFxb0DjIyUPl7S1iCgtAF03Adz04d+WQc+2vkR2AAvohxVsiEuoBMo/s/hYkocA== 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=s3kdm1lDYjdzIJwkMrYd/NBbXanHVS+ZY/kzco22Wpw=; b=IVjqZsG7QFb+05A4Ij5KZczigqj/tkL0OuEMSqTXrhWwWKA1+w8CfejIbgy/rQsTYxIdlFmN9LXF+kvWyWsKCH89Rm5Soc+1uSPEc1OTGYOtuknvKS/srZ3Mw6omzmXZaMrccT/2HB9D0io7kF0svpKQdh4W9NwhUN50vCCSRzg= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=oss.nxp.com; Received: from AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) by AM0PR04MB4931.eurprd04.prod.outlook.com (2603:10a6:208:c1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.22; Sat, 25 Jul 2020 14:24:57 +0000 Received: from AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::b1ae:d2cd:6170:bf76]) by AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::b1ae:d2cd:6170:bf76%7]) with mapi id 15.20.3216.027; Sat, 25 Jul 2020 14:24:57 +0000 From: Calvin Johnson To: "Rafael J . Wysocki" , Len Brown , Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Al Stone , Jeremy Linton , Russell King - ARM Linux admin , Jon , Cristi Sovaiala , Ioana Ciornei , Andrew Lunn , Andy Shevchenko , Florian Fainelli , Madalin Bucur Cc: linux-acpi@vger.kernel.org, netdev@vger.kernel.org, linux.cj@gmail.com, Paul Yang , Calvin Johnson Subject: [net-next PATCH v7 2/6] net: phy: introduce device_mdiobus_register() Date: Sat, 25 Jul 2020 19:54:00 +0530 Message-Id: <20200725142404.30634-3-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200725142404.30634-1-calvin.johnson@oss.nxp.com> References: <20200725142404.30634-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:3:2::28) 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 SG2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:3:2::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.9 via Frontend Transport; Sat, 25 Jul 2020 14:24:52 +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: 9ff7d112-194a-49da-374e-08d830a681b7 X-MS-TrafficTypeDiagnostic: AM0PR04MB4931: 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: TllzpI1m15PjFn5bazgfaHJ6DVrCTo1zKaL7/0W40UTPzN4oBveuSEQcuDyak5pM3kY/irlmM1n9QKbEpW41QDFFkKAVYf40HYcB+djZsEnGa1MIgy3uQYEAkYQ2NoKNHHg2KlJWa21aSDzi4Coa1WFGUWR6OuLwdIo0dkXOeCIXeiZgZj88qW80HcdaWJFSpAhJdw8QTpgtM6Oma/QYGWwYHfsZlxmhUFFvlfovbghasxH9rxYEgGWYCpQQH9H3MbI1sppLNVxF4PYeOINIsO/VRuptk6ERl+/oLw6dAxUW8Tk640l2Xvall2Yj+qalBSbRpdt2VqhC5R0eJKSJT2ReGj4INgF5oKmz6BVcmMdJ+ha2WhjwPs3M0jm/3qa5DjALmnSQkFtWK7lOSe5cwg== 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)(366004)(346002)(396003)(376002)(136003)(66946007)(66476007)(5660300002)(6506007)(6512007)(86362001)(55236004)(52116002)(478600001)(44832011)(110136005)(8676002)(316002)(54906003)(1076003)(66556008)(4326008)(16526019)(956004)(2616005)(26005)(8936002)(6636002)(186003)(83380400001)(2906002)(6486002)(6666004)(1006002)(7416002)(110426005)(921003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: raXNd4fChnllcAveXBlfAo49fH3B8yOYZkNPM+DUizupOiX3fWxDO6AXq4Jq4UEKV8Asz4jsUogGofhp4esiuYry4xfFR5Fc/3j96yXQkTf4fEvs4YdtHJtQ1a+o1GgWPFXE/imGdgLwf0kLPqIz7flpsWMZ5//AJkSqZ8mm9u8KoZXpIkEsmbkhwfQorYDlnGAAiJ9Jjr/VG5sAL3wQCvzk9MdS3nxgtjuHzYk5SOYM0mUCUGLYM0dlnOF3WgXGbczD6mu7p9wPUq23hx4gdjjyoQuMKuPLkkJVXYViX9Kw6ahlNKco6XwtKDFb4f6sIANGMQp+2JCol7vQFkDR+4p88hhhcIG2vRr4UPxg+v4mJoaAd3Z7EGAiv6i64d5QxQSoB7onq+dw+PyIS/d8JnV/pc/Ca3E9HbyyYSxTDM9IgJO3fBeJzj+290BfvsG4g31rxPm6MC59TYf1Q++4NmDx5+AiywXHuW78aa6WKRw= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ff7d112-194a-49da-374e-08d830a681b7 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2020 14:24:57.3316 (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: ityTJYmiO4q5Y2CoHvi9SW9KeoUc+85RDjs/KHUDAp68BGg+uwSyfPFaZ/ZQvOarA3p6D3dSIGAlj4jM7SPBUQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4931 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 v7: None 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 25 14:24:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1336248 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=ESXs7kC1; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BDSyd6Jfmz9sR4 for ; Sun, 26 Jul 2020 00:25:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727912AbgGYOZH (ORCPT ); Sat, 25 Jul 2020 10:25:07 -0400 Received: from mail-eopbgr30079.outbound.protection.outlook.com ([40.107.3.79]:2415 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726944AbgGYOZF (ORCPT ); Sat, 25 Jul 2020 10:25:05 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ROKMZEBuS4KRRL4sLJE5VN1VL3o4vJgYmt0/4N6hsktFzDZBLwUiYmu98vIVftXc9Q5MCaMjRzHRrIX4RQh/fn+n66L6Py/kwMsa183dAWMksUL+yKSZmm21eZ6+fLJxpA6ShwmZY0IhfezP24YzVQFlK537qTSJfxtDs52qp9/Jd9PorI31imIP/w9lG3EmNwI0jn37wRzWwoyKdkf5oiZgrssgwdCajd6b4p6gESJDgI8e9xD8c9tEEno2veVKI4TYve2rH5WVsksxoh/RB9MjmyA2n8ZKT7jHTnrm7bKfEnRXPobcYIP7k/BoPExl7mFtSI13W3eLbx3ygs/+1Q== 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=f1viDoyHHBQierD0TQySliftKgcLbKdXUmBXhtUvd9o=; b=eXsNniSShyH4V/ozMifaOWWrwrRswn7EdLXPe2Q3Nl78U7CER3/rUw/cXu1OKAsplBtDxlg1sc0qG8w+5oomEA6j9vP5l85VG1lu/85hA7rokVED8w4bdoMQ7esmPBHeoUShEFRPkr1SYGnitNMLRiWwYRgMlT9B2WnjWe40/Jf7j4v8l9xJF7suFUiYy1mn0scDAbsQeGD/FfmhVzBuikY1Gxw7wPT4lkMqMmSaoY3BkG7101U8K8adcnRVczeFqGKy+SFJYweDu0XXoP2RjsjNrusbnbfeHst2uXggzTyxPiigfs9y+pHGPz8D72MEueFEimHyUdGsmmrJm99P3Q== 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=f1viDoyHHBQierD0TQySliftKgcLbKdXUmBXhtUvd9o=; b=ESXs7kC1blyPPwksuBsnMETG4LvVp4ukmr2wctrGkiCnEWGimsez/1Z82hKsrRstTHT7ySJ+9aucAZrAEmardm8p4y7SdmLnE+M2axzNuygdYkvr+vkNookNSrFqf4Uulq1ZxSGDkwd5xDvgPidRhmv0Hlu5fQUGuYnYEshMKs4= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=oss.nxp.com; Received: from AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) by AM0PR04MB4931.eurprd04.prod.outlook.com (2603:10a6:208:c1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.22; Sat, 25 Jul 2020 14:25:02 +0000 Received: from AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::b1ae:d2cd:6170:bf76]) by AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::b1ae:d2cd:6170:bf76%7]) with mapi id 15.20.3216.027; Sat, 25 Jul 2020 14:25:02 +0000 From: Calvin Johnson To: "Rafael J . Wysocki" , Len Brown , Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Al Stone , Jeremy Linton , Russell King - ARM Linux admin , Jon , Cristi Sovaiala , Ioana Ciornei , Andrew Lunn , Andy Shevchenko , Florian Fainelli , Madalin Bucur Cc: linux-acpi@vger.kernel.org, netdev@vger.kernel.org, linux.cj@gmail.com, Paul Yang , Calvin Johnson Subject: [net-next PATCH v7 3/6] net/fsl: use device_mdiobus_register() Date: Sat, 25 Jul 2020 19:54:01 +0530 Message-Id: <20200725142404.30634-4-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200725142404.30634-1-calvin.johnson@oss.nxp.com> References: <20200725142404.30634-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:3:2::28) 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 SG2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:3:2::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.9 via Frontend Transport; Sat, 25 Jul 2020 14:24:57 +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: 59290318-d538-4254-e2f4-08d830a6849f X-MS-TrafficTypeDiagnostic: AM0PR04MB4931: 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: obOAs9Omm/laDZ/TRxBtVYPG8TCOZyUwKGPJBzvP4pUdvN7vpvzkXgQl9FaISOnZKPRch4+aOARGspqeLzLhSPTs6f6YhJaS0oXM/uBpcvCClck+3/GgMl43m6KKVmENODr8SEGgpvSV+BDHncze3cLqYZka7UXjgz1St0bEILYjTkMLfvFfpWNThau29zDY5eecpI8QqKDmQ6rGcfrXHTBKQeYZYCo8WVGzRSioeRAygq6+b0yI+9Q/DRGJSS68tv1DHxO8devoG4UhsUGEgXGdjGoY49Zp/iSLstLE+EdBVA0avmYXFIUkaUGwvFTMqVRcbRisbtSe2BvFqlkeRs7lijq2DkFQ7RD+ia8DkEAa2x4Hbss6b/5cjmy1InZthbnU3cRAurUAbuwV5qhToA== 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)(366004)(346002)(396003)(376002)(136003)(66946007)(66476007)(5660300002)(6506007)(6512007)(86362001)(55236004)(52116002)(478600001)(44832011)(110136005)(8676002)(316002)(54906003)(1076003)(66556008)(4326008)(16526019)(956004)(2616005)(26005)(8936002)(6636002)(186003)(83380400001)(2906002)(6486002)(6666004)(1006002)(7416002)(110426005)(921003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: HIblcTaqhe+jwUcbvkEfuffpbA88BgxlZ0Q7J2Y4fL/FtMYKryleiLkRIPSyj17ZFbY49fOuYKPE+i4OvAg0u1YjMvKaBUaK9Zr1znm76ZuwYxEJLVT0r7JwsgbTiXHvEYHW1wk223UEJrtBrVGVxr4QO4dw6PoAP9a3XsrUeptR+5XEKh2F3g6vo4hSqdZkwUNa9KW+W/DUpjxW8NIkfHwc5rs7DvsUvRc+BDTVoc+dvs8I6h+EWRNNiRitwXB2HO236FIbE2mUqqopozlv01wvLQaClejXdB2OQD9qq0r8hDAZ+NXBIE8X9HVNfiAmTWFUGK2lPBukyW56b4VrVUK8Wyu3vbCXYp282+4LqFdOCj+PyOeCxdGij2hmkAf80+obRSo9SQtPGKxu+K2j8iZ90c64X6f9k2An9Sk2sGMPfYuRG7ZcG02YSK0fBntbv0nZXGyJ58yxIkqE0vaOmKGxjjCslSelBO0DckxPDGs= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59290318-d538-4254-e2f4-08d830a6849f X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2020 14:25:02.2339 (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: RkO2E91LUNxDtmsBFO5FL1oO6dg9qLeADUqehqMm4cfvbMtBIPTSL9ItT58b1PzvymNZ1SnyBKixuv5QvIC/+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4931 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 v7: None 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 25 14:24:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1336249 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=g4ouGppV; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BDSyf5Ys4z9sRR for ; Sun, 26 Jul 2020 00:25:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727927AbgGYOZM (ORCPT ); Sat, 25 Jul 2020 10:25:12 -0400 Received: from mail-eopbgr30076.outbound.protection.outlook.com ([40.107.3.76]:49410 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726944AbgGYOZM (ORCPT ); Sat, 25 Jul 2020 10:25:12 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gQ77VoUYpn3fhY1CeNPwOl4si3a6yI7BDYTvhX8gPUReBwWLHniyzhlKZBgisv18rFLrQrVbaf6VyHA3//LERJ0BGInV7WH5k/bJ9Kk2FHrGFoNR7TMD9j+llsycth0GuM0+yaoCDv7z4EW7IJtObGYec8xsbZT+BZZhy5mj3n0+JypCPFP1o+4ms1KQES/DhTnVX4RhxQRV3YgtxPuxNHIh7zyHj8ajguJRd6GU9SdZFAsFOJGzFyukzVEiKV87/vY1YKqGqGI+mdbV2eDCVT3wZzipS82GJhzvRXk0tlrI/SpKj+yOthOZFi/IW+bdzWawjyjL5kpCW3Gb43wKaA== 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=0bCV7eZwrLmTtbw9JgaXnho/8k0YjV+s00K7ymt53Oc=; b=ctZhHSAh0uCASThko0V5ptTVAnB9FoU6W2seDZFdnTCq+HWVUsRPkMJwmTkvVoTfghrwlT9kotbMblFUdlcmVaJxPEvjQXYygAtjkbcdyX8QqLa5I6sxFP+VijZxE/8Xe99KTFY2zBHJg/3ws9KpdtPvspOjQs3v+VWSaHCW3tVZ/mzT3PD1IlqxuikGodw47fPvdwzKsgv8/dQi5QtQjY6b2OYeG8ezVQEJrGxwF6UHSfMiPOONYhCgWyfqkd7zQn2jAgIiMx4FmuQXUwT1Rm3nb5rlNkE+nqIIFCppdvbdMp8dhMSH/GzKr1PNP8yqcoDK9ULQ74sgW1Cya8mLBw== 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=0bCV7eZwrLmTtbw9JgaXnho/8k0YjV+s00K7ymt53Oc=; b=g4ouGppVXcFBLoRo9zJ7+WAt6qVq03qNK+5bC05C/+DcQAtxEUzpCep2Bk5DWRHkqVeoqTrhIeW/AKk77QqtwCCSb6pAjhHQ0oJsToErkd3cAR6lcsqPMtnjo4WuNF0XU9VC+60xShPJ+aAWVIfARCbxRHJi+kCMK8v5QDrFFcY= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=oss.nxp.com; Received: from AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) by AM0PR04MB4931.eurprd04.prod.outlook.com (2603:10a6:208:c1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.22; Sat, 25 Jul 2020 14:25:07 +0000 Received: from AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::b1ae:d2cd:6170:bf76]) by AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::b1ae:d2cd:6170:bf76%7]) with mapi id 15.20.3216.027; Sat, 25 Jul 2020 14:25:07 +0000 From: Calvin Johnson To: "Rafael J . Wysocki" , Len Brown , Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Al Stone , Jeremy Linton , Russell King - ARM Linux admin , Jon , Cristi Sovaiala , Ioana Ciornei , Andrew Lunn , Andy Shevchenko , Florian Fainelli , Madalin Bucur Cc: linux-acpi@vger.kernel.org, netdev@vger.kernel.org, linux.cj@gmail.com, Paul Yang , Calvin Johnson Subject: [net-next PATCH v7 4/6] net: phy: introduce phy_find_by_mdio_handle() Date: Sat, 25 Jul 2020 19:54:02 +0530 Message-Id: <20200725142404.30634-5-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200725142404.30634-1-calvin.johnson@oss.nxp.com> References: <20200725142404.30634-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:3:2::28) 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 SG2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:3:2::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.9 via Frontend Transport; Sat, 25 Jul 2020 14:25: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: e3354edb-3308-40db-9b68-08d830a6878b X-MS-TrafficTypeDiagnostic: AM0PR04MB4931: 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: oR1SRbr3D+9Tsnp+LMU2sHy70eTeiup462Vinq1w8qIjBCt1BIDMMFRZymfIqlxRy9S5e9Ky4Rcb54yTkGIciuD72Hhd7jVLy8Fnk3KQ7kx74Qw2Q+S1fIuVrt1t1vwK2gTsCWmDdWLfj0nwY3+XtnnGVgGFwmpqnwX4qxUWGyXs+ARWkgL76rPB/UL86Zc6jXrdZna+iozg/HfFtLPSoMxyMgBttM7QnUJtui7hBihhXUWXK2xqgmXsdwOwxRthX7eXAJz0qmvzCEy4FIQAqZ5rPW9zZDV5G5q065l0edcIzNTx7NpjMMOCSjgGiTj3CtFdzbfhYVzkIitY5wXrIRSBPLuaetBtmVvQr8a+CScKnF5CTMuq6D9EtjI5vGlrSZUxezdgYM9/NGGcX2oPKQ== 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)(366004)(346002)(396003)(376002)(136003)(66946007)(66476007)(5660300002)(6506007)(6512007)(86362001)(55236004)(52116002)(478600001)(44832011)(110136005)(8676002)(316002)(54906003)(1076003)(66556008)(4326008)(16526019)(956004)(2616005)(26005)(8936002)(6636002)(186003)(83380400001)(2906002)(6486002)(1006002)(7416002)(110426005)(921003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: rYaxVbLM/8OdbRmtk35R3G+n5y3PNyhJ1s7AetthYuUJTdZH0B4hiNbpIHKrq+gkAiYNY09ymqGVB/Q6HLCEv5nU8wipCINNLiM4hDmD9Eb6R5XJw7CHUJ7xXt2XK/iPJ5fHE0NK6k1QNDhhgBAXQqFRRG9Yhl7IaRjT1z63BKJFlsp3CC117Lz90yrGyTDEnsJ+FGE18ti9Q39pTBbvUIWoxdllQMZ+ajxUBQRWP9QtRiO24zDmrYnY9c/sGavz5XGkZFbujxxGmZK5KN/FBoTun9mw7k9n+4iCOUmv9wcfQmYhWdb45DYXsNXlhep+VpGlhYxu21mkBOM5hV9dBmyFX1dVdYV/IFC2yyb1ZuYCA/qk86sAfQPUuTNiB7EGswXaM1H0myhqNnypfr5i5aObf3VFr6u3nT1nweQUaYUbaY4nmdyXt6Dn5+id611RnEOmX6BsYNlCIWQypq1hS0w3jhFouI3uRe98BjikACc= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3354edb-3308-40db-9b68-08d830a6878b X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2020 14:25:07.1102 (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: EWhq1IS6JNu42i5BcmoWP5pYQIyWeZkWzqDB+8bWGai/t/Uu2nWcUaskmMKYyXpj5nk9qq8z9lCsHin6KgL2EA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4931 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 v7: - remove unnecessary -ve check for u32 var 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 1b9523595839..746755c086bf 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 @@ -965,6 +967,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 >= 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 25 14:24:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1336250 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=VZUYIm1k; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BDSyj2nx8z9sR4 for ; Sun, 26 Jul 2020 00:25:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727935AbgGYOZQ (ORCPT ); Sat, 25 Jul 2020 10:25:16 -0400 Received: from mail-eopbgr30083.outbound.protection.outlook.com ([40.107.3.83]:25203 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726944AbgGYOZQ (ORCPT ); Sat, 25 Jul 2020 10:25:16 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=etfvRWs5bBueYGhAOEKL0xoXzZejNEuNfnccDmvzCN72Q8VSHPrYp4/poeUpoK7I02j5MsIIp0FsjkeijR/4uSO06Y2Scy0wkW9027c5aQht6gJn9kJwnpPRfahPq2kgO1CaPSHicrRanu7tz/qIXE2WmEW60HbtFFz5OijCTHxObIbxjv25MDYxd879b18WA13a7JoUSoBXqR95r4CF6bkwuFpEDCYiT3SN5trm4PSMBuNVJV18zZXWRdhzWX8edA9bFq/tiPmyp8jL0D7ZnhQE5CO4SE8JONmy38BRK8vOr9pKBdQ6dTR/QeIclE9re4mLAfUdKcc1k4vg154vBg== 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=Ziarr/rvHphiexDqWgSBb5gjR25RlLjD89AgsUPmyAc=; b=I8lBy9ZETRTvbKl5cG5KIicrYELeZEiRAnJtEvRl3hQmVn18cs2x8TfFJcIo1a1NdqntX4PynZiKhYRWjrPoJ3MemIZA/W5bbDeuyKl/0TGUNGbWtRMifAOucYROAn6Uu5ify5urNdgLdP0HQEpOGTf7WwIDgjUmDiwmUx7dnSuay7kAa4XF2GWNvKs8XM6Kr3P4UKSMqzQmsRXc8mBc3GpsUpp619LunNS2D2ew/uYa6ofSYXeb7pIS63TeFU6I9lRiNH+win1tVkPubkfsYea2Z4xjeGjYarWgat2eCW2Y0jHHBqE+0BQlgJi3jRc3MlLyVmydp/l5xMpKR1JApw== 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=Ziarr/rvHphiexDqWgSBb5gjR25RlLjD89AgsUPmyAc=; b=VZUYIm1kvUXiv/6OrhyIjEp+VeZKnKYv63rS9fzbuwBJJyPWB9XdMu3hecnVK0rL4DdsrVdgn7Qi0dLz/wfnERZC2y05TmzBXzzN7X/7+gMi4qOk7TIY0aWV23nhIDWSJptxyFNsnnnPgZGy8Ca2L9PQKmWpKycLISHnqttQeSI= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=oss.nxp.com; Received: from AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) by AM0PR04MB4931.eurprd04.prod.outlook.com (2603:10a6:208:c1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.22; Sat, 25 Jul 2020 14:25:12 +0000 Received: from AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::b1ae:d2cd:6170:bf76]) by AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::b1ae:d2cd:6170:bf76%7]) with mapi id 15.20.3216.027; Sat, 25 Jul 2020 14:25:12 +0000 From: Calvin Johnson To: "Rafael J . Wysocki" , Len Brown , Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Al Stone , Jeremy Linton , Russell King - ARM Linux admin , Jon , Cristi Sovaiala , Ioana Ciornei , Andrew Lunn , Andy Shevchenko , Florian Fainelli , Madalin Bucur Cc: linux-acpi@vger.kernel.org, netdev@vger.kernel.org, linux.cj@gmail.com, Paul Yang , Calvin Johnson Subject: [net-next PATCH v7 5/6] phylink: introduce phylink_fwnode_phy_connect() Date: Sat, 25 Jul 2020 19:54:03 +0530 Message-Id: <20200725142404.30634-6-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200725142404.30634-1-calvin.johnson@oss.nxp.com> References: <20200725142404.30634-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:3:2::28) 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 SG2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:3:2::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.9 via Frontend Transport; Sat, 25 Jul 2020 14:25:07 +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: 030abf9d-da60-4c75-951a-08d830a68a74 X-MS-TrafficTypeDiagnostic: AM0PR04MB4931: 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: DOyhYUEMen80TjLBAeViQd32oW6Yjgs0LnNMnhksxxyO52renYgXBPKK9T3Cnv8S8svDuoVdoVxZlnLDvDppnAl+fgwdSNtAsmLM3vygb8HHu8RpKnuBYyRt1nogyAEwHFZI0FJ5DAT22XXt+Nj/80nSRNwfxzWPFCKmajAyRBtQlVD7AUpAKSZDRfW3tifZT/2fXLHKCK1I+KufOupa9ZAczaV67L/MmAMQ6TyrmA+LqzSk4+/WxuymrhcHvdoCY/LmZnpQh8Jg+SNjM78SnDg0v26F0kDiW6ZUazP+f6AuB5+rRWk2+Ht40P2hu6RBOk2IMTmeMI/wFJyfs1izPmDQP/uesdwc+TGw5oFYOyZKythLBYkeRo6U5itwMrM92Jzrmwa1mFBkDG0OujrJMg== 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)(366004)(346002)(396003)(376002)(136003)(66946007)(66476007)(5660300002)(6506007)(6512007)(86362001)(55236004)(52116002)(478600001)(44832011)(110136005)(8676002)(316002)(54906003)(1076003)(66556008)(4326008)(16526019)(956004)(2616005)(26005)(8936002)(6636002)(186003)(2906002)(6486002)(6666004)(1006002)(7416002)(110426005)(921003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: HXRPFCuW3H8Vlu5Alg80OWdt5CtL8Zyh0QlvsQB8KjczW0CUaeXCmh3k2J0KGqDNhdNA00/l47Wq+rYAvac1T9pZwO1Crlgogz6A6OWFJV6BjMuDKZYUmeYiLyI7EeyIDflJh3sbdH3wosr2/dJ1P2X7Zt/19PckxLZF9HZlbtZ2bDp3kpH1V0WsHilDRiHF3tzRDwR+lmi9cT7EpovjzsOozA1iW/TUJFkF0Iq/j38u51jel22GIQs0rVuwSoqZWeumNk1zFPjiv4B0QCBgvyO72IQY+cYRWPG0Dis6ZdItBCbMTFGPNFRJcGFY8LYAj1HX84JZl2CbtmYCmkI35Chx9doXvNfixYDVSeKh0V5wNUnVtY4sB4J4PfGBnbnimLw1sjWrsC4jLuaqU2bG8JMS1tM178f/qc3b9dxrQhd2VvWpHuTS0izJpYr8bI3WncZJ8PQ2taP4fj9mGI9MRZHcnI8OcZvBVCh7BKEfSy8= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 030abf9d-da60-4c75-951a-08d830a68a74 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2020 14:25:12.0004 (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: uUeLfwVL6Dzx9OIl9MuEFHN3883qnR+E3mjSn3WDgL8YGE09vSMrpktDSCvZEHybFei8I89yJj3v3yRMlJZ8Hw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4931 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 v7: - assign flags to phy_dev 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 | 32 ++++++++++++++++++++++++++++++++ include/linux/phylink.h | 3 +++ 2 files changed, 35 insertions(+) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 32b4bd6a5b55..c35ae42d9318 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 @@ -1118,6 +1119,37 @@ 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; + phy_dev->dev_flags |= flags; + 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 1aad2aea4610..ba23b5a1548f 100644 --- a/include/linux/phylink.h +++ b/include/linux/phylink.h @@ -434,6 +434,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 25 14:24:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 1336251 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=FiaOgz07; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BDSyq0Rzbz9sR4 for ; Sun, 26 Jul 2020 00:25:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727941AbgGYOZW (ORCPT ); Sat, 25 Jul 2020 10:25:22 -0400 Received: from mail-eopbgr30054.outbound.protection.outlook.com ([40.107.3.54]:55265 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726944AbgGYOZV (ORCPT ); Sat, 25 Jul 2020 10:25:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=btdofCflL5J/GT9DTrR+p0cjNP2kFOCeP6IAk3Uih8uj3wArbodGnINsR+DWYOGt8J81Yqi/w9Tkb+Wt2/xzT86gA4OZjdBR/IzOt/YK39799hUkEJT2OX29AXeINbo2s6u4uNJiy+2onx5RblExoApKAJkvMIeOIgUHgzCVMsJyFhKvbq1q9dosXsaMIi4RjzcuumgNeIdKg8zEaAHx0aPGw3e7bvz5/xQGkoJYEOQlzY/5FMIA+Q4LXy5aj9y8K/2LF+ZCYzQf2ngUACX6KJMNRa82kG+ePQK28h9EvuZ85+mowhsMYXc6Nn4x5yqRHqoEOMGkRxUjQEjKAtwTDw== 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=D1a+LynARogaUE+B20N8pKJgKotImA1s+9CwVCTT63w=; b=MWR6GyYOXBrLensMOMS5ekinqjaYtTtoFT8Rnhi77kuHqiNMywy5Re9gCRYsNsGpOsXjnLtAfIc3t2K+K/UVPDzxIZfSf6S5XLGAlDIR0SOvcuMQjtxOl5svLbhUYVDhq8ZscoW00unMYWAaal0p/Zsxjv7+7teiSQeXP+FWRH1KL9VkfyTM4VZgx/oHKjdfxlIFIMi/b1veMbVjJTtJQu/NR9yziZbgi4nXBTVummJaWV+kg/LWI3yg+B99MOb7RgsT5zQQ6yEYBM2oJNU7U9UphKDK3yOzOouOmwZntFZS9P/JGjdXTzJgMcIDdzrWOxgYoa0IUSrszYn2vIZOBg== 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=D1a+LynARogaUE+B20N8pKJgKotImA1s+9CwVCTT63w=; b=FiaOgz07IgNddssDXqi/YzeBvIuw6u38Mw9lPiePDbzWStj3dQB4cEHuUy3KtJ8gqv6mGNZc9yadJ7AJ9gcZNJj9517mhMYFrXEslmvKwLnVsuLh6KCJL0hw4BPr5n18pm7sEX5mcj2v6WCjbMeYE3ImUpbEYpOclKOFLXheGx0= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=oss.nxp.com; Received: from AM0PR04MB5636.eurprd04.prod.outlook.com (2603:10a6:208:130::22) by AM0PR04MB4931.eurprd04.prod.outlook.com (2603:10a6:208:c1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.22; Sat, 25 Jul 2020 14:25:17 +0000 Received: from AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::b1ae:d2cd:6170:bf76]) by AM0PR04MB5636.eurprd04.prod.outlook.com ([fe80::b1ae:d2cd:6170:bf76%7]) with mapi id 15.20.3216.027; Sat, 25 Jul 2020 14:25:17 +0000 From: Calvin Johnson To: "Rafael J . Wysocki" , Len Brown , Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Al Stone , Jeremy Linton , Russell King - ARM Linux admin , Jon , Cristi Sovaiala , Ioana Ciornei , Andrew Lunn , Andy Shevchenko , Florian Fainelli , Madalin Bucur Cc: linux-acpi@vger.kernel.org, netdev@vger.kernel.org, linux.cj@gmail.com, Paul Yang , Calvin Johnson Subject: [net-next PATCH v7 6/6] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver Date: Sat, 25 Jul 2020 19:54:04 +0530 Message-Id: <20200725142404.30634-7-calvin.johnson@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200725142404.30634-1-calvin.johnson@oss.nxp.com> References: <20200725142404.30634-1-calvin.johnson@oss.nxp.com> X-ClientProxiedBy: SG2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:3:2::28) 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 SG2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:3:2::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.9 via Frontend Transport; Sat, 25 Jul 2020 14:25:12 +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: 3420e7d2-d9bd-402e-6c33-08d830a68d5b X-MS-TrafficTypeDiagnostic: AM0PR04MB4931: 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: 8X7RFc83LCdHcRTcLci3PraJ4IomZjZAj2L+Tse/WA3ZA+VhkcH6XoUATgboRjJtGwpul7rHQPtjKuzS0SsUk+IvJSZFbtWEkyoGnHi98zNZ7sD85JZMWQP8sKgCKRqA47QTQPtVsCqOom0dSp0swOVyo5nTwcaii0oWg50aw5nXaSJoXSlMiI2/RC4vAwYIRK+VbGcpmeUhcR4tILeiuOj2pa1xb3TD4gn6b49DwJwqon/J2AmWO5BRPEQHe47zf+TxNwXjysYmym14864ne4c20RtRp6Vzh/QCWEfs5EXHpfjHDewcAXFQiwnhw4TYWw+AeuuJFpKhkLXXrtf99F155amLDS9kK9vi4bIByBVxuT6aNlYJUODZfSg+OiWmT6Fw1Zoe1gBLWAPk8wJKNQ== 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)(366004)(346002)(396003)(376002)(136003)(66946007)(66476007)(5660300002)(6506007)(6512007)(86362001)(55236004)(52116002)(478600001)(44832011)(110136005)(8676002)(316002)(54906003)(1076003)(66556008)(4326008)(16526019)(956004)(2616005)(26005)(8936002)(6636002)(186003)(83380400001)(2906002)(6486002)(6666004)(1006002)(7416002)(110426005)(921003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 7l6hcpFI1jkXqoM+4xsHsYLZJGRmv/a4IE1EU7RPZcg/UxcL+O0BR5IHzpgbMXYmfnsv0tR/4SlM9aSAVlpxdVcDuUhJ6IovS8tKCh5FDVdv7GWgzXh/Txfn3wJGq3X/HSRRCi9txuP83vphB+HuB+JhuW/fuPnLEIHOFCj+73D6pphOOatZ7ey8XKq1RHXyCZiE8KeJRdml9EfRGfxDQ72F7bu64ii2g9Z5LtlQ16AfRc+RfJX+wN/UqqCe4WfPhuHMnK0EvyDNLs2QhVux4ZZ5lLNpfqxk2Je3sWXIsu4orAaVJOBfR29qXyKJ5RVk3JQ2SUh2q73x4qSa7WTStwMvw7RqWMGSmoEmF54eDNscgnWE9bu8Gb1rA8W1YPcJwe7aLXjrHAh7dphNBaNjVkm8ghcJdEVQOEU1BUtw+m+ugOc+wtx51GnS3brTTgsUb7XBSPUi0rsC3q9wioDRDWog9UKJCkQ0m93/peV+YSw= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3420e7d2-d9bd-402e-6c33-08d830a68d5b X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5636.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2020 14:25:16.9697 (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: 9ms3kebN8lcFwTJX+Ign4Uvca7/WrxIQzjhXBxQszPChN0AgXf5J+YK/ZtSQUJUE9Y2yQ+Us8c9vPLl155XBMQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4931 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 v7: None 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;