From patchwork Wed Apr 5 09:26:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Felsch X-Patchwork-Id: 670603 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B41CFC76188 for ; Wed, 5 Apr 2023 09:27:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237340AbjDEJ1P (ORCPT ); Wed, 5 Apr 2023 05:27:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237012AbjDEJ1O (ORCPT ); Wed, 5 Apr 2023 05:27:14 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8A38449C for ; Wed, 5 Apr 2023 02:27:13 -0700 (PDT) Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pjzQ3-0004pA-Fk; Wed, 05 Apr 2023 11:27:07 +0200 From: Marco Felsch Date: Wed, 05 Apr 2023 11:26:56 +0200 Subject: [PATCH 05/12] net: phy: add phy_id_broken support MIME-Version: 1.0 Message-Id: <20230405-net-next-topic-net-phy-reset-v1-5-7e5329f08002@pengutronix.de> References: <20230405-net-next-topic-net-phy-reset-v1-0-7e5329f08002@pengutronix.de> In-Reply-To: <20230405-net-next-topic-net-phy-reset-v1-0-7e5329f08002@pengutronix.de> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Florian Fainelli , Broadcom internal kernel review list , Richard Cochran , Radu Pirea , Shyam Sundar S K , Yisen Zhuang , Salil Mehta , Jassi Brar , Ilias Apalodimas , Iyappan Subramanian , Keyur Chudgar , Quan Nguyen , "Rafael J. Wysocki" , Len Brown , Rob Herring , Frank Rowand Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, kernel@pengutronix.de X-Mailer: b4 0.12.1 X-SA-Exim-Connect-IP: 2a0a:edc0:0:1101:1d::28 X-SA-Exim-Mail-From: m.felsch@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: devicetree@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Some phy's don't report the correct phy-id, e.g. the TJA1102 dual-port report 0 for the 2nd port. To fix this a driver needs to supply the phyid instead and tell the phy framework to not try to readout the phyid. The latter case is done via the new 'phy_id_broken' flag which tells the phy framework to skip phyid readout for the corresponding phy. Signed-off-by: Marco Felsch --- drivers/net/phy/nxp-tja11xx.c | 1 + drivers/net/phy/phy_device.c | 3 +++ include/linux/phy.h | 3 +++ 3 files changed, 7 insertions(+) diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c index b5e03d66b7f5..2a4c0f6d74eb 100644 --- a/drivers/net/phy/nxp-tja11xx.c +++ b/drivers/net/phy/nxp-tja11xx.c @@ -560,6 +560,7 @@ static void tja1102_p1_register(struct work_struct *work) .mii_bus = bus, /* Real PHY ID of Port 1 is 0 */ .phy_id = PHY_ID_TJA1102, + .phy_id_broken = true, }; struct phy_device *phy; diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index bb465a324eef..7e4b3b3caba9 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -969,6 +969,9 @@ static int phy_device_detect(struct phy_device_config *config) int addr = config->phy_addr; int r; + if (config->phy_id_broken) + return 0; + if (is_c45) r = get_phy_c45_ids(bus, addr, c45_ids); else diff --git a/include/linux/phy.h b/include/linux/phy.h index 498f4dc7669d..0f0cb72a08ab 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -764,6 +764,8 @@ static inline struct phy_device *to_phy_device(const struct device *dev) * @phy_id: UID for this device found during discovery * @c45_ids: 802.3-c45 Device Identifiers if is_c45. * @is_c45: If true the PHY uses the 802.3 clause 45 protocol + * @phy_id_broken: Skip the phy_id detection instead use the supplied phy_id or + * c45_ids. * * The struct contain possible configuration parameters for a PHY device which * are used to setup the struct phy_device. @@ -775,6 +777,7 @@ struct phy_device_config { u32 phy_id; struct phy_c45_device_ids c45_ids; bool is_c45; + bool phy_id_broken; }; /**