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

Commit 1fbe6323 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by David S. Miller
Browse files

netxen: annotate register access functions 



o remove unnecessary length parameter since register access
  width is fixed 4 byte.
o remove superfluous pci_read_normalize and pci_write_normalize
  functions.

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

drivers/net/netxen/netxen_nic.h

+14 −61
Original line number Diff line number Diff line
@@ -1258,14 +1258,12 @@ struct netxen_adapter { 
	int (*init_port) (struct netxen_adapter *, int);

	int (*stop_port) (struct netxen_adapter *);



	int (*hw_read_wx)(struct netxen_adapter *, ulong, void *, int);

	int (*hw_write_wx)(struct netxen_adapter *, ulong, void *, int);

	u32 (*hw_read_wx)(struct netxen_adapter *, ulong);

	int (*hw_write_wx)(struct netxen_adapter *, ulong, u32);

	int (*pci_mem_read)(struct netxen_adapter *, u64, void *, int);

	int (*pci_mem_write)(struct netxen_adapter *, u64, void *, int);

	int (*pci_write_immediate)(struct netxen_adapter *, u64, u32);

	u32 (*pci_read_immediate)(struct netxen_adapter *, u64);

	void (*pci_write_normalize)(struct netxen_adapter *, u64, u32);

	u32 (*pci_read_normalize)(struct netxen_adapter *, u64);

	unsigned long (*pci_set_window)(struct netxen_adapter *,

			unsigned long long);
@@ -1302,46 +1300,6 @@ struct netxen_adapter { 
#define netxen_get_dma_watchdog_disabled(config_word) \

	(((config_word) >> 1) & 0x1)



/* Max number of xmit producer threads that can run simultaneously */

#define	MAX_XMIT_PRODUCERS		16



#define PCI_OFFSET_FIRST_RANGE(adapter, off)    \

	((adapter)->ahw.pci_base0 + (off))

#define PCI_OFFSET_SECOND_RANGE(adapter, off)   \

	((adapter)->ahw.pci_base1 + (off) - SECOND_PAGE_GROUP_START)

#define PCI_OFFSET_THIRD_RANGE(adapter, off)    \

	((adapter)->ahw.pci_base2 + (off) - THIRD_PAGE_GROUP_START)



static inline void __iomem *pci_base_offset(struct netxen_adapter *adapter,

					    unsigned long off)

{

	if ((off < FIRST_PAGE_GROUP_END) && (off >= FIRST_PAGE_GROUP_START)) {

		return (adapter->ahw.pci_base0 + off);

	} else if ((off < SECOND_PAGE_GROUP_END) &&

		   (off >= SECOND_PAGE_GROUP_START)) {

		return (adapter->ahw.pci_base1 + off - SECOND_PAGE_GROUP_START);

	} else if ((off < THIRD_PAGE_GROUP_END) &&

		   (off >= THIRD_PAGE_GROUP_START)) {

		return (adapter->ahw.pci_base2 + off - THIRD_PAGE_GROUP_START);

	}

	return NULL;

}



static inline void __iomem *pci_base(struct netxen_adapter *adapter,

				     unsigned long off)

{

	if ((off < FIRST_PAGE_GROUP_END) && (off >= FIRST_PAGE_GROUP_START)) {

		return adapter->ahw.pci_base0;

	} else if ((off < SECOND_PAGE_GROUP_END) &&

		   (off >= SECOND_PAGE_GROUP_START)) {

		return adapter->ahw.pci_base1;

	} else if ((off < THIRD_PAGE_GROUP_END) &&

		   (off >= THIRD_PAGE_GROUP_START)) {

		return adapter->ahw.pci_base2;

	}

	return NULL;

}



int netxen_niu_xgbe_enable_phy_interrupts(struct netxen_adapter *adapter);

int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter);

int netxen_niu_xgbe_disable_phy_interrupts(struct netxen_adapter *adapter);
@@ -1357,18 +1315,17 @@ int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu); 
void netxen_nic_reg_write(struct netxen_adapter *adapter, u64 off, u32 val);

