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

Commit 45918e2f authored by Anirban Chakraborty's avatar Anirban Chakraborty Committed by David S. Miller
Browse files

qlcnic: Remove obsolete code 



Current driver uses FW API version 2 and thus code corresponding to FW API
version 1 has become obsolete. Clean up this from the driver.

Signed-off-by: default avatarAnirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 51f932c4

drivers/net/qlcnic/qlcnic_ctx.c

+4 −22
Original line number Diff line number Diff line
@@ -224,12 +224,7 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter) 
		rds_ring = &recv_ctx->rds_rings[i];



		reg = le32_to_cpu(prsp_rds[i].host_producer_crb);

		if (adapter->fw_hal_version == QLCNIC_FW_BASE)

			rds_ring->crb_rcv_producer = qlcnic_get_ioaddr(adapter,

				QLCNIC_REG(reg - 0x200));

		else

			rds_ring->crb_rcv_producer = adapter->ahw.pci_base0 +

				reg;

		rds_ring->crb_rcv_producer = adapter->ahw.pci_base0 + reg;

	}



	prsp_sds = ((struct qlcnic_cardrsp_sds_ring *)
@@ -241,17 +236,9 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter) 
		reg = le32_to_cpu(prsp_sds[i].host_consumer_crb);

		reg2 = le32_to_cpu(prsp_sds[i].interrupt_crb);



		if (adapter->fw_hal_version == QLCNIC_FW_BASE) {

			sds_ring->crb_sts_consumer = qlcnic_get_ioaddr(adapter,

				QLCNIC_REG(reg - 0x200));

			sds_ring->crb_intr_mask = qlcnic_get_ioaddr(adapter,

				QLCNIC_REG(reg2 - 0x200));

		} else {

			sds_ring->crb_sts_consumer = adapter->ahw.pci_base0 +

				reg;

		sds_ring->crb_sts_consumer = adapter->ahw.pci_base0 + reg;

		sds_ring->crb_intr_mask = adapter->ahw.pci_base0 + reg2;

	}

	}



	recv_ctx->state = le32_to_cpu(prsp->host_ctx_state);

	recv_ctx->context_id = le16_to_cpu(prsp->context_id);
@@ -352,12 +339,7 @@ qlcnic_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter) 


	if (err == QLCNIC_RCODE_SUCCESS) {

		temp = le32_to_cpu(prsp->cds_ring.host_producer_crb);

		if (adapter->fw_hal_version == QLCNIC_FW_BASE)

			tx_ring->crb_cmd_producer = qlcnic_get_ioaddr(adapter,

				QLCNIC_REG(temp - 0x200));

		else

			tx_ring->crb_cmd_producer = adapter->ahw.pci_base0 +

				temp;

		tx_ring->crb_cmd_producer = adapter->ahw.pci_base0 + temp;



		adapter->tx_context_id =

			le16_to_cpu(prsp->context_id);

drivers/net/qlcnic/qlcnic_hdr.h

+0 −6
Original line number Diff line number Diff line
@@ -778,12 +778,6 @@ enum { 
	QLCNIC_NON_PRIV_FUNC	= 2

};



/* FW HAL api version */

enum {

	QLCNIC_FW_BASE	= 1,

	QLCNIC_FW_NPAR	= 2

};



#define QLC_DEV_DRV_DEFAULT 0x11111111



#define LSB(x)	((uint8_t)(x))

drivers/net/qlcnic/qlcnic_init.c

+7 −9
Original line number Diff line number Diff line
@@ -548,7 +548,6 @@ qlcnic_setup_idc_param(struct qlcnic_adapter *adapter) { 
	int timeo;

	u32 val;



	if (adapter->fw_hal_version == QLCNIC_FW_BASE) {

	val = QLCRD32(adapter, QLCNIC_CRB_DEV_PARTITION_INFO);

	val = QLC_DEV_GET_DRV(val, adapter->portnum);

	if ((val & 0x3) != QLCNIC_TYPE_NIC) {
@@ -557,7 +556,6 @@ qlcnic_setup_idc_param(struct qlcnic_adapter *adapter) { 
		return -EIO;

	}

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

	}

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

		timeo = 30;

drivers/net/qlcnic/qlcnic_main.c

+2 −20
Original line number Diff line number Diff line
@@ -377,15 +377,6 @@ static const struct net_device_ops qlcnic_netdev_ops = { 
};



static struct qlcnic_nic_template qlcnic_ops = {

	.get_mac_addr = qlcnic_get_mac_addr,

	.config_bridged_mode = qlcnic_config_bridged_mode,

	.config_led = qlcnic_config_led,

	.set_ilb_mode = qlcnic_set_ilb_mode,

	.clear_ilb_mode = qlcnic_clear_ilb_mode,

	.start_firmware = qlcnic_start_firmware

};



static struct qlcnic_nic_template qlcnic_pf_ops = {

	.get_mac_addr = qlcnic_get_mac_address,

	.config_bridged_mode = qlcnic_config_bridged_mode,

	.config_led = qlcnic_config_led,
@@ -534,15 +525,6 @@ qlcnic_get_driver_mode(struct qlcnic_adapter *adapter) 


	/* Determine FW API version */

	adapter->fw_hal_version = readl(adapter->ahw.pci_base0 + QLCNIC_FW_API);

	if (adapter->fw_hal_version == ~0) {

		adapter->nic_ops = &qlcnic_ops;

		adapter->fw_hal_version = QLCNIC_FW_BASE;

		adapter->ahw.pci_func = PCI_FUNC(adapter->pdev->devfn);

		adapter->capabilities = QLCRD32(adapter, CRB_FW_CAPABILITIES_1);

		dev_info(&adapter->pdev->dev,

			"FW does not support nic partion\n");

		return adapter->fw_hal_version;

	}



	/* Find PCI function number */

	pci_read_config_dword(adapter->pdev, QLCNIC_MSIX_TABLE_OFFSET, &func);
@@ -569,7 +551,7 @@ qlcnic_get_driver_mode(struct qlcnic_adapter *adapter) 
	switch (priv_level) {

	case QLCNIC_MGMT_FUNC:

		adapter->op_mode = QLCNIC_MGMT_FUNC;

		adapter->nic_ops = &qlcnic_pf_ops;

		adapter->nic_ops = &qlcnic_ops;

		qlcnic_get_pci_info(adapter);

		/* Set privilege level for other functions */

		qlcnic_set_function_modes(adapter);
@@ -582,7 +564,7 @@ qlcnic_get_driver_mode(struct qlcnic_adapter *adapter) 
		dev_info(&adapter->pdev->dev,

			"HAL Version: %d, Privileged function\n",

			adapter->fw_hal_version);

		adapter->nic_ops = &qlcnic_pf_ops;

		adapter->nic_ops = &qlcnic_ops;

		break;

	case QLCNIC_NON_PRIV_FUNC:

		adapter->op_mode = QLCNIC_NON_PRIV_FUNC;