]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
net: pcs: xpcs: propagate xpcs_read error to xpcs_get_state_c37_sgmii
authorVladimir Oltean <vladimir.oltean@nxp.com>
Wed, 20 Jul 2022 11:20:57 +0000 (14:20 +0300)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 16 Sep 2022 08:53:43 +0000 (10:53 +0200)
BugLink: https://bugs.launchpad.net/bugs/1989218
[ Upstream commit 27161db0904ee48e59140aa8d0835939a666c1f1 ]

While phylink_pcs_ops :: pcs_get_state does return void, xpcs_get_state()
does check for a non-zero return code from xpcs_get_state_c37_sgmii()
and prints that as a message to the kernel log.

However, a non-zero return code from xpcs_read() is translated into
"return false" (i.e. zero as int) and the I/O error is therefore not
printed. Fix that.

Fixes: b97b5331b8ab ("net: pcs: add C37 SGMII AN support for intel mGbE controller")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://lore.kernel.org/r/20220720112057.3504398-1-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/net/pcs/pcs-xpcs.c

index 7de631f5356fc832588fe54aef0168f32c575966..fd4cbf8a55ad7aa81b020403769bcebd1223bd43 100644 (file)
@@ -890,7 +890,7 @@ static int xpcs_get_state_c37_sgmii(struct dw_xpcs *xpcs,
         */
        ret = xpcs_read(xpcs, MDIO_MMD_VEND2, DW_VR_MII_AN_INTR_STS);
        if (ret < 0)
-               return false;
+               return ret;
 
        if (ret & DW_VR_MII_C37_ANSGM_SP_LNKSTS) {
                int speed_value;