From patchwork Wed Jul 12 15:07:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13310498 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B58834CF1 for ; Wed, 12 Jul 2023 15:07:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0A58C433D9; Wed, 12 Jul 2023 15:07:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689174454; bh=6hu2QLAnatQP5UFKHqQxLipPsz8mKS6yWJMOvqrfh4E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=oi9YDlwcTqrVxqhOw1EZZr9PArfNBsj2F7xdvu0hNxBS+lAeoSYV+yVW2SkbjXuJ9 ZJnTmXOAJffEds4stKmwQUKBJJcyNs70h0BlapfpbgY5pD1AJjN1xDNQXr1Kku+9+m auOKDvO9TbLw9TkKvY5TzgBK7NBJrZWU9zIZG7DFZkfIMpxm8Zzy/3UcucoiDBHo5X 5qNcGoh4zLdrErmwDnPVA+H/DYbdaG6VwkSiyrQToE9d/5aGcI7LcpplpauC2PZS+i nq2szRaVXz/UQU53cI4Vffdjg8b+M8Srm+/DE6dFL+kh5iwQ8jT3uyTTzczc/W+mBM s+gJJSuSDsjuw== From: Michael Walle Date: Wed, 12 Jul 2023 17:07:01 +0200 Subject: [PATCH net-next v3 01/11] net: phy: get rid of redundant is_c45 information Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-feature-c45-over-c22-v3-1-9eb37edf7be0@kernel.org> References: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> In-Reply-To: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yisen Zhuang , Salil Mehta , Florian Fainelli , Broadcom internal kernel review list , =?utf-8?q?Marek_Beh=C3=BAn?= , Xu Liang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Michael Walle X-Mailer: b4 0.12.2 X-Patchwork-Delegate: kuba@kernel.org phy_device_create() will be called with is_c45 and c45_ids. If c45_ids are set, is_c45 is (usually) true. Change the only caller which do things differently, then drop the is_c45 check in phy_device_create(). This is a preparation patch to replace the is_c45 boolean with an enum which will indicate how the PHY is accessed (by c22, c45 or c45-over-c22). Signed-off-by: Michael Walle Reviewed-by: Andrew Lunn --- drivers/net/phy/phy_device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 0c2014accba7..226d5507c865 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -689,7 +689,7 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id, * driver will get bored and give up as soon as it finds that * there's no driver _already_ loaded. */ - if (is_c45 && c45_ids) { + if (c45_ids) { const int num_ids = ARRAY_SIZE(c45_ids->device_ids); int i; @@ -970,7 +970,8 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45) true, &c45_ids); } - return phy_device_create(bus, addr, phy_id, is_c45, &c45_ids); + return phy_device_create(bus, addr, phy_id, is_c45, + !is_c45 ? NULL : &c45_ids); } EXPORT_SYMBOL(get_phy_device); From patchwork Wed Jul 12 15:07:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13310499 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DFB934CF1 for ; Wed, 12 Jul 2023 15:07:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51105C433C8; Wed, 12 Jul 2023 15:07:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689174458; bh=epYrE7lJCWpylSaA6z08Zv5BgEI9FHlBDfIZlfWd7MY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CLdH/kmV5NfX4WnADocwkUl3CMbKxUOvBKpzSw1pQ+6JTrBKAgi0c2bJ6Y8iqdyph HNNnlX+oQfc2pH/ZiBTUT5qMGr4o6Ti7OTWvRgVT2YOkazJlfMV352wU3MTJYrA3C0 uKugr0jAN6B5FgDnp7g9n6Sql1nT2DTLV35NfkMry/41kCPEUphXwxer1HVbRtVTpR 2C5QJ2G0Gd1nztAE0I7rFldUIcMz0tOU5VFn5TRws5U6yPhlSqiuI7bqVuc+GTEgqh fNz9jB2I+NtSGGAolPmnULzm1Gq3m/dk5kyULZ/BNClYSI+QTi+JoUjUKHccaGlFau lopqn4QK1Jbqg== From: Michael Walle Date: Wed, 12 Jul 2023 17:07:02 +0200 Subject: [PATCH net-next v3 02/11] net: phy: introduce phy_has_c45_registers() Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-feature-c45-over-c22-v3-2-9eb37edf7be0@kernel.org> References: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> In-Reply-To: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yisen Zhuang , Salil Mehta , Florian Fainelli , Broadcom internal kernel review list , =?utf-8?q?Marek_Beh=C3=BAn?= , Xu Liang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Michael Walle X-Mailer: b4 0.12.2 X-Patchwork-Delegate: kuba@kernel.org Provide a helper to determine if the PHY has a C45 register space. This is a preparation patch to remove the is_c45 field. No functional change. Signed-off-by: Michael Walle Reviewed-by: Andrew Lunn --- v3: - rename to phy_has_c45_registers() --- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 ++-- drivers/net/phy/bcm84881.c | 2 +- drivers/net/phy/marvell10g.c | 2 +- drivers/net/phy/mxl-gpy.c | 2 +- drivers/net/phy/phy-core.c | 4 ++-- drivers/net/phy/phy.c | 8 +++++--- drivers/net/phy/phy_device.c | 6 +++--- drivers/net/phy/phylink.c | 12 +++++++----- include/linux/phy.h | 5 +++++ 9 files changed, 27 insertions(+), 18 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c index b54f3706fb97..387d24f195aa 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c @@ -916,7 +916,7 @@ static void hns_get_strings(struct net_device *netdev, u32 stringset, u8 *data) hns_nic_test_strs[MAC_INTERNALLOOP_MAC]); ethtool_sprintf(&buff, hns_nic_test_strs[MAC_INTERNALLOOP_SERDES]); - if ((netdev->phydev) && (!netdev->phydev->is_c45)) + if (netdev->phydev && !phy_has_c45_registers(netdev->phydev)) ethtool_sprintf(&buff, hns_nic_test_strs[MAC_INTERNALLOOP_PHY]); @@ -976,7 +976,7 @@ static int hns_get_sset_count(struct net_device *netdev, int stringset) if (priv->ae_handle->phy_if == PHY_INTERFACE_MODE_XGMII) cnt--; - if ((!netdev->phydev) || (netdev->phydev->is_c45)) + if (!netdev->phydev || phy_has_c45_registers(netdev->phydev)) cnt--; return cnt; diff --git a/drivers/net/phy/bcm84881.c b/drivers/net/phy/bcm84881.c index 9717a1626f3f..857344260230 100644 --- a/drivers/net/phy/bcm84881.c +++ b/drivers/net/phy/bcm84881.c @@ -47,7 +47,7 @@ static int bcm84881_probe(struct phy_device *phydev) /* This driver requires PMAPMD and AN blocks */ const u32 mmd_mask = MDIO_DEVS_PMAPMD | MDIO_DEVS_AN; - if (!phydev->is_c45 || + if (!phy_has_c45_registers(phydev) || (phydev->c45_ids.devices_in_package & mmd_mask) != mmd_mask) return -ENODEV; diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index 55d9d7acc32e..d1c12843462f 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -499,7 +499,7 @@ static int mv3310_probe(struct phy_device *phydev) u32 mmd_mask = MDIO_DEVS_PMAPMD | MDIO_DEVS_AN; int ret; - if (!phydev->is_c45 || + if (!phy_has_c45_registers(phydev) || (phydev->c45_ids.devices_in_package & mmd_mask) != mmd_mask) return -ENODEV; diff --git a/drivers/net/phy/mxl-gpy.c b/drivers/net/phy/mxl-gpy.c index ea1073adc5a1..b4ddb9a003d9 100644 --- a/drivers/net/phy/mxl-gpy.c +++ b/drivers/net/phy/mxl-gpy.c @@ -281,7 +281,7 @@ static int gpy_probe(struct phy_device *phydev) int fw_version; int ret; - if (!phydev->is_c45) { + if (!phy_has_c45_registers(phydev)) { ret = phy_get_c45_ids(phydev); if (ret < 0) return ret; diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c index a64186dc53f8..686a57d56885 100644 --- a/drivers/net/phy/phy-core.c +++ b/drivers/net/phy/phy-core.c @@ -556,7 +556,7 @@ int __phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum) if (phydev->drv && phydev->drv->read_mmd) { val = phydev->drv->read_mmd(phydev, devad, regnum); - } else if (phydev->is_c45) { + } else if (phy_has_c45_registers(phydev)) { val = __mdiobus_c45_read(phydev->mdio.bus, phydev->mdio.addr, devad, regnum); } else { @@ -612,7 +612,7 @@ int __phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val) if (phydev->drv && phydev->drv->write_mmd) { ret = phydev->drv->write_mmd(phydev, devad, regnum, val); - } else if (phydev->is_c45) { + } else if (phy_has_c45_registers(phydev)) { ret = __mdiobus_c45_write(phydev->mdio.bus, phydev->mdio.addr, devad, regnum, val); } else { diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index bdf00b2b2c1d..c6059ba8b9e6 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -182,7 +182,8 @@ int phy_restart_aneg(struct phy_device *phydev) { int ret; - if (phydev->is_c45 && !(phydev->c45_ids.devices_in_package & BIT(0))) + if (phy_has_c45_registers(phydev) && + !(phydev->c45_ids.devices_in_package & BIT(0))) ret = genphy_c45_restart_aneg(phydev); else ret = genphy_restart_aneg(phydev); @@ -203,7 +204,7 @@ int phy_aneg_done(struct phy_device *phydev) { if (phydev->drv && phydev->drv->aneg_done) return phydev->drv->aneg_done(phydev); - else if (phydev->is_c45) + else if (phy_has_c45_registers(phydev)) return genphy_c45_aneg_done(phydev); else return genphy_aneg_done(phydev); @@ -896,7 +897,8 @@ int phy_config_aneg(struct phy_device *phydev) /* Clause 45 PHYs that don't implement Clause 22 registers are not * allowed to call genphy_config_aneg() */ - if (phydev->is_c45 && !(phydev->c45_ids.devices_in_package & BIT(0))) + if (phy_has_c45_registers(phydev) && + !(phydev->c45_ids.devices_in_package & BIT(0))) return genphy_c45_config_aneg(phydev); return genphy_config_aneg(phydev); diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 226d5507c865..44968ea447fc 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -533,7 +533,7 @@ static int phy_bus_match(struct device *dev, struct device_driver *drv) if (phydrv->match_phy_device) return phydrv->match_phy_device(phydev); - if (phydev->is_c45) { + if (phy_has_c45_registers(phydev)) { for (i = 1; i < num_ids; i++) { if (phydev->c45_ids.device_ids[i] == 0xffffffff) continue; @@ -1452,7 +1452,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, * exist, and we should use the genphy driver. */ if (!d->driver) { - if (phydev->is_c45) + if (phy_has_c45_registers(phydev)) d->driver = &genphy_c45_driver.mdiodrv.driver; else d->driver = &genphy_driver.mdiodrv.driver; @@ -3227,7 +3227,7 @@ static int phy_probe(struct device *dev) } else if (phydrv->get_features) err = phydrv->get_features(phydev); - else if (phydev->is_c45) + else if (phy_has_c45_registers(phydev)) err = genphy_c45_pma_read_abilities(phydev); else err = genphy_read_abilities(phydev); diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index d0aaa5cad853..54fde8252079 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -1726,7 +1726,8 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy, * against all interface modes, which may lead to more ethtool link * modes being advertised than are actually supported. */ - if (phy->is_c45 && config.rate_matching == RATE_MATCH_NONE && + if (phy_has_c45_registers(phy) && + config.rate_matching == RATE_MATCH_NONE && interface != PHY_INTERFACE_MODE_RXAUI && interface != PHY_INTERFACE_MODE_XAUI && interface != PHY_INTERFACE_MODE_USXGMII) @@ -2673,7 +2674,7 @@ static int phylink_phy_read(struct phylink *pl, unsigned int phy_id, reg); } - if (phydev->is_c45) { + if (phy_has_c45_registers(phydev)) { switch (reg) { case MII_BMCR: case MII_BMSR: @@ -2715,7 +2716,7 @@ static int phylink_phy_write(struct phylink *pl, unsigned int phy_id, reg, val); } - if (phydev->is_c45) { + if (phy_has_c45_registers(phydev)) { switch (reg) { case MII_BMCR: case MII_BMSR: @@ -3188,8 +3189,9 @@ static void phylink_sfp_link_up(void *upstream) */ static bool phylink_phy_no_inband(struct phy_device *phy) { - return phy->is_c45 && phy_id_compare(phy->c45_ids.device_ids[1], - 0xae025150, 0xfffffff0); + return phy_has_c45_registers(phy) && + phy_id_compare(phy->c45_ids.device_ids[1], + 0xae025150, 0xfffffff0); } static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy) diff --git a/include/linux/phy.h b/include/linux/phy.h index 11c1e91563d4..fdb3774e99fc 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -766,6 +766,11 @@ static inline struct phy_device *to_phy_device(const struct device *dev) return container_of(to_mdio_device(dev), struct phy_device, mdio); } +static inline bool phy_has_c45_registers(struct phy_device *phydev) +{ + return phydev->is_c45; +} + /** * struct phy_tdr_config - Configuration of a TDR raw test * From patchwork Wed Jul 12 15:07:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13310500 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D37734CF1 for ; Wed, 12 Jul 2023 15:07:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB97EC433CD; Wed, 12 Jul 2023 15:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689174461; bh=ACFNn7UNFr1+7nPIs/Klakd8MmbE6J0tasThf9jtVjY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=XX+TS6yvRMhFaKu16x0YVzksgpdcHrYmJbrR+DpywiJxsUSbv6DPRG0Yt0DBo128c v0NWb1TKLGW4CA3CaSUOPniYAsxaWI3XPOTPyBt+p0zn4YT71JQuRr7nBVh2feIIca ea3D6mCm4HELOQltn+6Iu0rUUk8azOCRzOlJtx//FIer47y95CulrcSVitNFzfhKPd 3eBSqorSvwXFhhicwYmFySsEvDxTAGv9G45B9ZTP5Ny6mtN545anE3Vm6FjxxCVrGX BaQhoplvzPUCluXmyXEmxR/T15RWnpEixe70Hp+9VCW+HeJR3IfvARXvgLxybo7kYr 5Sg2e8d6OneSw== From: Michael Walle Date: Wed, 12 Jul 2023 17:07:03 +0200 Subject: [PATCH net-next v3 03/11] net: phy: replace is_c45 with phy_accces_mode Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-feature-c45-over-c22-v3-3-9eb37edf7be0@kernel.org> References: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> In-Reply-To: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yisen Zhuang , Salil Mehta , Florian Fainelli , Broadcom internal kernel review list , =?utf-8?q?Marek_Beh=C3=BAn?= , Xu Liang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Michael Walle X-Mailer: b4 0.12.2 X-Patchwork-Delegate: kuba@kernel.org Instead of tracing whether the PHY is a C45 one, use the method how the PHY is accessed. For now, that is either by C22 or by C45 transactions. There is no functional change, just a semantical difference. This is a preparation patch to add a third access method C45-over-C22. Signed-off-by: Michael Walle --- v3: - use 22 and 45 as constants for the enum to catch errors - move enum in struct next to enum phy_state --- drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 8 +++---- drivers/net/mdio/fwnode_mdio.c | 6 +++-- drivers/net/phy/mdio_bus.c | 9 +++---- drivers/net/phy/nxp-tja11xx.c | 3 ++- drivers/net/phy/phy_device.c | 29 ++++++++++++++--------- drivers/net/phy/sfp.c | 12 ++++++---- include/linux/phy.h | 27 +++++++++++++++------ 7 files changed, 60 insertions(+), 34 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c index 928d934cb21a..74cd6197735b 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c @@ -687,9 +687,9 @@ static int hns_mac_register_phydev(struct mii_bus *mdio, struct hns_mac_cb *mac_cb, u32 addr) { + enum phy_access_mode mode; struct phy_device *phy; const char *phy_type; - bool is_c45; int rc; rc = fwnode_property_read_string(mac_cb->fw_port, @@ -698,13 +698,13 @@ hns_mac_register_phydev(struct mii_bus *mdio, struct hns_mac_cb *mac_cb, return rc; if (!strcmp(phy_type, phy_modes(PHY_INTERFACE_MODE_XGMII))) - is_c45 = true; + mode = PHY_ACCESS_C45; else if (!strcmp(phy_type, phy_modes(PHY_INTERFACE_MODE_SGMII))) - is_c45 = false; + mode = PHY_ACCESS_C22; else return -ENODATA; - phy = get_phy_device(mdio, addr, is_c45); + phy = get_phy_device(mdio, addr, mode); if (!phy || IS_ERR(phy)) return -EIO; diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c index 1183ef5e203e..972c8932c2fe 100644 --- a/drivers/net/mdio/fwnode_mdio.c +++ b/drivers/net/mdio/fwnode_mdio.c @@ -131,9 +131,11 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, is_c45 = fwnode_device_is_compatible(child, "ethernet-phy-ieee802.3-c45"); if (is_c45 || fwnode_get_phy_id(child, &phy_id)) - phy = get_phy_device(bus, addr, is_c45); + phy = get_phy_device(bus, addr, + is_c45 ? PHY_ACCESS_C45 : PHY_ACCESS_C22); else - phy = phy_device_create(bus, addr, phy_id, 0, NULL); + phy = phy_device_create(bus, addr, phy_id, PHY_ACCESS_C22, + NULL); if (IS_ERR(phy)) { rc = PTR_ERR(phy); goto clean_mii_ts; diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 8b3618d3da4a..a31eb1204f63 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -513,12 +513,13 @@ static int mdiobus_create_device(struct mii_bus *bus, return ret; } -static struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr, bool c45) +static struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr, + enum phy_access_mode mode) { struct phy_device *phydev = ERR_PTR(-ENODEV); int err; - phydev = get_phy_device(bus, addr, c45); + phydev = get_phy_device(bus, addr, mode); if (IS_ERR(phydev)) return phydev; @@ -550,7 +551,7 @@ static struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr, bool c45) */ struct phy_device *mdiobus_scan_c22(struct mii_bus *bus, int addr) { - return mdiobus_scan(bus, addr, false); + return mdiobus_scan(bus, addr, PHY_ACCESS_C22); } EXPORT_SYMBOL(mdiobus_scan_c22); @@ -568,7 +569,7 @@ EXPORT_SYMBOL(mdiobus_scan_c22); */ static struct phy_device *mdiobus_scan_c45(struct mii_bus *bus, int addr) { - return mdiobus_scan(bus, addr, true); + return mdiobus_scan(bus, addr, PHY_ACCESS_C45); } static int mdiobus_scan_bus_c22(struct mii_bus *bus) diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c index b13e15310feb..1c6c1523540e 100644 --- a/drivers/net/phy/nxp-tja11xx.c +++ b/drivers/net/phy/nxp-tja11xx.c @@ -580,7 +580,8 @@ static void tja1102_p1_register(struct work_struct *work) } /* Real PHY ID of Port 1 is 0 */ - phy = phy_device_create(bus, addr, PHY_ID_TJA1102, false, NULL); + phy = phy_device_create(bus, addr, PHY_ID_TJA1102, + PHY_ACCESS_C22, NULL); if (IS_ERR(phy)) { dev_err(dev, "Can't create PHY device for Port 1: %i\n", addr); diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 44968ea447fc..6254212d65a5 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -630,7 +630,7 @@ static int phy_request_driver_module(struct phy_device *dev, u32 phy_id) } struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id, - bool is_c45, + enum phy_access_mode mode, struct phy_c45_device_ids *c45_ids) { struct phy_device *dev; @@ -664,7 +664,7 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id, dev->autoneg = AUTONEG_ENABLE; dev->pma_extable = -ENODATA; - dev->is_c45 = is_c45; + dev->access_mode = mode; dev->phy_id = phy_id; if (c45_ids) dev->c45_ids = *c45_ids; @@ -926,7 +926,7 @@ EXPORT_SYMBOL(fwnode_get_phy_id); * struct * @bus: the target MII bus * @addr: PHY address on the MII bus - * @is_c45: If true the PHY uses the 802.3 clause 45 protocol + * @mode: Access mode of the PHY * * Probe for a PHY at @addr on @bus. * @@ -940,7 +940,8 @@ EXPORT_SYMBOL(fwnode_get_phy_id); * Returns an allocated &struct phy_device on success, %-ENODEV if there is * no PHY present, or %-EIO on bus access error. */ -struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45) +struct phy_device *get_phy_device(struct mii_bus *bus, int addr, + enum phy_access_mode mode) { struct phy_c45_device_ids c45_ids; u32 phy_id = 0; @@ -950,10 +951,16 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45) c45_ids.mmds_present = 0; memset(c45_ids.device_ids, 0xff, sizeof(c45_ids.device_ids)); - if (is_c45) - r = get_phy_c45_ids(bus, addr, &c45_ids); - else + switch (mode) { + case PHY_ACCESS_C22: r = get_phy_c22_id(bus, addr, &phy_id); + break; + case PHY_ACCESS_C45: + r = get_phy_c45_ids(bus, addr, &c45_ids); + break; + default: + return ERR_PTR(-EIO); + } if (r) return ERR_PTR(r); @@ -963,15 +970,15 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45) * probe with C45 to see if we're able to get a valid PHY ID in the C45 * space, if successful, create the C45 PHY device. */ - if (!is_c45 && phy_id == 0 && bus->read_c45) { + if (mode == PHY_ACCESS_C22 && phy_id == 0 && bus->read_c45) { r = get_phy_c45_ids(bus, addr, &c45_ids); if (!r) return phy_device_create(bus, addr, phy_id, - true, &c45_ids); + PHY_ACCESS_C45, &c45_ids); } - return phy_device_create(bus, addr, phy_id, is_c45, - !is_c45 ? NULL : &c45_ids); + return phy_device_create(bus, addr, phy_id, mode, + mode == PHY_ACCESS_C22 ? NULL : &c45_ids); } EXPORT_SYMBOL(get_phy_device); diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index d855a18308d7..e7f8decaf3ff 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -1750,12 +1750,13 @@ static void sfp_sm_phy_detach(struct sfp *sfp) sfp->mod_phy = NULL; } -static int sfp_sm_probe_phy(struct sfp *sfp, int addr, bool is_c45) +static int sfp_sm_probe_phy(struct sfp *sfp, int addr, + enum phy_access_mode mode) { struct phy_device *phy; int err; - phy = get_phy_device(sfp->i2c_mii, addr, is_c45); + phy = get_phy_device(sfp->i2c_mii, addr, mode); if (phy == ERR_PTR(-ENODEV)) return PTR_ERR(phy); if (IS_ERR(phy)) { @@ -1879,15 +1880,16 @@ static int sfp_sm_probe_for_phy(struct sfp *sfp) break; case MDIO_I2C_MARVELL_C22: - err = sfp_sm_probe_phy(sfp, SFP_PHY_ADDR, false); + err = sfp_sm_probe_phy(sfp, SFP_PHY_ADDR, PHY_ACCESS_C22); break; case MDIO_I2C_C45: - err = sfp_sm_probe_phy(sfp, SFP_PHY_ADDR, true); + err = sfp_sm_probe_phy(sfp, SFP_PHY_ADDR, PHY_ACCESS_C45); break; case MDIO_I2C_ROLLBALL: - err = sfp_sm_probe_phy(sfp, SFP_PHY_ADDR_ROLLBALL, true); + err = sfp_sm_probe_phy(sfp, SFP_PHY_ADDR_ROLLBALL, + PHY_ACCESS_C45); break; } diff --git a/include/linux/phy.h b/include/linux/phy.h index fdb3774e99fc..fb7481715c3b 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -531,6 +531,17 @@ struct phy_c45_device_ids { struct macsec_context; struct macsec_ops; +/** + * enum phy_access_mode - PHY register access mode definitions + * + * @PHY_ACCESS_C22: use 802.3 c22 MDIO transactions + * @PHY_ACCESS_C45: use 802.3 c45 MDIO transactions + */ +enum phy_access_mode { + PHY_ACCESS_C22 = 22, + PHY_ACCESS_C45 = 45, +}; + /** * struct phy_device - An instance of a PHY * @@ -539,8 +550,7 @@ struct macsec_ops; * @devlink: Create a link between phy dev and mac dev, if the external phy * used by current mac interface is managed by another mac interface. * @phy_id: UID for this device found during discovery - * @c45_ids: 802.3-c45 Device Identifiers if is_c45. - * @is_c45: Set to true if this PHY uses clause 45 addressing. + * @c45_ids: 802.3-c45 Device Identifiers if it's an C45 PHY. * @is_internal: Set to true if this PHY is internal to a MAC. * @is_pseudo_fixed_link: Set to true if this PHY is an Ethernet switch, etc. * @is_gigabit_capable: Set to true if PHY supports 1000Mbps @@ -555,6 +565,7 @@ struct macsec_ops; * @wol_enabled: Set to true if the PHY or the attached MAC have Wake-on-LAN * enabled. * @state: State of the PHY for management purposes + * @access_mode: MDIO access mode of the PHY. * @dev_flags: Device-specific flags used by the PHY driver. * * - Bits [15:0] are free to use by the PHY driver to communicate @@ -638,7 +649,6 @@ struct phy_device { u32 phy_id; struct phy_c45_device_ids c45_ids; - unsigned is_c45:1; unsigned is_internal:1; unsigned is_pseudo_fixed_link:1; unsigned is_gigabit_capable:1; @@ -665,6 +675,7 @@ struct phy_device { int rate_matching; enum phy_state state; + enum phy_access_mode access_mode; u32 dev_flags; @@ -768,7 +779,7 @@ static inline struct phy_device *to_phy_device(const struct device *dev) static inline bool phy_has_c45_registers(struct phy_device *phydev) { - return phydev->is_c45; + return phydev->access_mode != PHY_ACCESS_C22; } /** @@ -1624,7 +1635,7 @@ int phy_modify_paged(struct phy_device *phydev, int page, u32 regnum, u16 mask, u16 set); struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id, - bool is_c45, + enum phy_access_mode mode, struct phy_c45_device_ids *c45_ids); #if IS_ENABLED(CONFIG_PHYLIB) int fwnode_get_phy_id(struct fwnode_handle *fwnode, u32 *phy_id); @@ -1632,7 +1643,8 @@ struct mdio_device *fwnode_mdio_find_device(struct fwnode_handle *fwnode); struct phy_device *fwnode_phy_find_device(struct fwnode_handle *phy_fwnode); struct phy_device *device_phy_find_device(struct device *dev); struct fwnode_handle *fwnode_get_phy_node(const struct fwnode_handle *fwnode); -struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45); +struct phy_device *get_phy_device(struct mii_bus *bus, int addr, + enum phy_access_mode mode); int phy_device_register(struct phy_device *phy); void phy_device_free(struct phy_device *phydev); #else @@ -1664,7 +1676,8 @@ struct fwnode_handle *fwnode_get_phy_node(struct fwnode_handle *fwnode) } static inline -struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45) +struct phy_device *get_phy_device(struct mii_bus *bus, int addr, + enum phy_access_mode mode) { return NULL; } From patchwork Wed Jul 12 15:07:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13310501 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A130934CF1 for ; Wed, 12 Jul 2023 15:07:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58C87C4339A; Wed, 12 Jul 2023 15:07:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689174465; bh=9aHlE7am87TlqLD7Xuy3Eq66iXaKh9SMMvVijAYss5s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=kn5CtpvCv3Ea+BXNJIwGn6UeL6bfcvX21Vm6sDfAYIm9vD+bin8qSfiK495Q0i8PF Nr4cStIqbOGjKcrbEUyiW8qNB8FgXoh8HG0+KePvtOrBDS7K6ej+JXWFFlOkxMdNAK PExpypinNJBbD1wG5XfwQIqR3HqwYFIiGjohpnj8QXbiFfCbwez5hnoXfYBHs2IX6o n2Bl0dxfpoygrj6YPxpMNUKf/kTzNaFAXSciNaPjhcqDFO/PvKdOHGBChWu3ZqPVWY qYY/jnW9s89LmqAFxTtnNYuy/P0c8zmm1+ZqACIUWexZTZPDyNASd4DNdDjJzGh7Q1 NGopup2O28XuA== From: Michael Walle Date: Wed, 12 Jul 2023 17:07:04 +0200 Subject: [PATCH net-next v3 04/11] net: phy: make the "prevent_c45_scan" a property of the MII bus Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-feature-c45-over-c22-v3-4-9eb37edf7be0@kernel.org> References: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> In-Reply-To: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yisen Zhuang , Salil Mehta , Florian Fainelli , Broadcom internal kernel review list , =?utf-8?q?Marek_Beh=C3=BAn?= , Xu Liang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Michael Walle X-Mailer: b4 0.12.2 X-Patchwork-Delegate: kuba@kernel.org The blacklist will also be used elsewhere in the kernel, e.g. in the DT scanning code. Make it a property of mii_bus and export the function. Signed-off-by: Michael Walle Reviewed-by: Andrew Lunn --- v3: - add missing EXPORT_SYMBOL_GPL() for mdiobus_scan_for_broken_c45_access() --- drivers/net/phy/mdio_bus.c | 18 +++++++++--------- include/linux/phy.h | 5 +++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index a31eb1204f63..29ad9302fe11 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -613,9 +613,9 @@ static int mdiobus_scan_bus_c45(struct mii_bus *bus) * stomping over the true devices reply, to performing a write to * themselves which was intended for another device. Now that C22 * devices have been found, see if any of them are bad for C45, and if we - * should skip the C45 scan. + * should prohibit any C45 transactions. */ -static bool mdiobus_prevent_c45_scan(struct mii_bus *bus) +void mdiobus_scan_for_broken_c45_access(struct mii_bus *bus) { int i; @@ -628,11 +628,13 @@ static bool mdiobus_prevent_c45_scan(struct mii_bus *bus) continue; oui = phydev->phy_id >> 10; - if (oui == MICREL_OUI) - return true; + if (oui == MICREL_OUI) { + bus->prevent_c45_access = true; + break; + } } - return false; } +EXPORT_SYMBOL_GPL(mdiobus_scan_for_broken_c45_access); /** * __mdiobus_register - bring up all the PHYs on a given bus and attach them to bus @@ -652,7 +654,6 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) { struct mdio_device *mdiodev; struct gpio_desc *gpiod; - bool prevent_c45_scan; int i, err; if (!bus || !bus->name) @@ -724,9 +725,8 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) goto error; } - prevent_c45_scan = mdiobus_prevent_c45_scan(bus); - - if (!prevent_c45_scan && bus->read_c45) { + mdiobus_scan_for_broken_c45_access(bus); + if (!bus->prevent_c45_access && bus->read_c45) { err = mdiobus_scan_bus_c45(bus); if (err) goto error; diff --git a/include/linux/phy.h b/include/linux/phy.h index fb7481715c3b..cd67887a7289 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -410,6 +410,9 @@ struct mii_bus { /** @phy_ignore_ta_mask: PHY addresses to ignore the TA/read failure */ u32 phy_ignore_ta_mask; + /** @prevent_c45_access: Don't do any C45 transactions on the bus */ + unsigned prevent_c45_access:1; + /** * @irq: An array of interrupts, each PHY's interrupt at the index * matching its address @@ -462,6 +465,8 @@ static inline struct mii_bus *devm_mdiobus_alloc(struct device *dev) struct mii_bus *mdio_find_bus(const char *mdio_name); struct phy_device *mdiobus_scan_c22(struct mii_bus *bus, int addr); +void mdiobus_scan_for_broken_c45_access(struct mii_bus *bus); + #define PHY_INTERRUPT_DISABLED false #define PHY_INTERRUPT_ENABLED true From patchwork Wed Jul 12 15:07:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13310502 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 35C7434CF1 for ; Wed, 12 Jul 2023 15:07:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0F1DC4167D; Wed, 12 Jul 2023 15:07:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689174469; bh=ddCdu6WVsdWVFfvgBcdVDn3T10QccxGUylRsenvX6jw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=DitXThW4uKEoasdiRZYLAtA3p/W5TdLyOjeCnsFgj2M9B+fz/1FI2yRX3Xhy1XUgn SrY3Grn+AHRk5+lLLXQ1FJ0p5rS4rMSdw7ZlPaDAa5/gwJbyZ89iNebI/WpHMrR9rw 5FmgNySVn+xjePRk5RwCoIhGL3rNlYrkBoeq4TJ6K5+bv2EaTBvEXL3gHQGy/fFPn7 Gp6lLVEoDFO1S7Q1lQe6L/5ojU0Gug/9M5QLIViSJJ1yd7h5vM5+/jbZor4zFHBrU+ cqFJZ0CBJZfqlhJnpHCmGLGvv2hAqIOuzZdD7tFqzurw3Qd+L2z4LFHAmBGk9QXlKl PJcul75F7D8oQ== From: Michael Walle Date: Wed, 12 Jul 2023 17:07:05 +0200 Subject: [PATCH net-next v3 05/11] net: phy: print an info if a broken C45 bus is found Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-feature-c45-over-c22-v3-5-9eb37edf7be0@kernel.org> References: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> In-Reply-To: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yisen Zhuang , Salil Mehta , Florian Fainelli , Broadcom internal kernel review list , =?utf-8?q?Marek_Beh=C3=BAn?= , Xu Liang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Michael Walle X-Mailer: b4 0.12.2 X-Patchwork-Delegate: kuba@kernel.org If there is an PHY which gets confused by C45 transactions on the MDIO bus, print an info together with the PHY identifier of the offending one. Signed-off-by: Michael Walle Reviewed-by: Andrew Lunn --- v3: - make it a dev_dbg() - check is phydev is not null --- drivers/net/phy/mdio_bus.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 29ad9302fe11..bdc178671234 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -617,10 +617,10 @@ static int mdiobus_scan_bus_c45(struct mii_bus *bus) */ void mdiobus_scan_for_broken_c45_access(struct mii_bus *bus) { + struct phy_device *phydev; int i; for (i = 0; i < PHY_MAX_ADDR; i++) { - struct phy_device *phydev; u32 oui; phydev = mdiobus_get_phy(bus, i); @@ -633,6 +633,11 @@ void mdiobus_scan_for_broken_c45_access(struct mii_bus *bus) break; } } + + if (phydev && bus->prevent_c45_access) + dev_dbg(&bus->dev, + "Detected broken PHY (ID %08lx). Disabling C45 bus transactions.\n", + (unsigned long)phydev->phy_id); } EXPORT_SYMBOL_GPL(mdiobus_scan_for_broken_c45_access); From patchwork Wed Jul 12 15:07:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13310503 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0564E34CF1 for ; Wed, 12 Jul 2023 15:07:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77381C433C7; Wed, 12 Jul 2023 15:07:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689174472; bh=wG2VCl98E7sTdn8vbNFgM5GsfqltXpE2UFH1ICDLoVI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=u9bv7rM/R9PXPQeYhBBV7a+UvlPuwaDwID9TEoCVyBk41ePxUv9pVkeRfkkISjx2r lAF9HXXppONmY9LExJ8q4APXl6aT7/paYskfdNfUOCeaTskSiAX6tZbcu9GS0ddlUY Ppt5eftSt8Is6HACoTj5mbpRUlD495fPtW1vnhr47Z310fusjyUevynwpMaXKIXoME cGSDa2cUdDIZPIKsQeb0ieNRoV8FKljeh/eaejtz0jTCzCHj6v9z7OhB3a/nxtHXeX VcfzL8HrLVYIxtI86DhoRjLajhNziJcdrBhaMc0dGhvRJDylEDjAEprS5c8VtoMcN4 RcW0wtb7iwccA== From: Michael Walle Date: Wed, 12 Jul 2023 17:07:06 +0200 Subject: [PATCH net-next v3 06/11] net: phy: add error checks in mmd_phy_indirect() Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-feature-c45-over-c22-v3-6-9eb37edf7be0@kernel.org> References: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> In-Reply-To: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yisen Zhuang , Salil Mehta , Florian Fainelli , Broadcom internal kernel review list , =?utf-8?q?Marek_Beh=C3=BAn?= , Xu Liang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Michael Walle X-Mailer: b4 0.12.2 X-Patchwork-Delegate: kuba@kernel.org Add missing error checks in mmd_phy_indirect(). The error checks need to be disabled to retain the current behavior in phy_read_mmd() and phy_write_mmd(). Therefore, add a new parameter to enable the error checks. This is a preparation patch to introduce a new C45-over-C22 access method which will make use of the new error checking. Regarding the legacy handling, Russell states: | The reason for that goes back to commit a59a4d192166 ("phy: add the | EEE support and the way to access to the MMD registers.") | | and to maintain compatibility with that; if we start checking for | errors now, we might trigger a kernel regression sadly. Signed-off-by: Michael Walle Reviewed-by: Andrew Lunn --- v3: - don't export it anymore, instead there will be a dedicated helper --- drivers/net/phy/phy-core.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c index 686a57d56885..598023610ee5 100644 --- a/drivers/net/phy/phy-core.c +++ b/drivers/net/phy/phy-core.c @@ -524,18 +524,26 @@ int phy_speed_down_core(struct phy_device *phydev) return 0; } -static void mmd_phy_indirect(struct mii_bus *bus, int phy_addr, int devad, - u16 regnum) +static int mmd_phy_indirect(struct mii_bus *bus, int phy_addr, int devad, + u16 regnum, bool check_rc) { + int ret; + /* Write the desired MMD Devad */ - __mdiobus_write(bus, phy_addr, MII_MMD_CTRL, devad); + ret = __mdiobus_write(bus, phy_addr, MII_MMD_CTRL, devad); + if (check_rc && ret) + return ret; /* Write the desired MMD register address */ - __mdiobus_write(bus, phy_addr, MII_MMD_DATA, regnum); + ret = __mdiobus_write(bus, phy_addr, MII_MMD_DATA, regnum); + if (check_rc && ret) + return ret; /* Select the Function : DATA with no post increment */ - __mdiobus_write(bus, phy_addr, MII_MMD_CTRL, - devad | MII_MMD_CTRL_NOINCR); + ret = __mdiobus_write(bus, phy_addr, MII_MMD_CTRL, + devad | MII_MMD_CTRL_NOINCR); + + return check_rc ? ret : 0; } /** @@ -563,7 +571,7 @@ int __phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum) struct mii_bus *bus = phydev->mdio.bus; int phy_addr = phydev->mdio.addr; - mmd_phy_indirect(bus, phy_addr, devad, regnum); + mmd_phy_indirect(bus, phy_addr, devad, regnum, false); /* Read the content of the MMD's selected register */ val = __mdiobus_read(bus, phy_addr, MII_MMD_DATA); @@ -619,7 +627,7 @@ int __phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val) struct mii_bus *bus = phydev->mdio.bus; int phy_addr = phydev->mdio.addr; - mmd_phy_indirect(bus, phy_addr, devad, regnum); + mmd_phy_indirect(bus, phy_addr, devad, regnum, false); /* Write the data into MMD's selected register */ __mdiobus_write(bus, phy_addr, MII_MMD_DATA, val); From patchwork Wed Jul 12 15:07:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13310504 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9FA8B34CF1 for ; Wed, 12 Jul 2023 15:07:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05537C433C8; Wed, 12 Jul 2023 15:07:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689174476; bh=EFOwlRXK1V4bfqqKxN0RZOwt5jtHjodAKvcE7NEr8mc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=KJc6nHjYAmS+h2/zBNSlZFCMKHZDVOumyLUchcXX0PJMHIzGiZTMR4tsZAuafKjjr XqJI9qqPgPw8EuO60VzRTQ/d0jeII2O9a0/vbYBBjAFMqarB2h0rVr59EgpTg805VV quTjrJsII9bOwtGZNvSMUIzfFEDoM6kdmndSdsqkWd27pbae79KZJzULqssXcsFBBa Z7uPrePOm+rq2HxcaNInvC3EP74v9f320SLfIZZrG3DG1QAoKpVtWKrBrmw18ebKvm 6iQuY+TGi9VWqVq28sdhSZiyMUzSbaZdcpGg3WXjRRmsmS7jfAnxlRVphgZROLHGNS iMGH3J2RlEmLg== From: Michael Walle Date: Wed, 12 Jul 2023 17:07:07 +0200 Subject: [PATCH net-next v3 07/11] net: phy: introduce phy_mdiobus_read_mmd() Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-feature-c45-over-c22-v3-7-9eb37edf7be0@kernel.org> References: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> In-Reply-To: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yisen Zhuang , Salil Mehta , Florian Fainelli , Broadcom internal kernel review list , =?utf-8?q?Marek_Beh=C3=BAn?= , Xu Liang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Michael Walle X-Mailer: b4 0.12.2 X-Patchwork-Delegate: kuba@kernel.org Factor out the low-level MDIO bus access code in __phy_{read,write}_mmd() into individual helper functions. These can then be used without a struct phy_device, which is needed in the PHY probing code. To decide which access - direct or indirect - is used, move away from phy_has_c45_registers(). That function only indicates whether the PHY has C45 registers, but not how they are accessed. Instead look at the access_mode property. Export a locked variant of the read for the PHY probing code. Signed-off-by: Michael Walle --- v3: - new patch --- drivers/net/phy/phy-core.c | 109 +++++++++++++++++++++++++++++++-------------- include/linux/phy.h | 3 ++ 2 files changed, 78 insertions(+), 34 deletions(-) diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c index 598023610ee5..4863a85f8385 100644 --- a/drivers/net/phy/phy-core.c +++ b/drivers/net/phy/phy-core.c @@ -546,6 +546,73 @@ static int mmd_phy_indirect(struct mii_bus *bus, int phy_addr, int devad, return check_rc ? ret : 0; } +static int __phy_mdiobus_read_mmd(struct mii_bus *bus, int phy_addr, + enum phy_access_mode access_mode, + int devad, u32 regnum) +{ + switch (access_mode) { + case PHY_ACCESS_C45: + return __mdiobus_c45_read(bus, phy_addr, devad, regnum); + case PHY_ACCESS_C22: + /* ignore return value for legacy reasons */ + mmd_phy_indirect(bus, phy_addr, devad, regnum, false); + + /* Read the content of the MMD's selected register */ + return __mdiobus_read(bus, phy_addr, MII_MMD_DATA); + default: + return -EOPNOTSUPP; + } +} + +/** + * phy_mdiobus_read_mmd - low-level function for reading a register + * + * @bus: the target MII bus + * @phy_addr: PHY address on the MII bus + * @mode: Access mode of the PHY + * @devad: The target MMD (0..31) + * @regnum: The target register on the MMD (0..65535) + * + * Similar to phy_read_mmd() except that it can be used without a phydev and + * operates on the MII bus. + */ +int phy_mdiobus_read_mmd(struct mii_bus *bus, int phy_addr, + enum phy_access_mode mode, + int devad, u32 regnum) +{ + int ret; + + if (regnum > (u16)~0 || devad > 32) + return -EINVAL; + + mutex_lock(&bus->mdio_lock); + ret = __phy_mdiobus_read_mmd(bus, phy_addr, mode, devad, regnum); + mutex_unlock(&bus->mdio_lock); + + return ret; +} +EXPORT_SYMBOL(phy_mdiobus_read_mmd); + +static int __phy_mdiobus_write_mmd(struct mii_bus *bus, int phy_addr, + enum phy_access_mode mode, + int devad, u32 regnum, u16 val) +{ + switch (mode) { + case PHY_ACCESS_C45: + return __mdiobus_c45_write(bus, phy_addr, devad, regnum, val); + case PHY_ACCESS_C22: + /* ignore return value for legacy reasons */ + mmd_phy_indirect(bus, phy_addr, devad, regnum, false); + + /* Write the data into MMD's selected register */ + __mdiobus_write(bus, phy_addr, MII_MMD_DATA, val); + + return 0; + default: + return -EOPNOTSUPP; + } +} + /** * __phy_read_mmd - Convenience function for reading a register * from an MMD on a given PHY. @@ -557,26 +624,14 @@ static int mmd_phy_indirect(struct mii_bus *bus, int phy_addr, int devad, */ int __phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum) { - int val; - if (regnum > (u16)~0 || devad > 32) return -EINVAL; - if (phydev->drv && phydev->drv->read_mmd) { - val = phydev->drv->read_mmd(phydev, devad, regnum); - } else if (phy_has_c45_registers(phydev)) { - val = __mdiobus_c45_read(phydev->mdio.bus, phydev->mdio.addr, - devad, regnum); - } else { - struct mii_bus *bus = phydev->mdio.bus; - int phy_addr = phydev->mdio.addr; - - mmd_phy_indirect(bus, phy_addr, devad, regnum, false); + if (phydev->drv && phydev->drv->read_mmd) + return phydev->drv->read_mmd(phydev, devad, regnum); - /* Read the content of the MMD's selected register */ - val = __mdiobus_read(bus, phy_addr, MII_MMD_DATA); - } - return val; + return __phy_mdiobus_read_mmd(phydev->mdio.bus, phydev->mdio.addr, + phydev->access_mode, devad, regnum); } EXPORT_SYMBOL(__phy_read_mmd); @@ -613,28 +668,14 @@ EXPORT_SYMBOL(phy_read_mmd); */ int __phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val) { - int ret; - if (regnum > (u16)~0 || devad > 32) return -EINVAL; - if (phydev->drv && phydev->drv->write_mmd) { - ret = phydev->drv->write_mmd(phydev, devad, regnum, val); - } else if (phy_has_c45_registers(phydev)) { - ret = __mdiobus_c45_write(phydev->mdio.bus, phydev->mdio.addr, - devad, regnum, val); - } else { - struct mii_bus *bus = phydev->mdio.bus; - int phy_addr = phydev->mdio.addr; - - mmd_phy_indirect(bus, phy_addr, devad, regnum, false); - - /* Write the data into MMD's selected register */ - __mdiobus_write(bus, phy_addr, MII_MMD_DATA, val); + if (phydev->drv && phydev->drv->write_mmd) + return phydev->drv->write_mmd(phydev, devad, regnum, val); - ret = 0; - } - return ret; + return __phy_mdiobus_write_mmd(phydev->mdio.bus, phydev->mdio.addr, + phydev->access_mode, devad, regnum, val); } EXPORT_SYMBOL(__phy_write_mmd); diff --git a/include/linux/phy.h b/include/linux/phy.h index cd67887a7289..a482696a17a6 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1337,6 +1337,9 @@ int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum); __ret; \ }) +int phy_mdiobus_read_mmd(struct mii_bus *bus, int phy_addr, + enum phy_access_mode mode, + int devad, u32 regnum); /* * __phy_read_mmd - Convenience function for reading a register * from an MMD on a given PHY. From patchwork Wed Jul 12 15:07:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13310505 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBBAE24162 for ; Wed, 12 Jul 2023 15:07:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8BD2AC43397; Wed, 12 Jul 2023 15:07:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689174479; bh=Tmc5/2UDtcEs1h9nUuWx0TMjoX+wVWZ/iIzgviv/ihY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=bWQkTKEu/azFAhv0ExF44BMt0pVAE/GaEaSoH2V4gxkqVsIxasS+Hows5vkonQ6IC Kk6JF6t4u6SnodPOthl/EndkbqYhBdL8Rd+hnEVTgrlU3hLMwBD8br3LUIKZBylbtB 5WzikoSmK8EIOYuMijSHeCu7FeaofYQrteuxGvLFdU2toTVFtoUgRSXYPCbbUQUcZC hZ5lw32aCy+e8ihJZDTKbujRPKgGx5a+0Ai1WGS9C0mStZ0eCoPjfWlj+ARz2m3EUe lI06dIE5aeGNrfeMFJYqL/hviER9dDinMsetW99PN9GgTWTR77pTQHiKc1hB1tS1im YsAOsEPt7O53w== From: Michael Walle Date: Wed, 12 Jul 2023 17:07:08 +0200 Subject: [PATCH net-next v3 08/11] net: phy: add support for C45-over-C22 transfers Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-feature-c45-over-c22-v3-8-9eb37edf7be0@kernel.org> References: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> In-Reply-To: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yisen Zhuang , Salil Mehta , Florian Fainelli , Broadcom internal kernel review list , =?utf-8?q?Marek_Beh=C3=BAn?= , Xu Liang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Michael Walle X-Mailer: b4 0.12.2 X-Patchwork-Delegate: kuba@kernel.org If an MDIO bus is only capable of doing C22 transfers we can use indirect accesses to C45 registers over C22 registers. This was already the intention of the GPY215 driver. The author described their use case as follows: Our product supports both C22 and C45. In the real system, we found C22 was used by customers (with indirect access to C45 registers when necessary). In its probe function phy_get_c45_ids() is called but this will always do C45 accesses and thus will fail on a C22-only bus. Add a new transfer mode C45-over-C22. Care has to be taken for get_phy_device() which is called by either the bus scanning code or the network device drivers. In the former case, we must not do any C45-over-C22 accesses because it invokes register writes and we cannot be sure if the accessed device is a PHY. C45-over-C22 is just defined for network PHYs, not generic MDIO devices. Therefore, the it is the callers responsibility to choose the access mode for get_phy_device(). Due to the reasons above, the current scanning code the PHY core cannot make use of the new transfer mode because we cannot be sure what device is a PHY. The code will be used for the device tree scanning where we know which device is a PHY and therefore, C45-over-C22 is safe to use. A word on the error checking in the MMD access methods: due to legacy reasons, we cannot check for errors if we do "normal" MMD access to a C22 PHY without introducing possible regressions. Although, C45-over-C22 is doing essentially the same access, we can do better now and check for any errors while doing the indirect access. Signed-off-by: Michael Walle --- v3: - instead of the boolean c45_over_c22 flag pass an enum access_mode - use new low-level helper phy_mdiobus_read_mmd() --- drivers/net/phy/phy-core.c | 25 ++++++++++++++++++++----- drivers/net/phy/phy_device.c | 41 +++++++++++++++++++++++++++-------------- include/linux/phy.h | 3 +++ 3 files changed, 50 insertions(+), 19 deletions(-) diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c index 4863a85f8385..17ad118edbf1 100644 --- a/drivers/net/phy/phy-core.c +++ b/drivers/net/phy/phy-core.c @@ -550,12 +550,20 @@ static int __phy_mdiobus_read_mmd(struct mii_bus *bus, int phy_addr, enum phy_access_mode access_mode, int devad, u32 regnum) { + bool check_rc = true; + int ret; + switch (access_mode) { case PHY_ACCESS_C45: return __mdiobus_c45_read(bus, phy_addr, devad, regnum); case PHY_ACCESS_C22: /* ignore return value for legacy reasons */ - mmd_phy_indirect(bus, phy_addr, devad, regnum, false); + check_rc = false; + fallthrough; + case PHY_ACCESS_C45_OVER_C22: + ret = mmd_phy_indirect(bus, phy_addr, devad, regnum, check_rc); + if (check_rc && ret) + return ret; /* Read the content of the MMD's selected register */ return __mdiobus_read(bus, phy_addr, MII_MMD_DATA); @@ -597,17 +605,24 @@ static int __phy_mdiobus_write_mmd(struct mii_bus *bus, int phy_addr, enum phy_access_mode mode, int devad, u32 regnum, u16 val) { + bool check_rc = true; + int ret; + switch (mode) { case PHY_ACCESS_C45: return __mdiobus_c45_write(bus, phy_addr, devad, regnum, val); case PHY_ACCESS_C22: - /* ignore return value for legacy reasons */ - mmd_phy_indirect(bus, phy_addr, devad, regnum, false); + check_rc = false; + fallthrough; + case PHY_ACCESS_C45_OVER_C22: + ret = mmd_phy_indirect(bus, phy_addr, devad, regnum, check_rc); + if (check_rc && ret) + return ret; /* Write the data into MMD's selected register */ - __mdiobus_write(bus, phy_addr, MII_MMD_DATA, val); + ret = __mdiobus_write(bus, phy_addr, MII_MMD_DATA, val); - return 0; + return check_rc ? ret : 0; default: return -EOPNOTSUPP; } diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 6254212d65a5..01c41ecb63a7 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -726,11 +726,12 @@ EXPORT_SYMBOL(phy_device_create); * Returns: negative error number on bus access error, zero if no device * is responding, or positive if a device is present. */ -static int phy_c45_probe_present(struct mii_bus *bus, int prtad, int devad) +static int phy_c45_probe_present(struct mii_bus *bus, int prtad, + enum phy_access_mode mode, int devad) { int stat2; - stat2 = mdiobus_c45_read(bus, prtad, devad, MDIO_STAT2); + stat2 = phy_mdiobus_read_mmd(bus, prtad, mode, devad, MDIO_STAT2); if (stat2 < 0) return stat2; @@ -748,17 +749,18 @@ static int phy_c45_probe_present(struct mii_bus *bus, int prtad, int devad) * * Returns: 0 on success, -EIO on failure. */ -static int get_phy_c45_devs_in_pkg(struct mii_bus *bus, int addr, int dev_addr, +static int get_phy_c45_devs_in_pkg(struct mii_bus *bus, int addr, + enum phy_access_mode mode, int dev_addr, u32 *devices_in_package) { int phy_reg; - phy_reg = mdiobus_c45_read(bus, addr, dev_addr, MDIO_DEVS2); + phy_reg = phy_mdiobus_read_mmd(bus, addr, mode, dev_addr, MDIO_DEVS2); if (phy_reg < 0) return -EIO; *devices_in_package = phy_reg << 16; - phy_reg = mdiobus_c45_read(bus, addr, dev_addr, MDIO_DEVS1); + phy_reg = phy_mdiobus_read_mmd(bus, addr, mode, dev_addr, MDIO_DEVS1); if (phy_reg < 0) return -EIO; *devices_in_package |= phy_reg; @@ -780,6 +782,7 @@ static int get_phy_c45_devs_in_pkg(struct mii_bus *bus, int addr, int dev_addr, * the "devices in package" is invalid. */ static int get_phy_c45_ids(struct mii_bus *bus, int addr, + enum phy_access_mode mode, struct phy_c45_device_ids *c45_ids) { const int num_ids = ARRAY_SIZE(c45_ids->device_ids); @@ -798,14 +801,15 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, * Some PHYs (88x3310) vendor space is not IEEE802.3 * compliant. */ - ret = phy_c45_probe_present(bus, addr, i); + ret = phy_c45_probe_present(bus, addr, mode, i); if (ret < 0) return -EIO; if (!ret) continue; } - phy_reg = get_phy_c45_devs_in_pkg(bus, addr, i, &devs_in_pkg); + phy_reg = get_phy_c45_devs_in_pkg(bus, addr, mode, i, + &devs_in_pkg); if (phy_reg < 0) return -EIO; } @@ -815,7 +819,8 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, * MMD 0, as some 10G PHYs have zero Devices In package, * e.g. Cortina CS4315/CS4340 PHY. */ - phy_reg = get_phy_c45_devs_in_pkg(bus, addr, 0, &devs_in_pkg); + phy_reg = get_phy_c45_devs_in_pkg(bus, addr, mode, 0, + &devs_in_pkg); if (phy_reg < 0) return -EIO; @@ -834,7 +839,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, * to ignore these if they do not contain IEEE 802.3 * registers. */ - ret = phy_c45_probe_present(bus, addr, i); + ret = phy_c45_probe_present(bus, addr, mode, i); if (ret < 0) return ret; @@ -842,12 +847,14 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, continue; } - phy_reg = mdiobus_c45_read(bus, addr, i, MII_PHYSID1); + phy_reg = phy_mdiobus_read_mmd(bus, addr, mode, i, + MII_PHYSID1); if (phy_reg < 0) return -EIO; c45_ids->device_ids[i] = phy_reg << 16; - phy_reg = mdiobus_c45_read(bus, addr, i, MII_PHYSID2); + phy_reg = phy_mdiobus_read_mmd(bus, addr, mode, i, + MII_PHYSID2); if (phy_reg < 0) return -EIO; c45_ids->device_ids[i] |= phy_reg; @@ -937,6 +944,11 @@ EXPORT_SYMBOL(fwnode_get_phy_id); * If the "devices in package" appears valid, read the ID registers for each * MMD, allocate and return a &struct phy_device. * + * When using %PHY_ACCESS_C45_OVER_C22 as @mode care have to be taken to not + * access a non-PHY device as C45-over-C22 is a property of a PHY and not a + * generic MDIO device. As the access involves register writes, it may be + * destructive on non-PHY devices. IOW, it cannot be used for bus scanning. + * * Returns an allocated &struct phy_device on success, %-ENODEV if there is * no PHY present, or %-EIO on bus access error. */ @@ -956,7 +968,8 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr, r = get_phy_c22_id(bus, addr, &phy_id); break; case PHY_ACCESS_C45: - r = get_phy_c45_ids(bus, addr, &c45_ids); + case PHY_ACCESS_C45_OVER_C22: + r = get_phy_c45_ids(bus, addr, mode, &c45_ids); break; default: return ERR_PTR(-EIO); @@ -971,7 +984,7 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr, * space, if successful, create the C45 PHY device. */ if (mode == PHY_ACCESS_C22 && phy_id == 0 && bus->read_c45) { - r = get_phy_c45_ids(bus, addr, &c45_ids); + r = get_phy_c45_ids(bus, addr, PHY_ACCESS_C45, &c45_ids); if (!r) return phy_device_create(bus, addr, phy_id, PHY_ACCESS_C45, &c45_ids); @@ -1053,7 +1066,7 @@ EXPORT_SYMBOL(phy_device_remove); int phy_get_c45_ids(struct phy_device *phydev) { return get_phy_c45_ids(phydev->mdio.bus, phydev->mdio.addr, - &phydev->c45_ids); + PHY_ACCESS_C45, &phydev->c45_ids); } EXPORT_SYMBOL(phy_get_c45_ids); diff --git a/include/linux/phy.h b/include/linux/phy.h index a482696a17a6..e4014972b799 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -541,10 +541,13 @@ struct macsec_ops; * * @PHY_ACCESS_C22: use 802.3 c22 MDIO transactions * @PHY_ACCESS_C45: use 802.3 c45 MDIO transactions + * @PHY_ACCESS_C45_OVER_C22: indirectly access C45 registers by using by 802.3 + * c22 MDIO transactions and registers 13 and 14. */ enum phy_access_mode { PHY_ACCESS_C22 = 22, PHY_ACCESS_C45 = 45, + PHY_ACCESS_C45_OVER_C22 = 4522, }; /** From patchwork Wed Jul 12 15:07:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13310506 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B36024162 for ; Wed, 12 Jul 2023 15:08:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19723C433CB; Wed, 12 Jul 2023 15:07:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689174483; bh=GAjpRvAIlM6CKm/Pe/JoMXcbUjsEHttM8EMsZkCnfVc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=R74Y+0qvg5O9WE1C4wD1tQkMEZUiTm0sGGgQYdRbYvA7fGhhW3kG9fvAo1sU9nt6L 2KkrrBCeeTLjDRyKpbO5Itc1MvBGkb5jZrM1a6CzfQEWXw+X8hn0S+GwQuls8FcUL7 sXDoVN5vUQDIs5nsw+nQarQcfTYOUoUCSrxzYdhfIuwoG/c/FahpZaVW/k7ScLPIfA i9BXvblXzhYQDqTx0nxrEfcyf3+bC+h9r9y9kz/G4A5qIIvfkSISPpv9OVR3za2hjw aj6O2mBOZzzjtOwc56XfXut1TU8aShiLxFi2nrBs5x6ikqmp35lCKeH51ScARoNkUi eiIc3qyBWp2cg== From: Michael Walle Date: Wed, 12 Jul 2023 17:07:09 +0200 Subject: [PATCH net-next v3 09/11] net: phy: introduce phy_promote_to_c45() Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-feature-c45-over-c22-v3-9-9eb37edf7be0@kernel.org> References: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> In-Reply-To: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yisen Zhuang , Salil Mehta , Florian Fainelli , Broadcom internal kernel review list , =?utf-8?q?Marek_Beh=C3=BAn?= , Xu Liang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Michael Walle X-Mailer: b4 0.12.2 X-Patchwork-Delegate: kuba@kernel.org If not explitly asked to be probed as a C45 PHY, on a bus which is capable of doing both C22 and C45 transfers, C45 PHYs are first tried to be probed as C22 PHYs. To be able to promote the PHY to be a C45 one, the driver can call phy_promote_to_c45() in its probe function. This was already done in the mxl-gpy driver by the following snippet: if (!phy_is_c45(phydev)) { ret = phy_get_c45_ids(phydev); if (ret < 0) return ret; } Move that code into the core as it could be used by other drivers, too. If a PHY is promoted C45-over-C22 access is automatically used as a fallback if the bus doesn't support C45 transactions. Signed-off-by: Michael Walle --- drivers/net/phy/mxl-gpy.c | 9 ++++----- drivers/net/phy/phy_device.c | 36 ++++++++++++++++++++++++++++++------ include/linux/phy.h | 7 ++++++- 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/drivers/net/phy/mxl-gpy.c b/drivers/net/phy/mxl-gpy.c index b4ddb9a003d9..b7fca1aae1c3 100644 --- a/drivers/net/phy/mxl-gpy.c +++ b/drivers/net/phy/mxl-gpy.c @@ -281,11 +281,10 @@ static int gpy_probe(struct phy_device *phydev) int fw_version; int ret; - if (!phy_has_c45_registers(phydev)) { - ret = phy_get_c45_ids(phydev); - if (ret < 0) - return ret; - } + /* This might have been probed as a C22 PHY, but this is a C45 PHY */ + ret = phy_promote_to_c45(phydev); + if (ret) + return ret; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 01c41ecb63a7..97fb3cb8b54c 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1057,18 +1057,42 @@ void phy_device_remove(struct phy_device *phydev) EXPORT_SYMBOL(phy_device_remove); /** - * phy_get_c45_ids - Read 802.3-c45 IDs for phy device. - * @phydev: phy_device structure to read 802.3-c45 IDs + * phy_promote_to_c45 - Promote to a C45 PHY + * @phydev: phy_device structure + * + * If a PHY supports both C22 and C45 register access and it isn't specifically + * asked to probe as a C45 PHY it might be probed as a C22 PHY. The driver can + * call this function to promote the PHY from C22 to C45. + * + * Can also be called if a PHY is already a C45 one. In that case it does + * nothing. + * + * If the bus isn't capable of doing C45 transfers, C45-over-C22 access will be + * used as a fallback. * * Returns zero on success, %-EIO on bus access error, or %-ENODEV if * the "devices in package" is invalid. */ -int phy_get_c45_ids(struct phy_device *phydev) +int phy_promote_to_c45(struct phy_device *phydev) { - return get_phy_c45_ids(phydev->mdio.bus, phydev->mdio.addr, - PHY_ACCESS_C45, &phydev->c45_ids); + struct mii_bus *bus = phydev->mdio.bus; + + if (phydev->access_mode != PHY_ACCESS_C22) + return 0; + + if (dev_of_node(&phydev->mdio.dev)) + phydev_info(phydev, + "Promoting PHY to a C45 one. Please consider using compatible=\"ethernet-phy-ieee802.3-c45\"."); + + if (mdiobus_supports_c45(bus)) + phydev->access_mode = PHY_ACCESS_C45; + else + phydev->access_mode = PHY_ACCESS_C45_OVER_C22; + + return get_phy_c45_ids(bus, phydev->mdio.addr, phydev->access_mode, + &phydev->c45_ids); } -EXPORT_SYMBOL(phy_get_c45_ids); +EXPORT_SYMBOL(phy_promote_to_c45); /** * phy_find_first - finds the first PHY device on the bus diff --git a/include/linux/phy.h b/include/linux/phy.h index e4014972b799..180fa5ac0b29 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -467,6 +467,11 @@ struct phy_device *mdiobus_scan_c22(struct mii_bus *bus, int addr); void mdiobus_scan_for_broken_c45_access(struct mii_bus *bus); +static inline bool mdiobus_supports_c45(struct mii_bus *bus) +{ + return bus->read_c45 && !bus->prevent_c45_access; +} + #define PHY_INTERRUPT_DISABLED false #define PHY_INTERRUPT_ENABLED true @@ -1701,7 +1706,7 @@ static inline int phy_device_register(struct phy_device *phy) static inline void phy_device_free(struct phy_device *phydev) { } #endif /* CONFIG_PHYLIB */ void phy_device_remove(struct phy_device *phydev); -int phy_get_c45_ids(struct phy_device *phydev); +int phy_promote_to_c45(struct phy_device *phydev); int phy_init_hw(struct phy_device *phydev); int phy_suspend(struct phy_device *phydev); int phy_resume(struct phy_device *phydev); From patchwork Wed Jul 12 15:07:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13310507 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E6BF424162 for ; Wed, 12 Jul 2023 15:08:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2E83C433CD; Wed, 12 Jul 2023 15:08:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689174486; bh=tGVbgShLqia6tBA8cE55D5pDAK2IrF4I9EWmknCRjh0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=oOzUC8AP2YHXm+L+tlHSymOisnyM1agFYfwujCdepkeQxwmw0HuXbVP5yPmHO4uM6 AmoVAhx/inZg3P/zdkeBy8nL4eOmT9eArENLn2qdX8hXRP6Lko6AY+D0AOo08r3iSl iK6MxIUdU5SbV4LjklkEOCbXO8tLIhemOPP/xpNJTZSjN9oQIP05LxBDBLaCX+5UUk WFzLAPju8LJucJTcnAilU1wykcZHMv8paOWDsGZy0SRvbscPWOIj9FJsweXnvRxvu9 CkLungnJklyoB5aa8bFpogsauNedeJCj1hTO5Vqs6R4lqCocv6Cho5y27JW5Ys/9f/ ZKhxR1xu5o0jA== From: Michael Walle Date: Wed, 12 Jul 2023 17:07:10 +0200 Subject: [PATCH net-next v3 10/11] net: mdio: add C45-over-C22 fallback to fwnode_mdiobus_register_phy() Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-feature-c45-over-c22-v3-10-9eb37edf7be0@kernel.org> References: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> In-Reply-To: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yisen Zhuang , Salil Mehta , Florian Fainelli , Broadcom internal kernel review list , =?utf-8?q?Marek_Beh=C3=BAn?= , Xu Liang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Michael Walle X-Mailer: b4 0.12.2 X-Patchwork-Delegate: kuba@kernel.org If trying to register a C45 PHY on an MDIO bus which isn't capable of C45 (either because the MDIO controller doesn't support it or because C45 accesses are prohibited due to faulty C22 PHYs) we can fall back to the new C45-over-C22 access method. Signed-off-by: Michael Walle --- Please note, that both with the old and the new code compatible = "ethernet-phy-idNNNN.NNNN" only works for the C22 case. I'm wondering if compatible = "ethernet-phy-idNNNN.NNNN", "ethernet-phy-ieee802.3-c45 even makes sense because there might be multiple C45 ids. At least it is an allowed pattern according to the device tree bindings. But with the current code, the ethernet-phy-idNNNN.NNNN is ignored in the c45 case. --- drivers/net/mdio/fwnode_mdio.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c index 972c8932c2fe..fed056d82b4e 100644 --- a/drivers/net/mdio/fwnode_mdio.c +++ b/drivers/net/mdio/fwnode_mdio.c @@ -115,7 +115,6 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, struct mii_timestamper *mii_ts = NULL; struct pse_control *psec = NULL; struct phy_device *phy; - bool is_c45; u32 phy_id; int rc; @@ -129,13 +128,19 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, goto clean_pse; } - is_c45 = fwnode_device_is_compatible(child, "ethernet-phy-ieee802.3-c45"); - if (is_c45 || fwnode_get_phy_id(child, &phy_id)) - phy = get_phy_device(bus, addr, - is_c45 ? PHY_ACCESS_C45 : PHY_ACCESS_C22); - else + if (fwnode_device_is_compatible(child, "ethernet-phy-ieee802.3-c45")) { + if (mdiobus_supports_c45(bus)) + phy = get_phy_device(bus, addr, PHY_ACCESS_C45); + else + phy = get_phy_device(bus, addr, + PHY_ACCESS_C45_OVER_C22); + } else if (fwnode_get_phy_id(child, &phy_id) == 0) { phy = phy_device_create(bus, addr, phy_id, PHY_ACCESS_C22, NULL); + } else { + phy = get_phy_device(bus, addr, PHY_ACCESS_C22); + } + if (IS_ERR(phy)) { rc = PTR_ERR(phy); goto clean_mii_ts; From patchwork Wed Jul 12 15:07:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13310508 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CD8924162 for ; Wed, 12 Jul 2023 15:08:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 334A8C433CC; Wed, 12 Jul 2023 15:08:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689174490; bh=baWU82tteE6wohLuYV2acd4eWNdncxCiiHvc8i4RT7E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=JBXodkwGHRR6MuN1KLNe7Ym/WLACVHm+RSFcodWRO2lUSuTPalJkM50LuUGqRBqGL KvIgScZF/T2mFqpZksP0t00odQOXGFHKDOPhsAc6LmKPp4G5H9F9/Va8XGvOKJAZyE UwGtP8O0o2I9/03/yaAmnD0mtPlJOYo0flt1rnkXN3HSHgxwbislgXOsdNlf8DNW3F GmbfkWGdPFUoTW6xfWVKloLzasgwlVsoyGbTEuVMjObIl63xMAZSGQ6aRCoJ+U86Pt r++tMaqxdoasxEKjKWO164MAon7A7D9D2T0J4xeD9roFfdtlaABHDpUbvuwdbO32Ti TpSCgnSOvxhdA== From: Michael Walle Date: Wed, 12 Jul 2023 17:07:11 +0200 Subject: [PATCH net-next v3 11/11] net: mdio: support C45-over-C22 when probed via OF Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-feature-c45-over-c22-v3-11-9eb37edf7be0@kernel.org> References: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> In-Reply-To: <20230620-feature-c45-over-c22-v3-0-9eb37edf7be0@kernel.org> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Yisen Zhuang , Salil Mehta , Florian Fainelli , Broadcom internal kernel review list , =?utf-8?q?Marek_Beh=C3=BAn?= , Xu Liang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Michael Walle X-Mailer: b4 0.12.2 X-Patchwork-Delegate: kuba@kernel.org Fall back to C45-over-C22 when the MDIO bus isn't capable of doing C45 transfers. This might be the case if there are broken PHYs on the bus or if the MDIO controller cannot do C45 transactions at all. For this to work, split the PHY registration into three steps, as done in the generic PHY probing code: (1) add C22 PHYs (2) scan for broken C22 PHYs (3) add C45 PHYs If step (2) detects a broken PHY, any PHYs will be added with C45-over-C22 access in step (3). Step (3) also ensures, that C45-over-C22 is used if C45 access is not supported at all on the bus. Signed-off-by: Michael Walle --- drivers/net/mdio/of_mdio.c | 63 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 15 deletions(-) diff --git a/drivers/net/mdio/of_mdio.c b/drivers/net/mdio/of_mdio.c index 7eb32ebb846d..e9d3cf6b68ee 100644 --- a/drivers/net/mdio/of_mdio.c +++ b/drivers/net/mdio/of_mdio.c @@ -100,6 +100,11 @@ static const struct of_device_id whitelist_phys[] = { {} }; +static bool of_mdiobus_child_is_c45_phy(struct device_node *child) +{ + return of_device_is_compatible(child, "ethernet-phy-ieee802.3-c45"); +} + /* * Return true if the child node is for a phy. It must either: * o Compatible string of "ethernet-phy-idX.X" @@ -118,7 +123,7 @@ bool of_mdiobus_child_is_phy(struct device_node *child) if (of_get_phy_id(child, &phy_id) != -EINVAL) return true; - if (of_device_is_compatible(child, "ethernet-phy-ieee802.3-c45")) + if (of_mdiobus_child_is_c45_phy(child)) return true; if (of_device_is_compatible(child, "ethernet-phy-ieee802.3-c22")) @@ -138,6 +143,32 @@ bool of_mdiobus_child_is_phy(struct device_node *child) } EXPORT_SYMBOL(of_mdiobus_child_is_phy); +static int of_mdiobus_register_child(struct mii_bus *mdio, + struct device_node *child, bool *scanphys) +{ + int addr, rc; + + addr = of_mdio_parse_addr(&mdio->dev, child); + if (addr < 0) { + *scanphys = true; + return 0; + } + + if (mdiobus_is_registered_device(mdio, addr)) + return 0; + + if (of_mdiobus_child_is_phy(child)) + rc = of_mdiobus_register_phy(mdio, child, addr); + else + rc = of_mdiobus_register_device(mdio, child, addr); + + if (rc == -ENODEV) + dev_err(&mdio->dev, "MDIO device at address %d is missing.\n", + addr); + + return rc; +} + /** * __of_mdiobus_register - Register mii_bus and create PHYs from the device tree * @mdio: pointer to mii_bus structure @@ -178,24 +209,26 @@ int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np, if (rc) return rc; - /* Loop over the child nodes and register a phy_device for each phy */ + /* Loop over the child nodes, skipping C45 PHYs so we can scan for + * broken C22 PHYs. The C45 PHYs will be registered afterwards. + */ for_each_available_child_of_node(np, child) { - addr = of_mdio_parse_addr(&mdio->dev, child); - if (addr < 0) { - scanphys = true; + if (of_mdiobus_child_is_c45_phy(child)) continue; - } + rc = of_mdiobus_register_child(mdio, child, &scanphys); + if (rc) + goto unregister; + } - if (of_mdiobus_child_is_phy(child)) - rc = of_mdiobus_register_phy(mdio, child, addr); - else - rc = of_mdiobus_register_device(mdio, child, addr); + /* Some C22 PHYs are broken with C45 transactions. */ + mdiobus_scan_for_broken_c45_access(mdio); - if (rc == -ENODEV) - dev_err(&mdio->dev, - "MDIO device at address %d is missing.\n", - addr); - else if (rc) + /* Now add any missing C45 PHYs. If C45 access is not allowed, they + * will be registered with C45-over-C22 access. + */ + for_each_available_child_of_node(np, child) { + rc = of_mdiobus_register_child(mdio, child, &scanphys); + if (rc) goto unregister; }