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

Commit 4f96b988 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by David S. Miller
Browse files

netxen: clean up firmware version checks 



NX2031 firmware version will never be > 4.0.0, so replace
(adapter->fw_major < 4) checks with pci revision ID check.

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

drivers/net/netxen/netxen_nic.h

+1 −1
Original line number Diff line number Diff line
@@ -1299,7 +1299,7 @@ struct netxen_adapter { 


	nx_nic_intr_coalesce_t coal;



	u32 fw_major;

	u32 resv5;

	u32 fw_version;

	const struct firmware *fw;

};

drivers/net/netxen/netxen_nic_ctx.c

+3 −3
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter) 
		}

		rds_ring->desc_head = (struct rcv_desc *)addr;



		if (adapter->fw_major < 4)

		if (NX_IS_REVISION_P2(adapter->ahw.revision_id))

			rds_ring->crb_rcv_producer =

				recv_crb_registers[port].crb_rcv_producer[ring];

	}
@@ -675,7 +675,7 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter) 
	}





	if (adapter->fw_major >= 4) {

	if (!NX_IS_REVISION_P2(adapter->ahw.revision_id)) {

		err = nx_fw_cmd_create_rx_ctx(adapter);

		if (err)

			goto err_out_free;
@@ -705,7 +705,7 @@ void netxen_free_hw_resources(struct netxen_adapter *adapter) 


	int port = adapter->portnum;



	if (adapter->fw_major >= 4) {

	if (!NX_IS_REVISION_P2(adapter->ahw.revision_id)) {

		nx_fw_cmd_destroy_rx_ctx(adapter);

		nx_fw_cmd_destroy_tx_ctx(adapter);

	} else {

drivers/net/netxen/netxen_nic_hw.c

+0 −1
Original line number Diff line number Diff line
@@ -2045,7 +2045,6 @@ void netxen_nic_get_firmware_info(struct netxen_adapter *adapter) 
	fw_minor = NXRD32(adapter, NETXEN_FW_VERSION_MINOR);

	fw_build = NXRD32(adapter, NETXEN_FW_VERSION_SUB);



	adapter->fw_major = fw_major;

	adapter->fw_version = NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build);



	if (adapter->portnum == 0) {

drivers/net/netxen/netxen_nic_init.c

+1 −1
Original line number Diff line number Diff line
@@ -1477,7 +1477,7 @@ netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ringid, 
		NXWR32(adapter, rds_ring->crb_rcv_producer,

				(producer-1) & (rds_ring->num_desc-1));



		if (adapter->fw_major < 4) {

		if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {

			/*

			 * Write a doorbell msg to tell phanmon of change in

			 * receive ring producer

drivers/net/netxen/netxen_nic_main.c

+3 −3
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ netxen_nic_attach(struct netxen_adapter *adapter) 
		goto err_out_free_sw;

	}



	if (adapter->fw_major < 4) {

	if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {

		tx_ring = adapter->tx_ring;

		tx_ring->crb_cmd_producer = crb_cmd_producer[adapter->portnum];

		tx_ring->crb_cmd_consumer = crb_cmd_consumer[adapter->portnum];
@@ -1103,7 +1103,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * See if the firmware gave us a virtual-physical port mapping.

	 */

	adapter->physical_port = adapter->portnum;

	if (adapter->fw_major < 4) {

	if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {

		i = NXRD32(adapter, CRB_V2P(adapter->portnum));

		if (i != 0x55555555)

			adapter->physical_port = i;
@@ -1727,7 +1727,7 @@ static irqreturn_t netxen_intr(int irq, void *data) 
	}



	/* clear interrupt */

	if (adapter->fw_major < 4)

	if (NX_IS_REVISION_P2(adapter->ahw.revision_id))

		netxen_nic_disable_int(sds_ring);



	adapter->pci_write_immediate(adapter,