Commit d84a3ff9 authored by Jiawen Wu's avatar Jiawen Wu Committed by Paolo Abeni
Browse files

net: txgbe: Restrict the use of mismatched FW versions 



The new added mailbox commands require a new released firmware version.
Otherwise, a lot of logs "Unknown FW command" would be printed. And the
devices may not work properly. So add the test command in the probe
function.

Signed-off-by: default avatarJiawen Wu <jiawenwu@trustnetic.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/18283F17BE0FA335+20250521064402.22348-8-jiawenwu@trustnetic.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent c0f2e511

drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c

+16 −0
Original line number Diff line number Diff line
@@ -50,6 +50,22 @@ irqreturn_t txgbe_gpio_irq_handler_aml(int irq, void *data) 
	return IRQ_HANDLED;

}



int txgbe_test_hostif(struct wx *wx)

{

	struct txgbe_hic_ephy_getlink buffer;



	if (wx->mac.type != wx_mac_aml)

		return 0;



	buffer.hdr.cmd = FW_PHY_GET_LINK_CMD;

	buffer.hdr.buf_len = sizeof(struct txgbe_hic_ephy_getlink) -

			     sizeof(struct wx_hic_hdr);

	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);

}



static int txgbe_identify_sfp_hostif(struct wx *wx, struct txgbe_hic_i2c_read *buffer)

{

	buffer->hdr.cmd = FW_READ_SFP_INFO_CMD;

drivers/net/ethernet/wangxun/txgbe/txgbe_aml.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


void txgbe_gpio_init_aml(struct wx *wx);

irqreturn_t txgbe_gpio_irq_handler_aml(int irq, void *data);

int txgbe_test_hostif(struct wx *wx);

int txgbe_set_phy_link(struct wx *wx);

int txgbe_identify_sfp(struct wx *wx);

void txgbe_setup_link(struct wx *wx);

drivers/net/ethernet/wangxun/txgbe/txgbe_main.c

+7 −0
Original line number Diff line number Diff line
@@ -864,6 +864,13 @@ static int txgbe_probe(struct pci_dev *pdev, 
	if (etrack_id < 0x20010)

		dev_warn(&pdev->dev, "Please upgrade the firmware to 0x20010 or above.\n");



	err = txgbe_test_hostif(wx);

	if (err != 0) {

		dev_err(&pdev->dev, "Mismatched Firmware version\n");

		err = -EIO;

		goto err_release_hw;

	}



	txgbe = devm_kzalloc(&pdev->dev, sizeof(*txgbe), GFP_KERNEL);

	if (!txgbe) {

		err = -ENOMEM;