* [PATCH net] net: phy: air_en8811h: check PBUS register read errors
@ 2026-11-18 18:24 Zhao Li
2026-11-18 18:43 ` Andrew Lunn
0 siblings, 1 reply; 2+ messages in thread
From: Zhao Li @ 2026-11-18 18:24 UTC (permalink / raw)
To: Andrew Lunn, Heiner Kallweit, Russell King, David S . Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni
Cc: Eric Woudstra, Bjørn Mork, Lucien . Jheng, netdev,
linux-kernel, stable, Zhao Li
an8811hb_check_crc() ignores the return value of its PBUS reads. When
the status read fails, the loop tests a stale or uninitialized
pbus_value and can stop waiting before the check has finished. When the
result read fails, the PASS or FAIL message tests the status value.
en8811h_print_fw_version() also ignores a failed read, which leaves
priv->firmware_version at 0 on the first firmware load.
en8811h_read_status() then handles it as firmware older than 24011202
and guesses the link partner's 2.5GBASE-T ability from the link speed.
Return the error from each of these reads. A failed version read now
fails the firmware load or the probe, as the other PBUS errors there
do.
Found by an AI code review agent; not triggered. Compile-tested with W=1.
Fixes: 71e79430117d ("net: phy: air_en8811h: Add the Airoha EN8811H PHY driver")
Fixes: 5afda1d734ed ("net: phy: air_en8811h: add Airoha AN8811HB support")
Cc: stable@vger.kernel.org # needs adjustments for <= 7.1
Signed-off-by: Zhao Li <enderaoelyther@gmail.com>
---
No new W=1, sparse or smatch warnings.
drivers/net/phy/air_en8811h.c | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/drivers/net/phy/air_en8811h.c b/drivers/net/phy/air_en8811h.c
index 81aa9df08dee..da9a5deccdac 100644
--- a/drivers/net/phy/air_en8811h.c
+++ b/drivers/net/phy/air_en8811h.c
@@ -378,18 +378,25 @@ static int an8811hb_check_crc(struct phy_device *phydev, u32 set1,
AN8811HB_CRC_RD_EN);
if (ret < 0)
return ret;
- air_phy_buckpbus_reg_read(phydev, set1, &pbus_value);
+ ret = air_phy_buckpbus_reg_read(phydev, set1, &pbus_value);
+ if (ret < 0)
+ return ret;
do {
msleep(300);
- air_phy_buckpbus_reg_read(phydev, mon2, &pbus_value);
+ ret = air_phy_buckpbus_reg_read(phydev, mon2, &pbus_value);
+ if (ret < 0)
+ return ret;
/* We do not know what errors this check is supposed
* catch or what to do about a failure. So print the
* result and continue like the vendor driver does.
*/
if (pbus_value & AN8811HB_CRC_ST) {
- air_phy_buckpbus_reg_read(phydev, mon3, &pbus_value);
+ ret = air_phy_buckpbus_reg_read(phydev, mon3,
+ &pbus_value);
+ if (ret < 0)
+ return ret;
phydev_dbg(phydev, "CRC Check %s!\n",
pbus_value & AN8811HB_CRC_CHECK_PASS ?
"PASS" : "FAIL");
@@ -403,14 +410,20 @@ static int an8811hb_check_crc(struct phy_device *phydev, u32 set1,
return -ENODEV;
}
-static void en8811h_print_fw_version(struct phy_device *phydev)
+static int en8811h_print_fw_version(struct phy_device *phydev)
{
struct en8811h_priv *priv = phydev->priv;
+ int ret;
+
+ ret = air_phy_buckpbus_reg_read(phydev, EN8811H_FW_VERSION,
+ &priv->firmware_version);
+ if (ret < 0)
+ return ret;
- air_phy_buckpbus_reg_read(phydev, EN8811H_FW_VERSION,
- &priv->firmware_version);
phydev_info(phydev, "MD32 firmware version: %08x\n",
priv->firmware_version);
+
+ return 0;
}
static int an8811hb_load_file(struct phy_device *phydev, const char *name,
@@ -560,7 +573,7 @@ static int en8811h_load_firmware(struct phy_device *phydev)
if (ret < 0)
goto en8811h_load_firmware_out;
- en8811h_print_fw_version(phydev);
+ ret = en8811h_print_fw_version(phydev);
en8811h_load_firmware_out:
release_firmware(fw2);
@@ -1164,7 +1177,9 @@ static int an8811hb_probe(struct phy_device *phydev)
goto err_dev_create;
}
- en8811h_print_fw_version(phydev);
+ ret = en8811h_print_fw_version(phydev);
+ if (ret < 0)
+ goto err_dev_create;
/* mcu has just restarted after firmware load */
priv->mcu_needs_restart = false;
base-commit: 2a324a58a084c5cfd7e5a2f55e0786bee170a4a5
--
2.56.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH net] net: phy: air_en8811h: check PBUS register read errors
2026-11-18 18:24 [PATCH net] net: phy: air_en8811h: check PBUS register read errors Zhao Li
@ 2026-11-18 18:43 ` Andrew Lunn
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Lunn @ 2026-11-18 18:43 UTC (permalink / raw)
To: Zhao Li
Cc: Heiner Kallweit, Russell King, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Eric Woudstra, Bjørn Mork,
Lucien . Jheng, netdev, linux-kernel, stable
On Thu, Nov 19, 2026 at 02:24:36AM +0800, Zhao Li wrote:
> an8811hb_check_crc() ignores the return value of its PBUS reads. When
> the status read fails, the loop tests a stale or uninitialized
> pbus_value and can stop waiting before the check has finished. When the
> result read fails, the PASS or FAIL message tests the status value.
>
> en8811h_print_fw_version() also ignores a failed read, which leaves
> priv->firmware_version at 0 on the first firmware load.
> en8811h_read_status() then handles it as firmware older than 24011202
> and guesses the link partner's 2.5GBASE-T ability from the link speed.
>
> Return the error from each of these reads. A failed version read now
> fails the firmware load or the probe, as the other PBUS errors there
> do.
>
> Found by an AI code review agent; not triggered. Compile-tested with W=1.
>
> Fixes: 71e79430117d ("net: phy: air_en8811h: Add the Airoha EN8811H PHY driver")
> Fixes: 5afda1d734ed ("net: phy: air_en8811h: add Airoha AN8811HB support")
> Cc: stable@vger.kernel.org # needs adjustments for <= 7.1
Does this bother anybody?
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
MDIO pretty much never returns an error.
Please repost for net-next.
Andrew
---
pw-bot: cr
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-18 18:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-18 18:24 [PATCH net] net: phy: air_en8811h: check PBUS register read errors Zhao Li
2026-11-18 18:43 ` Andrew Lunn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®