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

Commit 3ce06a32 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by Jeff Garzik
Browse files

netxen: add 2MB PCI memory support 



New revision of netxen chip has 2MB PCI memory. Older chips
had 128MB addressable PCI memory. To retain compatibility,
this patch adds function pointers based on pci bar0 size.

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent e4c93c81

drivers/net/netxen/netxen_nic.h

+61 −9
Original line number Diff line number Diff line
@@ -799,6 +799,12 @@ struct netxen_hardware_context { 
	unsigned long first_page_group_start;

	void __iomem *db_base;

	unsigned long db_len;

	unsigned long pci_len0;



	int qdr_sn_window;

	int ddr_mn_window;

	unsigned long mn_win_crb;

	unsigned long ms_win_crb;



	u8 revision_id;

	u16 board_type;
@@ -894,6 +900,8 @@ struct netxen_adapter { 
	struct work_struct  tx_timeout_task;



	u32 curr_window;

	u32 crb_win;

	rwlock_t adapter_lock;



	u32 cmd_producer;

	__le32 *cmd_consumer;
@@ -947,6 +955,17 @@ struct netxen_adapter { 
	int (*init_port) (struct netxen_adapter *, int);

	void (*init_niu) (struct netxen_adapter *);

	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);

	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);

};				/* netxen_adapter structure */



/*
@@ -1022,19 +1041,52 @@ int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter, 
int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu);

int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu);

void netxen_nic_init_niu_gb(struct netxen_adapter *adapter);

void netxen_nic_pci_change_crbwindow(struct netxen_adapter *adapter, u32 wndw);

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);

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);



int netxen_nic_get_board_info(struct netxen_adapter *adapter);

int netxen_nic_hw_read_wx(struct netxen_adapter *adapter, u64 off, void *data,

			  int len);

int netxen_nic_hw_write_wx(struct netxen_adapter *adapter, u64 off, void *data,

			   int len);



int netxen_nic_hw_read_wx_128M(struct netxen_adapter *adapter,

		ulong off, void *data, int len);

int netxen_nic_hw_write_wx_128M(struct netxen_adapter *adapter,

		ulong off, void *data, int len);

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,

		u64 off, void *data, int size);

int netxen_nic_pci_write_immediate_128M(struct netxen_adapter *adapter,

		u64 off, u32 data);

u32 netxen_nic_pci_read_immediate_128M(struct netxen_adapter *adapter, u64 off);

void netxen_nic_pci_write_normalize_128M(struct netxen_adapter *adapter,

		u64 off, u32 data);

u32 netxen_nic_pci_read_normalize_128M(struct netxen_adapter *adapter, u64 off);

unsigned long netxen_nic_pci_set_window_128M(struct netxen_adapter *adapter,

		unsigned long long addr);

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);

int netxen_nic_hw_write_wx_2M(struct netxen_adapter *adapter,

		ulong off, void *data, int len);

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,

		u64 off, void *data, int size);

void netxen_crb_writelit_adapter(struct netxen_adapter *adapter,

				 unsigned long off, int data);

int netxen_nic_pci_write_immediate_2M(struct netxen_adapter *adapter,

		u64 off, u32 data);

u32 netxen_nic_pci_read_immediate_2M(struct netxen_adapter *adapter, u64 off);

void netxen_nic_pci_write_normalize_2M(struct netxen_adapter *adapter,

		u64 off, u32 data);

u32 netxen_nic_pci_read_normalize_2M(struct netxen_adapter *adapter, u64 off);

unsigned long netxen_nic_pci_set_window_2M(struct netxen_adapter *adapter,

		unsigned long long addr);



/* Functions from netxen_nic_init.c */