int netxen_nic_reg_read(struct netxen_adapter *adapter, u64 off);

void netxen_nic_write_w0(struct netxen_adapter *adapter, u32 index, u32 value);

void netxen_nic_read_w0(struct netxen_adapter *adapter, u32 index, u32 *value);

u32 netxen_nic_read_w0(struct netxen_adapter *adapter, u32 index);

void netxen_nic_write_w1(struct netxen_adapter *adapter, u32 index, u32 value);

void netxen_nic_read_w1(struct netxen_adapter *adapter, u32 index, u32 *value);

u32 netxen_nic_read_w1(struct netxen_adapter *adapter, u32 index);



int netxen_nic_get_board_info(struct netxen_adapter *adapter);

void netxen_nic_get_firmware_info(struct netxen_adapter *adapter);

int netxen_nic_wol_supported(struct netxen_adapter *adapter);



int netxen_nic_hw_read_wx_128M(struct netxen_adapter *adapter,

		ulong off, void *data, int len);

u32 netxen_nic_hw_read_wx_128M(struct netxen_adapter *adapter, ulong off);

int netxen_nic_hw_write_wx_128M(struct netxen_adapter *adapter,

		ulong off, void *data, int len);

		ulong off, u32 data);

int netxen_nic_pci_mem_read_128M(struct netxen_adapter *adapter,

		u64 off, void *data, int size);

int netxen_nic_pci_mem_write_128M(struct netxen_adapter *adapter,
@@ -1384,10 +1341,9 @@ unsigned long netxen_nic_pci_set_window_128M(struct netxen_adapter *adapter, 
void netxen_nic_pci_change_crbwindow_128M(struct netxen_adapter *adapter,

		u32 wndw);



int netxen_nic_hw_read_wx_2M(struct netxen_adapter *adapter,

		ulong off, void *data, int len);

u32 netxen_nic_hw_read_wx_2M(struct netxen_adapter *adapter, ulong off);

int netxen_nic_hw_write_wx_2M(struct netxen_adapter *adapter,

		ulong off, void *data, int len);

		ulong off, u32 data);

int netxen_nic_pci_mem_read_2M(struct netxen_adapter *adapter,

		u64 off, void *data, int size);

int netxen_nic_pci_mem_write_2M(struct netxen_adapter *adapter,
@@ -1514,9 +1470,8 @@ dma_watchdog_shutdown_request(struct netxen_adapter *adapter) 
	u32 ctrl;



	/* check if already inactive */

	if (adapter->hw_read_wx(adapter,

	    NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL), &ctrl, 4))

		printk(KERN_ERR "failed to read dma watchdog status\n");

	ctrl = adapter->hw_read_wx(adapter,

			NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL));



	if (netxen_get_dma_watchdog_enabled(ctrl) == 0)

		return 1;
@@ -1534,9 +1489,8 @@ dma_watchdog_shutdown_poll_result(struct netxen_adapter *adapter) 
{

	u32 ctrl;



	if (adapter->hw_read_wx(adapter,

	    NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL), &ctrl, 4))

		printk(KERN_ERR "failed to read dma watchdog status\n");

	ctrl = adapter->hw_read_wx(adapter,

			NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL));



	return (netxen_get_dma_watchdog_enabled(ctrl) == 0);

}
@@ -1546,9 +1500,8 @@ dma_watchdog_wakeup(struct netxen_adapter *adapter) 
{

	u32 ctrl;



	if (adapter->hw_read_wx(adapter,

		NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL), &ctrl, 4))

		printk(KERN_ERR "failed to read dma watchdog status\n");

	ctrl = adapter->hw_read_wx(adapter,

			NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL));



	if (netxen_get_dma_watchdog_enabled(ctrl))

		return 1;

drivers/net/netxen/netxen_nic_ctx.c

