From nobody Tue Feb 10 04:03:02 2026 Received: from dilbert.mork.no (dilbert.mork.no [65.108.154.246]) (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 9FC00330657; Fri, 23 Jan 2026 07:59:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=65.108.154.246 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769155163; cv=none; b=MKdpHePBSf5+o6XFldC6r4WXjLAXcwloaIf/QL+w22ESX3eAewo3Qqp8yR5R7puaHtCxQyYGgQ3v+1IbPSzD+PVttfI5K7tJXeqbvpdyTVS9zWJZIU2yXMVFPrb16Bu9b6LhOv/PKGZ/MEYbFEKqwzaGZHQSSen/PXpylPOdsaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769155163; c=relaxed/simple; bh=fTCqFHZj/OY/3Ab1Lck/ssuVgcSHr/dHEJUd9vrOZOk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hbtiD/qeiks4dVgpM8rCHS9dTprN+XW5vJ1W/Ygs5ppTzq2zCo89sb8hocvl02NTFUQRfbsPUs+vnAIqm3ZGa4EXuLBmMw4C1zOSbf+yKLqsvE2AhqH3ZF2SntamKHxo8CxrtI9+JWEbwU80kI9vNFPNwbCTrQWGQcOKbF+RL0s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=mork.no; spf=pass smtp.mailfrom=miraculix.mork.no; dkim=pass (1024-bit key) header.d=mork.no header.i=@mork.no header.b=F9IuqsUw; arc=none smtp.client-ip=65.108.154.246 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=mork.no Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=miraculix.mork.no Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mork.no header.i=@mork.no header.b="F9IuqsUw" Authentication-Results: dilbert.mork.no; dkim=pass (1024-bit key; secure) header.d=mork.no header.i=@mork.no header.a=rsa-sha256 header.s=b header.b=F9IuqsUw; dkim-atps=neutral Received: from canardo.dyn.mork.no ([IPv6:2a01:799:10e2:d900:0:0:0:1]) (authenticated bits=0) by dilbert.mork.no (8.18.1/8.18.1) with ESMTPSA id 60N7wfus1303108 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=OK); Fri, 23 Jan 2026 07:58:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mork.no; s=b; t=1769155121; bh=35Bf9EwSz+MEQ6C6HQ7TLaDA2eaYXECWAxshTaANixY=; h=From:To:Cc:Subject:Date:Message-ID:References:From; b=F9IuqsUwGjeYZqaguR6oT/RoguyChfaiJblIkP9E+TxE8zO16RQ6XMjaQsCznraSy SPZpIUMGGpmnYxlnCplDY5Q/xY7eTOGQfiLi+teTU/FQeJvto4KsHnILxYhgtc0VVf JIIhnQv8w3AaKdYK3+SEx26TtR2P1Ov+/k5Chqqo= Received: from miraculix.mork.no ([IPv6:2a01:799:10e2:d90a:6f50:7559:681d:630c]) (authenticated bits=0) by canardo.dyn.mork.no (8.18.1/8.18.1) with ESMTPSA id 60N7webn3568538 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=OK); Fri, 23 Jan 2026 08:58:41 +0100 Received: (nullmailer pid 1162098 invoked by uid 1000); Fri, 23 Jan 2026 07:58:40 -0000 From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= To: netdev@vger.kernel.org Cc: "Lucien.Jheng" , Daniel Golle , Vladimir Oltean , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org, =?UTF-8?q?Bj=C3=B8rn=20Mork?= Subject: [PATCH net-next v2 1/3] net: phy: air_en8811h: factor out shareable code Date: Fri, 23 Jan 2026 08:58:15 +0100 Message-ID: <20260123075817.1162068-2-bjorn@mork.no> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260123075817.1162068-1-bjorn@mork.no> References: <20260123075817.1162068-1-bjorn@mork.no> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Virus-Scanned: clamav-milter 1.4.3 at canardo.mork.no X-Virus-Status: Clean Create reusable helpers in preparation for the AN8811HB support. Signed-off-by: Bj=C3=B8rn Mork --- drivers/net/phy/air_en8811h.c | 123 +++++++++++++++++++++------------- 1 file changed, 77 insertions(+), 46 deletions(-) diff --git a/drivers/net/phy/air_en8811h.c b/drivers/net/phy/air_en8811h.c index e890bb2c0aa8..e617108fe469 100644 --- a/drivers/net/phy/air_en8811h.c +++ b/drivers/net/phy/air_en8811h.c @@ -448,6 +448,11 @@ static int en8811h_wait_mcu_ready(struct phy_device *p= hydev) { int ret, reg_value; =20 + ret =3D air_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1, + EN8811H_FW_CTRL_1_FINISH); + if (ret) + return ret; + /* Because of mdio-lock, may have to wait for multiple loads */ ret =3D phy_read_mmd_poll_timeout(phydev, MDIO_MMD_VEND1, EN8811H_PHY_FW_STATUS, reg_value, @@ -461,9 +466,18 @@ static int en8811h_wait_mcu_ready(struct phy_device *p= hydev) return 0; } =20 -static int en8811h_load_firmware(struct phy_device *phydev) +static void en8811h_print_fw_version(struct phy_device *phydev) { struct en8811h_priv *priv =3D phydev->priv; + + air_buckpbus_reg_read(phydev, EN8811H_FW_VERSION, + &priv->firmware_version); + phydev_info(phydev, "MD32 firmware version: %08x\n", + priv->firmware_version); +} + +static int en8811h_load_firmware(struct phy_device *phydev) +{ struct device *dev =3D &phydev->mdio.dev; const struct firmware *fw1, *fw2; int ret; @@ -500,17 +514,11 @@ static int en8811h_load_firmware(struct phy_device *p= hydev) if (ret < 0) goto en8811h_load_firmware_out; =20 - ret =3D air_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1, - EN8811H_FW_CTRL_1_FINISH); + ret =3D en8811h_wait_mcu_ready(phydev); if (ret < 0) goto en8811h_load_firmware_out; =20 - ret =3D en8811h_wait_mcu_ready(phydev); - - air_buckpbus_reg_read(phydev, EN8811H_FW_VERSION, - &priv->firmware_version); - phydev_info(phydev, "MD32 firmware version: %08x\n", - priv->firmware_version); + en8811h_print_fw_version(phydev); =20 en8811h_load_firmware_out: release_firmware(fw2); @@ -533,11 +541,6 @@ static int en8811h_restart_mcu(struct phy_device *phyd= ev) if (ret < 0) return ret; =20 - ret =3D air_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1, - EN8811H_FW_CTRL_1_FINISH); - if (ret < 0) - return ret; - return en8811h_wait_mcu_ready(phydev); } =20 @@ -919,6 +922,23 @@ static int en8811h_clk_provider_setup(struct device *d= ev, struct clk_hw *hw) return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, hw); } =20 +static int en8811h_leds_setup(struct phy_device *phydev) +{ + struct en8811h_priv *priv =3D phydev->priv; + int ret; + + priv->led[0].rules =3D AIR_DEFAULT_TRIGGER_LED0; + priv->led[1].rules =3D AIR_DEFAULT_TRIGGER_LED1; + priv->led[2].rules =3D AIR_DEFAULT_TRIGGER_LED2; + + ret =3D air_leds_init(phydev, EN8811H_LED_COUNT, AIR_PHY_LED_DUR, + AIR_LED_MODE_DISABLE); + if (ret < 0) + phydev_err(phydev, "Failed to disable leds: %d\n", ret); + + return ret; +} + static int en8811h_probe(struct phy_device *phydev) { struct en8811h_priv *priv; @@ -937,19 +957,12 @@ static int en8811h_probe(struct phy_device *phydev) /* mcu has just restarted after firmware load */ priv->mcu_needs_restart =3D false; =20 - priv->led[0].rules =3D AIR_DEFAULT_TRIGGER_LED0; - priv->led[1].rules =3D AIR_DEFAULT_TRIGGER_LED1; - priv->led[2].rules =3D AIR_DEFAULT_TRIGGER_LED2; - /* MDIO_DEVS1/2 empty, so set mmds_present bits here */ phydev->c45_ids.mmds_present |=3D MDIO_DEVS_PMAPMD | MDIO_DEVS_AN; =20 - ret =3D air_leds_init(phydev, EN8811H_LED_COUNT, AIR_PHY_LED_DUR, - AIR_LED_MODE_DISABLE); - if (ret < 0) { - phydev_err(phydev, "Failed to disable leds: %d\n", ret); + ret =3D en8811h_leds_setup(phydev); + if (ret < 0) return ret; - } =20 priv->phydev =3D phydev; /* Co-Clock Output */ @@ -1090,11 +1103,9 @@ static int en8811h_config_aneg(struct phy_device *ph= ydev) return __genphy_config_aneg(phydev, changed); } =20 -static int en8811h_read_status(struct phy_device *phydev) +static int en8811h_get_lpa(struct phy_device *phydev) { - struct en8811h_priv *priv =3D phydev->priv; - u32 pbus_value; - int ret, val; + int ret; =20 ret =3D genphy_update_link(phydev); if (ret) @@ -1112,23 +1123,12 @@ static int en8811h_read_status(struct phy_device *p= hydev) if (ret < 0) return ret; =20 - ret =3D genphy_read_lpa(phydev); - if (ret < 0) - return ret; - - /* Get link partner 2.5GBASE-T ability from vendor register */ - ret =3D air_buckpbus_reg_read(phydev, EN8811H_2P5G_LPA, &pbus_value); - if (ret < 0) - return ret; - linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, - phydev->lp_advertising, - pbus_value & EN8811H_2P5G_LPA_2P5G); - - if (phydev->autoneg_complete) - phy_resolve_aneg_pause(phydev); + return genphy_read_lpa(phydev); +} =20 - if (!phydev->link) - return 0; +static int en8811h_get_speed(struct phy_device *phydev) +{ + int val; =20 /* Get real speed from vendor register */ val =3D phy_read(phydev, AIR_AUX_CTRL_STATUS); @@ -1146,6 +1146,40 @@ static int en8811h_read_status(struct phy_device *ph= ydev) break; } =20 + /* Only supports full duplex */ + phydev->duplex =3D DUPLEX_FULL; + + return 0; +} + +static int en8811h_read_status(struct phy_device *phydev) +{ + struct en8811h_priv *priv =3D phydev->priv; + u32 pbus_value; + int ret; + + ret =3D en8811h_get_lpa(phydev); + if (ret < 0) + return ret; + + /* Get link partner 2.5GBASE-T ability from vendor register */ + ret =3D air_buckpbus_reg_read(phydev, EN8811H_2P5G_LPA, &pbus_value); + if (ret < 0) + return ret; + linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + phydev->lp_advertising, + pbus_value & EN8811H_2P5G_LPA_2P5G); + + if (phydev->autoneg_complete) + phy_resolve_aneg_pause(phydev); + + if (!phydev->link) + return 0; + + ret =3D en8811h_get_speed(phydev); + if (ret < 0) + return ret; + /* Firmware before version 24011202 has no vendor register 2P5G_LPA. * Assume link partner advertised it if connected at 2500Mbps. */ @@ -1155,9 +1189,6 @@ static int en8811h_read_status(struct phy_device *phy= dev) phydev->speed =3D=3D SPEED_2500); } =20 - /* Only supports full duplex */ - phydev->duplex =3D DUPLEX_FULL; - return 0; } =20 --=20 2.47.3