Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

netxen: remove unnecessary size checks

Browse source 
NX3031 have 64bit on card memory. Fix the limit check to
64MB and remove unnecessary 128bit read/write check.

Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sucheta Chakraborty 2010-05-11 23:53:03 +00:00 committed by David S. Miller
parent f8e21f8fe2
commit 215387a4b5
2 changed files with 8 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/netxen/netxen_nic_hdr.h
View file

@ -681,14 +681,8 @@ enum {
#define MIU_TEST_AGT_ADDR_HI (0x08) #define MIU_TEST_AGT_ADDR_HI (0x08)
#define MIU_TEST_AGT_WRDATA_LO (0x10) #define MIU_TEST_AGT_WRDATA_LO (0x10)
#define MIU_TEST_AGT_WRDATA_HI (0x14) #define MIU_TEST_AGT_WRDATA_HI (0x14)
#define MIU_TEST_AGT_WRDATA_UPPER_LO (0x20)
#define MIU_TEST_AGT_WRDATA_UPPER_HI (0x24)
#define MIU_TEST_AGT_WRDATA(i) (0x10+(0x10*((i)>>1))+(4*((i)&1)))
#define MIU_TEST_AGT_RDDATA_LO (0x18) #define MIU_TEST_AGT_RDDATA_LO (0x18)
#define MIU_TEST_AGT_RDDATA_HI (0x1c) #define MIU_TEST_AGT_RDDATA_HI (0x1c)
#define MIU_TEST_AGT_RDDATA_UPPER_LO (0x28)
#define MIU_TEST_AGT_RDDATA_UPPER_HI (0x2c)
#define MIU_TEST_AGT_RDDATA(i) (0x18+(0x10*((i)>>1))+(4*((i)&1)))
#define MIU_TEST_AGT_ADDR_MASK 0xfffffff8 #define MIU_TEST_AGT_ADDR_MASK 0xfffffff8
#define MIU_TEST_AGT_UPPER_ADDR(off) (0) #define MIU_TEST_AGT_UPPER_ADDR(off) (0)

52
drivers/net/netxen/netxen_nic_hw.c
View file

@ -1621,9 +1621,8 @@ static int
netxen_nic_pci_mem_write_2M(struct netxen_adapter *adapter, netxen_nic_pci_mem_write_2M(struct netxen_adapter *adapter,
u64 off, u64 data) u64 off, u64 data)
{ {
int i, j, ret; int j, ret;
u32 temp, off8; u32 temp, off8;
u64 stride;
void __iomem *mem_crb; void __iomem *mem_crb;
/* Only 64-bit aligned access */ /* Only 64-bit aligned access */
@ -1650,44 +1649,17 @@ netxen_nic_pci_mem_write_2M(struct netxen_adapter *adapter,
return -EIO; return -EIO;
correct: correct:
stride = NX_IS_REVISION_P3P(adapter->ahw.revision_id) ? 16 : 8; off8 = off & 0xfffffff8;
off8 = off & ~(stride-1);
spin_lock(&adapter->ahw.mem_lock); spin_lock(&adapter->ahw.mem_lock);
writel(off8, (mem_crb + MIU_TEST_AGT_ADDR_LO)); writel(off8, (mem_crb + MIU_TEST_AGT_ADDR_LO));
writel(0, (mem_crb + MIU_TEST_AGT_ADDR_HI)); writel(0, (mem_crb + MIU_TEST_AGT_ADDR_HI));
i = 0;
if (stride == 16) {
writel(TA_CTL_ENABLE, (mem_crb + TEST_AGT_CTRL));
writel((TA_CTL_START | TA_CTL_ENABLE),
(mem_crb + TEST_AGT_CTRL));
for (j = 0; j < MAX_CTL_CHECK; j++) {
temp = readl(mem_crb + TEST_AGT_CTRL);
if ((temp & TA_CTL_BUSY) == 0)
break;
}
if (j >= MAX_CTL_CHECK) {
ret = -EIO;
goto done;
}
i = (off & 0xf) ? 0 : 2;
writel(readl(mem_crb + MIU_TEST_AGT_RDDATA(i)),
mem_crb + MIU_TEST_AGT_WRDATA(i));
writel(readl(mem_crb + MIU_TEST_AGT_RDDATA(i+1)),
mem_crb + MIU_TEST_AGT_WRDATA(i+1));
i = (off & 0xf) ? 2 : 0;
}
writel(data & 0xffffffff, writel(data & 0xffffffff,
mem_crb + MIU_TEST_AGT_WRDATA(i)); mem_crb + MIU_TEST_AGT_WRDATA_LO);
writel((data >> 32) & 0xffffffff, writel((data >> 32) & 0xffffffff,
mem_crb + MIU_TEST_AGT_WRDATA(i+1)); mem_crb + MIU_TEST_AGT_WRDATA_HI);
writel((TA_CTL_ENABLE | TA_CTL_WRITE), (mem_crb + TEST_AGT_CTRL)); writel((TA_CTL_ENABLE | TA_CTL_WRITE), (mem_crb + TEST_AGT_CTRL));
writel((TA_CTL_START | TA_CTL_ENABLE | TA_CTL_WRITE), writel((TA_CTL_START | TA_CTL_ENABLE | TA_CTL_WRITE),
@ -1707,7 +1679,6 @@ netxen_nic_pci_mem_write_2M(struct netxen_adapter *adapter,
} else } else
ret = 0; ret = 0;
done:
spin_unlock(&adapter->ahw.mem_lock); spin_unlock(&adapter->ahw.mem_lock);
return ret; return ret;
@ -1719,7 +1690,7 @@ netxen_nic_pci_mem_read_2M(struct netxen_adapter *adapter,
{ {
int j, ret; int j, ret;
u32 temp, off8; u32 temp, off8;
u64 val, stride; u64 val;
void __iomem *mem_crb; void __iomem *mem_crb;
/* Only 64-bit aligned access */ /* Only 64-bit aligned access */
@ -1748,9 +1719,7 @@ netxen_nic_pci_mem_read_2M(struct netxen_adapter *adapter,
return -EIO; return -EIO;
correct: correct:
stride = NX_IS_REVISION_P3P(adapter->ahw.revision_id) ? 16 : 8; off8 = off & 0xfffffff8;
off8 = off & ~(stride-1);
spin_lock(&adapter->ahw.mem_lock); spin_lock(&adapter->ahw.mem_lock);
@ -1771,13 +1740,8 @@ netxen_nic_pci_mem_read_2M(struct netxen_adapter *adapter,
"failed to read through agent\n"); "failed to read through agent\n");
ret = -EIO; ret = -EIO;
} else { } else {
off8 = MIU_TEST_AGT_RDDATA_LO; val = (u64)(readl(mem_crb + MIU_TEST_AGT_RDDATA_HI)) << 32;
if ((stride == 16) && (off & 0xf)) val |= readl(mem_crb + MIU_TEST_AGT_RDDATA_LO);
off8 = MIU_TEST_AGT_RDDATA_UPPER_LO;
temp = readl(mem_crb + off8 + 4);
val = (u64)temp << 32;
val |= readl(mem_crb + off8);
*data = val; *data = val;
ret = 0; ret = 0;
} }