Skip to content

L
linux
Commit c6d6a9a0 authored by Lino Sanfilippo's avatar Lino Sanfilippo Committed by Greg Kroah-Hartman
Browse files
Options

staging: slicoss: dont use a structure but offsets for register accesses 

Use the new register accessors that use offsets instead of the slic_regs
structure to read/write registers. Since not longer needed remove the
structure completley.
Signed-off-by: default avatarLino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bc894318
Show whitespace changes
Inline Side-by-side
Showing with 120 additions and 423 deletions
drivers/staging/slicoss/slic.h
View file @ c6d6a9a0
...@@ -417,7 +417,6 @@ struct adapter { ...@@ -417,7 +417,6 @@ struct adapter {
struct slic_shmem *pshmem; struct slic_shmem *pshmem;
dma_addr_t phys_shmem; dma_addr_t phys_shmem;
u32 isrcopy; u32 isrcopy;
__iomem struct slic_regs *slic_regs;
void __iomem *regs; void __iomem *regs;
unsigned char state; unsigned char state;
unsigned char linkstate; unsigned char linkstate;
......
drivers/staging/slicoss/slichw.h
View file @ c6d6a9a0
...@@ -402,225 +402,6 @@ struct slic_rspbuf { ...@@ -402,225 +402,6 @@ struct slic_rspbuf {
#define SLIC_REG_HOSTID 0x1554 #define SLIC_REG_HOSTID 0x1554
struct slic_regs {
u32 slic_reset; /* Reset Register */
u32 pad0;
u32 slic_icr; /* Interrupt Control Register */
u32 pad2;
#define SLIC_ICR 0x0008
u32 slic_isp; /* Interrupt status pointer */
u32 pad1;
#define SLIC_ISP 0x0010
u32 slic_isr; /* Interrupt status */
u32 pad3;
#define SLIC_ISR 0x0018
u32 slic_hbar; /* Header buffer address reg */
u32 pad4;
/*
* 31-8 - phy addr of set of contiguous hdr buffers
* 7-0 - number of buffers passed
* Buffers are 256 bytes long on 256-byte boundaries.
*/
#define SLIC_HBAR 0x0020
#define SLIC_HBAR_CNT_MSK 0x000000FF
u32 slic_dbar; /* Data buffer handle & address reg */
u32 pad5;
/* 4 sets of registers; Buffers are 2K bytes long 2 per 4K page. */
#define SLIC_DBAR 0x0028
#define SLIC_DBAR_SIZE 2048
u32 slic_cbar; /* Xmt Cmd buf addr regs.*/
/*
* 1 per XMT interface
* 31-5 - phy addr of host command buffer
* 4-0 - length of cmd in multiples of 32 bytes
* Buffers are 32 bytes up to 512 bytes long
*/
#define SLIC_CBAR 0x0030
#define SLIC_CBAR_LEN_MSK 0x0000001F
#define SLIC_CBAR_ALIGN 0x00000020
u32 slic_wcs; /* write control store*/
#define SLIC_WCS 0x0034
#define SLIC_WCS_START 0x80000000 /*Start the SLIC (Jump to WCS)*/
#define SLIC_WCS_COMPARE 0x40000000 /* Compare with value in WCS*/
u32 slic_rbar; /* Response buffer address reg.*/
u32 pad7;
/*
* 31-8 - phy addr of set of contiguous response buffers
* 7-0 - number of buffers passed
* Buffers are 32 bytes long on 32-byte boundaries.
*/
#define SLIC_RBAR 0x0038
#define SLIC_RBAR_CNT_MSK 0x000000FF
#define SLIC_RBAR_SIZE 32
u32 slic_stats; /* read statistics (UPR) */
u32 pad8;
#define SLIC_RSTAT 0x0040
u32 slic_rlsr; /* read link status */
u32 pad9;
#define SLIC_LSTAT 0x0048
u32 slic_wmcfg; /* Write Mac Config */
u32 pad10;
#define SLIC_WMCFG 0x0050
u32 slic_wphy; /* Write phy register */
u32 pad11;
#define SLIC_WPHY 0x0058
u32 slic_rcbar; /* Rcv Cmd buf addr reg */
u32 pad12;
#define SLIC_RCBAR 0x0060
u32 slic_rconfig; /* Read SLIC Config*/
u32 pad13;
#define SLIC_RCONFIG 0x0068
u32 slic_intagg; /* Interrupt aggregation time */
u32 pad14;
#define SLIC_INTAGG 0x0070
u32 slic_wxcfg; /* Write XMIT config reg*/
u32 pad16;
#define SLIC_WXCFG 0x0078
u32 slic_wrcfg; /* Write RCV config reg*/
u32 pad17;
#define SLIC_WRCFG 0x0080
u32 slic_wraddral; /* Write rcv addr a low*/
u32 pad18;
#define SLIC_WRADDRAL 0x0088
u32 slic_wraddrah; /* Write rcv addr a high*/
u32 pad19;
#define SLIC_WRADDRAH 0x0090
u32 slic_wraddrbl; /* Write rcv addr b low*/
u32 pad20;
#define SLIC_WRADDRBL 0x0098
u32 slic_wraddrbh; /* Write rcv addr b high*/
u32 pad21;
#define SLIC_WRADDRBH 0x00a0
u32 slic_mcastlow; /* Low bits of mcast mask*/
u32 pad22;
#define SLIC_MCASTLOW 0x00a8
u32 slic_mcasthigh; /* High bits of mcast mask*/
u32 pad23;
#define SLIC_MCASTHIGH 0x00b0
u32 slic_ping; /* Ping the card*/
u32 pad24;
#define SLIC_PING 0x00b8
u32 slic_dump_cmd; /* Dump command */
u32 pad25;
#define SLIC_DUMP_CMD 0x00c0
u32 slic_dump_data; /* Dump data pointer */
u32 pad26;
#define SLIC_DUMP_DATA 0x00c8
u32 slic_pcistatus; /* Read card's pci_status register */
u32 pad27;
#define SLIC_PCISTATUS 0x00d0
u32 slic_wrhostid; /* Write hostid field */
u32 pad28;
#define SLIC_WRHOSTID 0x00d8
#define SLIC_RDHOSTID_1GB 0x1554
#define SLIC_RDHOSTID_2GB 0x1554
u32 slic_low_power; /* Put card in a low power state */
u32 pad29;
#define SLIC_LOW_POWER 0x00e0
u32 slic_quiesce; /* force slic into quiescent state
* before soft reset
*/
u32 pad30;
#define SLIC_QUIESCE 0x00e8
u32 slic_reset_iface;/* reset interface queues */
u32 pad31;
#define SLIC_RESET_IFACE 0x00f0
u32 slic_addr_upper;/* Bits 63-32 for host i/f addrs */
u32 pad32;
#define SLIC_ADDR_UPPER 0x00f8 /*Register is only written when it has changed*/
u32 slic_hbar64; /* 64 bit Header buffer address reg */
u32 pad33;
#define SLIC_HBAR64 0x0100
u32 slic_dbar64; /* 64 bit Data buffer handle & address reg */
u32 pad34;
#define SLIC_DBAR64 0x0108
u32 slic_cbar64; /* 64 bit Xmt Cmd buf addr regs. */
u32 pad35;
#define SLIC_CBAR64 0x0110
u32 slic_rbar64; /* 64 bit Response buffer address reg.*/
u32 pad36;
#define SLIC_RBAR64 0x0118
u32 slic_rcbar64; /* 64 bit Rcv Cmd buf addr reg*/
u32 pad37;
#define SLIC_RCBAR64 0x0120
u32 slic_stats64; /* read statistics (64 bit UPR) */
u32 pad38;
#define SLIC_RSTAT64 0x0128
u32 slic_rcv_wcs; /*Download Gigabit RCV sequencer ucode*/
u32 pad39;
#define SLIC_RCV_WCS 0x0130
#define SLIC_RCVWCS_BEGIN 0x40000000
#define SLIC_RCVWCS_FINISH 0x80000000
u32 slic_wrvlanid; /* Write VlanId field */
u32 pad40;
#define SLIC_WRVLANID 0x0138
u32 slic_read_xf_info; /* Read Transformer info */
u32 pad41;
#define SLIC_READ_XF_INFO 0x0140
u32 slic_write_xf_info; /* Write Transformer info */
u32 pad42;
#define SLIC_WRITE_XF_INFO 0x0148
u32 RSVD1; /* TOE Only */
u32 pad43;
u32 RSVD2; /* TOE Only */
u32 pad44;
u32 RSVD3; /* TOE Only */
u32 pad45;
u32 RSVD4; /* TOE Only */
u32 pad46;
u32 slic_ticks_per_sec; /* Write card ticks per second */
u32 pad47;
#define SLIC_TICKS_PER_SEC 0x0170
};
enum UPR_REQUEST { enum UPR_REQUEST {
SLIC_UPR_STATS, SLIC_UPR_STATS,
SLIC_UPR_RLSR, SLIC_UPR_RLSR,
......
drivers/staging/slicoss/slicoss.c
View file @ c6d6a9a0
...@@ -128,27 +128,6 @@ static struct ethtool_ops slic_ethtool_ops; ...@@ -128,27 +128,6 @@ static struct ethtool_ops slic_ethtool_ops;
MODULE_DEVICE_TABLE(pci, slic_pci_tbl); MODULE_DEVICE_TABLE(pci, slic_pci_tbl);
static inline void slic_reg32_write(void __iomem *reg, u32 value, bool flush)
{
writel(value, reg);
if (flush)
mb();
}
static inline void slic_reg64_write(struct adapter *adapter, void __iomem *reg,
u32 value, void __iomem *regh, u32 paddrh,
bool flush)
{
unsigned long flags;
spin_lock_irqsave(&adapter->bit64reglock, flags);
writel(paddrh, regh);
writel(value, reg);
if (flush)
mb();
spin_unlock_irqrestore(&adapter->bit64reglock, flags);
}
static void slic_mcast_set_bit(struct adapter *adapter, char *address) static void slic_mcast_set_bit(struct adapter *adapter, char *address)
{ {
unsigned char crcpoly; unsigned char crcpoly;
...@@ -172,8 +151,6 @@ static void slic_mcast_set_bit(struct adapter *adapter, char *address) ...@@ -172,8 +151,6 @@ static void slic_mcast_set_bit(struct adapter *adapter, char *address)
static void slic_mcast_set_mask(struct adapter *adapter) static void slic_mcast_set_mask(struct adapter *adapter)
{ {
__iomem struct slic_regs *slic_regs = adapter->slic_regs;
if (adapter->macopts & (MAC_ALLMCAST | MAC_PROMISC)) { if (adapter->macopts & (MAC_ALLMCAST | MAC_PROMISC)) {
/* /*
* Turn on all multicast addresses. We have to do this for * Turn on all multicast addresses. We have to do this for
...@@ -181,18 +158,17 @@ static void slic_mcast_set_mask(struct adapter *adapter) ...@@ -181,18 +158,17 @@ static void slic_mcast_set_mask(struct adapter *adapter)
* Microcode from having to keep state about the MAC * Microcode from having to keep state about the MAC
* configuration. * configuration.
*/ */
slic_reg32_write(&slic_regs->slic_mcastlow, 0xFFFFFFFF, FLUSH); slic_write32(adapter, SLIC_REG_MCASTLOW, 0xFFFFFFFF);
slic_reg32_write(&slic_regs->slic_mcasthigh, 0xFFFFFFFF, slic_write32(adapter, SLIC_REG_MCASTHIGH, 0xFFFFFFFF);
FLUSH);
} else { } else {
/* /*
* Commit our multicast mast to the SLIC by writing to the * Commit our multicast mast to the SLIC by writing to the
* multicast address mask registers * multicast address mask registers
*/ */
slic_reg32_write(&slic_regs->slic_mcastlow, slic_write32(adapter, SLIC_REG_MCASTLOW,
(u32)(adapter->mcastmask & 0xFFFFFFFF), FLUSH); (u32)(adapter->mcastmask & 0xFFFFFFFF));
slic_reg32_write(&slic_regs->slic_mcasthigh, slic_write32(adapter, SLIC_REG_MCASTHIGH,
(u32)((adapter->mcastmask >> 32) & 0xFFFFFFFF), FLUSH); (u32)((adapter->mcastmask >> 32) & 0xFFFFFFFF));
} }
} }
...@@ -208,13 +184,6 @@ static void slic_timer_ping(ulong dev) ...@@ -208,13 +184,6 @@ static void slic_timer_ping(ulong dev)
add_timer(&adapter->pingtimer); add_timer(&adapter->pingtimer);
} }
static void slic_unmap_mmio_space(struct adapter *adapter)
{
if (adapter->slic_regs)
iounmap(adapter->slic_regs);
adapter->slic_regs = NULL;
}
/* /*
* slic_link_config * slic_link_config
* *
...@@ -224,7 +193,6 @@ static void slic_unmap_mmio_space(struct adapter *adapter) ...@@ -224,7 +193,6 @@ static void slic_unmap_mmio_space(struct adapter *adapter)
static void slic_link_config(struct adapter *adapter, static void slic_link_config(struct adapter *adapter,
u32 linkspeed, u32 linkduplex) u32 linkspeed, u32 linkduplex)
{ {
u32 __iomem *wphy;
u32 speed; u32 speed;
u32 duplex; u32 duplex;
u32 phy_config; u32 phy_config;
...@@ -239,8 +207,6 @@ static void slic_link_config(struct adapter *adapter, ...@@ -239,8 +207,6 @@ static void slic_link_config(struct adapter *adapter,
if (linkduplex > LINK_AUTOD) if (linkduplex > LINK_AUTOD)
linkduplex = LINK_AUTOD; linkduplex = LINK_AUTOD;
wphy = &adapter->slic_regs->slic_wphy;
if ((linkspeed == LINK_AUTOSPEED) || (linkspeed == LINK_1000MB)) { if ((linkspeed == LINK_AUTOSPEED) || (linkspeed == LINK_1000MB)) {
if (adapter->flags & ADAPT_FLAGS_FIBERMEDIA) { if (adapter->flags & ADAPT_FLAGS_FIBERMEDIA) {
/* /*
...@@ -252,7 +218,7 @@ static void slic_link_config(struct adapter *adapter, ...@@ -252,7 +218,7 @@ static void slic_link_config(struct adapter *adapter,
phy_advreg = (MIICR_REG_4 | (PAR_ADV1000XFD)); phy_advreg = (MIICR_REG_4 | (PAR_ADV1000XFD));
/* enable PAUSE frames */ /* enable PAUSE frames */
phy_advreg |= PAR_ASYMPAUSE_FIBER; phy_advreg |= PAR_ASYMPAUSE_FIBER;
slic_reg32_write(wphy, phy_advreg, FLUSH); slic_write32(adapter, SLIC_REG_WPHY, phy_advreg);
if (linkspeed == LINK_AUTOSPEED) { if (linkspeed == LINK_AUTOSPEED) {
/* reset phy, enable auto-neg */ /* reset phy, enable auto-neg */
...@@ -260,14 +226,16 @@ static void slic_link_config(struct adapter *adapter, ...@@ -260,14 +226,16 @@ static void slic_link_config(struct adapter *adapter,
(MIICR_REG_PCR | (MIICR_REG_PCR |
(PCR_RESET | PCR_AUTONEG | (PCR_RESET | PCR_AUTONEG |
PCR_AUTONEG_RST)); PCR_AUTONEG_RST));
slic_reg32_write(wphy, phy_config, FLUSH); slic_write32(adapter, SLIC_REG_WPHY,
phy_config);
} else { /* forced 1000 Mb FD*/ } else { /* forced 1000 Mb FD*/
/* /*
* power down phy to break link * power down phy to break link
* this may not work) * this may not work)
*/ */
phy_config = (MIICR_REG_PCR | PCR_POWERDOWN); phy_config = (MIICR_REG_PCR | PCR_POWERDOWN);
slic_reg32_write(wphy, phy_config, FLUSH); slic_write32(adapter, SLIC_REG_WPHY,
phy_config);
slic_flush_write(adapter); slic_flush_write(adapter);
/* /*
* wait, Marvell says 1 sec, * wait, Marvell says 1 sec,
...@@ -283,7 +251,8 @@ static void slic_link_config(struct adapter *adapter, ...@@ -283,7 +251,8 @@ static void slic_link_config(struct adapter *adapter,
(MIICR_REG_PCR | (MIICR_REG_PCR |
(PCR_RESET | PCR_SPEED_1000 | (PCR_RESET | PCR_SPEED_1000 |
PCR_DUPLEX_FULL)); PCR_DUPLEX_FULL));
slic_reg32_write(wphy, phy_config, FLUSH); slic_write32(adapter, SLIC_REG_WPHY,
phy_config);
} }
} else { /* copper gigabit */ } else { /* copper gigabit */
...@@ -310,10 +279,10 @@ static void slic_link_config(struct adapter *adapter, ...@@ -310,10 +279,10 @@ static void slic_link_config(struct adapter *adapter,
phy_advreg |= PAR_ASYMPAUSE; phy_advreg |= PAR_ASYMPAUSE;
/* required by the Cicada PHY */ /* required by the Cicada PHY */
phy_advreg |= PAR_802_3; phy_advreg |= PAR_802_3;
slic_reg32_write(wphy, phy_advreg, FLUSH); slic_write32(adapter, SLIC_REG_WPHY, phy_advreg);
/* advertise FD only @1000 Mb */ /* advertise FD only @1000 Mb */
phy_gctlreg = (MIICR_REG_9 | (PGC_ADV1000FD)); phy_gctlreg = (MIICR_REG_9 | (PGC_ADV1000FD));
slic_reg32_write(wphy, phy_gctlreg, FLUSH); slic_write32(adapter, SLIC_REG_WPHY, phy_gctlreg);
if (adapter->subsysid != SLIC_1GB_CICADA_SUBSYS_ID) { if (adapter->subsysid != SLIC_1GB_CICADA_SUBSYS_ID) {
/* /*
...@@ -322,20 +291,23 @@ static void slic_link_config(struct adapter *adapter, ...@@ -322,20 +291,23 @@ static void slic_link_config(struct adapter *adapter,
*/ */
phy_config = phy_config =
(MIICR_REG_16 | (MRV_REG16_XOVERON)); (MIICR_REG_16 | (MRV_REG16_XOVERON));
slic_reg32_write(wphy, phy_config, FLUSH); slic_write32(adapter, SLIC_REG_WPHY,
phy_config);
/* reset phy, enable auto-neg */ /* reset phy, enable auto-neg */
phy_config = phy_config =
(MIICR_REG_PCR | (MIICR_REG_PCR |
(PCR_RESET | PCR_AUTONEG | (PCR_RESET | PCR_AUTONEG |
PCR_AUTONEG_RST)); PCR_AUTONEG_RST));
slic_reg32_write(wphy, phy_config, FLUSH); slic_write32(adapter, SLIC_REG_WPHY,
phy_config);
} else { /* it's a Cicada PHY */ } else { /* it's a Cicada PHY */
/* enable and restart auto-neg (don't reset) */ /* enable and restart auto-neg (don't reset) */
phy_config = phy_config =
(MIICR_REG_PCR | (MIICR_REG_PCR |
(PCR_AUTONEG | PCR_AUTONEG_RST)); (PCR_AUTONEG | PCR_AUTONEG_RST));
slic_reg32_write(wphy, phy_config, FLUSH); slic_write32(adapter, SLIC_REG_WPHY,
phy_config);
} }
} }
} else { } else {
...@@ -355,12 +327,12 @@ static void slic_link_config(struct adapter *adapter, ...@@ -355,12 +327,12 @@ static void slic_link_config(struct adapter *adapter,
* disable auto crossover * disable auto crossover
*/ */
phy_config = (MIICR_REG_16 | (MRV_REG16_XOVEROFF)); phy_config = (MIICR_REG_16 | (MRV_REG16_XOVEROFF));
slic_reg32_write(wphy, phy_config, FLUSH); slic_write32(adapter, SLIC_REG_WPHY, phy_config);
} }
/* power down phy to break link (this may not work) */ /* power down phy to break link (this may not work) */
phy_config = (MIICR_REG_PCR | (PCR_POWERDOWN | speed | duplex)); phy_config = (MIICR_REG_PCR | (PCR_POWERDOWN | speed | duplex));
slic_reg32_write(wphy, phy_config, FLUSH); slic_write32(adapter, SLIC_REG_WPHY, phy_config);
slic_flush_write(adapter); slic_flush_write(adapter);
/* wait, Marvell says 1 sec, try to get away with 10 ms */ /* wait, Marvell says 1 sec, try to get away with 10 ms */
mdelay(10); mdelay(10);
...@@ -373,11 +345,11 @@ static void slic_link_config(struct adapter *adapter, ...@@ -373,11 +345,11 @@ static void slic_link_config(struct adapter *adapter,
*/ */
phy_config = phy_config =
(MIICR_REG_PCR | (PCR_RESET | speed | duplex)); (MIICR_REG_PCR | (PCR_RESET | speed | duplex));
slic_reg32_write(wphy, phy_config, FLUSH); slic_write32(adapter, SLIC_REG_WPHY, phy_config);
} else { /* it's a Cicada PHY */ } else { /* it's a Cicada PHY */
/* disable auto-neg, set speed, powerup */ /* disable auto-neg, set speed, powerup */
phy_config = (MIICR_REG_PCR | (speed | duplex)); phy_config = (MIICR_REG_PCR | (speed | duplex));
slic_reg32_write(wphy, phy_config, FLUSH); slic_write32(adapter, SLIC_REG_WPHY, phy_config);
} }
} }
} }
...@@ -387,7 +359,6 @@ static int slic_card_download_gbrcv(struct adapter *adapter) ...@@ -387,7 +359,6 @@ static int slic_card_download_gbrcv(struct adapter *adapter)
const struct firmware *fw; const struct firmware *fw;
const char *file = ""; const char *file = "";
int ret; int ret;
__iomem struct slic_regs *slic_regs = adapter->slic_regs;
u32 codeaddr; u32 codeaddr;
u32 instruction; u32 instruction;
int index = 0; int index = 0;
...@@ -428,27 +399,26 @@ static int slic_card_download_gbrcv(struct adapter *adapter) ...@@ -428,27 +399,26 @@ static int slic_card_download_gbrcv(struct adapter *adapter)
break; break;
} }
/* start download */ /* start download */
slic_reg32_write(&slic_regs->slic_rcv_wcs, SLIC_RCVWCS_BEGIN, FLUSH); slic_write32(adapter, SLIC_REG_RCV_WCS, SLIC_RCVWCS_BEGIN);
/* download the rcv sequencer ucode */ /* download the rcv sequencer ucode */
for (codeaddr = 0; codeaddr < rcvucodelen; codeaddr++) { for (codeaddr = 0; codeaddr < rcvucodelen; codeaddr++) {
/* write out instruction address */ /* write out instruction address */
slic_reg32_write(&slic_regs->slic_rcv_wcs, codeaddr, FLUSH); slic_write32(adapter, SLIC_REG_RCV_WCS, codeaddr);
instruction = *(u32 *)(fw->data + index); instruction = *(u32 *)(fw->data + index);
index += 4; index += 4;
/* write out the instruction data low addr */ /* write out the instruction data low addr */
slic_reg32_write(&slic_regs->slic_rcv_wcs, instruction, FLUSH); slic_write32(adapter, SLIC_REG_RCV_WCS, instruction);
instruction = *(u8 *)(fw->data + index); instruction = *(u8 *)(fw->data + index);
index++; index++;
/* write out the instruction data high addr */ /* write out the instruction data high addr */
slic_reg32_write(&slic_regs->slic_rcv_wcs, (u8)instruction, slic_write32(adapter, SLIC_REG_RCV_WCS, instruction);
FLUSH);
} }
/* download finished */ /* download finished */
release_firmware(fw); release_firmware(fw);
slic_reg32_write(&slic_regs->slic_rcv_wcs, SLIC_RCVWCS_FINISH, FLUSH); slic_write32(adapter, SLIC_REG_RCV_WCS, SLIC_RCVWCS_FINISH);
slic_flush_write(adapter); slic_flush_write(adapter);
return 0; return 0;
...@@ -465,7 +435,6 @@ static int slic_card_download(struct adapter *adapter) ...@@ -465,7 +435,6 @@ static int slic_card_download(struct adapter *adapter)
u32 section; u32 section;
int thissectionsize; int thissectionsize;
int codeaddr; int codeaddr;
__iomem struct slic_regs *slic_regs = adapter->slic_regs;
u32 instruction; u32 instruction;
u32 baseaddress; u32 baseaddress;
u32 i; u32 i;
...@@ -509,17 +478,17 @@ static int slic_card_download(struct adapter *adapter) ...@@ -509,17 +478,17 @@ static int slic_card_download(struct adapter *adapter)
for (codeaddr = 0; codeaddr < thissectionsize; codeaddr++) { for (codeaddr = 0; codeaddr < thissectionsize; codeaddr++) {
/* Write out instruction address */ /* Write out instruction address */
slic_reg32_write(&slic_regs->slic_wcs, slic_write32(adapter, SLIC_REG_WCS,
baseaddress + codeaddr, FLUSH); baseaddress + codeaddr);
/* Write out instruction to low addr */ /* Write out instruction to low addr */
slic_reg32_write(&slic_regs->slic_wcs, slic_write32(adapter, SLIC_REG_WCS,
instruction, FLUSH); instruction);
instruction = *(u32 *)(fw->data + index); instruction = *(u32 *)(fw->data + index);
index += 4; index += 4;
/* Write out instruction to high addr */ /* Write out instruction to high addr */
slic_reg32_write(&slic_regs->slic_wcs, slic_write32(adapter, SLIC_REG_WCS,
instruction, FLUSH); instruction);
instruction = *(u32 *)(fw->data + index); instruction = *(u32 *)(fw->data + index);
index += 4; index += 4;
} }
...@@ -534,17 +503,15 @@ static int slic_card_download(struct adapter *adapter) ...@@ -534,17 +503,15 @@ static int slic_card_download(struct adapter *adapter)
for (codeaddr = 0; codeaddr < thissectionsize; codeaddr++) { for (codeaddr = 0; codeaddr < thissectionsize; codeaddr++) {
/* Write out instruction address */ /* Write out instruction address */
slic_reg32_write(&slic_regs->slic_wcs, slic_write32(adapter, SLIC_REG_WCS,
SLIC_WCS_COMPARE | (baseaddress + codeaddr), SLIC_WCS_COMPARE | (baseaddress +
FLUSH); codeaddr));
/* Write out instruction to low addr */ /* Write out instruction to low addr */
slic_reg32_write(&slic_regs->slic_wcs, instruction, slic_write32(adapter, SLIC_REG_WCS, instruction);
FLUSH);
instruction = *(u32 *)(fw->data + index); instruction = *(u32 *)(fw->data + index);
index += 4; index += 4;
/* Write out instruction to high addr */ /* Write out instruction to high addr */
slic_reg32_write(&slic_regs->slic_wcs, instruction, slic_write32(adapter, SLIC_REG_WCS, instruction);
FLUSH);
instruction = *(u32 *)(fw->data + index); instruction = *(u32 *)(fw->data + index);
index += 4; index += 4;
...@@ -553,9 +520,9 @@ static int slic_card_download(struct adapter *adapter) ...@@ -553,9 +520,9 @@ static int slic_card_download(struct adapter *adapter)
release_firmware(fw); release_firmware(fw);
/* Everything OK, kick off the card */ /* Everything OK, kick off the card */
mdelay(10); mdelay(10);
slic_reg32_write(&slic_regs->slic_wcs, SLIC_WCS_START, FLUSH);
slic_flush_write(adapter);
slic_write32(adapter, SLIC_REG_WCS, SLIC_WCS_START);
slic_flush_write(adapter);
/* /*
* stall for 20 ms, long enough for ucode to init card * stall for 20 ms, long enough for ucode to init card
* and reach mainloop * and reach mainloop
...@@ -587,21 +554,21 @@ static void slic_adapter_set_hwaddr(struct adapter *adapter) ...@@ -587,21 +554,21 @@ static void slic_adapter_set_hwaddr(struct adapter *adapter)
static void slic_intagg_set(struct adapter *adapter, u32 value) static void slic_intagg_set(struct adapter *adapter, u32 value)
{ {
slic_reg32_write(&adapter->slic_regs->slic_intagg, value, FLUSH); slic_write32(adapter, SLIC_REG_INTAGG, value);
adapter->card->loadlevel_current = value; adapter->card->loadlevel_current = value;
} }
static void slic_soft_reset(struct adapter *adapter) static void slic_soft_reset(struct adapter *adapter)
{ {
if (adapter->card->state == CARD_UP) { if (adapter->card->state == CARD_UP) {
slic_reg32_write(&adapter->slic_regs->slic_quiesce, 0, FLUSH); slic_write32(adapter, SLIC_REG_QUIESCE, 0);
slic_flush_write(adapter); slic_flush_write(adapter);
mdelay(1); mdelay(1);
} }
slic_reg32_write(&adapter->slic_regs->slic_reset, SLIC_RESET_MAGIC, slic_write32(adapter, SLIC_REG_RESET, SLIC_RESET_MAGIC);
FLUSH);
slic_flush_write(adapter); slic_flush_write(adapter);
mdelay(1); mdelay(1);
} }
...@@ -609,17 +576,16 @@ static void slic_mac_address_config(struct adapter *adapter) ...@@ -609,17 +576,16 @@ static void slic_mac_address_config(struct adapter *adapter)
{ {
u32 value; u32 value;
u32 value2; u32 value2;
__iomem struct slic_regs *slic_regs = adapter->slic_regs;
value = ntohl(*(__be32 *)&adapter->currmacaddr[2]); value = ntohl(*(__be32 *)&adapter->currmacaddr[2]);
slic_reg32_write(&slic_regs->slic_wraddral, value, FLUSH); slic_write32(adapter, SLIC_REG_WRADDRAL, value);
slic_reg32_write(&slic_regs->slic_wraddrbl, value, FLUSH); slic_write32(adapter, SLIC_REG_WRADDRBL, value);
value2 = (u32)((adapter->currmacaddr[0] << 8 | value2 = (u32)((adapter->currmacaddr[0] << 8 |
adapter->currmacaddr[1]) & 0xFFFF); adapter->currmacaddr[1]) & 0xFFFF);
slic_reg32_write(&slic_regs->slic_wraddrah, value2, FLUSH); slic_write32(adapter, SLIC_REG_WRADDRAH, value2);
slic_reg32_write(&slic_regs->slic_wraddrbh, value2, FLUSH); slic_write32(adapter, SLIC_REG_WRADDRBH, value2);
/* /*
* Write our multicast mask out to the card. This is done * Write our multicast mask out to the card. This is done
...@@ -632,7 +598,6 @@ static void slic_mac_address_config(struct adapter *adapter) ...@@ -632,7 +598,6 @@ static void slic_mac_address_config(struct adapter *adapter)
static void slic_mac_config(struct adapter *adapter) static void slic_mac_config(struct adapter *adapter)
{ {
u32 value; u32 value;
__iomem struct slic_regs *slic_regs = adapter->slic_regs;
/* Setup GMAC gaps */ /* Setup GMAC gaps */
if (adapter->linkspeed == LINK_1000MB) { if (adapter->linkspeed == LINK_1000MB) {
...@@ -656,7 +621,7 @@ static void slic_mac_config(struct adapter *adapter) ...@@ -656,7 +621,7 @@ static void slic_mac_config(struct adapter *adapter)
} }
/* write mac config */ /* write mac config */
slic_reg32_write(&slic_regs->slic_wmcfg, value, FLUSH); slic_write32(adapter, SLIC_REG_WMCFG, value);
/* setup mac addresses */ /* setup mac addresses */
slic_mac_address_config(adapter); slic_mac_address_config(adapter);
...@@ -666,7 +631,6 @@ static void slic_config_set(struct adapter *adapter, bool linkchange) ...@@ -666,7 +631,6 @@ static void slic_config_set(struct adapter *adapter, bool linkchange)
{ {
u32 value; u32 value;
u32 RcrReset; u32 RcrReset;
__iomem struct slic_regs *slic_regs = adapter->slic_regs;
if (linkchange) { if (linkchange) {
/* Setup MAC */ /* Setup MAC */
...@@ -683,7 +647,7 @@ static void slic_config_set(struct adapter *adapter, bool linkchange) ...@@ -683,7 +647,7 @@ static void slic_config_set(struct adapter *adapter, bool linkchange)
GXCR_XMTEN | /* Enable transmit */ GXCR_XMTEN | /* Enable transmit */
GXCR_PAUSEEN); /* Enable pause */ GXCR_PAUSEEN); /* Enable pause */
slic_reg32_write(&slic_regs->slic_wxcfg, value, FLUSH); slic_write32(adapter, SLIC_REG_WXCFG, value);
/* Setup rcvcfg last */ /* Setup rcvcfg last */
value = (RcrReset | /* Reset, if linkchange */ value = (RcrReset | /* Reset, if linkchange */
...@@ -696,7 +660,7 @@ static void slic_config_set(struct adapter *adapter, bool linkchange) ...@@ -696,7 +660,7 @@ static void slic_config_set(struct adapter *adapter, bool linkchange)
value = (GXCR_RESET | /* Always reset */ value = (GXCR_RESET | /* Always reset */
GXCR_XMTEN); /* Enable transmit */ GXCR_XMTEN); /* Enable transmit */
slic_reg32_write(&slic_regs->slic_wxcfg, value, FLUSH); slic_write32(adapter, SLIC_REG_WXCFG, value);
/* Setup rcvcfg last */ /* Setup rcvcfg last */
value = (RcrReset | /* Reset, if linkchange */ value = (RcrReset | /* Reset, if linkchange */
...@@ -713,7 +677,7 @@ static void slic_config_set(struct adapter *adapter, bool linkchange) ...@@ -713,7 +677,7 @@ static void slic_config_set(struct adapter *adapter, bool linkchange)
if (adapter->macopts & MAC_PROMISC) if (adapter->macopts & MAC_PROMISC)
value |= GRCR_RCVALL; value |= GRCR_RCVALL;
slic_reg32_write(&slic_regs->slic_wrcfg, value, FLUSH); slic_write32(adapter, SLIC_REG_WRCFG, value);
} }
/* /*
...@@ -723,24 +687,23 @@ static void slic_config_clear(struct adapter *adapter) ...@@ -723,24 +687,23 @@ static void slic_config_clear(struct adapter *adapter)
{ {
u32 value; u32 value;
u32 phy_config; u32 phy_config;
__iomem struct slic_regs *slic_regs = adapter->slic_regs;
/* Setup xmtcfg */ /* Setup xmtcfg */
value = (GXCR_RESET | /* Always reset */ value = (GXCR_RESET | /* Always reset */
GXCR_PAUSEEN); /* Enable pause */ GXCR_PAUSEEN); /* Enable pause */
slic_reg32_write(&slic_regs->slic_wxcfg, value, FLUSH); slic_write32(adapter, SLIC_REG_WXCFG, value);
value = (GRCR_RESET | /* Always reset */ value = (GRCR_RESET | /* Always reset */
GRCR_CTLEN | /* Enable CTL frames */ GRCR_CTLEN | /* Enable CTL frames */
GRCR_ADDRAEN | /* Address A enable */ GRCR_ADDRAEN | /* Address A enable */
(GRCR_HASHSIZE << GRCR_HASHSIZE_SHIFT)); (GRCR_HASHSIZE << GRCR_HASHSIZE_SHIFT));
slic_reg32_write(&slic_regs->slic_wrcfg, value, FLUSH); slic_write32(adapter, SLIC_REG_WRCFG, value);
/* power down phy */ /* power down phy */
phy_config = (MIICR_REG_PCR | (PCR_POWERDOWN)); phy_config = (MIICR_REG_PCR | (PCR_POWERDOWN));
slic_reg32_write(&slic_regs->slic_wphy, phy_config, FLUSH); slic_write32(adapter, SLIC_REG_WPHY, phy_config);
} }
static bool slic_mac_filter(struct adapter *adapter, static bool slic_mac_filter(struct adapter *adapter,
...@@ -816,13 +779,11 @@ static void slic_timer_load_check(ulong cardaddr) ...@@ -816,13 +779,11 @@ static void slic_timer_load_check(ulong cardaddr)
{ {
struct sliccard *card = (struct sliccard *)cardaddr; struct sliccard *card = (struct sliccard *)cardaddr;
struct adapter *adapter = card->master; struct adapter *adapter = card->master;
u32 __iomem *intagg;
u32 load = card->events; u32 load = card->events;
u32 level = 0; u32 level = 0;
if ((adapter) && (adapter->state == ADAPT_UP) && if ((adapter) && (adapter->state == ADAPT_UP) &&
(card->state == CARD_UP) && (slic_global.dynamic_intagg)) { (card->state == CARD_UP) && (slic_global.dynamic_intagg)) {
intagg = &adapter->slic_regs->slic_intagg;
if (adapter->devid == SLIC_1GB_DEVICE_ID) { if (adapter->devid == SLIC_1GB_DEVICE_ID) {
if (adapter->linkspeed == LINK_1000MB) if (adapter->linkspeed == LINK_1000MB)
level = 100; level = 100;
...@@ -842,7 +803,7 @@ static void slic_timer_load_check(ulong cardaddr) ...@@ -842,7 +803,7 @@ static void slic_timer_load_check(ulong cardaddr)
} }
if (card->loadlevel_current != level) { if (card->loadlevel_current != level) {
card->loadlevel_current = level; card->loadlevel_current = level;
slic_reg32_write(intagg, level, FLUSH); slic_write32(adapter, SLIC_REG_INTAGG, level);
} }
} else { } else {
if (load > SLIC_LOAD_5) if (load > SLIC_LOAD_5)
...@@ -859,7 +820,7 @@ static void slic_timer_load_check(ulong cardaddr) ...@@ -859,7 +820,7 @@ static void slic_timer_load_check(ulong cardaddr)
level = SLIC_INTAGG_0; level = SLIC_INTAGG_0;
if (card->loadlevel_current != level) { if (card->loadlevel_current != level) {
card->loadlevel_current = level; card->loadlevel_current = level;
slic_reg32_write(intagg, level, FLUSH); slic_write32(adapter, SLIC_REG_INTAGG, level);
} }
} }
} }
...@@ -903,7 +864,6 @@ static int slic_upr_queue_request(struct adapter *adapter, ...@@ -903,7 +864,6 @@ static int slic_upr_queue_request(struct adapter *adapter,
static void slic_upr_start(struct adapter *adapter) static void slic_upr_start(struct adapter *adapter)
{ {
struct slic_upr *upr; struct slic_upr *upr;
__iomem struct slic_regs *slic_regs = adapter->slic_regs;
upr = adapter->upr_list; upr = adapter->upr_list;
if (!upr) if (!upr)
...@@ -915,29 +875,24 @@ static void slic_upr_start(struct adapter *adapter) ...@@ -915,29 +875,24 @@ static void slic_upr_start(struct adapter *adapter)
switch (upr->upr_request) { switch (upr->upr_request) {
case SLIC_UPR_STATS: case SLIC_UPR_STATS:
if (upr->upr_data_h == 0) { if (upr->upr_data_h == 0) {
slic_reg32_write(&slic_regs->slic_stats, upr->upr_data, slic_write32(adapter, SLIC_REG_RSTAT, upr->upr_data);
FLUSH);
} else { } else {
slic_reg64_write(adapter, &slic_regs->slic_stats64, slic_write64(adapter, SLIC_REG_RSTAT64, upr->upr_data,
upr->upr_data, upr->upr_data_h);
&slic_regs->slic_addr_upper,
upr->upr_data_h, FLUSH);
} }
break; break;
case SLIC_UPR_RLSR: case SLIC_UPR_RLSR:
slic_reg64_write(adapter, &slic_regs->slic_rlsr, upr->upr_data, slic_write64(adapter, SLIC_REG_LSTAT, upr->upr_data,
&slic_regs->slic_addr_upper, upr->upr_data_h, upr->upr_data_h);
FLUSH);
break; break;
case SLIC_UPR_RCONFIG: case SLIC_UPR_RCONFIG:
slic_reg64_write(adapter, &slic_regs->slic_rconfig, slic_write64(adapter, SLIC_REG_RCONFIG, upr->upr_data,
upr->upr_data, &slic_regs->slic_addr_upper, upr->upr_data_h);
upr->upr_data_h, FLUSH);
break; break;
case SLIC_UPR_PING: case SLIC_UPR_PING:
slic_reg32_write(&slic_regs->slic_ping, 1, FLUSH); slic_write32(adapter, SLIC_REG_PING, 1);
break; break;
} }
slic_flush_write(adapter); slic_flush_write(adapter);
...@@ -1194,7 +1149,6 @@ static int slic_rspqueue_init(struct adapter *adapter) ...@@ -1194,7 +1149,6 @@ static int slic_rspqueue_init(struct adapter *adapter)
{ {
int i; int i;
struct slic_rspqueue *rspq = &adapter->rspqueue; struct slic_rspqueue *rspq = &adapter->rspqueue;
__iomem struct slic_regs *slic_regs = adapter->slic_regs;
u32 paddrh = 0; u32 paddrh = 0;
memset(rspq, 0, sizeof(struct slic_rspqueue)); memset(rspq, 0, sizeof(struct slic_rspqueue));
...@@ -1213,14 +1167,12 @@ static int slic_rspqueue_init(struct adapter *adapter) ...@@ -1213,14 +1167,12 @@ static int slic_rspqueue_init(struct adapter *adapter)
} }
if (paddrh == 0) { if (paddrh == 0) {
slic_reg32_write(&slic_regs->slic_rbar, slic_write32(adapter, SLIC_REG_RBAR,
(rspq->paddr[i] | SLIC_RSPQ_BUFSINPAGE), rspq->paddr[i] | SLIC_RSPQ_BUFSINPAGE);
DONT_FLUSH);
} else { } else {
slic_reg64_write(adapter, &slic_regs->slic_rbar64, slic_write64(adapter, SLIC_REG_RBAR64,
(rspq->paddr[i] | SLIC_RSPQ_BUFSINPAGE), rspq->paddr[i] | SLIC_RSPQ_BUFSINPAGE,
&slic_regs->slic_addr_upper, paddrh);
paddrh, DONT_FLUSH);
} }
} }
rspq->offset = 0; rspq->offset = 0;
...@@ -1241,9 +1193,9 @@ static struct slic_rspbuf *slic_rspqueue_getnext(struct adapter *adapter) ...@@ -1241,9 +1193,9 @@ static struct slic_rspbuf *slic_rspqueue_getnext(struct adapter *adapter)
if (++rspq->offset < SLIC_RSPQ_BUFSINPAGE) { if (++rspq->offset < SLIC_RSPQ_BUFSINPAGE) {
rspq->rspbuf++; rspq->rspbuf++;
} else { } else {
slic_reg64_write(adapter, &adapter->slic_regs->slic_rbar64, slic_write64(adapter, SLIC_REG_RBAR64,
(rspq->paddr[rspq->pageindex] | SLIC_RSPQ_BUFSINPAGE), rspq->paddr[rspq->pageindex] |
&adapter->slic_regs->slic_addr_upper, 0, DONT_FLUSH); SLIC_RSPQ_BUFSINPAGE, 0);
rspq->pageindex = (rspq->pageindex + 1) % rspq->num_pages; rspq->pageindex = (rspq->pageindex + 1) % rspq->num_pages;
rspq->offset = 0; rspq->offset = 0;
rspq->rspbuf = (struct slic_rspbuf *) rspq->rspbuf = (struct slic_rspbuf *)
...@@ -1577,14 +1529,11 @@ static int slic_rcvqueue_fill(struct adapter *adapter) ...@@ -1577,14 +1529,11 @@ static int slic_rcvqueue_fill(struct adapter *adapter)
} }
#endif #endif
if (paddrh == 0) { if (paddrh == 0) {
slic_reg32_write(&adapter->slic_regs->slic_hbar, slic_write32(adapter, SLIC_REG_HBAR,
(u32)paddrl, DONT_FLUSH); (u32)paddrl);
} else { } else {
slic_reg64_write(adapter, slic_write64(adapter, SLIC_REG_HBAR64, paddrl,
&adapter->slic_regs->slic_hbar64, paddrh);
paddrl,
&adapter->slic_regs->slic_addr_upper,
paddrh, DONT_FLUSH);
} }
if (rcvq->head) if (rcvq->head)
rcvq->tail->next = skb; rcvq->tail->next = skb;
...@@ -1707,12 +1656,9 @@ static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb) ...@@ -1707,12 +1656,9 @@ static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb)
dev_err(dev, " rcvq->count[%x]\n", rcvq->count); dev_err(dev, " rcvq->count[%x]\n", rcvq->count);
} }
if (paddrh == 0) { if (paddrh == 0) {
slic_reg32_write(&adapter->slic_regs->slic_hbar, (u32)paddrl, slic_write32(adapter, SLIC_REG_HBAR, (u32)paddrl);
DONT_FLUSH);
} else { } else {
slic_reg64_write(adapter, &adapter->slic_regs->slic_hbar64, slic_write64(adapter, SLIC_REG_HBAR64, paddrl, paddrh);
paddrl, &adapter->slic_regs->slic_addr_upper,
paddrh, DONT_FLUSH);
} }
if (rcvq->head) if (rcvq->head)
rcvq->tail->next = skb; rcvq->tail->next = skb;
...@@ -2158,9 +2104,9 @@ static irqreturn_t slic_interrupt(int irq, void *dev_id) ...@@ -2158,9 +2104,9 @@ static irqreturn_t slic_interrupt(int irq, void *dev_id)
u32 isr; u32 isr;
if ((adapter->pshmem) && (adapter->pshmem->isr)) { if ((adapter->pshmem) && (adapter->pshmem->isr)) {
slic_reg32_write(&adapter->slic_regs->slic_icr, slic_write32(adapter, SLIC_REG_ICR, ICR_INT_MASK);
ICR_INT_MASK, FLUSH);
slic_flush_write(adapter); slic_flush_write(adapter);
isr = adapter->isrcopy = adapter->pshmem->isr; isr = adapter->isrcopy = adapter->pshmem->isr;
adapter->pshmem->isr = 0; adapter->pshmem->isr = 0;
adapter->num_isrs++; adapter->num_isrs++;
...@@ -2181,7 +2127,7 @@ static irqreturn_t slic_interrupt(int irq, void *dev_id) ...@@ -2181,7 +2127,7 @@ static irqreturn_t slic_interrupt(int irq, void *dev_id)
adapter->isrcopy = 0; adapter->isrcopy = 0;
adapter->all_reg_writes += 2; adapter->all_reg_writes += 2;
adapter->isr_reg_writes++; adapter->isr_reg_writes++;
slic_reg32_write(&adapter->slic_regs->slic_isr, 0, FLUSH); slic_write32(adapter, SLIC_REG_ISR, 0);
} else { } else {
adapter->false_interrupts++; adapter->false_interrupts++;
} }
...@@ -2233,13 +2179,11 @@ static netdev_tx_t slic_xmit_start(struct sk_buff *skb, struct net_device *dev) ...@@ -2233,13 +2179,11 @@ static netdev_tx_t slic_xmit_start(struct sk_buff *skb, struct net_device *dev)
} }
#endif #endif
if (hcmd->paddrh == 0) { if (hcmd->paddrh == 0) {
slic_reg32_write(&adapter->slic_regs->slic_cbar, slic_write32(adapter, SLIC_REG_CBAR, (hcmd->paddrl |
(hcmd->paddrl | hcmd->cmdsize), DONT_FLUSH); hcmd->cmdsize));
} else { } else {
slic_reg64_write(adapter, &adapter->slic_regs->slic_cbar64, slic_write64(adapter, SLIC_REG_CBAR64,
(hcmd->paddrl | hcmd->cmdsize), hcmd->paddrl | hcmd->cmdsize, hcmd->paddrh);
&adapter->slic_regs->slic_addr_upper,
hcmd->paddrh, DONT_FLUSH);
} }
xmit_done: xmit_done:
return NETDEV_TX_OK; return NETDEV_TX_OK;
...@@ -2299,7 +2243,6 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags) ...@@ -2299,7 +2243,6 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags)
{ {
struct sliccard *card = adapter->card; struct sliccard *card = adapter->card;
struct net_device *dev = adapter->netdev; struct net_device *dev = adapter->netdev;
__iomem struct slic_regs *slic_regs = adapter->slic_regs;
struct slic_shmem *pshmem; struct slic_shmem *pshmem;
int rc; int rc;
...@@ -2344,7 +2287,7 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags) ...@@ -2344,7 +2287,7 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags)
adapter->queues_initialized = 1; adapter->queues_initialized = 1;
} }
slic_reg32_write(&slic_regs->slic_icr, ICR_INT_OFF, FLUSH); slic_write32(adapter, SLIC_REG_ICR, ICR_INT_OFF);
slic_flush_write(adapter); slic_flush_write(adapter);
mdelay(1); mdelay(1);
...@@ -2357,14 +2300,13 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags) ...@@ -2357,14 +2300,13 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags)
spin_lock_irqsave(&adapter->bit64reglock, flags); spin_lock_irqsave(&adapter->bit64reglock, flags);
#if BITS_PER_LONG == 64 #if BITS_PER_LONG == 64
slic_reg32_write(&slic_regs->slic_addr_upper, slic_write32(adapter, SLIC_REG_ADDR_UPPER,
SLIC_GET_ADDR_HIGH(&pshmem->isr), DONT_FLUSH); SLIC_GET_ADDR_HIGH(&pshmem->isr));
slic_reg32_write(&slic_regs->slic_isp, slic_write32(adapter, SLIC_REG_ISP,
SLIC_GET_ADDR_LOW(&pshmem->isr), FLUSH); SLIC_GET_ADDR_LOW(&pshmem->isr));
#else #else
slic_reg32_write(&slic_regs->slic_addr_upper, 0, DONT_FLUSH); slic_write32(adapter, SLIC_REG_ADDR_UPPER, 0);
slic_reg32_write(&slic_regs->slic_isp, (u32)&pshmem->isr, slic_write32(adapter, SLIC_REG_ISP, (u32)&pshmem->isr);
FLUSH);
#endif #endif
spin_unlock_irqrestore(&adapter->bit64reglock, flags); spin_unlock_irqrestore(&adapter->bit64reglock, flags);
adapter->isp_initialized = 1; adapter->isp_initialized = 1;
...@@ -2395,17 +2337,19 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags) ...@@ -2395,17 +2337,19 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags)
*/ */
adapter->isrcopy = 0; adapter->isrcopy = 0;
adapter->pshmem->isr = 0; adapter->pshmem->isr = 0;
slic_reg32_write(&slic_regs->slic_isr, 0, FLUSH); slic_write32(adapter, SLIC_REG_ISR, 0);
slic_reg32_write(&slic_regs->slic_icr, ICR_INT_ON, FLUSH); slic_write32(adapter, SLIC_REG_ICR, ICR_INT_ON);
slic_link_config(adapter, LINK_AUTOSPEED, LINK_AUTOD); slic_link_config(adapter, LINK_AUTOSPEED, LINK_AUTOD);
slic_flush_write(adapter); slic_flush_write(adapter);
rc = slic_link_event_handler(adapter); rc = slic_link_event_handler(adapter);
if (rc) { if (rc) {
/* disable interrupts then clear pending events */ /* disable interrupts then clear pending events */
slic_reg32_write(&slic_regs->slic_icr, ICR_INT_OFF, FLUSH); slic_write32(adapter, SLIC_REG_ICR, ICR_INT_OFF);
slic_reg32_write(&slic_regs->slic_isr, 0, FLUSH); slic_write32(adapter, SLIC_REG_ISR, 0);
slic_flush_write(adapter); slic_flush_write(adapter);
if (adapter->pingtimerset) { if (adapter->pingtimerset) {
del_timer(&adapter->pingtimer); del_timer(&adapter->pingtimer);
adapter->pingtimerset = 0; adapter->pingtimerset = 0;
...@@ -2478,7 +2422,7 @@ static void slic_entry_remove(struct pci_dev *pcidev) ...@@ -2478,7 +2422,7 @@ static void slic_entry_remove(struct pci_dev *pcidev)
unregister_netdev(dev); unregister_netdev(dev);
slic_adapter_freeresources(adapter); slic_adapter_freeresources(adapter);
slic_unmap_mmio_space(adapter); iounmap(adapter->regs);
/* free multicast addresses */ /* free multicast addresses */
mlist = adapter->mcastaddrs; mlist = adapter->mcastaddrs;
...@@ -2512,7 +2456,6 @@ static int slic_entry_halt(struct net_device *dev) ...@@ -2512,7 +2456,6 @@ static int slic_entry_halt(struct net_device *dev)
{ {
struct adapter *adapter = netdev_priv(dev); struct adapter *adapter = netdev_priv(dev);
struct sliccard *card = adapter->card; struct sliccard *card = adapter->card;
__iomem struct slic_regs *slic_regs = adapter->slic_regs;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&slic_global.driver_lock, flags); spin_lock_irqsave(&slic_global.driver_lock, flags);
...@@ -2522,7 +2465,7 @@ static int slic_entry_halt(struct net_device *dev) ...@@ -2522,7 +2465,7 @@ static int slic_entry_halt(struct net_device *dev)
adapter->upr_list = NULL; adapter->upr_list = NULL;
adapter->upr_busy = 0; adapter->upr_busy = 0;
adapter->devflags_prev = 0; adapter->devflags_prev = 0;
slic_reg32_write(&slic_regs->slic_icr, ICR_INT_OFF, FLUSH); slic_write32(adapter, SLIC_REG_ICR, ICR_INT_OFF);
adapter->all_reg_writes++; adapter->all_reg_writes++;
adapter->icr_reg_writes++; adapter->icr_reg_writes++;
slic_config_clear(adapter); slic_config_clear(adapter);
...@@ -2532,9 +2475,10 @@ static int slic_entry_halt(struct net_device *dev) ...@@ -2532,9 +2475,10 @@ static int slic_entry_halt(struct net_device *dev)
adapter->activated = 0; adapter->activated = 0;
} }
#ifdef AUTOMATIC_RESET #ifdef AUTOMATIC_RESET
slic_reg32_write(&slic_regs->slic_reset_iface, 0, FLUSH); slic_write32(adapter, SLIC_REG_RESET_IFACE, 0);
#endif #endif
slic_flush_write(adapter); slic_flush_write(adapter);
/* /*
* Reset the adapter's cmd queues * Reset the adapter's cmd queues
*/ */
...@@ -2680,7 +2624,6 @@ static void slic_config_pci(struct pci_dev *pcidev) ...@@ -2680,7 +2624,6 @@ static void slic_config_pci(struct pci_dev *pcidev)
static int slic_card_init(struct sliccard *card, struct adapter *adapter) static int slic_card_init(struct sliccard *card, struct adapter *adapter)
{ {
__iomem struct slic_regs *slic_regs = adapter->slic_regs;
struct slic_eeprom *peeprom; struct slic_eeprom *peeprom;
struct oslic_eeprom *pOeeprom; struct oslic_eeprom *pOeeprom;
dma_addr_t phys_config; dma_addr_t phys_config;
...@@ -2725,17 +2668,17 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter) ...@@ -2725,17 +2668,17 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
memset(peeprom, 0, sizeof(struct slic_eeprom)); memset(peeprom, 0, sizeof(struct slic_eeprom));
slic_reg32_write(&slic_regs->slic_icr, ICR_INT_OFF, FLUSH); slic_write32(adapter, SLIC_REG_ICR, ICR_INT_OFF);
slic_flush_write(adapter); slic_flush_write(adapter);
mdelay(1); mdelay(1);
pshmem = (struct slic_shmem *)(unsigned long) pshmem = (struct slic_shmem *)(unsigned long)
adapter->phys_shmem; adapter->phys_shmem;
spin_lock_irqsave(&adapter->bit64reglock, flags); spin_lock_irqsave(&adapter->bit64reglock, flags);
slic_reg32_write(&slic_regs->slic_addr_upper, slic_write32(adapter, SLIC_REG_ADDR_UPPER,
SLIC_GET_ADDR_HIGH(&pshmem->isr), DONT_FLUSH); SLIC_GET_ADDR_HIGH(&pshmem->isr));
slic_reg32_write(&slic_regs->slic_isp, slic_write32(adapter, SLIC_REG_ISP,
SLIC_GET_ADDR_LOW(&pshmem->isr), FLUSH); SLIC_GET_ADDR_LOW(&pshmem->isr));
spin_unlock_irqrestore(&adapter->bit64reglock, flags); spin_unlock_irqrestore(&adapter->bit64reglock, flags);
status = slic_config_get(adapter, phys_configl, phys_configh); status = slic_config_get(adapter, phys_configl, phys_configh);
...@@ -2749,12 +2692,9 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter) ...@@ -2749,12 +2692,9 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
if (adapter->pshmem->isr) { if (adapter->pshmem->isr) {
if (adapter->pshmem->isr & ISR_UPC) { if (adapter->pshmem->isr & ISR_UPC) {
adapter->pshmem->isr = 0; adapter->pshmem->isr = 0;
slic_reg64_write(adapter, slic_write64(adapter, SLIC_REG_ISP, 0,
&slic_regs->slic_isp, 0, 0);
&slic_regs->slic_addr_upper, slic_write32(adapter, SLIC_REG_ISR, 0);
0, FLUSH);
slic_reg32_write(&slic_regs->slic_isr,
0, FLUSH);
slic_flush_write(adapter); slic_flush_write(adapter);
slic_upr_request_complete(adapter, 0); slic_upr_request_complete(adapter, 0);
...@@ -2762,8 +2702,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter) ...@@ -2762,8 +2702,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
} }
adapter->pshmem->isr = 0; adapter->pshmem->isr = 0;
slic_reg32_write(&slic_regs->slic_isr, slic_write32(adapter, SLIC_REG_ISR, 0);
0, FLUSH);
slic_flush_write(adapter); slic_flush_write(adapter);
} else { } else {
mdelay(1); mdelay(1);
...@@ -2771,11 +2710,10 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter) ...@@ -2771,11 +2710,10 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
if (i > 5000) { if (i > 5000) {
dev_err(&adapter->pcidev->dev, dev_err(&adapter->pcidev->dev,
"Fetch of config data timed out.\n"); "Fetch of config data timed out.\n");
slic_reg64_write(adapter, slic_write64(adapter, SLIC_REG_ISP,
&slic_regs->slic_isp, 0, 0, 0);
&slic_regs->slic_addr_upper,
0, FLUSH);
slic_flush_write(adapter); slic_flush_write(adapter);
status = -EINVAL; status = -EINVAL;
goto card_init_err; goto card_init_err;
} }
...@@ -2853,9 +2791,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter) ...@@ -2853,9 +2791,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
peeprom, phys_config); peeprom, phys_config);
if (!card->config.EepromValid) { if (!card->config.EepromValid) {
slic_reg64_write(adapter, &slic_regs->slic_isp, 0, slic_write64(adapter, SLIC_REG_ISP, 0, 0);
&slic_regs->slic_addr_upper,
0, FLUSH);
slic_flush_write(adapter); slic_flush_write(adapter);
dev_err(&adapter->pcidev->dev, "EEPROM invalid.\n"); dev_err(&adapter->pcidev->dev, "EEPROM invalid.\n");
return -EINVAL; return -EINVAL;
...@@ -2936,7 +2872,6 @@ static int slic_init_adapter(struct net_device *netdev, ...@@ -2936,7 +2872,6 @@ static int slic_init_adapter(struct net_device *netdev,
adapter->busnumber = pcidev->bus->number; adapter->busnumber = pcidev->bus->number;
adapter->slotnumber = ((pcidev->devfn >> 3) & 0x1F); adapter->slotnumber = ((pcidev->devfn >> 3) & 0x1F);
adapter->functionnumber = (pcidev->devfn & 0x7); adapter->functionnumber = (pcidev->devfn & 0x7);
adapter->slic_regs = memaddr;
adapter->regs = memaddr; adapter->regs = memaddr;
adapter->irq = pcidev->irq; adapter->irq = pcidev->irq;
adapter->chipid = chip_idx; adapter->chipid = chip_idx;
...@@ -2989,27 +2924,9 @@ static u32 slic_card_locate(struct adapter *adapter) ...@@ -2989,27 +2924,9 @@ static u32 slic_card_locate(struct adapter *adapter)
struct sliccard *card = slic_global.slic_card; struct sliccard *card = slic_global.slic_card;
struct physcard *physcard = slic_global.phys_card; struct physcard *physcard = slic_global.phys_card;
ushort card_hostid; ushort card_hostid;
u16 __iomem *hostid_reg;
uint i; uint i;
uint rdhostid_offset = 0;
switch (adapter->devid) {
case SLIC_2GB_DEVICE_ID:
rdhostid_offset = SLIC_RDHOSTID_2GB;
break;
case SLIC_1GB_DEVICE_ID:
rdhostid_offset = SLIC_RDHOSTID_1GB;
break;
default:
return -ENODEV;
}
hostid_reg =
(u16 __iomem *)(((u8 __iomem *)(adapter->slic_regs)) +
rdhostid_offset);
/* read the 16 bit hostid from SRAM */ card_hostid = slic_read32(adapter, SLIC_REG_HOSTID);
card_hostid = (ushort)readw(hostid_reg);
/* Initialize a new card structure if need be */ /* Initialize a new card structure if need be */
if (card_hostid == SLIC_HOSTID_DEFAULT) { if (card_hostid == SLIC_HOSTID_DEFAULT) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7