+8 −10
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ netxen_api_lock(struct netxen_adapter *adapter) 


	for (;;) {

		/* Acquire PCIE HW semaphore5 */

		netxen_nic_read_w0(adapter,

			NETXEN_PCIE_REG(PCIE_SEM5_LOCK), &done);

		done = netxen_nic_read_w0(adapter,

			NETXEN_PCIE_REG(PCIE_SEM5_LOCK));



		if (done == 1)

			break;
@@ -65,11 +65,9 @@ netxen_api_lock(struct netxen_adapter *adapter) 
static int

netxen_api_unlock(struct netxen_adapter *adapter)

{

	u32 val;



	/* Release PCIE HW semaphore5 */

	netxen_nic_read_w0(adapter,

		NETXEN_PCIE_REG(PCIE_SEM5_UNLOCK), &val);

		NETXEN_PCIE_REG(PCIE_SEM5_UNLOCK));

	return 0;

}
@@ -86,7 +84,7 @@ netxen_poll_rsp(struct netxen_adapter *adapter) 
		if (++timeout > NX_OS_CRB_RETRY_COUNT)

			return NX_CDRP_RSP_TIMEOUT;



		netxen_nic_read_w1(adapter, NX_CDRP_CRB_OFFSET, &rsp);

		rsp = netxen_nic_read_w1(adapter, NX_CDRP_CRB_OFFSET);

	} while (!NX_CDRP_IS_RSP(rsp));



	return rsp;
@@ -125,7 +123,7 @@ netxen_issue_cmd(struct netxen_adapter *adapter, 


		rcode = NX_RCODE_TIMEOUT;

	} else if (rsp == NX_CDRP_RSP_FAIL) {

		netxen_nic_read_w1(adapter, NX_ARG1_CRB_OFFSET, &rcode);

		rcode = netxen_nic_read_w1(adapter, NX_ARG1_CRB_OFFSET);



		printk(KERN_ERR "%s: failed card response code:0x%x\n",

				netxen_nic_driver_name, rcode);
@@ -517,11 +515,11 @@ netxen_init_old_ctx(struct netxen_adapter *adapter) 
	adapter->ctx_desc->sts_ring_addr = cpu_to_le64(sds_ring->phys_addr);

	adapter->ctx_desc->sts_ring_size = cpu_to_le32(sds_ring->num_desc);



	adapter->pci_write_normalize(adapter, CRB_CTX_ADDR_REG_LO(func_id),

	adapter->hw_write_wx(adapter, CRB_CTX_ADDR_REG_LO(func_id),

			lower32(adapter->ctx_desc_phys_addr));

	adapter->pci_write_normalize(adapter, CRB_CTX_ADDR_REG_HI(func_id),

	adapter->hw_write_wx(adapter, CRB_CTX_ADDR_REG_HI(func_id),

			upper32(adapter->ctx_desc_phys_addr));

	adapter->pci_write_normalize(adapter, CRB_CTX_SIGNATURE_REG(func_id),

	adapter->hw_write_wx(adapter, CRB_CTX_SIGNATURE_REG(func_id),

			NETXEN_CTX_SIGNATURE | func_id);

	return 0;

}

drivers/net/netxen/netxen_nic_ethtool.c

+22 −23
Original line number Diff line number Diff line
@@ -92,11 +92,11 @@ netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo) 
	strncpy(drvinfo->driver, netxen_nic_driver_name, 32);

	strncpy(drvinfo->version, NETXEN_NIC_LINUX_VERSIONID, 32);

	write_lock_irqsave(&adapter->adapter_lock, flags);

	fw_major = adapter->pci_read_normalize(adapter,

	fw_major = adapter->hw_read_wx(adapter,

					NETXEN_FW_VERSION_MAJOR);

	fw_minor = adapter->pci_read_normalize(adapter,

	fw_minor = adapter->hw_read_wx(adapter,

					NETXEN_FW_VERSION_MINOR);

	fw_build = adapter->pci_read_normalize(adapter,

	fw_build = adapter->hw_read_wx(adapter,

					NETXEN_FW_VERSION_SUB);

	write_unlock_irqrestore(&adapter->adapter_lock, flags);

	sprintf(drvinfo->fw_version, "%d.%d.%d", fw_major, fw_minor, fw_build);
@@ -135,7 +135,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 
	} else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {

		u32 val;



		adapter->hw_read_wx(adapter, NETXEN_PORT_MODE_ADDR, &val, 4);

		val = adapter->hw_read_wx(adapter, NETXEN_PORT_MODE_ADDR);

		if (val == NETXEN_PORT_MODE_802_3_AP) {

			ecmd->supported = SUPPORTED_1000baseT_Full;

			ecmd->advertising = ADVERTISED_1000baseT_Full;
@@ -156,8 +156,8 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 
		if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {

			u16 pcifn = adapter->ahw.pci_func;



			adapter->hw_read_wx(adapter,

				P3_LINK_SPEED_REG(pcifn), &val, 4);

			val = adapter->hw_read_wx(adapter,

				P3_LINK_SPEED_REG(pcifn));

			ecmd->speed = P3_LINK_SPEED_MHZ *

					P3_LINK_SPEED_VAL(pcifn, val);

		} else
@@ -423,12 +423,12 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p) 
	regs->version = (1 << 24) | (adapter->ahw.revision_id << 16) |

	    (adapter->pdev)->device;

	/* which mode */

	adapter->hw_read_wx(adapter, NETXEN_NIU_MODE, &regs_buff[0], 4);

	regs_buff[0] = adapter->hw_read_wx(adapter, NETXEN_NIU_MODE);

	mode = regs_buff[0];



	/* Common registers to all the modes */

	adapter->hw_read_wx(adapter,

			NETXEN_NIU_STRAP_VALUE_SAVE_HIGHER, &regs_buff[2], 4);

	regs_buff[2] = adapter->hw_read_wx(adapter,

			NETXEN_NIU_STRAP_VALUE_SAVE_HIGHER);

	/* GB/XGB Mode */

	mode = (mode / 2) - 1;

	window = 0;
@@ -439,9 +439,8 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p) 
				window = adapter->physical_port *

					NETXEN_NIC_PORT_WINDOW;



			adapter->hw_read_wx(adapter,

				niu_registers[mode].reg[i - 3] + window,

				&regs_buff[i], 4);

			regs_buff[i] = adapter->hw_read_wx(adapter,

				niu_registers[mode].reg[i - 3] + window);

		}



	}
@@ -465,7 +464,7 @@ static u32 netxen_nic_test_link(struct net_device *dev) 
			return !val;

		}

	} else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {

		val = adapter->pci_read_normalize(adapter, CRB_XG_STATE);

		val = adapter->hw_read_wx(adapter, CRB_XG_STATE);

		return (val == XG_LINK_UP) ? 0 : 1;

	}

	return -EIO;
