From patchwork Thu Jun 17 22:26:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1493993 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=s36Q50a2; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G5cB340Nrz9sRN for ; Fri, 18 Jun 2021 08:27:23 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4C62F82BCF; Fri, 18 Jun 2021 00:26:49 +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="s36Q50a2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1B7E282B48; Fri, 18 Jun 2021 00:26:28 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2062e.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::62e]) (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 8403580796 for ; Fri, 18 Jun 2021 00:26:24 +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=DplBWqiVUv5/MmV5EnuKS4oCcgGah5UUh7wIo0B7pCFWW+gV18SKsyyQy5sgGOBPpPQ/qvsBKw7Y6vdq9+AyvL/2WmNvJTpGz63qUNLN7loIxVftGknD3FAlPxNdm2LWgZ07IzjRunfDj/MUKtGnTlqz/xIwPjzrejPJdQerM08aA6KbQMu3fK7RpcS6AbaRFqqfjyqXlUroX3UK3ZLQpbLrP8A4EF7t2Xuz3Hpk4o0Yr99AGzIsQiDRLW3ZugMHW1X6vCT9QPP2feg50wN5gp2ywAJnRCg8q9Hp3UzSJOU/ng9/DZHGl5Ahd8q9Lt5SfMB+MvT8h1l4wOeXq5Z2YQ== 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=nRaI3JbBH8/57NXFXGkM3ZbeVw0DhjteW+YBlMtQz/g=; b=L+rjzbpt3UzDb8AqMdsSi6NN9JJlxY5Asyn6YahEdpu+3Rb6iSu2W0KBFVxk8kTqkSrK3WJBRk3A8F6I7HNMMeOD5M0pbR+42q5dYmMlJIJPOsdDMKfAq/BLUsgmosWxwnMDXdBRwpLoerQGfFqrHskCpquSBpWKentInvuRM1k8ffeL+vf7nAydpqgadU0zqm3X+C2LTtbt0EnVeuhk57oj3W8Q5hXkcA+dDqP2qRKQZSudWHNSkp5VAw6iI2j7uxAS9yXO8OTZ86Z+ILoIvTruwIAEvhnve6Tv3G99ckISrxB9ivcNB3ZndJ/BDdffdYnL585uFxctSy6ep/KJVw== 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=nRaI3JbBH8/57NXFXGkM3ZbeVw0DhjteW+YBlMtQz/g=; b=s36Q50a2YluG/RVjIh82QgLEdqIB5ksXpjF/uAAsKFagtgUGN/URt3kxmlt2QEzHCpAbHAPHJVMzMjmM88cA1xH/o50wKTFLe4Ld2oeTmvAo5MPbctu81MyqBoaqVL8IZqxw5fmjuV/qjKZQvBNVqR0YiEuQ9k9vjUdT4esj2Ho= 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 VI1PR04MB6269.eurprd04.prod.outlook.com (2603:10a6:803:fa::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19; Thu, 17 Jun 2021 22:26:23 +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.4242.021; Thu, 17 Jun 2021 22:26:23 +0000 From: Vladimir Oltean To: Joe Hershberger , Ramon Fried , u-boot@lists.denx.de Cc: Claudiu Manoil , Priyanka Jain , Bin Meng Subject: [PATCH v2 5/6] drivers: net: fsl_enetc: require a PHY device when probing Date: Fri, 18 Jun 2021 01:26:03 +0300 Message-Id: <20210617222604.2563375-6-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210617222604.2563375-1-vladimir.oltean@nxp.com> References: <20210617222604.2563375-1-vladimir.oltean@nxp.com> X-Originating-IP: [188.26.224.68] X-ClientProxiedBy: AM0PR07CA0015.eurprd07.prod.outlook.com (2603:10a6:208:ac::28) 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 AM0PR07CA0015.eurprd07.prod.outlook.com (2603:10a6:208:ac::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.7 via Frontend Transport; Thu, 17 Jun 2021 22:26:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7baec006-2288-4ab7-e728-08d931deefe1 X-MS-TrafficTypeDiagnostic: VI1PR04MB6269: 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: jH0ncdP9hHWIQEIDN2fFHy16Avzo6h5illRq5wWtD9ugFRyPpCGsoOSC73tkpoF949kKYvhKDL+g+jh2+K9SptKNceDgGsU2z5LDiR4PfXthrYgcapCJBHnOSzNpPQ/tThzIndPgsNXZY+mXOcwqH2o4J6DB9U6qrXctVlbWREz1ctG3ypW07Q+7wlHZbJc0IaUG68bMHdTTRLYFEq8ypmh/Q2fpjscLeGuCqmKp4Iqry0hIZ97Hrx+Oohl8lVx8Ql1i3VHkGWpf0q1a23sE9Du+68mbBmWWyijOoCYKK8RACO1arn95kgxi436BuvbFm+LRI3ZRHn5cFEgs/Ctk+yz50bjjLVMmYKgneD0Ofw0bDbwh+FvkGQbPAPAp0ep+7Hm2NX0fnCFxpnvuH+zomRTnjNfn6onEKZMRd/qXg5/3S/u93e2jXEGoE2N5+UDY4ZIlC3VDAKAyJHHk/Kvu8/CZMEIOgnsxwM1R1xeWnMnsnBhmHbydCIcIBU5J9cFkGLncCTyv0ddBQRbCIPTb7OfztjybSTCQ6cKBzJGW0hZYZv6z8vXyvA9MQrBbJR2R+3CnE6mBi4zHk6nzRc5o+6zcJuLBfRWTPu7KNnq/0l5tJsvf8G+Th4hwhizk/V7Aad3F70CyNuuvX4aZH6URYqw257GMWmqyCMOG1i9Gd94sJh8oo7/KDSshqjex/83u 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)(346002)(136003)(396003)(366004)(376002)(39860400002)(8676002)(83380400001)(36756003)(478600001)(6486002)(26005)(6512007)(8936002)(38350700002)(6506007)(6666004)(2906002)(66946007)(4326008)(38100700002)(956004)(110136005)(54906003)(2616005)(86362001)(52116002)(316002)(66556008)(66476007)(5660300002)(186003)(1076003)(44832011)(16526019)(69590400013); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EAfuCVsXREBOi9xvORDCbXqEur/93HOr94WaYy+tFUWGd803a+xNY2qBGM+a13VJVeie5au8tszFcm524+tH8PDRn67b5cKcEmZPFrCBp0E8F0muQHU/qJI9kn27WqO1gzMUktgqr3K57vOG2pyLCbmHizXWUxCMcPnlDd2r7Kyfpnz9Khqr5tfvFZZE03UwSiw5rCxm+P7nm5sf2JDAM/pHqdY4UU7J6ugDccSbxr8esv/gG8xxZXnCBZD8QdJVKZbILlBgZf0lDDg6Q8ayu7JRrZ1uxve8GEOb99nGdITXCZwGjMn3tsywEaArdofrV1mqTdDWkiKlvdoBYdwvTqs5HjxYXbWD6HHlSp029b/gAhpoiTGPfT2JpDEYPonFcX+4KA7+XKB1aAMeCRnyuLIf1Jj34Vl1doC8yLBHAd7osi6pRLaZQc1SeRZEpYNFPJtDwimmCfdh7x/FWWloWAvQ2lDAeB9008po9oZsMe+z+ImXt15jyPIRGcW1Z68lZ31bUydlqtc+aiLBw/j70+5q19n7V2swCAprombMRh6Ti2RRbTTLCDePZyXvDGIqFUTYB9lWm5Q8LusJSwkkpRnG+djysbex0oHEDo0NXbHdLpYv227mus68166OPV9A6mU1NLTaC6V0zRLJXNIJVKCjE2Wz+Xahkj+X2bTOk2y+Q8hggL4ilGFlv8fOUHPyeC0KYltQwt880Ad4PBklXBFN2rZt98ufxDLhw9WAVPBRL+MqrxjwFhp/Y38ikSBW2vgXw6DnOZqgMEN+Al6DLuKBQJisOxwwK5Ezkb74524pTNpkZLtTDnayr+bHWeS7AIfPHcXCXlFoDLLZ7O9ofRCJjBkmYEmOR5BrK/LRkEYQvXN3HS1RvoItcFzgUTuDlMIVOt1Nk5P3ytS+pmL11Uxxeu7v3n/C4zPi1OylqM7qMn84PL+wGLLUK6WBIZntWTmlDWtmBY2NvwD8rmTQ4mkGPwxX6cd7/86S+ri3CKE7Lj3mdILJuY+/+F8FOrxzy8ieyIHrEoPgsGbneVSxR1hZKh3uXYGGZfZptPeeYUmu4StIoFkyS5wqIu3Lxl/6Kuqeq4xkoA/jUnBPex8RtaEOMplcwYS55oxKxkANbBHxVWXrYYdCDqB9zuYX5YLk0L9XxQd83QPi6CdsvmutACHPtThr5INmfdBLOdl+uqapCf7C63ZaJpc8uXkJEERnveKVSngqmqftcF9DNgW7k9J5fBd+iQmNM/jp/khNV2K38tfDp4SnwZNxyEVe4U+ogZ7fxKgS3ZIbYj2PvPDKb18opkrO+0feUEpsEQXkV1E5hLCH03oJ8E0YOQ3sjRnc X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7baec006-2288-4ab7-e728-08d931deefe1 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 22:26:22.8364 (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: zSi/6I0NTsWEV15xCAsd8Q5Sl0ON3xFzMg16yTYEQYorae/vjsuKcTDzK18auIjP5QwRYXxLlwzkI/+cGM0Smw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6269 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 Reviewed-by: Ramon Fried --- v1->v2: none 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; }