Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96f2ebd2 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by David S. Miller
Browse files

netxen: fix firmware init handshake 



Make sure all functions run firmware init handshake.

If PCI function 0 fails to initialize firmware, mark the
state failed so that other functions on the same board
bail out quickly instead of waiting 30s for firmware
handshake.

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 01542cd1

drivers/net/netxen/netxen_nic_init.c

+20 −17
Original line number Diff line number Diff line
@@ -944,28 +944,31 @@ int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val) 
	u32 val = 0;

	int retries = 60;



	if (!pegtune_val) {

	if (pegtune_val)

		return 0;



	do {

		val = NXRD32(adapter, CRB_CMDPEG_STATE);



			if (val == PHAN_INITIALIZE_COMPLETE ||

				val == PHAN_INITIALIZE_ACK)

		switch (val) {

		case PHAN_INITIALIZE_COMPLETE:

		case PHAN_INITIALIZE_ACK:

			return 0;

		case PHAN_INITIALIZE_FAILED:

			goto out_err;

		default:

			break;

		}



		msleep(500);



	} while (--retries);



		if (!retries) {

			pegtune_val = NXRD32(adapter,

					NETXEN_ROMUSB_GLB_PEGTUNE_DONE);

			printk(KERN_WARNING "netxen_phantom_init: init failed, "

					"pegtune_val=%x\n", pegtune_val);

			return -1;

		}

	}

	NXWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_FAILED);



	return 0;

out_err:

	dev_warn(&adapter->pdev->dev, "firmware init failed\n");

	return -EIO;

}



static int

drivers/net/netxen/netxen_nic_main.c

+2 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw) 
		first_driver = (adapter->ahw.pci_func == 0);



	if (!first_driver)

		return 0;

		goto wait_init;



	first_boot = NXRD32(adapter, NETXEN_CAM_RAM(0x1fc));
@@ -752,6 +752,7 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw) 
		| (_NETXEN_NIC_LINUX_SUBVERSION);

	NXWR32(adapter, CRB_DRIVER_VERSION, val);



wait_init:

	/* Handshake with the card before we register the devices. */

	err = netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);

	if (err) {