@@ -529,10 +528,10 @@ netxen_nic_get_pauseparam(struct net_device *dev, 
		if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))

			return;

		/* get flow control settings */

		netxen_nic_read_w0(adapter,NETXEN_NIU_GB_MAC_CONFIG_0(port),

				&val);

		val = netxen_nic_read_w0(adapter,

				NETXEN_NIU_GB_MAC_CONFIG_0(port));

		pause->rx_pause = netxen_gb_get_rx_flowctl(val);

		netxen_nic_read_w0(adapter, NETXEN_NIU_GB_PAUSE_CTL, &val);

		val = netxen_nic_read_w0(adapter, NETXEN_NIU_GB_PAUSE_CTL);

		switch (port) {

			case 0:

				pause->tx_pause = !(netxen_gb_get_gb0_mask(val));
@@ -552,7 +551,7 @@ netxen_nic_get_pauseparam(struct net_device *dev, 
		if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS))

			return;

		pause->rx_pause = 1;

		netxen_nic_read_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, &val);

		val = netxen_nic_read_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL);

		if (port == 0)

			pause->tx_pause = !(netxen_xg_get_xg0_mask(val));

		else
@@ -575,8 +574,8 @@ netxen_nic_set_pauseparam(struct net_device *dev, 
		if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))

			return -EIO;

		/* set flow control */

		netxen_nic_read_w0(adapter,

					NETXEN_NIU_GB_MAC_CONFIG_0(port), &val);

		val = netxen_nic_read_w0(adapter,

					NETXEN_NIU_GB_MAC_CONFIG_0(port));



		if (pause->rx_pause)

			netxen_gb_rx_flowctl(val);
