From patchwork Mon Feb 24 21:15:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerhard Engleder X-Patchwork-Id: 13989010 X-Patchwork-Delegate: kuba@kernel.org Received: from mx01lb.world4you.com (mx01lb.world4you.com [81.19.149.111]) (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 898998C11 for ; Mon, 24 Feb 2025 22:01:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.19.149.111 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740434508; cv=none; b=mTjOc7VAw7dGxbOoUWLl21OzTS8eudX2zBHWkVvB/Aib8Nwyx/EOLR444hsjcps6A9pFBi7huIY2iB8GKOz3ASzmn4t0UhMjvSbsgesGDKRmR5+MTgt5k2vzw4hdcjaTy+9xaVpq2/WgsU5n3mWbiUpW+nwnKbgHqXvUzOa7eRs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740434508; c=relaxed/simple; bh=pMvSHjchM9W8kNo75hrxMwQTDrjLxCsxjFDa9DJEP1E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CIWMKzCGw6emoaYsG01g8aO36JQUXc9WiGKTVlc3oAo1JOjlRk8h9ATfQ9bmPuBXare+VAka7tsifIFqRPTDSpdlc2CRHVWgkde9ZVjGAFknavVjqvHqqnFlF1ikhIiHrbU13Ank68kFEr90mpkM7zR2f8Sqlj5+fkNxVUBlO0M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com; spf=pass smtp.mailfrom=engleder-embedded.com; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b=ZKdrXq/M; arc=none smtp.client-ip=81.19.149.111 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b="ZKdrXq/M" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=engleder-embedded.com; s=dkim11; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ydWY3hVbHMYa6av3a71wVEnVgm5uMVSve7OqSnUk+tU=; b=ZKdrXq/M7FDlIMop2y30pyzi0m jPbvoanuGzIrOXaEsLBUor2LZuNkf+vqdC8tXWreO/vAiRJ6N6rUDAlNKxv4njzFVWypu3R8OEthJ 5bKbFsRY52duG/tnwfWFtrdbvfs/JpbMnR5QYR2oA0sJil92Ip0sGMp+sLz2+Mb1CLvc=; Received: from 88-117-55-1.adsl.highway.telekom.at ([88.117.55.1] helo=hornet.engleder.at) by mx01lb.world4you.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1tmfnk-000000000wu-0e6l; Mon, 24 Feb 2025 22:15:44 +0100 From: Gerhard Engleder To: andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, Gerhard Engleder Subject: [PATCH net-next v8 1/8] net: phy: Allow loopback speed selection for PHY drivers Date: Mon, 24 Feb 2025 22:15:24 +0100 Message-Id: <20250224211531.115980-2-gerhard@engleder-embedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224211531.115980-1-gerhard@engleder-embedded.com> References: <20250224211531.115980-1-gerhard@engleder-embedded.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-AV-Do-Run: Yes X-ACL-Warn: X-W4Y-Internal X-Patchwork-Delegate: kuba@kernel.org PHY drivers support loopback mode, but it is not possible to select the speed of the loopback mode. The speed is chosen by the set_loopback() operation of the PHY driver. Same is valid for genphy_loopback(). There are PHYs that support loopback with different speeds. Extend set_loopback() to make loopback speed selection possible. Signed-off-by: Gerhard Engleder Reviewed-by: Andrew Lunn --- drivers/net/phy/adin1100.c | 5 ++++- drivers/net/phy/dp83867.c | 5 ++++- drivers/net/phy/marvell.c | 8 +++++++- drivers/net/phy/mxl-gpy.c | 11 +++++++---- drivers/net/phy/phy-c45.c | 5 ++++- drivers/net/phy/phy_device.c | 12 +++++++++--- drivers/net/phy/xilinx_gmii2rgmii.c | 7 ++++--- include/linux/phy.h | 16 ++++++++++++---- 8 files changed, 51 insertions(+), 18 deletions(-) diff --git a/drivers/net/phy/adin1100.c b/drivers/net/phy/adin1100.c index 6bb469429b9d..bd7a47a903ac 100644 --- a/drivers/net/phy/adin1100.c +++ b/drivers/net/phy/adin1100.c @@ -215,8 +215,11 @@ static int adin_resume(struct phy_device *phydev) return adin_set_powerdown_mode(phydev, false); } -static int adin_set_loopback(struct phy_device *phydev, bool enable) +static int adin_set_loopback(struct phy_device *phydev, bool enable, int speed) { + if (enable && speed) + return -EOPNOTSUPP; + if (enable) return phy_set_bits_mmd(phydev, MDIO_MMD_PCS, MDIO_PCS_10T1L_CTRL, BMCR_LOOPBACK); diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c index c1451df430ac..063266cafe9c 100644 --- a/drivers/net/phy/dp83867.c +++ b/drivers/net/phy/dp83867.c @@ -1009,8 +1009,11 @@ static void dp83867_link_change_notify(struct phy_device *phydev) } } -static int dp83867_loopback(struct phy_device *phydev, bool enable) +static int dp83867_loopback(struct phy_device *phydev, bool enable, int speed) { + if (enable && speed) + return -EOPNOTSUPP; + return phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK, enable ? BMCR_LOOPBACK : 0); } diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index dd254e36ca8a..f2ad675537d1 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -2131,13 +2131,19 @@ static void marvell_get_stats_simple(struct phy_device *phydev, data[i] = marvell_get_stat_simple(phydev, i); } -static int m88e1510_loopback(struct phy_device *phydev, bool enable) +static int m88e1510_loopback(struct phy_device *phydev, bool enable, int speed) { int err; if (enable) { u16 bmcr_ctl, mscr2_ctl = 0; + if (speed == SPEED_10 || speed == SPEED_100 || + speed == SPEED_1000) + phydev->speed = speed; + else if (speed) + return -EINVAL; + bmcr_ctl = mii_bmcr_encode_fixed(phydev->speed, phydev->duplex); err = phy_write(phydev, MII_BMCR, bmcr_ctl); diff --git a/drivers/net/phy/mxl-gpy.c b/drivers/net/phy/mxl-gpy.c index 94d9cb727121..a6cca8d43253 100644 --- a/drivers/net/phy/mxl-gpy.c +++ b/drivers/net/phy/mxl-gpy.c @@ -813,7 +813,7 @@ static void gpy_get_wol(struct phy_device *phydev, wol->wolopts = priv->wolopts; } -static int gpy_loopback(struct phy_device *phydev, bool enable) +static int gpy_loopback(struct phy_device *phydev, bool enable, int speed) { struct gpy_priv *priv = phydev->priv; u16 set = 0; @@ -822,6 +822,9 @@ static int gpy_loopback(struct phy_device *phydev, bool enable) if (enable) { u64 now = get_jiffies_64(); + if (speed) + return -EOPNOTSUPP; + /* wait until 3 seconds from last disable */ if (time_before64(now, priv->lb_dis_to)) msleep(jiffies64_to_msecs(priv->lb_dis_to - now)); @@ -845,15 +848,15 @@ static int gpy_loopback(struct phy_device *phydev, bool enable) return 0; } -static int gpy115_loopback(struct phy_device *phydev, bool enable) +static int gpy115_loopback(struct phy_device *phydev, bool enable, int speed) { struct gpy_priv *priv = phydev->priv; if (enable) - return gpy_loopback(phydev, enable); + return gpy_loopback(phydev, enable, speed); if (priv->fw_minor > 0x76) - return gpy_loopback(phydev, 0); + return gpy_loopback(phydev, 0, 0); return genphy_soft_reset(phydev); } diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c index 37c9a344bf4a..d99b67af13a8 100644 --- a/drivers/net/phy/phy-c45.c +++ b/drivers/net/phy/phy-c45.c @@ -1227,8 +1227,11 @@ int gen10g_config_aneg(struct phy_device *phydev) } EXPORT_SYMBOL_GPL(gen10g_config_aneg); -int genphy_c45_loopback(struct phy_device *phydev, bool enable) +int genphy_c45_loopback(struct phy_device *phydev, bool enable, int speed) { + if (enable && speed) + return -EOPNOTSUPP; + return phy_modify_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, MDIO_PCS_CTRL1_LOOPBACK, enable ? MDIO_PCS_CTRL1_LOOPBACK : 0); diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 7c4e1ad1864c..6487b19970b4 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2072,9 +2072,9 @@ int phy_loopback(struct phy_device *phydev, bool enable) } if (phydev->drv->set_loopback) - ret = phydev->drv->set_loopback(phydev, enable); + ret = phydev->drv->set_loopback(phydev, enable, 0); else - ret = genphy_loopback(phydev, enable); + ret = genphy_loopback(phydev, enable, 0); if (ret) goto out; @@ -2843,12 +2843,18 @@ int genphy_resume(struct phy_device *phydev) } EXPORT_SYMBOL(genphy_resume); -int genphy_loopback(struct phy_device *phydev, bool enable) +int genphy_loopback(struct phy_device *phydev, bool enable, int speed) { if (enable) { u16 ctl = BMCR_LOOPBACK; int ret, val; + if (speed == SPEED_10 || speed == SPEED_100 || + speed == SPEED_1000) + phydev->speed = speed; + else if (speed) + return -EINVAL; + ctl |= mii_bmcr_encode_fixed(phydev->speed, phydev->duplex); phy_modify(phydev, MII_BMCR, ~0, ctl); diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c index 7c51daecf18e..2024d8ef36d9 100644 --- a/drivers/net/phy/xilinx_gmii2rgmii.c +++ b/drivers/net/phy/xilinx_gmii2rgmii.c @@ -64,15 +64,16 @@ static int xgmiitorgmii_read_status(struct phy_device *phydev) return 0; } -static int xgmiitorgmii_set_loopback(struct phy_device *phydev, bool enable) +static int xgmiitorgmii_set_loopback(struct phy_device *phydev, bool enable, + int speed) { struct gmii2rgmii *priv = mdiodev_get_drvdata(&phydev->mdio); int err; if (priv->phy_drv->set_loopback) - err = priv->phy_drv->set_loopback(phydev, enable); + err = priv->phy_drv->set_loopback(phydev, enable, speed); else - err = genphy_loopback(phydev, enable); + err = genphy_loopback(phydev, enable, speed); if (err < 0) return err; diff --git a/include/linux/phy.h b/include/linux/phy.h index 13be48d3b8b3..73d81cc9e5e1 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1178,8 +1178,16 @@ struct phy_driver { int (*set_tunable)(struct phy_device *dev, struct ethtool_tunable *tuna, const void *data); - /** @set_loopback: Set the loopback mood of the PHY */ - int (*set_loopback)(struct phy_device *dev, bool enable); + /** + * @set_loopback: Set the loopback mode of the PHY + * enable selects if the loopback mode is enabled or disabled. If the + * loopback mode is enabled, then the speed of the loopback mode can be + * requested with the speed argument. If the speed argument is zero, + * then any speed can be selected. If the speed argument is > 0, then + * this speed shall be selected for the loopback mode or EOPNOTSUPP + * shall be returned if speed selection is not supported. + */ + int (*set_loopback)(struct phy_device *dev, bool enable, int speed); /** @get_sqi: Get the signal quality indication */ int (*get_sqi)(struct phy_device *dev); /** @get_sqi_max: Get the maximum signal quality indication */ @@ -1977,7 +1985,7 @@ int genphy_read_status(struct phy_device *phydev); int genphy_read_master_slave(struct phy_device *phydev); int genphy_suspend(struct phy_device *phydev); int genphy_resume(struct phy_device *phydev); -int genphy_loopback(struct phy_device *phydev, bool enable); +int genphy_loopback(struct phy_device *phydev, bool enable, int speed); int genphy_soft_reset(struct phy_device *phydev); irqreturn_t genphy_handle_interrupt_no_ack(struct phy_device *phydev); @@ -2019,7 +2027,7 @@ int genphy_c45_pma_baset1_read_master_slave(struct phy_device *phydev); int genphy_c45_read_status(struct phy_device *phydev); int genphy_c45_baset1_read_status(struct phy_device *phydev); int genphy_c45_config_aneg(struct phy_device *phydev); -int genphy_c45_loopback(struct phy_device *phydev, bool enable); +int genphy_c45_loopback(struct phy_device *phydev, bool enable, int speed); int genphy_c45_pma_resume(struct phy_device *phydev); int genphy_c45_pma_suspend(struct phy_device *phydev); int genphy_c45_fast_retrain(struct phy_device *phydev, bool enable); From patchwork Mon Feb 24 21:15:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerhard Engleder X-Patchwork-Id: 13989012 X-Patchwork-Delegate: kuba@kernel.org Received: from mx01lb.world4you.com (mx01lb.world4you.com [81.19.149.111]) (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 A598A8C11 for ; Mon, 24 Feb 2025 22:01:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.19.149.111 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740434516; cv=none; b=EaJQxwXFGwRXl4zneBIpm4pGclgwXAEueAd9FilEecey+Fs5H5yUma4SRSkQHgql4A+cUF+FYj5hsebbK13waqjcWz0BhfzZ+J5wSMiDaJDV9sQYKbqqt2EVPuxacbpE3KlI6hFj/tg/WdEnWQ5Ai7vERAP8qoxldZg3kymhzhA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740434516; c=relaxed/simple; bh=DiyfeZznG3Y/3tYbp1JNq7xJmytB3do4e9ioGJmbv+w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=s37hqLYdTXtWjYue/rh+fRbmzUVcaSSosv1r3OV4lop4eDlVwU1lQKdvb/yJfIWRhG1PnB+/yq8vWldN+ls4geZwuNj/blfrLTdClMK0/J239NKCQWfoWTbMpVeYJMHwbluhY119fh+kTpywPBmr1Mg4X3BcV/5TgB6/2PtiQW0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com; spf=pass smtp.mailfrom=engleder-embedded.com; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b=Y4xdoEw2; arc=none smtp.client-ip=81.19.149.111 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b="Y4xdoEw2" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=engleder-embedded.com; s=dkim11; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=vhXDZTLqdu7IJW4noakGN2b7sjwsAcQ4Qd/URI3PMF0=; b=Y4xdoEw2v8+XkV1Fa/apPDbTrF Xp3QYOSSx+BwPdCEGid/lAZHbLaBxvjr9krc5qT4O4TeJkXarZW5yS+eEVdULbw+Xrd7zaw5WKwK7 NzEREjQhfpTp8Y/+slqC7qr0zIA+8TNkz5QjZDYJlZRPAY0fSkc4KGMQAW5KDo27eMTk=; Received: from 88-117-55-1.adsl.highway.telekom.at ([88.117.55.1] helo=hornet.engleder.at) by mx01lb.world4you.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1tmfnl-000000000wu-3Uix; Mon, 24 Feb 2025 22:15:46 +0100 From: Gerhard Engleder To: andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, Gerhard Engleder Subject: [PATCH net-next v8 2/8] net: phy: Support speed selection for PHY loopback Date: Mon, 24 Feb 2025 22:15:25 +0100 Message-Id: <20250224211531.115980-3-gerhard@engleder-embedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224211531.115980-1-gerhard@engleder-embedded.com> References: <20250224211531.115980-1-gerhard@engleder-embedded.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-AV-Do-Run: Yes X-ACL-Warn: X-W4Y-Internal X-Patchwork-Delegate: kuba@kernel.org phy_loopback() leaves it to the PHY driver to select the speed of the loopback mode. Thus, the speed of the loopback mode depends on the PHY driver in use. Add support for speed selection to phy_loopback() to enable loopback with defined speeds. Ensure that link up is signaled if speed changes as speed is not allowed to change during link up. Link down and up is necessary for a new speed. Signed-off-by: Gerhard Engleder --- drivers/net/ethernet/engleder/tsnep_main.c | 2 +- .../net/ethernet/hisilicon/hns/hns_ethtool.c | 4 +- .../hisilicon/hns3/hns3pf/hclge_main.c | 4 +- .../hisilicon/hns3/hns3pf/hclge_mdio.c | 2 +- .../stmicro/stmmac/stmmac_selftests.c | 8 +- drivers/net/phy/phy.c | 87 +++++++++++++++++++ drivers/net/phy/phy_device.c | 35 -------- include/linux/phy.h | 2 +- net/core/selftests.c | 4 +- 9 files changed, 100 insertions(+), 48 deletions(-) diff --git a/drivers/net/ethernet/engleder/tsnep_main.c b/drivers/net/ethernet/engleder/tsnep_main.c index 18df6a5cbfc6..a16b12137edb 100644 --- a/drivers/net/ethernet/engleder/tsnep_main.c +++ b/drivers/net/ethernet/engleder/tsnep_main.c @@ -230,7 +230,7 @@ static int tsnep_phy_loopback(struct tsnep_adapter *adapter, bool enable) { int retval; - retval = phy_loopback(adapter->phydev, enable); + retval = phy_loopback(adapter->phydev, enable, 0); /* PHY link state change is not signaled if loopback is enabled, it * would delay a working loopback anyway, let's ensure that loopback diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c index 6c458f037262..60a586a951a0 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c @@ -266,9 +266,9 @@ static int hns_nic_config_phy_loopback(struct phy_device *phy_dev, u8 en) if (err) goto out; - err = phy_loopback(phy_dev, true); + err = phy_loopback(phy_dev, true, 0); } else { - err = phy_loopback(phy_dev, false); + err = phy_loopback(phy_dev, false, 0); if (err) goto out; diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 3f17b3073e50..f8161d6eb152 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -7875,7 +7875,7 @@ static int hclge_enable_phy_loopback(struct hclge_dev *hdev, if (ret) return ret; - return phy_loopback(phydev, true); + return phy_loopback(phydev, true, 0); } static int hclge_disable_phy_loopback(struct hclge_dev *hdev, @@ -7883,7 +7883,7 @@ static int hclge_disable_phy_loopback(struct hclge_dev *hdev, { int ret; - ret = phy_loopback(phydev, false); + ret = phy_loopback(phydev, false, 0); if (ret) return ret; diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c index 80079657afeb..9a456ebf9b7c 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c @@ -258,7 +258,7 @@ void hclge_mac_start_phy(struct hclge_dev *hdev) if (!phydev) return; - phy_loopback(phydev, false); + phy_loopback(phydev, false, 0); phy_start(phydev); } diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c index 3ca1c2a816ff..a01bc394d1ac 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c @@ -382,14 +382,14 @@ static int stmmac_test_phy_loopback(struct stmmac_priv *priv) if (!priv->dev->phydev) return -EOPNOTSUPP; - ret = phy_loopback(priv->dev->phydev, true); + ret = phy_loopback(priv->dev->phydev, true, 0); if (ret) return ret; attr.dst = priv->dev->dev_addr; ret = __stmmac_test_loopback(priv, &attr); - phy_loopback(priv->dev->phydev, false); + phy_loopback(priv->dev->phydev, false, 0); return ret; } @@ -1985,7 +1985,7 @@ void stmmac_selftest_run(struct net_device *dev, case STMMAC_LOOPBACK_PHY: ret = -EOPNOTSUPP; if (dev->phydev) - ret = phy_loopback(dev->phydev, true); + ret = phy_loopback(dev->phydev, true, 0); if (!ret) break; fallthrough; @@ -2018,7 +2018,7 @@ void stmmac_selftest_run(struct net_device *dev, case STMMAC_LOOPBACK_PHY: ret = -EOPNOTSUPP; if (dev->phydev) - ret = phy_loopback(dev->phydev, false); + ret = phy_loopback(dev->phydev, false, 0); if (!ret) break; fallthrough; diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 831b36839627..f1ff5542de1d 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1722,6 +1722,93 @@ void phy_mac_interrupt(struct phy_device *phydev) } EXPORT_SYMBOL(phy_mac_interrupt); +/** + * phy_loopback - Configure loopback mode of PHY + * @phydev: target phy_device struct + * @enable: enable or disable loopback mode + * @speed: enable loopback mode with speed + * + * Configure loopback mode of PHY and signal link down and link up if speed is + * changing. + * + * Return: 0 on success, negative error code on failure. + */ +int phy_loopback(struct phy_device *phydev, bool enable, int speed) +{ + bool link_up = false; + int ret = 0; + + if (!phydev->drv) + return -EIO; + + mutex_lock(&phydev->lock); + + if (enable && phydev->loopback_enabled) { + ret = -EBUSY; + goto out; + } + + if (!enable && !phydev->loopback_enabled) { + ret = -EINVAL; + goto out; + } + + if (enable) { + /* + * Link up is signaled with a defined speed. If speed changes, + * then first link down and after that link up needs to be + * signaled. + */ + if (phydev->link && phydev->state == PHY_RUNNING) { + /* link is up and signaled */ + if (speed && phydev->speed != speed) { + /* signal link down and up for new speed */ + phydev->link = false; + phydev->state = PHY_NOLINK; + phy_link_down(phydev); + + link_up = true; + } + } else { + /* link is not signaled */ + if (speed) { + /* signal link up for new speed */ + link_up = true; + } + } + } + + if (phydev->drv->set_loopback) + ret = phydev->drv->set_loopback(phydev, enable, speed); + else + ret = genphy_loopback(phydev, enable, speed); + + if (ret) { + if (enable) { + /* try to restore link if enabling loopback fails */ + if (phydev->drv->set_loopback) + phydev->drv->set_loopback(phydev, false, 0); + else + genphy_loopback(phydev, false, 0); + } + + goto out; + } + + if (link_up) { + phydev->link = true; + phydev->state = PHY_RUNNING; + phy_link_up(phydev); + } + + phydev->loopback_enabled = enable; + +out: + mutex_unlock(&phydev->lock); + return ret; +} +EXPORT_SYMBOL(phy_loopback); + /** * phy_eee_tx_clock_stop_capable() - indicate whether the MAC can stop tx clock * @phydev: target phy_device struct diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 6487b19970b4..5130d0f3f4c3 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2052,41 +2052,6 @@ int phy_resume(struct phy_device *phydev) } EXPORT_SYMBOL(phy_resume); -int phy_loopback(struct phy_device *phydev, bool enable) -{ - int ret = 0; - - if (!phydev->drv) - return -EIO; - - mutex_lock(&phydev->lock); - - if (enable && phydev->loopback_enabled) { - ret = -EBUSY; - goto out; - } - - if (!enable && !phydev->loopback_enabled) { - ret = -EINVAL; - goto out; - } - - if (phydev->drv->set_loopback) - ret = phydev->drv->set_loopback(phydev, enable, 0); - else - ret = genphy_loopback(phydev, enable, 0); - - if (ret) - goto out; - - phydev->loopback_enabled = enable; - -out: - mutex_unlock(&phydev->lock); - return ret; -} -EXPORT_SYMBOL(phy_loopback); - /** * phy_reset_after_clk_enable - perform a PHY reset if needed * @phydev: target phy_device struct diff --git a/include/linux/phy.h b/include/linux/phy.h index 73d81cc9e5e1..dcd96e623e31 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1870,7 +1870,7 @@ int phy_init_hw(struct phy_device *phydev); int phy_suspend(struct phy_device *phydev); int phy_resume(struct phy_device *phydev); int __phy_resume(struct phy_device *phydev); -int phy_loopback(struct phy_device *phydev, bool enable); +int phy_loopback(struct phy_device *phydev, bool enable, int speed); int phy_sfp_connect_phy(void *upstream, struct phy_device *phy); void phy_sfp_disconnect_phy(void *upstream, struct phy_device *phy); void phy_sfp_attach(void *upstream, struct sfp_bus *bus); diff --git a/net/core/selftests.c b/net/core/selftests.c index 8f801e6e3b91..e99ae983fca9 100644 --- a/net/core/selftests.c +++ b/net/core/selftests.c @@ -299,7 +299,7 @@ static int net_test_phy_loopback_enable(struct net_device *ndev) if (!ndev->phydev) return -EOPNOTSUPP; - return phy_loopback(ndev->phydev, true); + return phy_loopback(ndev->phydev, true, 0); } static int net_test_phy_loopback_disable(struct net_device *ndev) @@ -307,7 +307,7 @@ static int net_test_phy_loopback_disable(struct net_device *ndev) if (!ndev->phydev) return -EOPNOTSUPP; - return phy_loopback(ndev->phydev, false); + return phy_loopback(ndev->phydev, false, 0); } static int net_test_phy_loopback_udp(struct net_device *ndev) From patchwork Mon Feb 24 21:15:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerhard Engleder X-Patchwork-Id: 13989011 X-Patchwork-Delegate: kuba@kernel.org Received: from mx01lb.world4you.com (mx01lb.world4you.com [81.19.149.111]) (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 BD10D8C11 for ; Mon, 24 Feb 2025 22:01:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.19.149.111 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740434512; cv=none; b=K/ljJnO4WKNv3jXd4c92nHjfxVnBLUfPacoE3U9FzXJWcbSs2pQ3N0EHLPzMIZB8uJ8dA10wl5fnnCkk4RftFfo6qwdf3W4qsjSd5dk9Y8wMtT3JaZIZVNPc1aKuJNEX2oxdMgH4YZ0KAx9vO5gtQR0lBIXQ4jICh7h/UTUXYD4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740434512; c=relaxed/simple; bh=QEKHIQ5ErvkvJyId9qVE83R+XW0uQ2qd9xh/n86cAXk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ioM9h25we6AvVsTJvlmpKAH4jozlpw4Jhk1WXPlks1TTWeDki/+YysMwY3HypZvyWK10V1ewpLYpkTbmQ95LP31QxwKZlF0QcqkPVc2W41/El3LpdzX3T/WdVm9Jma6GHW4I0hL3Ozqz7gEUFFZ4R1Tt29x11ga1+jc6q51e4bo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com; spf=pass smtp.mailfrom=engleder-embedded.com; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b=FeqMHw2x; arc=none smtp.client-ip=81.19.149.111 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b="FeqMHw2x" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=engleder-embedded.com; s=dkim11; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=RaQrNGqtJlx0rIA/HDsTPrByyWliWNtnWVUHMoJu1t8=; b=FeqMHw2xbTPMp2Wfl4YYpGySUs UyAst5PNTpJ0Z6PXbA0ZDqhRZ94T2GMmdlj6ZD1105gWxZcrFEeFcNLZgLtE9Z6lX/XTfJs5wLqRa ri1QGfyeTclNgXhhaWnPhAFe78+r1zlheyE2tdgQfmCStnnWSNevzg1BS2nYWXe4R744=; Received: from 88-117-55-1.adsl.highway.telekom.at ([88.117.55.1] helo=hornet.engleder.at) by mx01lb.world4you.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1tmfno-000000000wu-1hR8; Mon, 24 Feb 2025 22:15:48 +0100 From: Gerhard Engleder To: andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, Gerhard Engleder Subject: [PATCH net-next v8 3/8] net: phy: micrel: Add loopback support Date: Mon, 24 Feb 2025 22:15:26 +0100 Message-Id: <20250224211531.115980-4-gerhard@engleder-embedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224211531.115980-1-gerhard@engleder-embedded.com> References: <20250224211531.115980-1-gerhard@engleder-embedded.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-AV-Do-Run: Yes X-ACL-Warn: X-W4Y-Internal X-Patchwork-Delegate: kuba@kernel.org The KSZ9031 PHYs requires full duplex for loopback mode. Add PHY specific set_loopback() to ensure this. Signed-off-by: Gerhard Engleder --- drivers/net/phy/micrel.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 9c0b1c229af6..f375832e3987 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -1030,6 +1030,29 @@ static int ksz9021_config_init(struct phy_device *phydev) #define MII_KSZ9031RN_EDPD 0x23 #define MII_KSZ9031RN_EDPD_ENABLE BIT(0) +static int ksz9031_set_loopback(struct phy_device *phydev, bool enable, + int speed) +{ + u16 ctl = BMCR_LOOPBACK; + int val; + + if (!enable) + return genphy_loopback(phydev, enable, 0); + + if (speed == SPEED_10 || speed == SPEED_100 || speed == SPEED_1000) + phydev->speed = speed; + else if (speed) + return -EINVAL; + phydev->duplex = DUPLEX_FULL; + + ctl |= mii_bmcr_encode_fixed(phydev->speed, phydev->duplex); + + phy_write(phydev, MII_BMCR, ctl); + + return phy_read_poll_timeout(phydev, MII_BMSR, val, val & BMSR_LSTATUS, + 5000, 500000, true); +} + static int ksz9031_of_load_skew_values(struct phy_device *phydev, const struct device_node *of_node, u16 reg, size_t field_sz, @@ -5564,6 +5587,7 @@ static struct phy_driver ksphy_driver[] = { .resume = kszphy_resume, .cable_test_start = ksz9x31_cable_test_start, .cable_test_get_status = ksz9x31_cable_test_get_status, + .set_loopback = ksz9031_set_loopback, }, { .phy_id = PHY_ID_LAN8814, .phy_id_mask = MICREL_PHY_ID_MASK, From patchwork Mon Feb 24 21:15:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerhard Engleder X-Patchwork-Id: 13988928 X-Patchwork-Delegate: kuba@kernel.org Received: from mx01lb.world4you.com (mx01lb.world4you.com [81.19.149.111]) (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 7CBF71DBB03 for ; Mon, 24 Feb 2025 21:15:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.19.149.111 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740431756; cv=none; b=gCTUBSqH/YJNRzMcVOZVYdxLuqxSRGFwSmpr6peK9DKUR69+SWkfQ0Wmy4ZaBNkxY6eWkvJywJs1n5+JazdzpnQ9c9Wsg/5d9NCA8Fwehjqsza5I0GvaXnu3m1jzxeirC60GNNhC2U8pjTPWQqaXF6pWYVzMv/dRIl3TV/VMcYM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740431756; c=relaxed/simple; bh=S2dE/z0aGsnbY8NdaLYNkmZW9KztXUsXLqLz6hIA4B8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=syJ4uRSD9Yssgev1mm/ma4WKvWXpAZUOhNMzZEjXA8nqqabU+Z1C3y6PW1q26HSifpFmhfokBDZeF55nPnCjrwf33EMJSZxqulPCMdxg8LqJSDNh1wraNll+4Sz2YFgHgMlx6LPzXHGpAodpvsmt8OqXm6fcSOEdyDmqdVR7HUU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com; spf=pass smtp.mailfrom=engleder-embedded.com; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b=LMApmUC+; arc=none smtp.client-ip=81.19.149.111 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b="LMApmUC+" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=engleder-embedded.com; s=dkim11; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ZiPc592vzeYKTRjw+Zr7BdQk9/pym+uW6W6CjjQX6Oc=; b=LMApmUC+B9JwYPVcBgpp8VFqar qckRcnn4DfF7OhvvuYmcU7wx4H2xZz4acd99LUsvSi/o7MN0FvDfvrO6oEkMFvLzj1WNcAswNqWSG 3YPlnrs2iVcLc8WrWy/rPtS1UPcQpZECHyxyXum3fxa+lOpHNAh50WZTIo/jkkcYDXaI=; Received: from 88-117-55-1.adsl.highway.telekom.at ([88.117.55.1] helo=hornet.engleder.at) by mx01lb.world4you.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1tmfnp-000000000wu-46rm; Mon, 24 Feb 2025 22:15:50 +0100 From: Gerhard Engleder To: andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, Gerhard Engleder Subject: [PATCH net-next v8 4/8] net: phy: marvell: Align set_loopback() implementation Date: Mon, 24 Feb 2025 22:15:27 +0100 Message-Id: <20250224211531.115980-5-gerhard@engleder-embedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224211531.115980-1-gerhard@engleder-embedded.com> References: <20250224211531.115980-1-gerhard@engleder-embedded.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-AV-Do-Run: Yes X-ACL-Warn: X-W4Y-Internal X-Patchwork-Delegate: kuba@kernel.org Use genphy_loopback() to disable loopback like ksz9031_set_loopback(). This way disable loopback is implemented only once within genphy_loopback() and the set_loopback() implementations look similar. Also fix comment about msleep() in the out-of loopback case which is not executed in the out-of loopback case. Suggested-by: Andrew Lunn Signed-off-by: Gerhard Engleder Reviewed-by: Andrew Lunn --- drivers/net/phy/marvell.c | 72 ++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index f2ad675537d1..623292948fa7 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -2133,56 +2133,50 @@ static void marvell_get_stats_simple(struct phy_device *phydev, static int m88e1510_loopback(struct phy_device *phydev, bool enable, int speed) { + u16 bmcr_ctl, mscr2_ctl = 0; int err; - if (enable) { - u16 bmcr_ctl, mscr2_ctl = 0; + if (!enable) + return genphy_loopback(phydev, enable, 0); - if (speed == SPEED_10 || speed == SPEED_100 || - speed == SPEED_1000) - phydev->speed = speed; - else if (speed) - return -EINVAL; - - bmcr_ctl = mii_bmcr_encode_fixed(phydev->speed, phydev->duplex); - - err = phy_write(phydev, MII_BMCR, bmcr_ctl); - if (err < 0) - return err; + if (speed == SPEED_10 || speed == SPEED_100 || speed == SPEED_1000) + phydev->speed = speed; + else if (speed) + return -EINVAL; - if (phydev->speed == SPEED_1000) - mscr2_ctl = BMCR_SPEED1000; - else if (phydev->speed == SPEED_100) - mscr2_ctl = BMCR_SPEED100; + bmcr_ctl = mii_bmcr_encode_fixed(phydev->speed, phydev->duplex); - err = phy_modify_paged(phydev, MII_MARVELL_MSCR_PAGE, - MII_88E1510_MSCR_2, BMCR_SPEED1000 | - BMCR_SPEED100, mscr2_ctl); - if (err < 0) - return err; + err = phy_write(phydev, MII_BMCR, bmcr_ctl); + if (err < 0) + return err; - /* Need soft reset to have speed configuration takes effect */ - err = genphy_soft_reset(phydev); - if (err < 0) - return err; + if (phydev->speed == SPEED_1000) + mscr2_ctl = BMCR_SPEED1000; + else if (phydev->speed == SPEED_100) + mscr2_ctl = BMCR_SPEED100; - err = phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK, - BMCR_LOOPBACK); + err = phy_modify_paged(phydev, MII_MARVELL_MSCR_PAGE, + MII_88E1510_MSCR_2, BMCR_SPEED1000 | + BMCR_SPEED100, mscr2_ctl); + if (err < 0) + return err; - if (!err) { - /* It takes some time for PHY device to switch - * into/out-of loopback mode. - */ - msleep(1000); - } + /* Need soft reset to have speed configuration takes effect */ + err = genphy_soft_reset(phydev); + if (err < 0) return err; - } else { - err = phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK, 0); - if (err < 0) - return err; - return phy_config_aneg(phydev); + err = phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK, + BMCR_LOOPBACK); + + if (!err) { + /* + * It takes some time for PHY device to switch into loopback + * mode. + */ + msleep(1000); } + return err; } static int marvell_vct5_wait_complete(struct phy_device *phydev) From patchwork Mon Feb 24 21:15:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerhard Engleder X-Patchwork-Id: 13988929 X-Patchwork-Delegate: kuba@kernel.org Received: from mx01lb.world4you.com (mx01lb.world4you.com [81.19.149.111]) (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 3096918D634 for ; Mon, 24 Feb 2025 21:15:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.19.149.111 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740431756; cv=none; b=nAMZ0DwUkjyuzUcVtFxKWwMo3P5QMSMkgWUrRivbFNvt4hPvieYfg//o/q5wzxAyKJsgnBIIbJ1OXdp9vqhXbZmuzPLm3/c1CG1fT8h4Zis0rKuUJZvbn+qt9P0PhGZnunByYUhhmgvGl9qo/+xH1zObstz+Qno8jY4ceiHM7KA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740431756; c=relaxed/simple; bh=YeBYrwSQEp0dNNZNpUaqkukDqYYjQW4pZLiqS6JrucA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rSPgDL4sgesNNyW3zDCRZ2HvqLFx4/ddh9sNIZxUAkcr23IQE2PL8ugSKYDqVZTNys5y67iM2Ckl1pIMorS3Rhr5IzYTzD7O2HZBGpAZsmvdHEiP32uLBCMTm2t0+dpWBhLA3UhOsdEm/mSjn1nopuO5uxEotFbPoXqgGW+4DMI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com; spf=pass smtp.mailfrom=engleder-embedded.com; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b=bVgwx65d; arc=none smtp.client-ip=81.19.149.111 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b="bVgwx65d" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=engleder-embedded.com; s=dkim11; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=uReMLVAbSNd7wQC1AA3HmaHs8nu68miO7fUikGXVTmI=; b=bVgwx65ddUSQueXI7cpc2zGgI0 BpD16BR/j8VyvY7D/WlyjG85XUrRO70iWWj1aTXphxpl3tNTzYcthN5Cr25RbOY86IgfrslEl+rY8 KwB76BNOHTQA6QZuaKTRAXAGMYYLuaKSw+jBJ9nNUgvMlOcs2vGZgDLSwKkOPaGAAHGw=; Received: from 88-117-55-1.adsl.highway.telekom.at ([88.117.55.1] helo=hornet.engleder.at) by mx01lb.world4you.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1tmfnr-000000000wu-230Q; Mon, 24 Feb 2025 22:15:51 +0100 From: Gerhard Engleder To: andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, Gerhard Engleder Subject: [PATCH net-next v8 5/8] tsnep: Select speed for loopback Date: Mon, 24 Feb 2025 22:15:28 +0100 Message-Id: <20250224211531.115980-6-gerhard@engleder-embedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224211531.115980-1-gerhard@engleder-embedded.com> References: <20250224211531.115980-1-gerhard@engleder-embedded.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-AV-Do-Run: Yes X-ACL-Warn: X-W4Y-Internal X-Patchwork-Delegate: kuba@kernel.org Use 100 Mbps only if the PHY is configured to this speed. Otherwise use always the maximum speed of 1000 Mbps. Also remove explicit setting of carrier on and link mode after loopback. This is not needed anymore, because phy_loopback() with selected speed signals the link and the speed to the MAC. Signed-off-by: Gerhard Engleder Reviewed-by: Andrew Lunn --- drivers/net/ethernet/engleder/tsnep_main.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/engleder/tsnep_main.c b/drivers/net/ethernet/engleder/tsnep_main.c index a16b12137edb..d77a5b423c4c 100644 --- a/drivers/net/ethernet/engleder/tsnep_main.c +++ b/drivers/net/ethernet/engleder/tsnep_main.c @@ -228,20 +228,19 @@ static void tsnep_phy_link_status_change(struct net_device *netdev) static int tsnep_phy_loopback(struct tsnep_adapter *adapter, bool enable) { - int retval; - - retval = phy_loopback(adapter->phydev, enable, 0); + int speed; - /* PHY link state change is not signaled if loopback is enabled, it - * would delay a working loopback anyway, let's ensure that loopback - * is working immediately by setting link mode directly - */ - if (!retval && enable) { - netif_carrier_on(adapter->netdev); - tsnep_set_link_mode(adapter); + if (enable) { + if (adapter->phydev->autoneg == AUTONEG_DISABLE && + adapter->phydev->speed == SPEED_100) + speed = SPEED_100; + else + speed = SPEED_1000; + } else { + speed = 0; } - return retval; + return phy_loopback(adapter->phydev, enable, speed); } static int tsnep_phy_open(struct tsnep_adapter *adapter) From patchwork Mon Feb 24 21:15:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerhard Engleder X-Patchwork-Id: 13988930 X-Patchwork-Delegate: kuba@kernel.org Received: from mx01lb.world4you.com (mx01lb.world4you.com [81.19.149.111]) (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 D2BB21DC98B for ; Mon, 24 Feb 2025 21:15:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.19.149.111 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740431758; cv=none; b=gPBWYmQ00y9wwdHk6m8CBr8ppyddqewcCKZSBSSm3NxHQy2FjFJ9al4JJNw1HUyTTi3CSa1BOmro9OJ7SrWs9IpXIG9ZUBGLxnDkterCpq2WZIzePWTtyNdX6wRreuYGOrT0FoB9RU+rcl19LDrtXLEItmhQ5nJkMaAgAvmog80= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740431758; c=relaxed/simple; bh=EaCBbcPCGa8dp3ifCLwDQLlputgRNIhh6OhZe2+/Q7E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TREsqJer4w9jD0e4YHnvAQcK9XoV53zewYawKDwSlvzNCDklqeW8kiFTofNuQqb0eAhTzj4AHs6VI8aCjIoiTZ4oFiM0scFSkMOM10+PJ1SCOYk9b3Xbrj7PqnORTbwue1AnAwnuLrB3FeMcIHcBWpeyclcklGNLc9RYlELALzo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com; spf=pass smtp.mailfrom=engleder-embedded.com; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b=s1InA8v8; arc=none smtp.client-ip=81.19.149.111 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b="s1InA8v8" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=engleder-embedded.com; s=dkim11; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=cynox6oiup4mn0lbNS/dqWIuxwqkNO6QWusLPyx2rVI=; b=s1InA8v8k0LnuEpV/IIuOqPP8m LkgL6mWAGCS34b/fz08Brnc1yVVyhZkE5atOb+FfbzeOM5es8SlWENTPD77CmBFQRImTNOrra147d iHOtpHtHDhjq51sSSCFwvCQOlBkff73ZHS9Vwh6aoH0whDTdVmKyIyoq9NucLfsgcu4Q=; Received: from 88-117-55-1.adsl.highway.telekom.at ([88.117.55.1] helo=hornet.engleder.at) by mx01lb.world4you.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1tmfns-000000000wu-44lF; Mon, 24 Feb 2025 22:15:53 +0100 From: Gerhard Engleder To: andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, Gerhard Engleder , Oleksij Rempel Subject: [PATCH net-next v8 6/8] net: selftests: Support selftest sets Date: Mon, 24 Feb 2025 22:15:29 +0100 Message-Id: <20250224211531.115980-7-gerhard@engleder-embedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224211531.115980-1-gerhard@engleder-embedded.com> References: <20250224211531.115980-1-gerhard@engleder-embedded.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-AV-Do-Run: Yes X-ACL-Warn: X-W4Y-Internal X-Patchwork-Delegate: kuba@kernel.org Currently only one test set is supported. Extend selftests to support multiple test sets with different speeds which can be combined by network drivers. Signed-off-by: Gerhard Engleder CC: Oleksij Rempel --- include/net/selftests.h | 27 +++++++ net/core/selftests.c | 172 +++++++++++++++++++++++++++------------- 2 files changed, 142 insertions(+), 57 deletions(-) diff --git a/include/net/selftests.h b/include/net/selftests.h index e65e8d230d33..e97aaebaf51a 100644 --- a/include/net/selftests.h +++ b/include/net/selftests.h @@ -4,6 +4,14 @@ #include +/** + * enum net_selftest - selftest set ID + * @NET_SELFTEST_LOOPBACK_CARRIER: Loopback tests based on carrier speed + */ +enum net_selftest { + NET_SELFTEST_LOOPBACK_CARRIER = 0, +}; + #if IS_ENABLED(CONFIG_NET_SELFTESTS) void net_selftest(struct net_device *ndev, struct ethtool_test *etest, @@ -11,6 +19,11 @@ void net_selftest(struct net_device *ndev, struct ethtool_test *etest, int net_selftest_get_count(void); void net_selftest_get_strings(u8 *data); +void net_selftest_set(int set, int speed, struct net_device *ndev, + struct ethtool_test *etest, u64 *buf); +int net_selftest_set_get_count(int set); +void net_selftest_set_get_strings(int set, int speed, u8 **data); + #else static inline void net_selftest(struct net_device *ndev, struct ethtool_test *etest, @@ -27,5 +40,19 @@ static inline void net_selftest_get_strings(u8 *data) { } +static inline void net_selftest_set(int set, int speed, struct net_device *ndev, + struct ethtool_test *etest, u64 *buf) +{ +} + +static inline int net_selftest_set_get_count(int set, void) +{ + return 0; +} + +static inline void net_selftest_set_get_strings(int set, int speed, u8 *data) +{ +} + #endif #endif /* _NET_SELFTESTS */ diff --git a/net/core/selftests.c b/net/core/selftests.c index e99ae983fca9..4a7022a1e931 100644 --- a/net/core/selftests.c +++ b/net/core/selftests.c @@ -14,6 +14,10 @@ #include #include +struct net_test_ctx { + u8 next_id; +}; + struct net_packet_attrs { const unsigned char *src; const unsigned char *dst; @@ -44,14 +48,13 @@ struct netsfhdr { u8 id; } __packed; -static u8 net_test_next_id; - #define NET_TEST_PKT_SIZE (sizeof(struct ethhdr) + sizeof(struct iphdr) + \ sizeof(struct netsfhdr)) #define NET_TEST_PKT_MAGIC 0xdeadcafecafedeadULL #define NET_LB_TIMEOUT msecs_to_jiffies(200) -static struct sk_buff *net_test_get_skb(struct net_device *ndev, +static struct sk_buff *net_test_get_skb(struct net_test_ctx *ctx, + struct net_device *ndev, struct net_packet_attrs *attr) { struct sk_buff *skb = NULL; @@ -141,8 +144,8 @@ static struct sk_buff *net_test_get_skb(struct net_device *ndev, shdr = skb_put(skb, sizeof(*shdr)); shdr->version = 0; shdr->magic = cpu_to_be64(NET_TEST_PKT_MAGIC); - attr->id = net_test_next_id; - shdr->id = net_test_next_id++; + attr->id = ctx->next_id; + shdr->id = ctx->next_id++; if (attr->size) skb_put(skb, attr->size); @@ -237,7 +240,8 @@ static int net_test_loopback_validate(struct sk_buff *skb, return 0; } -static int __net_test_loopback(struct net_device *ndev, +static int __net_test_loopback(struct net_test_ctx *ctx, + struct net_device *ndev, struct net_packet_attrs *attr) { struct net_test_priv *tpriv; @@ -258,7 +262,7 @@ static int __net_test_loopback(struct net_device *ndev, tpriv->packet = attr; dev_add_pack(&tpriv->pt); - skb = net_test_get_skb(ndev, attr); + skb = net_test_get_skb(ctx, ndev, attr); if (!skb) { ret = -ENOMEM; goto cleanup; @@ -284,17 +288,41 @@ static int __net_test_loopback(struct net_device *ndev, return ret; } -static int net_test_netif_carrier(struct net_device *ndev) +struct net_test { + const char *name; + int (*fn)(struct net_test_ctx *ctx, struct net_device *ndev); + bool loopback_speed; +}; + +/** + * NET_SELFTEST - Define a selftest. + * @_name: Selftest name. + * @_string: Selftest string. + */ +#define NET_SELFTEST(_name, _string) \ + struct net_test net_test_##_name = { \ + .name = _string, \ + .fn = net_test_##_name##_fn, \ + } + +static int net_test_netif_carrier_fn(struct net_test_ctx *ctx, + struct net_device *ndev) { return netif_carrier_ok(ndev) ? 0 : -ENOLINK; } -static int net_test_phy_phydev(struct net_device *ndev) +static const NET_SELFTEST(netif_carrier, "Carrier"); + +static int net_test_phy_phydev_fn(struct net_test_ctx *ctx, + struct net_device *ndev) { return ndev->phydev ? 0 : -EOPNOTSUPP; } -static int net_test_phy_loopback_enable(struct net_device *ndev) +static const NET_SELFTEST(phy_phydev, "PHY dev is present"); + +static int net_test_phy_loopback_enable_fn(struct net_test_ctx *ctx, + struct net_device *ndev) { if (!ndev->phydev) return -EOPNOTSUPP; @@ -302,7 +330,10 @@ static int net_test_phy_loopback_enable(struct net_device *ndev) return phy_loopback(ndev->phydev, true, 0); } -static int net_test_phy_loopback_disable(struct net_device *ndev) +static const NET_SELFTEST(phy_loopback_enable, "PHY loopback enable"); + +static int net_test_phy_loopback_disable_fn(struct net_test_ctx *ctx, + struct net_device *ndev) { if (!ndev->phydev) return -EOPNOTSUPP; @@ -310,98 +341,125 @@ static int net_test_phy_loopback_disable(struct net_device *ndev) return phy_loopback(ndev->phydev, false, 0); } -static int net_test_phy_loopback_udp(struct net_device *ndev) +static const NET_SELFTEST(phy_loopback_disable, "PHY loopback disable"); + +static int net_test_phy_loopback_udp_fn(struct net_test_ctx *ctx, + struct net_device *ndev) { struct net_packet_attrs attr = { }; attr.dst = ndev->dev_addr; - return __net_test_loopback(ndev, &attr); + return __net_test_loopback(ctx, ndev, &attr); } -static int net_test_phy_loopback_udp_mtu(struct net_device *ndev) +static const NET_SELFTEST(phy_loopback_udp, "PHY loopback UDP"); + +static int net_test_phy_loopback_udp_mtu_fn(struct net_test_ctx *ctx, + struct net_device *ndev) { struct net_packet_attrs attr = { }; attr.dst = ndev->dev_addr; attr.max_size = ndev->mtu; - return __net_test_loopback(ndev, &attr); + return __net_test_loopback(ctx, ndev, &attr); } -static int net_test_phy_loopback_tcp(struct net_device *ndev) +static const NET_SELFTEST(phy_loopback_udp_mtu, "PHY loopback MTU"); + +static int net_test_phy_loopback_tcp_fn(struct net_test_ctx *ctx, + struct net_device *ndev) { struct net_packet_attrs attr = { }; attr.dst = ndev->dev_addr; attr.tcp = true; - return __net_test_loopback(ndev, &attr); + return __net_test_loopback(ctx, ndev, &attr); } -static const struct net_test { - char name[ETH_GSTRING_LEN]; - int (*fn)(struct net_device *ndev); -} net_selftests[] = { - { - .name = "Carrier ", - .fn = net_test_netif_carrier, - }, { - .name = "PHY dev is present ", - .fn = net_test_phy_phydev, - }, { - /* This test should be done before all PHY loopback test */ - .name = "PHY internal loopback, enable ", - .fn = net_test_phy_loopback_enable, - }, { - .name = "PHY internal loopback, UDP ", - .fn = net_test_phy_loopback_udp, - }, { - .name = "PHY internal loopback, MTU ", - .fn = net_test_phy_loopback_udp_mtu, - }, { - .name = "PHY internal loopback, TCP ", - .fn = net_test_phy_loopback_tcp, - }, { - /* This test should be done after all PHY loopback test */ - .name = "PHY internal loopback, disable", - .fn = net_test_phy_loopback_disable, - }, +static const NET_SELFTEST(phy_loopback_tcp, "PHY loopback TCP"); + +static const struct net_test *net_selftests_carrier[] = { + &net_test_netif_carrier, + &net_test_phy_phydev, + &net_test_phy_loopback_enable, + &net_test_phy_loopback_udp, + &net_test_phy_loopback_udp_mtu, + &net_test_phy_loopback_tcp, + &net_test_phy_loopback_disable, }; -void net_selftest(struct net_device *ndev, struct ethtool_test *etest, u64 *buf) +static const struct net_test **net_selftests_set_get(int set) { - int count = net_selftest_get_count(); + switch (set) { + case NET_SELFTEST_LOOPBACK_CARRIER: + return net_selftests_carrier; + } + + return NULL; +} + +void net_selftest_set(int set, int speed, struct net_device *ndev, + struct ethtool_test *etest, u64 *buf) +{ + const struct net_test **selftests = net_selftests_set_get(set); + int count = net_selftest_set_get_count(set); + struct net_test_ctx ctx = { 0 }; int i; memset(buf, 0, sizeof(*buf) * count); - net_test_next_id = 0; - if (etest->flags != ETH_TEST_FL_OFFLINE) { + if (!(etest->flags & ETH_TEST_FL_OFFLINE)) { netdev_err(ndev, "Only offline tests are supported\n"); etest->flags |= ETH_TEST_FL_FAILED; return; } - for (i = 0; i < count; i++) { - buf[i] = net_selftests[i].fn(ndev); + buf[i] = selftests[i]->fn(&ctx, ndev); if (buf[i] && (buf[i] != -EOPNOTSUPP)) etest->flags |= ETH_TEST_FL_FAILED; } } +EXPORT_SYMBOL_GPL(net_selftest_set); + +int net_selftest_set_get_count(int set) +{ + switch (set) { + case NET_SELFTEST_LOOPBACK_CARRIER: + return ARRAY_SIZE(net_selftests_carrier); + default: + return -EINVAL; + } +} +EXPORT_SYMBOL_GPL(net_selftest_set_get_count); + +void net_selftest_set_get_strings(int set, int speed, u8 **data) +{ + const struct net_test **selftests = net_selftests_set_get(set); + int count = net_selftest_set_get_count(set); + int i; + + /* right pad strings for aligned ethtool output */ + for (i = 0; i < count; i++) + ethtool_sprintf(data, "%-30s", selftests[i]->name); +} +EXPORT_SYMBOL_GPL(net_selftest_set_get_strings); + +void net_selftest(struct net_device *ndev, struct ethtool_test *etest, u64 *buf) +{ + net_selftest_set(NET_SELFTEST_LOOPBACK_CARRIER, 0, ndev, etest, buf); +} EXPORT_SYMBOL_GPL(net_selftest); int net_selftest_get_count(void) { - return ARRAY_SIZE(net_selftests); + return net_selftest_set_get_count(NET_SELFTEST_LOOPBACK_CARRIER); } EXPORT_SYMBOL_GPL(net_selftest_get_count); void net_selftest_get_strings(u8 *data) { - int i; - - for (i = 0; i < net_selftest_get_count(); i++) - ethtool_sprintf(&data, "%2d. %s", i + 1, - net_selftests[i].name); + net_selftest_set_get_strings(NET_SELFTEST_LOOPBACK_CARRIER, 0, &data); } EXPORT_SYMBOL_GPL(net_selftest_get_strings); From patchwork Mon Feb 24 21:15:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerhard Engleder X-Patchwork-Id: 13988931 X-Patchwork-Delegate: kuba@kernel.org Received: from mx01lb.world4you.com (mx01lb.world4you.com [81.19.149.111]) (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 EBA781DDA00 for ; Mon, 24 Feb 2025 21:15:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.19.149.111 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740431759; cv=none; b=czwdwSB23l2VBbotsOaV9DtG0c8JsRGa4MDT3jrGyuciPaOYtDUOPtYBCV5FmMK7k8O9G7oRi0uA7zMvILf8wFGspJ8Sa/g/rdhHUP1u4bEoTcuGyTcVUmsf6iiGh+ZShw15eXwbCYvstEQVAiIgelKFlOUKoN6PD9V4jjOB0og= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740431759; c=relaxed/simple; bh=JG88TSCoxq8ilYitRgQ6gzdrooc5CgxUsszDiKez0Jk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=o/OcVfr1E9DfZxqM/rtgvnNLpOSz9OHxYK7xnbnAVpTlUaYjv/D9ovlXprjlcIp8ZStPwCIxE6aggeVGCmKx8Z5T+pcK+RvBXdWSHi8twFDYclwsXWg00Hrna06iFfxUkQhrHubqMRuJ8wN8iaJ4DIckYsOwVx3i9NI2X+HJmnM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com; spf=pass smtp.mailfrom=engleder-embedded.com; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b=v1qS+TuY; arc=none smtp.client-ip=81.19.149.111 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b="v1qS+TuY" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=engleder-embedded.com; s=dkim11; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Z0YkePKYmtexFo833UA8Awy1Dlr6/NsKbPPZaF3Qjz0=; b=v1qS+TuY4ckiyb6OUee4MuhHOY kV30rNsfgAHrM1wSwLyXIq/44ZNwAdNcZsyHaxiblu+y2v+JyGqUmXr6/Ty+0dSGw5DsjSo3WKTqe 9cBxUaqJhB/53hVHsCixmA8o+/5tXV1WTBSVydpSBG2//TDM6pNqfV31S4TxocDlFpxo=; Received: from 88-117-55-1.adsl.highway.telekom.at ([88.117.55.1] helo=hornet.engleder.at) by mx01lb.world4you.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1tmfnu-000000000wu-1Vt2; Mon, 24 Feb 2025 22:15:54 +0100 From: Gerhard Engleder To: andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, Gerhard Engleder Subject: [PATCH net-next v8 7/8] net: selftests: Add selftests sets with fixed speed Date: Mon, 24 Feb 2025 22:15:30 +0100 Message-Id: <20250224211531.115980-8-gerhard@engleder-embedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224211531.115980-1-gerhard@engleder-embedded.com> References: <20250224211531.115980-1-gerhard@engleder-embedded.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-AV-Do-Run: Yes X-ACL-Warn: X-W4Y-Internal X-Patchwork-Delegate: kuba@kernel.org Add PHY loopback selftest set which uses the speed argument to select a fixed speed. Signed-off-by: Gerhard Engleder --- include/net/selftests.h | 2 ++ net/core/selftests.c | 46 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/include/net/selftests.h b/include/net/selftests.h index e97aaebaf51a..d9450c0352a4 100644 --- a/include/net/selftests.h +++ b/include/net/selftests.h @@ -7,9 +7,11 @@ /** * enum net_selftest - selftest set ID * @NET_SELFTEST_LOOPBACK_CARRIER: Loopback tests based on carrier speed + * @NET_SELFTEST_LOOPBACK_SPEED: Loopback tests with fixed speed */ enum net_selftest { NET_SELFTEST_LOOPBACK_CARRIER = 0, + NET_SELFTEST_LOOPBACK_SPEED, }; #if IS_ENABLED(CONFIG_NET_SELFTESTS) diff --git a/net/core/selftests.c b/net/core/selftests.c index 4a7022a1e931..b6ad711136b4 100644 --- a/net/core/selftests.c +++ b/net/core/selftests.c @@ -16,6 +16,7 @@ struct net_test_ctx { u8 next_id; + int speed; }; struct net_packet_attrs { @@ -305,6 +306,16 @@ struct net_test { .fn = net_test_##_name##_fn, \ } +/** + * NET_SELFTEST_LOOPBACK_SPEED - Define a selftest which enables loopback with a fixed speed. + * @_name: Selftest name. + */ +#define NET_SELFTEST_LOOPBACK_SPEED(_name) \ + struct net_test net_test_##_name = { \ + .fn = net_test_##_name##_fn, \ + .loopback_speed = true, \ + } + static int net_test_netif_carrier_fn(struct net_test_ctx *ctx, struct net_device *ndev) { @@ -332,6 +343,17 @@ static int net_test_phy_loopback_enable_fn(struct net_test_ctx *ctx, static const NET_SELFTEST(phy_loopback_enable, "PHY loopback enable"); +static int net_test_phy_loopback_speed_enable_fn(struct net_test_ctx *ctx, + struct net_device *ndev) +{ + if (!ndev->phydev) + return -EOPNOTSUPP; + + return phy_loopback(ndev->phydev, true, ctx->speed); +} + +static const NET_SELFTEST_LOOPBACK_SPEED(phy_loopback_speed_enable); + static int net_test_phy_loopback_disable_fn(struct net_test_ctx *ctx, struct net_device *ndev) { @@ -388,11 +410,22 @@ static const struct net_test *net_selftests_carrier[] = { &net_test_phy_loopback_disable, }; +static const struct net_test *net_selftests_speed[] = { + &net_test_phy_phydev, + &net_test_phy_loopback_speed_enable, + &net_test_phy_loopback_udp, + &net_test_phy_loopback_udp_mtu, + &net_test_phy_loopback_tcp, + &net_test_phy_loopback_disable, +}; + static const struct net_test **net_selftests_set_get(int set) { switch (set) { case NET_SELFTEST_LOOPBACK_CARRIER: return net_selftests_carrier; + case NET_SELFTEST_LOOPBACK_SPEED: + return net_selftests_speed; } return NULL; @@ -403,7 +436,7 @@ void net_selftest_set(int set, int speed, struct net_device *ndev, { const struct net_test **selftests = net_selftests_set_get(set); int count = net_selftest_set_get_count(set); - struct net_test_ctx ctx = { 0 }; + struct net_test_ctx ctx = { .speed = speed }; int i; memset(buf, 0, sizeof(*buf) * count); @@ -427,6 +460,8 @@ int net_selftest_set_get_count(int set) switch (set) { case NET_SELFTEST_LOOPBACK_CARRIER: return ARRAY_SIZE(net_selftests_carrier); + case NET_SELFTEST_LOOPBACK_SPEED: + return ARRAY_SIZE(net_selftests_speed); default: return -EINVAL; } @@ -440,8 +475,13 @@ void net_selftest_set_get_strings(int set, int speed, u8 **data) int i; /* right pad strings for aligned ethtool output */ - for (i = 0; i < count; i++) - ethtool_sprintf(data, "%-30s", selftests[i]->name); + for (i = 0; i < count; i++) { + if (selftests[i]->loopback_speed) + ethtool_sprintf(data, "PHY loopback %-17s", + phy_speed_to_str(speed)); + else + ethtool_sprintf(data, "%-30s", selftests[i]->name); + } } EXPORT_SYMBOL_GPL(net_selftest_set_get_strings); From patchwork Mon Feb 24 21:15:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerhard Engleder X-Patchwork-Id: 13988932 X-Patchwork-Delegate: kuba@kernel.org Received: from mx01lb.world4you.com (mx01lb.world4you.com [81.19.149.111]) (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 4C3F31DDA33 for ; Mon, 24 Feb 2025 21:15:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.19.149.111 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740431760; cv=none; b=eS4uGbwYUYa/ja5e2Fu2PprkHFfbtkhsNp+HrMpR48fPLp16qxRiDZKClRcrXma+R5xTXXcBv3jM/fUNJv8ORCXvfmANn02dj1yk2AnArwK9jcfN5Ourop1UG9A23SbvbndzDZIJ1yBeb96nJnmwTUMaVpzcE0Pk4ceuc53rgwc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740431760; c=relaxed/simple; bh=VxARNUgP1YlGVkhMRSdQLQRUmxHNUAAWwoTX7cZtvng=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TKGbO6gGY16c05GcP2UHBaa8liHuRdt4BfbPiK78erVtbPtXwRgZjmr2LVeJK2dldnHxz+G2H0ZAj7a4LGO0rrcdj8iK0WfurMUPCcwcZEce9fQk9oGyH8yCwqUb1cyDMQeOCKy81zAXPQ/emzSkTUDvJgUKH7A3tcYOb7a3jJo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com; spf=pass smtp.mailfrom=engleder-embedded.com; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b=vkO556Mh; arc=none smtp.client-ip=81.19.149.111 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b="vkO556Mh" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=engleder-embedded.com; s=dkim11; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=j2RTWx/iEDaz/kSGFvPpAU09x18Ez11+jc7uAhpeyXs=; b=vkO556MhHibu9QfHDOILH7Gw+y mLiebsu1BggJYNU57nCKPdMahMKahOdDZnKlWUyGtZBX1Bw0ZB2z12h3ls+q8ZiSINY6L9kgBVtQ4 w01diyMOi3YC9FqHdlZfsUnGGvQx+jfxwtziIp/jOElirKSHuCLR8JOnejJx8Jd/YKj8=; Received: from 88-117-55-1.adsl.highway.telekom.at ([88.117.55.1] helo=hornet.engleder.at) by mx01lb.world4you.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1tmfnv-000000000wu-3Fqd; Mon, 24 Feb 2025 22:15:55 +0100 From: Gerhard Engleder To: andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, Gerhard Engleder Subject: [PATCH net-next v8 8/8] tsnep: Add loopback selftests Date: Mon, 24 Feb 2025 22:15:31 +0100 Message-Id: <20250224211531.115980-9-gerhard@engleder-embedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224211531.115980-1-gerhard@engleder-embedded.com> References: <20250224211531.115980-1-gerhard@engleder-embedded.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-AV-Do-Run: Yes X-ACL-Warn: X-W4Y-Internal X-Patchwork-Delegate: kuba@kernel.org Add selftest sets with 100 Mbps and 1000 Mbps fixed speed to ethtool selftests. Signed-off-by: Gerhard Engleder --- .../net/ethernet/engleder/tsnep_selftests.c | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/engleder/tsnep_selftests.c b/drivers/net/ethernet/engleder/tsnep_selftests.c index 8a9145f93147..b1f08f17f55b 100644 --- a/drivers/net/ethernet/engleder/tsnep_selftests.c +++ b/drivers/net/ethernet/engleder/tsnep_selftests.c @@ -4,6 +4,7 @@ #include "tsnep.h" #include +#include enum tsnep_test { TSNEP_TEST_ENABLE = 0, @@ -756,27 +757,36 @@ static bool tsnep_test_taprio_extension(struct tsnep_adapter *adapter) int tsnep_ethtool_get_test_count(void) { - return TSNEP_TEST_COUNT; + int count = TSNEP_TEST_COUNT; + + count += net_selftest_set_get_count(NET_SELFTEST_LOOPBACK_SPEED); + count += net_selftest_set_get_count(NET_SELFTEST_LOOPBACK_SPEED); + + return count; } void tsnep_ethtool_get_test_strings(u8 *data) { memcpy(data, tsnep_test_strings, sizeof(tsnep_test_strings)); + data += sizeof(tsnep_test_strings); + + net_selftest_set_get_strings(NET_SELFTEST_LOOPBACK_SPEED, 100, &data); + net_selftest_set_get_strings(NET_SELFTEST_LOOPBACK_SPEED, 1000, &data); } void tsnep_ethtool_self_test(struct net_device *netdev, struct ethtool_test *eth_test, u64 *data) { struct tsnep_adapter *adapter = netdev_priv(netdev); + int count = tsnep_ethtool_get_test_count(); + int i; - eth_test->len = TSNEP_TEST_COUNT; + eth_test->len = count; if (eth_test->flags != ETH_TEST_FL_OFFLINE) { /* no tests are done online */ - data[TSNEP_TEST_ENABLE] = 0; - data[TSNEP_TEST_TAPRIO] = 0; - data[TSNEP_TEST_TAPRIO_CHANGE] = 0; - data[TSNEP_TEST_TAPRIO_EXTENSION] = 0; + for (i = 0; i < count; i++) + data[i] = 0; return; } @@ -808,4 +818,12 @@ void tsnep_ethtool_self_test(struct net_device *netdev, eth_test->flags |= ETH_TEST_FL_FAILED; data[TSNEP_TEST_TAPRIO_EXTENSION] = 1; } + data += TSNEP_TEST_COUNT; + + net_selftest_set(NET_SELFTEST_LOOPBACK_SPEED, 100, netdev, eth_test, + data); + data += net_selftest_set_get_count(NET_SELFTEST_LOOPBACK_SPEED); + + net_selftest_set(NET_SELFTEST_LOOPBACK_SPEED, 1000, netdev, eth_test, + data); }