void netxen_free_adapter_offload(struct netxen_adapter *adapter);
@@ -1129,7 +1181,7 @@ dma_watchdog_shutdown_request(struct netxen_adapter *adapter) 
	u32 ctrl;



	/* check if already inactive */

	if (netxen_nic_hw_read_wx(adapter,

	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");
@@ -1149,7 +1201,7 @@ dma_watchdog_shutdown_poll_result(struct netxen_adapter *adapter) 
{

	u32 ctrl;



	if (netxen_nic_hw_read_wx(adapter,

	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");
@@ -1161,7 +1213,7 @@ dma_watchdog_wakeup(struct netxen_adapter *adapter) 
{

	u32 ctrl;



	if (netxen_nic_hw_read_wx(adapter,

	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");

drivers/net/netxen/netxen_nic_ethtool.c

+17 −14
Original line number Diff line number Diff line
@@ -93,17 +93,21 @@ static void 
netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)

{

	struct netxen_adapter *adapter = netdev_priv(dev);

	unsigned long flags;

	u32 fw_major = 0;

	u32 fw_minor = 0;

	u32 fw_build = 0;



	strncpy(drvinfo->driver, netxen_nic_driver_name, 32);

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

	fw_major = readl(NETXEN_CRB_NORMALIZE(adapter,

					      NETXEN_FW_VERSION_MAJOR));

	fw_minor = readl(NETXEN_CRB_NORMALIZE(adapter,

					      NETXEN_FW_VERSION_MINOR));

	fw_build = readl(NETXEN_CRB_NORMALIZE(adapter, NETXEN_FW_VERSION_SUB));

	write_lock_irqsave(&adapter->adapter_lock, flags);

	fw_major = adapter->pci_read_normalize(adapter,

					NETXEN_FW_VERSION_MAJOR);

	fw_minor = adapter->pci_read_normalize(adapter,

					NETXEN_FW_VERSION_MINOR);

	fw_build = adapter->pci_read_normalize(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);



	strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
@@ -361,19 +365,18 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p) 
{

	struct netxen_adapter *adapter = netdev_priv(dev);

	__u32 mode, *regs_buff = p;

	void __iomem *addr;

	int i, window;



	memset(p, 0, NETXEN_NIC_REGS_LEN);

	regs->version = (1 << 24) | (adapter->ahw.revision_id << 16) |

	    (adapter->pdev)->device;

	/* which mode */

	NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_MODE, &regs_buff[0]);

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

	mode = regs_buff[0];



	/* Common registers to all the modes */

	NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_STRAP_VALUE_SAVE_HIGHER,

				   &regs_buff[2]);

	adapter->hw_read_wx(adapter,

			NETXEN_NIU_STRAP_VALUE_SAVE_HIGHER, &regs_buff[2], 4);

	/* GB/XGB Mode */

	mode = (mode / 2) - 1;

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

					NETXEN_NIC_PORT_WINDOW;



			NETXEN_NIC_LOCKED_READ_REG(niu_registers[mode].

						   reg[i - 3] + window,

						   &regs_buff[i]);

			adapter->hw_read_wx(adapter,

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

				&regs_buff[i], 4);

		}



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

		}

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

		val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE));

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

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

	}

	return -EIO;
@@ -668,7 +671,7 @@ static int netxen_nic_reg_test(struct net_device *dev) 
	data_written = (u32)0xa5a5a5a5;



	netxen_nic_reg_write(adapter, CRB_SCRATCHPAD_TEST, data_written);

	data_read = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_SCRATCHPAD_TEST));

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

	if (data_written != data_read)

		return 1;

drivers/net/netxen/netxen_nic_hw.c

+1244 −115

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/netxen/netxen_nic_hw.h

+11 −10
Original line number Diff line number Diff line
@@ -82,19 +82,9 @@ struct netxen_adapter; 


#define NETXEN_PCI_MAPSIZE_BYTES  (NETXEN_PCI_MAPSIZE << 20)



#define NETXEN_NIC_LOCKED_READ_REG(X, Y)	\

	addr = pci_base_offset(adapter, X);	\

	*(u32 *)Y = readl((void __iomem*) addr);



struct netxen_port;

void netxen_nic_set_link_parameters(struct netxen_adapter *adapter);

void netxen_nic_flash_print(struct netxen_adapter *adapter);

int netxen_nic_hw_write_wx(struct netxen_adapter *adapter, u64 off,

			   void *data, int len);

void netxen_crb_writelit_adapter(struct netxen_adapter *adapter,

				 unsigned long off, int data);

int netxen_nic_hw_read_wx(struct netxen_adapter *adapter, u64 off,

			  void *data, int len);



typedef u8 netxen_ethernet_macaddr_t[6];
@@ -503,4 +493,15 @@ int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter); 


int netxen_niu_disable_xg_port(struct netxen_adapter *adapter);



typedef struct {

	unsigned valid;

	unsigned start_128M;

	unsigned end_128M;

	unsigned start_2M;

} crb_128M_2M_sub_block_map_t;



typedef struct {

	crb_128M_2M_sub_block_map_t sub_block[16];

} crb_128M_2M_block_map_t;



#endif				/* __NETXEN_NIC_HW_H_ */

drivers/net/netxen/netxen_nic_init.c

+27 −27
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ int netxen_init_firmware(struct netxen_adapter *adapter) 
	u32 state = 0, loops = 0, err = 0;



	/* Window 1 call */

	state = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));

	state = adapter->pci_read_normalize(adapter, CRB_CMDPEG_STATE);



	if (state == PHAN_INITIALIZE_ACK)

		return 0;
@@ -132,7 +132,7 @@ int netxen_init_firmware(struct netxen_adapter *adapter) 
	while (state != PHAN_INITIALIZE_COMPLETE && loops < 2000) {

		udelay(100);

		/* Window 1 call */

		state = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));

		state = adapter->pci_read_normalize(adapter, CRB_CMDPEG_STATE);



		loops++;

	}
