Commit 10c073e4 authored by Veerasenareddy Burru's avatar Veerasenareddy Burru Committed by David S. Miller
Browse files

octeon_ep: defer probe if firmware not ready 



Defer probe if firmware is not ready for device usage.

Signed-off-by: default avatarVeerasenareddy Burru <vburru@marvell.com>
Signed-off-by: default avatarAbhijit Ayarekar <aayarekar@marvell.com>
Signed-off-by: default avatarSatananda Burla <sburla@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fbf8ba56

drivers/net/ethernet/marvell/octeon_ep/octep_main.c

+26 −0
Original line number Diff line number Diff line
@@ -1016,6 +1016,26 @@ static void octep_device_cleanup(struct octep_device *oct) 
	oct->conf = NULL;

}



static bool get_fw_ready_status(struct pci_dev *pdev)

{

	u32 pos = 0;

	u16 vsec_id;

	u8 status;



	while ((pos = pci_find_next_ext_capability(pdev, pos,

						   PCI_EXT_CAP_ID_VNDR))) {

		pci_read_config_word(pdev, pos + 4, &vsec_id);

#define FW_STATUS_VSEC_ID  0xA3

		if (vsec_id != FW_STATUS_VSEC_ID)

			continue;



		pci_read_config_byte(pdev, (pos + 8), &status);

		dev_info(&pdev->dev, "Firmware ready status = %u\n", status);

		return status;

	}

	return false;

}



/**

 * octep_probe() - Octeon PCI device probe handler.

 *
@@ -1051,6 +1071,12 @@ static int octep_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	pci_set_master(pdev);



	if (!get_fw_ready_status(pdev)) {

		dev_notice(&pdev->dev, "Firmware not ready; defer probe.\n");

		err = -EPROBE_DEFER;

		goto err_alloc_netdev;

	}



	netdev = alloc_etherdev_mq(sizeof(struct octep_device),

				   OCTEP_MAX_QUEUES);

	if (!netdev) {