From patchwork Thu Apr 8 21:10:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1464066 X-Patchwork-Delegate: sbabic@denx.de 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=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=vVg64nRn; 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 4FGYpJ26hlz9sSC for ; Fri, 9 Apr 2021 07:11:04 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EF2BF81B55; Thu, 8 Apr 2021 23:10:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.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=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="vVg64nRn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4FEE481782; Thu, 8 Apr 2021 23:10:44 +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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0609.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::609]) (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 670F88177E for ; Thu, 8 Apr 2021 23:10:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WRQENL9uu4796kP1LORP6/m6g+m+XyZATAQy0JjpXmHfJuv+lcnuR9uQJyHtGRDCplUdsS93ECYeDlGVoXFzky5zjnt0+I4QqiuvFf8lCOIyrKfKsMDone5nxuHXxJQPDbAIDabVaAg7mMTkn/0C5LMmkrmY6LaR0LaFjxqxbd12ljUU3JGHoPugHBmcWEhyku0LoqfgzHiK8PBTktF1M2lYdr2Qt1q+XNsityE4WMEd1Kzc4KZeHLpCMK8NY1AyI01VJKh8Fl3wz4F7mkc3nuklwQ3wC6fpJPCXESSXlcJj9/83Xu2JZN1t5pVdC53mcjzJSNEhDe8SRsWvWKSn9w== 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=ZfaxzcFdjXF7HTVLs6lVyhWFGj7SI6a/DI9mA9uKcV8=; b=Jdv/QoTsBf/1cZ8ZOy2mgsRzlqmu554bjNma69X7KmM9RFKqIrr11SIJhNOZsfMingJrJJRo9+TJOrMiMhKIvCAXBf9T6QQewtfKgJe0LookMRjXzUuAhWppqE3tomg3lBLdmXg7l4937KE7o9Pb0/PzDMuS8ovEoIu0X6fwBKaUU0MytSdl/B+EvLbL3O0As/TMHbDQxwmKVwqmsyqO9/em7S6LWhFgh1Z3pqYfnn6jIfintVTOOxGnoRa9VMmr2x1koho8PyacaHKTFNkWZZhO4vDpcNIRmsy4nhWhzTEwxMWEkJet3IS+tlK6Ge6n43SMn9yBan62owyL1rXDqw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZfaxzcFdjXF7HTVLs6lVyhWFGj7SI6a/DI9mA9uKcV8=; b=vVg64nRnm/gEW6ycmf9UEE/ca8DvhabAyEKov2I3FdR5/bXBNYtYtxGn4xDRGrIgkcZ71VzKViuLqQKlLN1qOVp/W1CYVccoMNju/RoufzjPrfzyx8bB0oFWWxQHZ1p6l24GWhAVYUTMfNtCPSe0RUlfktduuF95W9HyKWoognc= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0302MB2632.eurprd03.prod.outlook.com (2603:10a6:4:ab::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Thu, 8 Apr 2021 21:10:39 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922%7]) with mapi id 15.20.4020.018; Thu, 8 Apr 2021 21:10:39 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Ramon Fried Cc: Ye Li , Peng Fan , Fabio Estevam , Joe Hershberger , Sean Anderson Subject: [PATCH 2/2] net: fec: Only unregister MII bus if we registered it Date: Thu, 8 Apr 2021 17:10:21 -0400 Message-Id: <20210408211022.2842725-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210408211022.2842725-1-sean.anderson@seco.com> References: <20210408211022.2842725-1-sean.anderson@seco.com> X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BL0PR02CA0091.namprd02.prod.outlook.com (2603:10b6:208:51::32) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by BL0PR02CA0091.namprd02.prod.outlook.com (2603:10b6:208:51::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Thu, 8 Apr 2021 21:10:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 73a55027-25f3-4e31-7c55-08d8fad2c2ff X-MS-TrafficTypeDiagnostic: DB6PR0302MB2632: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TYYl/XfMsXxMbHo6+d3fBRny07dGANxD8v6acJdzVSdTzfGn7DVFV/Ca91DQb21ek6oqIgxUlUy+YSMGDDCu7ITYu4kJMLClhCcc2ApfbEaoQ5ZOjbO2CRQuXdVbPuFqAMMn4UfYaDZhrlVb94BYCs/SEekH/x8RcvKRWmQxK6zkeqwV9zz3fU6CIjxDNRQtckLL2ec+Qj+zE0fSr/8AH9GF4nxA2pY5bsDerG26LM55fijT3HG+/z7GOBVZqYYeTa8o6G8/QSlrf8PELt4oLx/4b0jLT4A+A28vkLaFZiCqxKHBpvnYlRfcvrsNFnQfQSVkS/W5Re6ijMJhiCZVMUCTnBOL+ddhTPbMJuG87CdNHg/DKbd2KD3fIAFj1pWN9jxsb95LoKJXChka/Vmw2ZZh7beDvTSsvcEuWhj7zLja+N49E50LfhYgQBp0g0ASrHcs5kdj5cHBxIwOT+wTEBa3eMyjvRdWPnvTHOhgYD222WgP5jYnLY7JhjMF+u2nYTT2JiJtdmzhSIWxLWdJ1Lc+pQlpS8tngP28uATv6kwcvWtJKW4M52a50c3rvuI1kqd+Ona9Fo9fUqxJ1R94vNsNl0d4s7UeBsb0uA4WoITRHM7AuW5zTQ4Luzm5zezQHt+S60lXbnWG/Pmk2DWctAnR7C+7RpCXyiLb5qkTc/SthXI4rWSDIpUg3C8VvLGP X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(366004)(346002)(39830400003)(136003)(376002)(6512007)(478600001)(107886003)(2906002)(6486002)(54906003)(316002)(8936002)(38100700001)(38350700001)(186003)(6916009)(6666004)(8676002)(6506007)(52116002)(66946007)(66476007)(66556008)(1076003)(5660300002)(44832011)(956004)(2616005)(36756003)(86362001)(16526019)(83380400001)(4326008)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 8dWgXlpBYer0crzoy/mmLdkgG0VnydrDa7F3QjsAHEXZpYNNYMRqC/Hja32ty2ZILiA9pL+imueenv6IcheE1srZEYZSmQAGnOE5qsIS0TcEwI/C/sJ+msIMLERssK7xPLo977H15UwtaeNzb99u0XueFdfUUpgZtWMYM/wFzQuWJW7cP2xQTPEJWuesa9ZM4UzxoRvaoP6R9O9dMaMzLD3rd27jee9Obtx8zpayOWaymsJg9/yoo+mnFlDNF2PR+NC1bw891w3vdqDk4caTpo/yaXHE3RvRbOCXYL7Odj29bOHtynEtqzLzQ5dVLQhi/W7fu4GGrCu2m/2FiIVXZmuRy00wWXl7xedgtRgcdJ/W29gg7gtWHjz9CzXY/TwYAE85FW6PH80h8/ESQmCxOqnxgQtm/kiRUL0Fm8xHFk3rU2qfrnqMwIHVCZltVXaLnVDozEe9jXtYWAb3cczI9RPS2zCnrK3mCHWMigbQwGNnA+mDJhyZJvm/f9nZLHiz9McCc4fglkd8Cf5h7QzimVULW7+X+65EVCru5B04vZDziZQ23fEObtPiXzazi1FYIk677M7/4insgdYh7WfJo0VXnk7VnX0TMj0ugSQp9Zs9kEbZJfeG3/R538uPTsIudKTkNAaIqC3dOTF4w65xwt/F5+qp4jDstm3sffb7eFmiDUCxMZYNPNfS+hlWvQVeinDOUk82PsCdSU+v/qbDgRkCkHXql+FY34eITPPWmvufq2KOLU2/KGMJThaDx7EcPY7r3Xxm9Bp3+NTVtjyOvazDjEbri9752tU7C8/UXYEiW6q878dvl9y27PUqKQpHUQZod+ZmZvWEWJ30BGMuuG7TVLLXkY4iVjZMctM/BuU1ovDLQUTYViJBR1rkRc14UmBccTVpWGaBiFTudEQsEVXB1i4SxCU8eyiz5auo3py8HHQaGGtPojTfmupKyv+fIStx+h6iuPJVg9By0+tpurXStckO+pkcXdI5Y/aXhBTPMqf1ILcCEz6nfYfI91/+zusHHjQBLH8uFy+quXcRbsfRsshtyrMBCd4paJOnGKg27Cp6PnKW/ICYxhyX/FFMGcitXbm1MzpYaGfYQjyLov7CM9UAH1PEt6R/+JZZTBHu0K4/nqkWyjXzGXmIigUuqO3QfX/IpEfoN/Uh+K07dpp+27/oOO0VMRy2GDQIPMVP2IrC7lIz1ICwO86hRyHyM0eNeGcuyT9rnCbT1fUUqBK7e3uoCVpzu2yD/SP2a9tt2btikPnFAm0k0M+HV0wN1vhqpq1vrCHgLJApZB3oOBXP3uHcnehVRWCTnggt/nDKLzihdqhgcH9fUfzWjtvj X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73a55027-25f3-4e31-7c55-08d8fad2c2ff X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2021 21:10:39.6585 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ArlSGPe9n9V+4rfc7VCfWBA0URX0kOvXLhoupQMZlF7aWQTQ5QkpW0tGApehrpLGrVGaPdKUkXPCXqDbigY0jg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0302MB2632 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.102.4 at phobos.denx.de X-Virus-Status: Clean If we fail to probe for whatever reason, we cannot unregister/free the MII bus unless we registered it with fec_get_miibus. This fixes FECs sharing an MDIO bus from destroying it, preventing the other FEC from using it. Fixes: 6a895d039b ("net: Update eQos driver and FEC driver to use eth phy interfaces") Signed-off-by: Sean Anderson Reviewed-by: Ramon Fried --- drivers/net/fec_mxc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 37eb894248..a64ba955a5 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1355,6 +1355,7 @@ static void fec_gpio_reset(struct fec_priv *priv) static int fecmxc_probe(struct udevice *dev) { + bool dm_mii_bus = true; struct eth_pdata *pdata = dev_get_plat(dev); struct fec_priv *priv = dev_get_priv(dev); struct mii_dev *bus = NULL; @@ -1462,6 +1463,7 @@ static int fecmxc_probe(struct udevice *dev) #endif if (!bus) { + dm_mii_bus = false; #ifdef CONFIG_FEC_MXC_MDIO_BASE bus = fec_get_miibus((ulong)CONFIG_FEC_MXC_MDIO_BASE, dev_seq(dev)); @@ -1507,8 +1509,10 @@ static int fecmxc_probe(struct udevice *dev) return 0; err_phy: - mdio_unregister(bus); - free(bus); + if (!dm_mii_bus) { + mdio_unregister(bus); + free(bus); + } err_mii: err_timeout: fec_free_descs(priv);