@@ -143,14 +143,14 @@ int netxen_init_firmware(struct netxen_adapter *adapter) 
		return err;

	}

	/* Window 1 call */

	writel(INTR_SCHEME_PERPORT,

	       NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_CAPABILITIES_HOST));

	writel(MSI_MODE_MULTIFUNC,

	       NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_MSI_MODE_HOST));

	writel(MPORT_MULTI_FUNCTION_MODE,

	       NETXEN_CRB_NORMALIZE(adapter, CRB_MPORT_MODE));

	writel(PHAN_INITIALIZE_ACK,

	       NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));

	adapter->pci_write_normalize(adapter,

			CRB_NIC_CAPABILITIES_HOST, INTR_SCHEME_PERPORT);

	adapter->pci_write_normalize(adapter,

			CRB_NIC_MSI_MODE_HOST, MSI_MODE_MULTIFUNC);

	adapter->pci_write_normalize(adapter,

			CRB_MPORT_MODE, MPORT_MULTI_FUNCTION_MODE);

	adapter->pci_write_normalize(adapter,

			CRB_CMDPEG_STATE, PHAN_INITIALIZE_ACK);



	return err;

}
@@ -811,7 +811,7 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose) 
				buf[i].data = NETXEN_NIC_XDMA_RESET;

			}



			netxen_nic_hw_write_wx(adapter, off, &buf[i].data, 4);

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



			if (init_delay == 1) {

				msleep(1000);
@@ -824,7 +824,7 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose) 
		/* disable_peg_cache_all */



		/* unreset_net_cache */

		netxen_nic_hw_read_wx(adapter, NETXEN_ROMUSB_GLB_SW_RESET, &val,

		adapter->hw_read_wx(adapter, NETXEN_ROMUSB_GLB_SW_RESET, &val,

				      4);

		netxen_crb_writelit_adapter(adapter, NETXEN_ROMUSB_GLB_SW_RESET,

					    (val & 0xffffff0f));
@@ -884,8 +884,8 @@ int netxen_initialize_adapter_offload(struct netxen_adapter *adapter) 
	hi = (addr >> 32) & 0xffffffff;

	lo = addr & 0xffffffff;



	writel(hi, NETXEN_CRB_NORMALIZE(adapter, CRB_HOST_DUMMY_BUF_ADDR_HI));

	writel(lo, NETXEN_CRB_NORMALIZE(adapter, CRB_HOST_DUMMY_BUF_ADDR_LO));

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

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



	return 0;

}
@@ -924,10 +924,10 @@ int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val) 


	if (!pegtune_val) {

		do {

			val = readl(NETXEN_CRB_NORMALIZE

				  (adapter, CRB_CMDPEG_STATE));

			pegtune_val = readl(NETXEN_CRB_NORMALIZE

				  (adapter, NETXEN_ROMUSB_GLB_PEGTUNE_DONE));

			val = adapter->pci_read_normalize(adapter,

					CRB_CMDPEG_STATE);

			pegtune_val = adapter->pci_read_normalize(adapter,

					NETXEN_ROMUSB_GLB_PEGTUNE_DONE);



			if (val == PHAN_INITIALIZE_COMPLETE ||

				val == PHAN_INITIALIZE_ACK)
@@ -951,7 +951,7 @@ static int netxen_nic_check_temp(struct netxen_adapter *adapter) 
	uint32_t temp, temp_state, temp_val;

	int rv = 0;



	temp = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_TEMP_STATE));

	temp = adapter->pci_read_normalize(adapter, CRB_TEMP_STATE);



	temp_state = nx_get_temp_state(temp);

	temp_val = nx_get_temp_val(temp);
@@ -1119,8 +1119,8 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max) 
		recv_ctx->status_rx_consumer = consumer;



		/* Window = 1 */

		writel(consumer, NETXEN_CRB_NORMALIZE(adapter,

					recv_ctx->crb_sts_consumer));

		adapter->pci_write_normalize(adapter,

				recv_ctx->crb_sts_consumer, consumer);

	}



	return count;
@@ -1264,9 +1264,9 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid) 
		rcv_desc->begin_alloc = index;

		rcv_desc->producer = producer;

			/* Window = 1 */

		writel((producer - 1) & (rcv_desc->max_rx_desc_count - 1),

		       NETXEN_CRB_NORMALIZE(adapter,

			       rcv_desc->crb_rcv_producer));

		adapter->pci_write_normalize(adapter,

				rcv_desc->crb_rcv_producer,

				(producer-1) & (rcv_desc->max_rx_desc_count-1));

			/*

			 * Write a doorbell msg to tell phanmon of change in

			 * receive ring producer
@@ -1344,9 +1344,9 @@ static void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, 
		rcv_desc->begin_alloc = index;

		rcv_desc->producer = producer;

			/* Window = 1 */

		writel((producer - 1) & (rcv_desc->max_rx_desc_count - 1),

		       NETXEN_CRB_NORMALIZE(adapter,

			       rcv_desc->crb_rcv_producer));

		adapter->pci_write_normalize(adapter,

			rcv_desc->crb_rcv_producer,

				(producer-1) & (rcv_desc->max_rx_desc_count-1));

			wmb();

	}

}