From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 13 Nov 2025 20:32:50 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.19-rc1~170^2~173
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c99ebb6132595b4b288a413981197eb076547c5a;p=thirdparty%2Fkernel%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.18-rc6).

No conflicts, adjacent changes in:

drivers/net/phy/micrel.c
  96a9178a29a6 ("net: phy: micrel: lan8814 fix reset of the QSGMII interface")
  61b7ade9ba8c ("net: phy: micrel: Add support for non PTP SKUs for lan8814")

and a trivial one in tools/testing/selftests/drivers/net/Makefile.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

c99ebb6132595b4b288a413981197eb076547c5a
diff --cc drivers/net/phy/micrel.c
index d167a58924f79,01c87c9b77020..57ea947369fed
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@@ -4592,19 -4464,13 +4586,25 @@@ static int lan8814_probe(struct phy_dev
  	devm_phy_package_join(&phydev->mdio.dev, phydev,
  			      addr, sizeof(struct lan8814_shared_priv));
  
 +	/* There are lan8814 SKUs that don't support PTP. Make sure that for
 +	 * those skus no PTP device is created. Here we check if the SKU
 +	 * supports PTP.
 +	 */
 +	err = lanphy_read_page_reg(phydev, LAN8814_PAGE_COMMON_REGS,
 +				   LAN8814_SKUS);
 +	if (err < 0)
 +		return err;
 +
 +	priv->is_ptp_available = err == LAN8814_REV_LAN8814 ||
 +				 err == LAN8814_REV_LAN8818;
 +
  	if (phy_package_init_once(phydev)) {
+ 		/* Reset the PHY */
+ 		lanphy_modify_page_reg(phydev, LAN8814_PAGE_COMMON_REGS,
+ 				       LAN8814_QSGMII_SOFT_RESET,
+ 				       LAN8814_QSGMII_SOFT_RESET_BIT,
+ 				       LAN8814_QSGMII_SOFT_RESET_BIT);
+ 
  		err = lan8814_release_coma_mode(phydev);
  		if (err)
  			return err;