@@ -586,7 +585,7 @@ netxen_nic_set_pauseparam(struct net_device *dev, 
		netxen_nic_write_w0(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port),

				val);

		/* set autoneg */

		netxen_nic_read_w0(adapter, NETXEN_NIU_GB_PAUSE_CTL, &val);

		val = netxen_nic_read_w0(adapter, NETXEN_NIU_GB_PAUSE_CTL);

		switch (port) {

			case 0:

				if (pause->tx_pause)
@@ -618,7 +617,7 @@ netxen_nic_set_pauseparam(struct net_device *dev, 
	} else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {

		if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS))

			return -EIO;

		netxen_nic_read_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, &val);

		val = netxen_nic_read_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL);

		if (port == 0) {

			if (pause->tx_pause)

				netxen_xg_unset_xg0_mask(val);
@@ -644,14 +643,14 @@ static int netxen_nic_reg_test(struct net_device *dev) 
	struct netxen_adapter *adapter = netdev_priv(dev);

	u32 data_read, data_written;



	netxen_nic_read_w0(adapter, NETXEN_PCIX_PH_REG(0), &data_read);

	data_read = netxen_nic_read_w0(adapter, NETXEN_PCIX_PH_REG(0));

	if ((data_read & 0xffff) != PHAN_VENDOR_ID)

	return 1;



	data_written = (u32)0xa5a5a5a5;



	netxen_nic_reg_write(adapter, CRB_SCRATCHPAD_TEST, data_written);

	data_read = adapter->pci_read_normalize(adapter, CRB_SCRATCHPAD_TEST);

	data_read = adapter->hw_read_wx(adapter, CRB_SCRATCHPAD_TEST);

	if (data_written != data_read)

		return 1;

drivers/net/netxen/netxen_nic_hw.c

+101 −128

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/netxen/netxen_nic_init.c

+19 −21
Original line number Diff line number Diff line
@@ -368,8 +368,8 @@ static int rom_lock(struct netxen_adapter *adapter) 


	while (!done) {

		/* acquire semaphore2 from PCI HW block */

		netxen_nic_read_w0(adapter, NETXEN_PCIE_REG(PCIE_SEM2_LOCK),

				   &done);

		done = netxen_nic_read_w0(adapter,

				NETXEN_PCIE_REG(PCIE_SEM2_LOCK));

		if (done == 1)

			break;

		if (timeout >= rom_lock_timeout)
@@ -411,10 +411,8 @@ static int netxen_wait_rom_done(struct netxen_adapter *adapter) 


static void netxen_rom_unlock(struct netxen_adapter *adapter)

{

	u32 val;



	/* release semaphore2 */

	netxen_nic_read_w0(adapter, NETXEN_PCIE_REG(PCIE_SEM2_UNLOCK), &val);

	netxen_nic_read_w0(adapter, NETXEN_PCIE_REG(PCIE_SEM2_UNLOCK));



}
@@ -623,7 +621,7 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose) 
			}

		}



		adapter->hw_write_wx(adapter, off, &buf[i].data, 4);

		adapter->hw_write_wx(adapter, off, buf[i].data);



		msleep(init_delay);

	}
@@ -633,8 +631,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose) 


	/* unreset_net_cache */

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

		adapter->hw_read_wx(adapter,

				NETXEN_ROMUSB_GLB_SW_RESET, &val, 4);

		val = adapter->hw_read_wx(adapter,

				NETXEN_ROMUSB_GLB_SW_RESET);

		netxen_crb_writelit_adapter(adapter,

				NETXEN_ROMUSB_GLB_SW_RESET, (val & 0xffffff0f));

	}
