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

Commit b3a24649 authored by Sucheta Chakraborty's avatar Sucheta Chakraborty Committed by David S. Miller
Browse files

qlcnic: check device class 



pci-func class can be other than ethernet in Qlogic CNA device.

Signed-off-by: default avatarSucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: default avatarAmit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 96f8118c

drivers/net/qlcnic/qlcnic.h

+1 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ int qlcnic_need_fw_reset(struct qlcnic_adapter *adapter); 
void qlcnic_request_firmware(struct qlcnic_adapter *adapter);

void qlcnic_release_firmware(struct qlcnic_adapter *adapter);

int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter);

void qlcnic_setup_idc_param(struct qlcnic_adapter *adapter);

int qlcnic_setup_idc_param(struct qlcnic_adapter *adapter);



int qlcnic_rom_fast_read(struct qlcnic_adapter *adapter, int addr, int *valp);

int qlcnic_rom_fast_read_words(struct qlcnic_adapter *adapter, int addr,

drivers/net/qlcnic/qlcnic_init.c

+15 −1
Original line number Diff line number Diff line
@@ -514,10 +514,22 @@ int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter) 
	return 0;

}



void

int

qlcnic_setup_idc_param(struct qlcnic_adapter *adapter) {



	int timeo;

	u32 val;



	val = QLCRD32(adapter, QLCNIC_CRB_DEV_PARTITION_INFO);

	val = (val >> (adapter->portnum * 4)) & 0xf;



	if ((val & 0x3) != 1) {

		dev_err(&adapter->pdev->dev, "Not an Ethernet NIC func=%u\n",

									val);

		return -EIO;

	}



	adapter->physical_port = (val >> 2);



	if (qlcnic_rom_fast_read(adapter, QLCNIC_ROM_DEV_INIT_TIMEOUT, &timeo))

		timeo = 30;
@@ -528,6 +540,8 @@ qlcnic_setup_idc_param(struct qlcnic_adapter *adapter) { 
		timeo = 10;



	adapter->reset_ack_timeo = timeo;



	return 0;

}



static int

drivers/net/qlcnic/qlcnic_main.c

+2 −6
Original line number Diff line number Diff line
@@ -1080,17 +1080,13 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_out_iounmap;

	}



	qlcnic_setup_idc_param(adapter);

	if (qlcnic_setup_idc_param(adapter))

		goto err_out_iounmap;



	err = qlcnic_start_firmware(adapter);

	if (err)

		goto err_out_decr_ref;



	/*

	 * See if the firmware gave us a virtual-physical port mapping.

	 */

	adapter->physical_port = adapter->portnum;



	qlcnic_clear_stats(adapter);



	qlcnic_setup_intr(adapter);