]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: txgbe: remove the redundant data return in SW-FW mailbox
authorJiawen Wu <jiawenwu@trustnetic.com>
Mon, 19 Jan 2026 06:59:35 +0000 (14:59 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 30 Jan 2026 09:32:26 +0000 (10:32 +0100)
commit 3d778e65b4f44c6af4901d83020bb8a0a010f39e upstream.

For these two firmware mailbox commands, in txgbe_test_hostif() and
txgbe_set_phy_link_hostif(), there is no need to read data from the
buffer.

Under the current setting, OEM firmware will cause the driver to fail to
probe. Because OEM firmware returns more link information, with a larger
OEM structure txgbe_hic_ephy_getlink. However, the current driver does
not support the OEM function. So just fix it in the way that does not
involve reading the returned data.

Fixes: d84a3ff9aae8 ("net: txgbe: Restrict the use of mismatched FW versions")
Cc: stable@vger.kernel.org
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
Link: https://patch.msgid.link/2914AB0BC6158DDA+20260119065935.6015-1-jiawenwu@trustnetic.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c

index dc87ccad965240c57e66e1729968dbed5e7ceb4b..08b9b426f648465e86723177ec0332de0b61d837 100644 (file)
@@ -65,7 +65,7 @@ int txgbe_test_hostif(struct wx *wx)
        buffer.hdr.cmd_or_resp.cmd_resv = FW_CEM_CMD_RESERVED;
 
        return wx_host_interface_command(wx, (u32 *)&buffer, sizeof(buffer),
-                                       WX_HI_COMMAND_TIMEOUT, true);
+                                        WX_HI_COMMAND_TIMEOUT, false);
 }
 
 static int txgbe_identify_sfp_hostif(struct wx *wx, struct txgbe_hic_i2c_read *buffer)
@@ -103,7 +103,7 @@ static int txgbe_set_phy_link_hostif(struct wx *wx, int speed, int autoneg, int
        buffer.duplex = duplex;
 
        return wx_host_interface_command(wx, (u32 *)&buffer, sizeof(buffer),
-                                        WX_HI_COMMAND_TIMEOUT, true);
+                                        WX_HI_COMMAND_TIMEOUT, false);
 }
 
 static void txgbe_get_link_capabilities(struct wx *wx)