@@ -683,12 +681,12 @@ int netxen_initialize_adapter_offload(struct netxen_adapter *adapter) 
	hi = (addr >> 32) & 0xffffffff;

	lo = addr & 0xffffffff;



	adapter->pci_write_normalize(adapter, CRB_HOST_DUMMY_BUF_ADDR_HI, hi);

	adapter->pci_write_normalize(adapter, CRB_HOST_DUMMY_BUF_ADDR_LO, lo);

	adapter->hw_write_wx(adapter, CRB_HOST_DUMMY_BUF_ADDR_HI, hi);

	adapter->hw_write_wx(adapter, CRB_HOST_DUMMY_BUF_ADDR_LO, lo);



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

		uint32_t temp = 0;

		adapter->hw_write_wx(adapter, CRB_HOST_DUMMY_BUF, &temp, 4);

		adapter->hw_write_wx(adapter, CRB_HOST_DUMMY_BUF, temp);

	}



	return 0;
@@ -730,7 +728,7 @@ int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val) 


	if (!pegtune_val) {

		do {

			val = adapter->pci_read_normalize(adapter,

			val = adapter->hw_read_wx(adapter,

					CRB_CMDPEG_STATE);



			if (val == PHAN_INITIALIZE_COMPLETE ||
@@ -742,7 +740,7 @@ int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val) 
		} while (--retries);



		if (!retries) {

			pegtune_val = adapter->pci_read_normalize(adapter,

			pegtune_val = adapter->hw_read_wx(adapter,

					NETXEN_ROMUSB_GLB_PEGTUNE_DONE);

			printk(KERN_WARNING "netxen_phantom_init: init failed, "

					"pegtune_val=%x\n", pegtune_val);
@@ -760,7 +758,7 @@ netxen_receive_peg_ready(struct netxen_adapter *adapter) 
	int retries = 2000;



	do {

		val = adapter->pci_read_normalize(adapter, CRB_RCVPEG_STATE);

		val = adapter->hw_read_wx(adapter, CRB_RCVPEG_STATE);



		if (val == PHAN_PEG_RCV_INITIALIZED)

			return 0;
@@ -786,13 +784,13 @@ int netxen_init_firmware(struct netxen_adapter *adapter) 
	if (err)

		return err;



	adapter->pci_write_normalize(adapter,

	adapter->hw_write_wx(adapter,

			CRB_NIC_CAPABILITIES_HOST, INTR_SCHEME_PERPORT);

	adapter->pci_write_normalize(adapter,

	adapter->hw_write_wx(adapter,

			CRB_NIC_MSI_MODE_HOST, MSI_MODE_MULTIFUNC);

	adapter->pci_write_normalize(adapter,

	adapter->hw_write_wx(adapter,

			CRB_MPORT_MODE, MPORT_MULTI_FUNCTION_MODE);

	adapter->pci_write_normalize(adapter,

	adapter->hw_write_wx(adapter,

			CRB_CMDPEG_STATE, PHAN_INITIALIZE_ACK);



	if (adapter->fw_version >= NETXEN_VERSION_CODE(4, 0, 222)) {
@@ -1059,7 +1057,7 @@ netxen_process_rcv_ring(struct nx_host_sds_ring *sds_ring, int max) 


	if (count) {

		sds_ring->consumer = consumer;

		adapter->pci_write_normalize(adapter,

		adapter->hw_write_wx(adapter,

				sds_ring->crb_sts_consumer, consumer);

	}
@@ -1178,7 +1176,7 @@ netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ringid, 


	if (count) {

		rds_ring->producer = producer;

		adapter->pci_write_normalize(adapter,

		adapter->hw_write_wx(adapter,

				rds_ring->crb_rcv_producer,

				(producer-1) & (rds_ring->num_desc-1));
@@ -1239,7 +1237,7 @@ netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, 


	if (count) {

		rds_ring->producer = producer;

		adapter->pci_write_normalize(adapter,

		adapter->hw_write_wx(adapter,

			rds_ring->crb_rcv_producer,

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

			wmb();