From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24D29C2B9F4 for ; Thu, 17 Jun 2021 14:37:09 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 80567610EA for ; Thu, 17 Jun 2021 14:37:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 80567610EA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B9ED882B89; Thu, 17 Jun 2021 16:36:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="DDbFW0PU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DFB6982B1C; Thu, 17 Jun 2021 16:36:22 +0200 (CEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2061b.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::61b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8AEF082ABD for ; Thu, 17 Jun 2021 16:36:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vladimir.oltean@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aTAW2v1ylgdqhm0OPnYMu6CyEl6k/pd22DMgPrm6eg/A9VtUaoBjyilt2rV9wHVGG4kP3tpWrLyju3xkjl6b1wyt0Zyp1f65pPD48qNvwRE9vEpjpBHRtQrIEcBX0qIR9E565E8/PTZQ+CXcv/VU1hH931NjU+puKIMerZ9QtaGPPCYHq+uH7/6BJlm8b07Lj+78qmZ8sx9bwzTTn6qt6YUA2FPHxlY5m9sO1jxvwpoZ+KQ1sHK4MGMs683k4xJS8jzUDFYMHfKa4bPxTNdM0cgzjLly/mv+CA3oD25SwZfVobAyyw4d4fUoKqRAL+I3PZSGDZwlYOhHCXpjjQhnzA== 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=vnCOEsOzBMMU90Q0qOu/SrkVnUX7B8pbNHla6oLd9Cg=; b=OHQYzgJegfULMJm/jlouIjV3l60B9gt2Ei/1xlSyPM1MmEbtYXjOmgrddINq3yzvQDIis1hgIVIEBh6LPiqDzGgdc8cPppH6V6LK9bJQ6QZl9DOfMEosGbRcgQjDqJpnu6r9A585Y1A1JqbWkjH2sKYyXdvFuZXUQU7sIbn4aIUk7YcJaKN7M9ESpnG0xHZ79UknSnNWBUAl33aPUqIRpfSm3FA52bTqlt8Vk7t/s/FvStkhRmr3sPi9xkX8bOky75lZbcqHYpYodNi7CFbuHg9MpZk6SPe2TjmZKbckqMYqu+4RK5EuP6k8x3UDxt2PVcfvDNdV+K2KlxHvF92fjg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vnCOEsOzBMMU90Q0qOu/SrkVnUX7B8pbNHla6oLd9Cg=; b=DDbFW0PUVD2prVB18woxz2/aMvvvDbV0xtej3u/lpXOqtcvgyI9c7+a3twUW/wARdYfSB7le3O9uzaZISO/41mQjGSDs9jVwZU08nBBEDA3vDkkGRH/IUlly0bGtc0tLgMDFsrdosxs9iSLCRuS7tA9Fx805HxMXLLZy+Df6FjM= Authentication-Results: ni.com; dkim=none (message not signed) header.d=none;ni.com; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR04MB3965.eurprd04.prod.outlook.com (2603:10a6:803:3e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.18; Thu, 17 Jun 2021 14:36:17 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::b1a0:d654:a578:53ab]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::b1a0:d654:a578:53ab%7]) with mapi id 15.20.4219.025; Thu, 17 Jun 2021 14:36:17 +0000 From: Vladimir Oltean To: Joe Hershberger , Ramon Fried , u-boot@lists.denx.de Cc: Claudiu Manoil , Priyanka Jain , Bin Meng Subject: [PATCH 5/6] drivers: net: fsl_enetc: require a PHY device when probing Date: Thu, 17 Jun 2021 17:35:53 +0300 Message-Id: <20210617143554.2104712-6-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210617143554.2104712-1-vladimir.oltean@nxp.com> References: <20210617143554.2104712-1-vladimir.oltean@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [188.26.224.68] X-ClientProxiedBy: AM0PR02CA0004.eurprd02.prod.outlook.com (2603:10a6:208:3e::17) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (188.26.224.68) by AM0PR02CA0004.eurprd02.prod.outlook.com (2603:10a6:208:3e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Thu, 17 Jun 2021 14:36:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 48fceb7b-b535-4734-8cba-08d9319d43d7 X-MS-TrafficTypeDiagnostic: VI1PR04MB3965: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 02bEaaeSjooqe1u/ncJHuQhhM9igmgxMwoTzbg+cqASwyuT0at0K4EQPnHR+BuDMBYMaSQBNQvQPaVm9VLRQtDZxt3oh9qbsmIq82U2qRJRYLqcHw6Jne78R+0P1gMtgdO9btCijUe481gS5MnvN+4kvfEsr+37kDTI7jiFmnTS6ZsJ/vTithC/aC+b9IDEgd4JdmBz6zV/HvzIS0v4M8kwDCQmkn9bs68yXpsiLL+r6z+rAnpRR4rcBnX4DaCl1UYIxcRGv0MDegREROlIaI8tur6HVpXPC0QR8ZDT7d1rs+q33UM/SUmu9aRrWBR59Y/hnn1t7VmluWE5OA+aDczkJfe+xru57Wk6WEAZ5yFFWCkFebodBwG1HivQu9VnvmpKpx0y3Iu/WoopSqcW0Ui3lzL1smcg+9QnZX4bHewJaYnI9SdcWy/mRew5bUWQkoEM55BWDYwb+g68GqWm9v7OcAhuJUeRJqjU89ebZLVxEU4l3s8WpTlELAim6LD1bVh3LMXkI7OAQ5NMSGOYPvD093TgqnMivHHsj1VbFqXp2+AQq1XYj0gC67yTIKuP/yh9Xg+ybMxEAhJTI0d2CP7mR/P927aHldjAQOjSClSVQWQdtGb55fDRtr2bSN6ruibD8Yha++Bt4B1R/NsY9qAGN34x1/6BKIn8NPIqXl082nlBeUVSDqt7ZJ4WGRh0X X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(110136005)(83380400001)(66476007)(36756003)(54906003)(1076003)(498600001)(66946007)(44832011)(4326008)(186003)(66556008)(38350700002)(86362001)(6512007)(2616005)(8676002)(2906002)(5660300002)(6666004)(52116002)(8936002)(26005)(38100700002)(6486002)(6506007)(16526019)(956004)(69590400013); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?J7WqIUqQDHx67vKlXftgp+8cO+uV1oso1t/JyeN/0Wp6cLZSrCA0TRUXQ2CQ?= =?us-ascii?Q?LoQvTjZt3AWwOOblfklPSLomv1ldVBLeBF58BmJFpNbjK83ebWJ1meyHnOZX?= =?us-ascii?Q?aNhU6NeJH4LdC983a/NQuBl3Gjnipc3AFO5FAVzC9L+hrLwcNF/3E36Y0fTG?= =?us-ascii?Q?1TM7p7LuKNIGdinbDjSnY1GmpvSE/Qq7smGtlr8Rdlmt3ZzWZHZb6JZveHFV?= =?us-ascii?Q?1CdivKBDU2rydz1Fca+CbE9mBN1CcetbXsmic2eF+JO5flxGLix75Db5p502?= =?us-ascii?Q?RcZ+TC0/vGXYuEV09P/cyI27TihwVEIBhFOW4LysSLxmrA1OErJSNVYwVxuc?= =?us-ascii?Q?mLOGrcRck49FnsSvAu86q4IZ7OndvdjBLfLmx2fuwp3Mq/S7/8hkAzzKxUoj?= =?us-ascii?Q?ZTu0YPiVTZUI9YMm9Vb+c1dBGntdUOwTSmvIxd2q1WR1Kh2ZCFtMQHqPHHUD?= =?us-ascii?Q?XMp3RYvhwpW+kE2Pa4/NPEWNIpzKB+Qr5dWlab+MB1HifW30X7zL6uOdox1j?= =?us-ascii?Q?78gROYBulKsC2EKb+x1n1bzPdtqENCW2WiQWMcO7WwaOJXU0xbB23hpWVEc0?= =?us-ascii?Q?9SmEuoJaInTkwqCR1rqIcwK+KbVHliF9X8xsvd1eb+Z8aYiVh7LcOkA3cIj6?= =?us-ascii?Q?hOuwGFJwt8rkmEM48K73W/rBBQSTs7e1XIYUpjTyHC6hWmPy3sXiqjep2fpl?= =?us-ascii?Q?CMm0p89mreAFInFfOBz81+mdedRtx2iIkwPLvPdCF6pVhUyVzB438DLsaq4P?= =?us-ascii?Q?A4C2OAqb0euVkmRwzhlmZBME+PxJ5KRckdP9XNsk95MlIPg1Yj61JCZfl3Bm?= =?us-ascii?Q?tpb/nIEK4RPzqsBS042ofOHvXhoT3AbE9S0D2h8e3xXlpCcmHihdGasYXIPk?= =?us-ascii?Q?NzgYUjYUO9wElFGIErx/GJB+/wzmBTmmSvrMIy4+zA2NmTRd+66O5wzg+arY?= =?us-ascii?Q?wZ37Vz1pdR8nDfWNu1VQJ/1km7gPh00RygVqmuOfP+DTn5eGq5fYAjjXMzbX?= =?us-ascii?Q?BmNhWV+vnnnRaAqAMV/OQqjOGDwzPSJKUEjoVqQPs50dN7NT8Wurk/FatdYh?= =?us-ascii?Q?gpxG1uqlgRChrGcLxJJsnmp/tKf6S3QmXTH1dSE58Qd3RWvCSS+Mm1TatfmL?= =?us-ascii?Q?V4VeZoc7G5/VER/D3XaJfbk/GVzOwztRElLPwAE9zgAXHBbuspBoHp8Iy51M?= =?us-ascii?Q?MCW9OTKX94zYWkdSk8Zo5n4zENILk5MBuccX5F7s9RoOFqAVUY9FyKWH/pvM?= =?us-ascii?Q?97xs0OILJZBoPyJ4B2uyKbympyDe9mxXIlGnuXylAr//RPH/7uCXj6lbuS2O?= =?us-ascii?Q?88jP5IuA+DVG2zFkQfZyApIL?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48fceb7b-b535-4734-8cba-08d9319d43d7 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 14:36:17.1390 (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: ++EUuOg38VzYCRg7PXbKCAxOFi8ZDUxU3OvLj/7v0ERdCP/HpviFeFxqALX9ykB+VOq77HmVFR8adx8nRCGeoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3965 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Given that even a fixed-link has an associated phy_device, there is no reason to operate in a mode when dm_eth_phy_connect fails. Remove the driver checks for a NULL priv->phy and just return -ENODEV when that happens. Signed-off-by: Vladimir Oltean --- drivers/net/fsl_enetc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c index f6fc7801b95b..5961775024ff 100644 --- a/drivers/net/fsl_enetc.c +++ b/drivers/net/fsl_enetc.c @@ -281,21 +281,20 @@ static void enetc_start_pcs(struct udevice *dev) } /* Configure the actual/external ethernet PHY, if one is found */ -static void enetc_config_phy(struct udevice *dev) +static int enetc_config_phy(struct udevice *dev) { struct enetc_priv *priv = dev_get_priv(dev); int supported; priv->phy = dm_eth_phy_connect(dev); - if (!priv->phy) - return; + return -ENODEV; supported = PHY_GBIT_FEATURES | SUPPORTED_2500baseX_Full; priv->phy->supported &= supported; priv->phy->advertising &= supported; - phy_config(priv->phy); + return phy_config(priv->phy); } /* @@ -335,9 +334,8 @@ static int enetc_probe(struct udevice *dev) dm_pci_clrset_config16(dev, PCI_COMMAND, 0, PCI_COMMAND_MEMORY); enetc_start_pcs(dev); - enetc_config_phy(dev); - return 0; + return enetc_config_phy(dev); } /* @@ -550,8 +548,7 @@ static int enetc_start(struct udevice *dev) enetc_setup_mac_iface(dev); - if (priv->phy) - phy_startup(priv->phy); + phy_startup(priv->phy); return 0; } -- 2.25.1