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.7 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 F05EFC433F5 for ; Sat, 18 Sep 2021 12:47:17 +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 3217B61288 for ; Sat, 18 Sep 2021 12:47:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3217B61288 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AA94C83231; Sat, 18 Sep 2021 14:47:13 +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="S2l3ppgu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CE5B983231; Sat, 18 Sep 2021 14:47:10 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on062d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::62d]) (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 DB49482999 for ; Sat, 18 Sep 2021 14:47:06 +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=doEJTDZCbXQZrBePZydQpX8G64Cxxq+w2PQQXHqvuvx9fhrULHYAlVz2jBEpPUPmQJsexgZpdcrI1A/E24YLHVLsARZH82bxJvxvkPtVL2ZC2qCmnCRkO5uBXVN955L8tX85gD477Rp1GRKXSd8mJH7RX5WBmRYNPgjTkPhiWic1dzk5Q+meB5enMbLcWAW1odHfpNhnyx5OfQ7Wbb7+r0lIz995kL4cttOu1HkZXN8qb+LgUwVxFJv68cWcO+s1886VBh4/fvwsXEJoHCXEiAw8KfLGt6uSPUc1Rdr/Qitz4AR5GYDrmnbYeFzbWGZwQgXlL6/8BFOwk8Xh5NcfXw== 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; bh=cZgqvc5YoKApaedLguPCGNSQrEBuj9fYgeglzBLL2sI=; b=Br9fvJwiBkZNcZc1lFpi4iebpRkTN//hrYN4Y2xG05JHbR0J8m1g1gKQTYOzUP649jPjjjW1Yed5kWG2GL/G4S62Fa6vjVdiaLapDzB8NPjTYxTGitNuvE74CIyxjMhsIUKXo7BQTh/B7UnTfM3Ae7qfBzFyTAXs6vdz/bzhgHyts5tZEDS7Of+gv2fTh9YnX3rAEefQ3Jg92tVSakhta0Sd23IxVNwOG+Xj1Vi5zNqVknoGFzX2Gb/B+3F17BGK3tI8WQSFLOa8Bwcss0tvOhEjpBlvr6aAIMDHjK+B+PuKhv29z4Xf8k0cYuYwJDC0me9wz2xFGRBrUI7tm3NGPg== 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=cZgqvc5YoKApaedLguPCGNSQrEBuj9fYgeglzBLL2sI=; b=S2l3ppgujXGaJxm+FONvkPnUEMYPG29+TPt5HmXDLH5+2qNyNaciPbnnA+sOAyjGql5n77f6rlP6rqQiqjZKTE6C0fAPHrdJPEX1H6iG9x7fTc+Akj6ccwzsyxjNG9n6PH9ZuTVPu9SioDOnMYsSSlxbt5vUIuFwso78778+V7w= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VE1PR04MB6511.eurprd04.prod.outlook.com (2603:10a6:803:11f::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Sat, 18 Sep 2021 12:47:06 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0%2]) with mapi id 15.20.4500.021; Sat, 18 Sep 2021 12:47:06 +0000 From: Vladimir Oltean To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried , Bin Meng Subject: [PATCH 1/2] net: tsec: only call tsec_get_interface as fallback to DT-specified PHY mode Date: Sat, 18 Sep 2021 15:46:54 +0300 Message-Id: <20210918124655.1086645-2-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210918124655.1086645-1-vladimir.oltean@nxp.com> References: <20210918124655.1086645-1-vladimir.oltean@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: VI1PR0601CA0035.eurprd06.prod.outlook.com (2603:10a6:800:1e::45) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (82.78.148.104) by VI1PR0601CA0035.eurprd06.prod.outlook.com (2603:10a6:800:1e::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.16 via Frontend Transport; Sat, 18 Sep 2021 12:47:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 616cc54b-dc26-4a2a-34bf-08d97aa26b9d X-MS-TrafficTypeDiagnostic: VE1PR04MB6511: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ggYJHJQ5BThh+HgX5wsh6+X7wAYLwzfsStUGOU5UuyJwaUjv+WoduM2srYJRgpKu5Bccc0pyKLMfJVXzA/kdjBCw9kQ9r2YVOjhuwKaT3DWZUklBJKDd0+/t1mOZX5oyksNlHOThLEqQmy+3pIj40SN5EqRj77PgBBKhPpi2NLYRvQpl5gQcHWgMnLpaqXSXXoDVpixWtBjysLs+DTaWl8QkvseDqiP0bp+XLBZwwQTQMry1W9kX8hdTVVWzQrxarcSDT9HHzfmwehSLQhEzDYckz0DqZ/V9Olod4UFwj3deZ7leSA2smlEfSzuuXl3gA1IDSfKnFOt8oOHpkcOgQksb8SA4EcFkB/aEUd+ajgxwFmJHji19bsCfv2kDQBjGfk8mdehA4mKeywjgKJd8PRuA3851xwt2W4cOmG4SOY2I0Y7tbXnnFARXO0eao0HPiglKP3PzK5OerZoGJkSZJKKe1OG/qRJzxguCMiqKclfEHvMnNSvxLFi8jlmwjoHzZJ5SztbdDkTUGUrpL19WQk9e8g5cqcT+W6hvu0qfTLflNvG/Tdy5C+BrlIgaw+x9+7yRyIcRrxfrM9oDDkMr3W5R7YDmKbuBtRCFtTo9ZB4SywoH5kZmCn58UP46i2TmfWNw7ZjqjKE62lHDguq4BvQTwR/QhPNPgT7yIEQe0d1515if5Ylk7Llr9i6RLGYgeBbivKYQqriHXirgemVsuw== 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)(26005)(186003)(6512007)(66556008)(8676002)(4326008)(508600001)(86362001)(956004)(2906002)(1076003)(66946007)(5660300002)(66476007)(54906003)(6916009)(2616005)(38350700002)(36756003)(6486002)(8936002)(52116002)(6666004)(6506007)(316002)(44832011)(38100700002)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QFf4s4vGhTuY8gmemDrF0WK3py0Ixj4ayC/73/Rqua6AtGejNgQ9SB9KJezO?= =?us-ascii?Q?n1t3NxlZ5geCOMK+zvo9TUDBu0wjFnmWsMVFwTM02FQ7/lG9EckyESdMlNym?= =?us-ascii?Q?X82PCLk49Op1lnIrNVKsy6NtGfW9ywninCtBL92cbKf8FEi0hivLXTFsYDU/?= =?us-ascii?Q?+jUwAAhB/bG0nUTMg/LCbE/OlYpLY0Q6xTluYH0QpZU/9QTklwXNFq2IM5Fb?= =?us-ascii?Q?sdINoHxwb3sUU3TSc1HiQqrFXGVDc2hnHG7kcVKijvCdiOZSg3QQSd544Y+h?= =?us-ascii?Q?2ffbOx8b8YRv6nJZcBbZ0ooRm4lnyAPcrOv5se/hFDjGwX4EM1GRXPjLlBeX?= =?us-ascii?Q?t3ejCNQZ0VQsq+F8VdIWouZ3ynacdlttquTdXSeJX1Ed6PK0AtRI7VGlFCey?= =?us-ascii?Q?m57Fhtco7xrg5Ya/BWqXKDcThygqP6rha4WWR71RFi3rehDrsSE5Wowzh/LU?= =?us-ascii?Q?1uhd7FDzcU8Rjt9KylOHqRTBryO/EaabZVs0UmuC1S7Rq5h/SwsnMJdTpJkk?= =?us-ascii?Q?0p/otfpBsk3QNYTyj7kI9wSkZDRSYYeJzvQjJwbLVul6Ht/J11QL0BXAUMwK?= =?us-ascii?Q?vrnY8jp3DVguMt1EaFvyAIB2wzwnZDROL7c8rDAfsQaPLavFyGPwH8/mq7/T?= =?us-ascii?Q?UR67KNYLduO/+Lsvx8jyUwufpUCq3S8Lg8tiNfmHzBXN6/eP8uYAQQl4BCvy?= =?us-ascii?Q?+SkN5a8EIdWV1uWeZM3zVdlAdrdjkxEofNhZsQ7u1Klykr/jKhetE3gFINU/?= =?us-ascii?Q?b+6/sX1xFjtRazo7tFFTGE2dZUrR6MsCcRjk9XctFHwXoIrZ+b820F3lkeJ7?= =?us-ascii?Q?is5P173WSrK1+Q/yJm+qZmK7bvuDCMpsnf5Igvj5QdImU9K4GQzXk8zhAjd0?= =?us-ascii?Q?MAY2PNdhCN9XM53nUMZ63hrp+Gd995OmOj4yERE8eiwqj2fEGirwPtK00fS1?= =?us-ascii?Q?uyy2q26FCtfx6bg4w0hH+nOgkGim+32DBu4Qg0hxsy2TcIrfjX1sl54oAtTT?= =?us-ascii?Q?5GL06tomqI87Sh14RWrN1hrCss9qpJND09cNgOahTZ0scYGEMPR50MsuvqQf?= =?us-ascii?Q?WIXS8b7dU5aTBu5DZnznUXjq2hl2i3kRVCfh7EkgGWKFC3w+SerkeCvmVJEB?= =?us-ascii?Q?0v5Ygvl8VhR6g7Jn2La6BM5HR2ODyFvSm+KyuURVzNUsNpWGNu0PES2xpfQh?= =?us-ascii?Q?QImxdPkHBUsLBEOsKZQY1HTmHNGFpl2X2eaY+zxmG1TBQVab7Fy6m2JApggV?= =?us-ascii?Q?kLgF9GSTkiPZ8pRMlJ6O8A6lm/Iq9MMi49tLxoTNEKblZ51npNEIpVe1C4gs?= =?us-ascii?Q?s1VWe3wv1Hjw07jLSDsuOvY7?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 616cc54b-dc26-4a2a-34bf-08d97aa26b9d X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2021 12:47:05.9520 (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: NmkYnyAWL2P3PefSqCK8bk3lkXebjJsiUfywdAVB89kZ1osJNXIgzLRkqBUPc64RZ1Oz8YF/x0U6CkgydwZvrg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6511 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 Currently the init_phy function may overwrite the priv->interface property, since it calls tsec_get_interface which tries to determine it dynamically based on default register values in ECNTRL. Let's do that only if phy-connection-type happens to not be defined in the device tree. Signed-off-by: Vladimir Oltean --- drivers/net/tsec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index ee820aae15ef..809cf7e432e6 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -701,8 +701,6 @@ static int init_phy(struct tsec_private *priv) /* Assign a Physical address to the TBI */ out_be32(®s->tbipa, priv->tbiaddr); - priv->interface = tsec_get_interface(priv); - if (priv->interface == PHY_INTERFACE_MODE_SGMII) tsec_configure_serdes(priv); @@ -888,10 +886,9 @@ int tsec_probe(struct udevice *dev) phy_mode = dev_read_prop(dev, "phy-connection-type", NULL); if (phy_mode) pdata->phy_interface = phy_get_interface_by_name(phy_mode); - if (pdata->phy_interface == -1) { - printf("Invalid PHY interface '%s'\n", phy_mode); - return -EINVAL; - } + if (pdata->phy_interface == -1) + pdata->phy_interface = tsec_get_interface(priv); + priv->interface = pdata->phy_interface; /* Check for speed limit, default is 1000Mbps */ -- 2.25.1