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

Commit 6abb4b83 authored by Amit Kumar Salecha's avatar Amit Kumar Salecha Committed by David S. Miller
Browse files

netxen: onchip memory access change 



Add support for different windowing scheme for on chip
memory in future chip revisions. This is required by
diagnostic tools.

Signed-off-by: default avatarAmit Kumar Salecha <amit@netxen.com>
Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0be367bd

drivers/net/netxen/netxen_nic_hdr.h

+3 −0
Original line number Diff line number Diff line
@@ -867,6 +867,9 @@ enum { 
		(PCIX_SN_WINDOW_F0 + (0x20 * (func))) :\

		(PCIX_SN_WINDOW_F4 + (0x10 * ((func)-4))))



#define PCIX_OCM_WINDOW		(0x10800)

#define PCIX_OCM_WINDOW_REG(func)	(PCIX_OCM_WINDOW + 0x20 * (func))



#define PCIX_TARGET_STATUS	(0x10118)

#define PCIX_TARGET_STATUS_F1	(0x10160)

#define PCIX_TARGET_STATUS_F2	(0x10164)

drivers/net/netxen/netxen_nic_hw.c

+9 −8
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#define MASK(n) ((1ULL<<(n))-1)

#define MN_WIN(addr) (((addr & 0x1fc0000) >> 1) | ((addr >> 25) & 0x3ff))

#define OCM_WIN(addr) (((addr & 0x1ff0000) >> 1) | ((addr >> 25) & 0x3ff))

#define OCM_WIN_P3P(addr) (addr & 0xffc0000)

#define MS_WIN(addr) (addr & 0x0ffc0000)



#define GET_MEM_OFFS_2M(addr) (addr & MASK(18))
@@ -1338,7 +1339,7 @@ static int 
netxen_nic_pci_set_window_2M(struct netxen_adapter *adapter,

		u64 addr, u32 *start)

{

	u32 win_read, window;

	u32 window;

	struct pci_dev *pdev = adapter->pdev;



	if ((addr & 0x00ff800) == 0xff800) {
@@ -1347,14 +1348,14 @@ netxen_nic_pci_set_window_2M(struct netxen_adapter *adapter, 
		return -EIO;

	}



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

		window = OCM_WIN_P3P(addr);

	else

		window = OCM_WIN(addr);



	writel(window, adapter->ahw.ocm_win_crb);

	win_read = readl(adapter->ahw.ocm_win_crb);

	if ((win_read >> 7) != window) {

		if (printk_ratelimit())

			dev_warn(&pdev->dev, "failed to set OCM window\n");

		return -EIO;

	}

	/* read back to flush */

	readl(adapter->ahw.ocm_win_crb);



	adapter->ahw.ocm_win = window;

	*start = NETXEN_PCI_OCM0_2M + GET_MEM_OFFS_2M(addr);

drivers/net/netxen/netxen_nic_main.c

+5 −1
Original line number Diff line number Diff line
@@ -649,7 +649,11 @@ netxen_setup_pci_map(struct netxen_adapter *adapter) 
	adapter->ahw.pci_base1 = mem_ptr1;

	adapter->ahw.pci_base2 = mem_ptr2;



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

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

		adapter->ahw.ocm_win_crb = netxen_get_ioaddr(adapter,

			NETXEN_PCIX_PS_REG(PCIX_OCM_WINDOW_REG(pci_func)));



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

		adapter->ahw.ocm_win_crb = netxen_get_ioaddr(adapter,

			NETXEN_PCIX_PS_REG(PCIE_MN_WINDOW_REG(pci_func)));

	}