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

Staging: et131x: CSRAddress to regs

Browse source 
Switch this to a Linux like naming as it occurs all over.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2009-08-27 10:59:30 +01:00 committed by Greg Kroah-Hartman
parent 6ae56042c1
commit f3f415a3b4
11 changed files with 72 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/et131x/et1310_jagcore.c
View file

@ -101,7 +101,7 @@ extern dbg_info_t *et131x_dbginfo;
*/ */
void ConfigGlobalRegs(struct et131x_adapter *etdev) void ConfigGlobalRegs(struct et131x_adapter *etdev)
{ {
struct _GLOBAL_t __iomem *pGbl = &etdev->CSRAddress->global; struct _GLOBAL_t __iomem *pGbl = &etdev->regs->global;
DBG_ENTER(et131x_dbginfo); DBG_ENTER(et131x_dbginfo);
@ -188,7 +188,7 @@ void ConfigMMCRegs(struct et131x_adapter *etdev)
mmc_ctrl.bits.arb_disable = 0x0; mmc_ctrl.bits.arb_disable = 0x0;
mmc_ctrl.bits.mmc_enable = 0x1; mmc_ctrl.bits.mmc_enable = 0x1;
writel(mmc_ctrl.value, &etdev->CSRAddress->mmc.mmc_ctrl.value); writel(mmc_ctrl.value, &etdev->regs->mmc.mmc_ctrl.value);
DBG_LEAVE(et131x_dbginfo); DBG_LEAVE(et131x_dbginfo);
} }
@ -207,12 +207,12 @@ void et131x_enable_interrupts(struct et131x_adapter *adapter)
MaskValue |= 0x10000; MaskValue |= 0x10000;
adapter->CachedMaskValue.value = MaskValue; adapter->CachedMaskValue.value = MaskValue;
writel(MaskValue, &adapter->CSRAddress->global.int_mask.value); writel(MaskValue, &adapter->regs->global.int_mask.value);
} }
void et131x_disable_interrupts(struct et131x_adapter *adapter) void et131x_disable_interrupts(struct et131x_adapter *adapter)
{ {
/* Disable all global interrupts */ /* Disable all global interrupts */
adapter->CachedMaskValue.value = INT_MASK_DISABLE; adapter->CachedMaskValue.value = INT_MASK_DISABLE;
writel(INT_MASK_DISABLE, &adapter->CSRAddress->global.int_mask.value); writel(INT_MASK_DISABLE, &adapter->regs->global.int_mask.value);
} }

32
drivers/staging/et131x/et1310_mac.c
View file

@ -103,7 +103,7 @@ extern dbg_info_t *et131x_dbginfo;
*/ */
void ConfigMACRegs1(struct et131x_adapter *etdev) void ConfigMACRegs1(struct et131x_adapter *etdev)
{ {
struct _MAC_t __iomem *pMac = &etdev->CSRAddress->mac; struct _MAC_t __iomem *pMac = &etdev->regs->mac;
MAC_STATION_ADDR1_t station1; MAC_STATION_ADDR1_t station1;
MAC_STATION_ADDR2_t station2; MAC_STATION_ADDR2_t station2;
MAC_IPG_t ipg; MAC_IPG_t ipg;
@ -182,7 +182,7 @@ void ConfigMACRegs1(struct et131x_adapter *etdev)
void ConfigMACRegs2(struct et131x_adapter *etdev) void ConfigMACRegs2(struct et131x_adapter *etdev)
{ {
int32_t delay = 0; int32_t delay = 0;
struct _MAC_t __iomem *pMac = &etdev->CSRAddress->mac; struct _MAC_t __iomem *pMac = &etdev->regs->mac;
MAC_CFG1_t cfg1; MAC_CFG1_t cfg1;
MAC_CFG2_t cfg2; MAC_CFG2_t cfg2;
MAC_IF_CTRL_t ifctrl; MAC_IF_CTRL_t ifctrl;
@ -190,7 +190,7 @@ void ConfigMACRegs2(struct et131x_adapter *etdev)
DBG_ENTER(et131x_dbginfo); DBG_ENTER(et131x_dbginfo);
ctl.value = readl(&etdev->CSRAddress->txmac.ctl.value); ctl.value = readl(&etdev->regs->txmac.ctl.value);
cfg1.value = readl(&pMac->cfg1.value); cfg1.value = readl(&pMac->cfg1.value);
cfg2.value = readl(&pMac->cfg2.value); cfg2.value = readl(&pMac->cfg2.value);
ifctrl.value = readl(&pMac->if_ctrl.value); ifctrl.value = readl(&pMac->if_ctrl.value);
@ -269,7 +269,7 @@ void ConfigMACRegs2(struct et131x_adapter *etdev)
/* Enable TXMAC */ /* Enable TXMAC */
ctl.bits.txmac_en = 0x1; ctl.bits.txmac_en = 0x1;
ctl.bits.fc_disable = 0x1; ctl.bits.fc_disable = 0x1;
writel(ctl.value, &etdev->CSRAddress->txmac.ctl.value); writel(ctl.value, &etdev->regs->txmac.ctl.value);
/* Ready to start the RXDMA/TXDMA engine */ /* Ready to start the RXDMA/TXDMA engine */
if (!MP_TEST_FLAG(etdev, fMP_ADAPTER_LOWER_POWER)) { if (!MP_TEST_FLAG(etdev, fMP_ADAPTER_LOWER_POWER)) {
@ -285,7 +285,7 @@ void ConfigMACRegs2(struct et131x_adapter *etdev)
void ConfigRxMacRegs(struct et131x_adapter *etdev) void ConfigRxMacRegs(struct et131x_adapter *etdev)
{ {
struct _RXMAC_t __iomem *pRxMac = &etdev->CSRAddress->rxmac; struct _RXMAC_t __iomem *pRxMac = &etdev->regs->rxmac;
RXMAC_WOL_SA_LO_t sa_lo; RXMAC_WOL_SA_LO_t sa_lo;
RXMAC_WOL_SA_HI_t sa_hi; RXMAC_WOL_SA_HI_t sa_hi;
RXMAC_PF_CTRL_t pf_ctrl = { 0 }; RXMAC_PF_CTRL_t pf_ctrl = { 0 };
@ -427,7 +427,7 @@ void ConfigRxMacRegs(struct et131x_adapter *etdev)
void ConfigTxMacRegs(struct et131x_adapter *etdev) void ConfigTxMacRegs(struct et131x_adapter *etdev)
{ {
struct _TXMAC_t __iomem *pTxMac = &etdev->CSRAddress->txmac; struct _TXMAC_t __iomem *pTxMac = &etdev->regs->txmac;
TXMAC_CF_PARAM_t Local; TXMAC_CF_PARAM_t Local;
DBG_ENTER(et131x_dbginfo); DBG_ENTER(et131x_dbginfo);
@ -450,7 +450,7 @@ void ConfigTxMacRegs(struct et131x_adapter *etdev)
void ConfigMacStatRegs(struct et131x_adapter *etdev) void ConfigMacStatRegs(struct et131x_adapter *etdev)
{ {
struct _MAC_STAT_t __iomem *pDevMacStat = struct _MAC_STAT_t __iomem *pDevMacStat =
&etdev->CSRAddress->macStat; &etdev->regs->macStat;
DBG_ENTER(et131x_dbginfo); DBG_ENTER(et131x_dbginfo);
@ -581,7 +581,7 @@ void UpdateMacStatHostCounters(struct et131x_adapter *etdev)
{ {
struct _ce_stats_t *stats = &etdev->Stats; struct _ce_stats_t *stats = &etdev->Stats;
struct _MAC_STAT_t __iomem *pDevMacStat = struct _MAC_STAT_t __iomem *pDevMacStat =
&etdev->CSRAddress->macStat; &etdev->regs->macStat;
stats->collisions += readl(&pDevMacStat->TNcl); stats->collisions += readl(&pDevMacStat->TNcl);
stats->first_collision += readl(&pDevMacStat->TScl); stats->first_collision += readl(&pDevMacStat->TScl);
@ -619,11 +619,11 @@ void HandleMacStatInterrupt(struct et131x_adapter *etdev)
/* Read the interrupt bits from the register(s). These are Clear On /* Read the interrupt bits from the register(s). These are Clear On
* Write. * Write.
*/ */
Carry1.value = readl(&etdev->CSRAddress->macStat.Carry1.value); Carry1.value = readl(&etdev->regs->macStat.Carry1.value);
Carry2.value = readl(&etdev->CSRAddress->macStat.Carry2.value); Carry2.value = readl(&etdev->regs->macStat.Carry2.value);
writel(Carry1.value, &etdev->CSRAddress->macStat.Carry1.value); writel(Carry1.value, &etdev->regs->macStat.Carry1.value);
writel(Carry2.value, &etdev->CSRAddress->macStat.Carry2.value); writel(Carry2.value, &etdev->regs->macStat.Carry2.value);
/* We need to do update the host copy of all the MAC_STAT counters. /* We need to do update the host copy of all the MAC_STAT counters.
* For each counter, check it's overflow bit. If the overflow bit is * For each counter, check it's overflow bit. If the overflow bit is
@ -665,7 +665,7 @@ void HandleMacStatInterrupt(struct et131x_adapter *etdev)
void SetupDeviceForMulticast(struct et131x_adapter *etdev) void SetupDeviceForMulticast(struct et131x_adapter *etdev)
{ {
struct _RXMAC_t __iomem *rxmac = &etdev->CSRAddress->rxmac; struct _RXMAC_t __iomem *rxmac = &etdev->regs->rxmac;
uint32_t nIndex; uint32_t nIndex;
uint32_t result; uint32_t result;
uint32_t hash1 = 0; uint32_t hash1 = 0;
@ -718,7 +718,7 @@ void SetupDeviceForMulticast(struct et131x_adapter *etdev)
} }
/* Write out the new hash to the device */ /* Write out the new hash to the device */
pm_csr.value = readl(&etdev->CSRAddress->global.pm_csr.value); pm_csr.value = readl(&etdev->regs->global.pm_csr.value);
if (pm_csr.bits.pm_phy_sw_coma == 0) { if (pm_csr.bits.pm_phy_sw_coma == 0) {
writel(hash1, &rxmac->multi_hash1); writel(hash1, &rxmac->multi_hash1);
writel(hash2, &rxmac->multi_hash2); writel(hash2, &rxmac->multi_hash2);
@ -731,7 +731,7 @@ void SetupDeviceForMulticast(struct et131x_adapter *etdev)
void SetupDeviceForUnicast(struct et131x_adapter *etdev) void SetupDeviceForUnicast(struct et131x_adapter *etdev)
{ {
struct _RXMAC_t __iomem *rxmac = &etdev->CSRAddress->rxmac; struct _RXMAC_t __iomem *rxmac = &etdev->regs->rxmac;
RXMAC_UNI_PF_ADDR1_t uni_pf1; RXMAC_UNI_PF_ADDR1_t uni_pf1;
RXMAC_UNI_PF_ADDR2_t uni_pf2; RXMAC_UNI_PF_ADDR2_t uni_pf2;
RXMAC_UNI_PF_ADDR3_t uni_pf3; RXMAC_UNI_PF_ADDR3_t uni_pf3;
@ -763,7 +763,7 @@ void SetupDeviceForUnicast(struct et131x_adapter *etdev)
uni_pf1.bits.addr1_5 = etdev->CurrentAddress[4]; uni_pf1.bits.addr1_5 = etdev->CurrentAddress[4];
uni_pf1.bits.addr1_6 = etdev->CurrentAddress[5]; uni_pf1.bits.addr1_6 = etdev->CurrentAddress[5];
pm_csr.value = readl(&etdev->CSRAddress->global.pm_csr.value); pm_csr.value = readl(&etdev->regs->global.pm_csr.value);
if (pm_csr.bits.pm_phy_sw_coma == 0) { if (pm_csr.bits.pm_phy_sw_coma == 0) {
writel(uni_pf1.value, &rxmac->uni_pf_addr1.value); writel(uni_pf1.value, &rxmac->uni_pf_addr1.value);
writel(uni_pf2.value, &rxmac->uni_pf_addr2.value); writel(uni_pf2.value, &rxmac->uni_pf_addr2.value);

4
drivers/staging/et131x/et1310_phy.c
View file

@ -118,7 +118,7 @@ static int et131x_xcvr_init(struct et131x_adapter *adapter);
int PhyMiRead(struct et131x_adapter *adapter, uint8_t xcvrAddr, int PhyMiRead(struct et131x_adapter *adapter, uint8_t xcvrAddr,
uint8_t xcvrReg, uint16_t *value) uint8_t xcvrReg, uint16_t *value)
{ {
struct _MAC_t __iomem *mac = &adapter->CSRAddress->mac; struct _MAC_t __iomem *mac = &adapter->regs->mac;
int status = 0; int status = 0;
uint32_t delay; uint32_t delay;
MII_MGMT_ADDR_t miiAddr; MII_MGMT_ADDR_t miiAddr;
@ -202,7 +202,7 @@ int PhyMiRead(struct et131x_adapter *adapter, uint8_t xcvrAddr,
*/ */
int MiWrite(struct et131x_adapter *adapter, uint8_t xcvrReg, uint16_t value) int MiWrite(struct et131x_adapter *adapter, uint8_t xcvrReg, uint16_t value)
{ {
struct _MAC_t __iomem *mac = &adapter->CSRAddress->mac; struct _MAC_t __iomem *mac = &adapter->regs->mac;
int status = 0; int status = 0;
uint8_t xcvrAddr = adapter->Stats.xcvr_addr; uint8_t xcvrAddr = adapter->Stats.xcvr_addr;
uint32_t delay; uint32_t delay;

10
drivers/staging/et131x/et1310_pm.c
View file

@ -125,7 +125,7 @@ void EnablePhyComa(struct et131x_adapter *etdev)
DBG_ENTER(et131x_dbginfo); DBG_ENTER(et131x_dbginfo);
GlobalPmCSR.value = readl(&etdev->CSRAddress->global.pm_csr.value); GlobalPmCSR.value = readl(&etdev->regs->global.pm_csr.value);
/* Save the GbE PHY speed and duplex modes. Need to restore this /* Save the GbE PHY speed and duplex modes. Need to restore this
* when cable is plugged back in * when cable is plugged back in
@ -144,11 +144,11 @@ void EnablePhyComa(struct et131x_adapter *etdev)
GlobalPmCSR.bits.pm_sysclk_gate = 0; GlobalPmCSR.bits.pm_sysclk_gate = 0;
GlobalPmCSR.bits.pm_txclk_gate = 0; GlobalPmCSR.bits.pm_txclk_gate = 0;
GlobalPmCSR.bits.pm_rxclk_gate = 0; GlobalPmCSR.bits.pm_rxclk_gate = 0;
writel(GlobalPmCSR.value, &etdev->CSRAddress->global.pm_csr.value); writel(GlobalPmCSR.value, &etdev->regs->global.pm_csr.value);
/* Program gigE PHY in to Coma mode */ /* Program gigE PHY in to Coma mode */
GlobalPmCSR.bits.pm_phy_sw_coma = 1; GlobalPmCSR.bits.pm_phy_sw_coma = 1;
writel(GlobalPmCSR.value, &etdev->CSRAddress->global.pm_csr.value); writel(GlobalPmCSR.value, &etdev->regs->global.pm_csr.value);
DBG_LEAVE(et131x_dbginfo); DBG_LEAVE(et131x_dbginfo);
} }
@ -163,14 +163,14 @@ void DisablePhyComa(struct et131x_adapter *etdev)
DBG_ENTER(et131x_dbginfo); DBG_ENTER(et131x_dbginfo);
GlobalPmCSR.value = readl(&etdev->CSRAddress->global.pm_csr.value); GlobalPmCSR.value = readl(&etdev->regs->global.pm_csr.value);
/* Disable phy_sw_coma register and re-enable JAGCore clocks */ /* Disable phy_sw_coma register and re-enable JAGCore clocks */
GlobalPmCSR.bits.pm_sysclk_gate = 1; GlobalPmCSR.bits.pm_sysclk_gate = 1;
GlobalPmCSR.bits.pm_txclk_gate = 1; GlobalPmCSR.bits.pm_txclk_gate = 1;
GlobalPmCSR.bits.pm_rxclk_gate = 1; GlobalPmCSR.bits.pm_rxclk_gate = 1;
GlobalPmCSR.bits.pm_phy_sw_coma = 0; GlobalPmCSR.bits.pm_phy_sw_coma = 0;
writel(GlobalPmCSR.value, &etdev->CSRAddress->global.pm_csr.value); writel(GlobalPmCSR.value, &etdev->regs->global.pm_csr.value);
/* Restore the GbE PHY speed and duplex modes; /* Restore the GbE PHY speed and duplex modes;
* Reset JAGCore; re-configure and initialize JAGCore and gigE PHY * Reset JAGCore; re-configure and initialize JAGCore and gigE PHY

26
drivers/staging/et131x/et1310_rx.c
View file

@ -680,7 +680,7 @@ void et131x_rfd_resources_free(struct et131x_adapter *adapter, MP_RFD *pMpRfd)
*/ */
void ConfigRxDmaRegs(struct et131x_adapter *etdev) void ConfigRxDmaRegs(struct et131x_adapter *etdev)
{ {
struct _RXDMA_t __iomem *pRxDma = &etdev->CSRAddress->rxdma; struct _RXDMA_t __iomem *pRxDma = &etdev->regs->rxdma;
struct _rx_ring_t *pRxLocal = &etdev->RxRing; struct _rx_ring_t *pRxLocal = &etdev->RxRing;
PFBR_DESC_t pFbrEntry; PFBR_DESC_t pFbrEntry;
uint32_t iEntry; uint32_t iEntry;
@ -817,8 +817,8 @@ void SetRxDmaTimer(struct et131x_adapter *etdev)
*/ */
if ((etdev->uiLinkSpeed == TRUEPHY_SPEED_100MBPS) || if ((etdev->uiLinkSpeed == TRUEPHY_SPEED_100MBPS) ||
(etdev->uiLinkSpeed == TRUEPHY_SPEED_10MBPS)) { (etdev->uiLinkSpeed == TRUEPHY_SPEED_10MBPS)) {
writel(0, &etdev->CSRAddress->rxdma.max_pkt_time.value); writel(0, &etdev->regs->rxdma.max_pkt_time.value);
writel(1, &etdev->CSRAddress->rxdma.num_pkt_done.value); writel(1, &etdev->regs->rxdma.num_pkt_done.value);
} }
} }
@ -833,11 +833,11 @@ void et131x_rx_dma_disable(struct et131x_adapter *etdev)
DBG_ENTER(et131x_dbginfo); DBG_ENTER(et131x_dbginfo);
/* Setup the receive dma configuration register */ /* Setup the receive dma configuration register */
writel(0x00002001, &etdev->CSRAddress->rxdma.csr.value); writel(0x00002001, &etdev->regs->rxdma.csr.value);
csr.value = readl(&etdev->CSRAddress->rxdma.csr.value); csr.value = readl(&etdev->regs->rxdma.csr.value);
if (csr.bits.halt_status != 1) { if (csr.bits.halt_status != 1) {
udelay(5); udelay(5);
csr.value = readl(&etdev->CSRAddress->rxdma.csr.value); csr.value = readl(&etdev->regs->rxdma.csr.value);
if (csr.bits.halt_status != 1) if (csr.bits.halt_status != 1)
DBG_ERROR(et131x_dbginfo, DBG_ERROR(et131x_dbginfo,
"RX Dma failed to enter halt state. CSR 0x%08x\n", "RX Dma failed to enter halt state. CSR 0x%08x\n",
@ -857,7 +857,7 @@ void et131x_rx_dma_enable(struct et131x_adapter *etdev)
if (etdev->RegistryPhyLoopbk) if (etdev->RegistryPhyLoopbk)
/* RxDMA is disabled for loopback operation. */ /* RxDMA is disabled for loopback operation. */
writel(0x1, &etdev->CSRAddress->rxdma.csr.value); writel(0x1, &etdev->regs->rxdma.csr.value);
else { else {
/* Setup the receive dma configuration register for normal operation */ /* Setup the receive dma configuration register for normal operation */
RXDMA_CSR_t csr = { 0 }; RXDMA_CSR_t csr = { 0 };
@ -878,12 +878,12 @@ void et131x_rx_dma_enable(struct et131x_adapter *etdev)
else if (etdev->RxRing.Fbr0BufferSize == 1024) else if (etdev->RxRing.Fbr0BufferSize == 1024)
csr.bits.fbr0_size = 3; csr.bits.fbr0_size = 3;
#endif #endif
writel(csr.value, &etdev->CSRAddress->rxdma.csr.value); writel(csr.value, &etdev->regs->rxdma.csr.value);
csr.value = readl(&etdev->CSRAddress->rxdma.csr.value); csr.value = readl(&etdev->regs->rxdma.csr.value);
if (csr.bits.halt_status != 0) { if (csr.bits.halt_status != 0) {
udelay(5); udelay(5);
csr.value = readl(&etdev->CSRAddress->rxdma.csr.value); csr.value = readl(&etdev->regs->rxdma.csr.value);
if (csr.bits.halt_status != 0) { if (csr.bits.halt_status != 0) {
DBG_ERROR(et131x_dbginfo, DBG_ERROR(et131x_dbginfo,
"RX Dma failed to exit halt state. CSR 0x%08x\n", "RX Dma failed to exit halt state. CSR 0x%08x\n",
@ -978,7 +978,7 @@ PMP_RFD nic_rx_pkts(struct et131x_adapter *etdev)
} }
writel(pRxLocal->local_psr_full.value, writel(pRxLocal->local_psr_full.value,
&etdev->CSRAddress->rxdma.psr_full_offset.value); &etdev->regs->rxdma.psr_full_offset.value);
#ifndef USE_FBR0 #ifndef USE_FBR0
if (ringIndex != 1) { if (ringIndex != 1) {
@ -1273,7 +1273,7 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev)
if ((PacketArrayCount == NUM_PACKETS_HANDLED) || TempUnfinishedRec) { if ((PacketArrayCount == NUM_PACKETS_HANDLED) || TempUnfinishedRec) {
etdev->RxRing.UnfinishedReceives = true; etdev->RxRing.UnfinishedReceives = true;
writel(etdev->RegistryTxTimeInterval * NANO_IN_A_MICRO, writel(etdev->RegistryTxTimeInterval * NANO_IN_A_MICRO,
&etdev->CSRAddress->global.watchdog_timer); &etdev->regs->global.watchdog_timer);
} else { } else {
/* Watchdog timer will disable itself if appropriate. */ /* Watchdog timer will disable itself if appropriate. */
etdev->RxRing.UnfinishedReceives = false; etdev->RxRing.UnfinishedReceives = false;
@ -1290,7 +1290,7 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev)
void nic_return_rfd(struct et131x_adapter *etdev, PMP_RFD pMpRfd) void nic_return_rfd(struct et131x_adapter *etdev, PMP_RFD pMpRfd)
{ {
struct _rx_ring_t *pRxLocal = &etdev->RxRing; struct _rx_ring_t *pRxLocal = &etdev->RxRing;
struct _RXDMA_t __iomem *pRxDma = &etdev->CSRAddress->rxdma; struct _RXDMA_t __iomem *pRxDma = &etdev->regs->rxdma;
uint16_t bi = pMpRfd->iBufferIndex; uint16_t bi = pMpRfd->iBufferIndex;
uint8_t ri = pMpRfd->iRingIndex; uint8_t ri = pMpRfd->iRingIndex;
unsigned long flags; unsigned long flags;

20
drivers/staging/et131x/et1310_tx.c
View file

@ -249,7 +249,7 @@ void et131x_tx_dma_memory_free(struct et131x_adapter *adapter)
*/ */
void ConfigTxDmaRegs(struct et131x_adapter *etdev) void ConfigTxDmaRegs(struct et131x_adapter *etdev)
{ {
struct _TXDMA_t __iomem *pTxDma = &etdev->CSRAddress->txdma; struct _TXDMA_t __iomem *pTxDma = &etdev->regs->txdma;
DBG_ENTER(et131x_dbginfo); DBG_ENTER(et131x_dbginfo);
@ -289,7 +289,7 @@ void et131x_tx_dma_disable(struct et131x_adapter *etdev)
DBG_ENTER(et131x_dbginfo); DBG_ENTER(et131x_dbginfo);
/* Setup the tramsmit dma configuration register */ /* Setup the tramsmit dma configuration register */
writel(0x101, &etdev->CSRAddress->txdma.csr.value); writel(0x101, &etdev->regs->txdma.csr.value);
DBG_LEAVE(et131x_dbginfo); DBG_LEAVE(et131x_dbginfo);
} }
@ -306,7 +306,7 @@ void et131x_tx_dma_enable(struct et131x_adapter *etdev)
if (etdev->RegistryPhyLoopbk) { if (etdev->RegistryPhyLoopbk) {
/* TxDMA is disabled for loopback operation. */ /* TxDMA is disabled for loopback operation. */
writel(0x101, &etdev->CSRAddress->txdma.csr.value); writel(0x101, &etdev->regs->txdma.csr.value);
} else { } else {
TXDMA_CSR_t csr = { 0 }; TXDMA_CSR_t csr = { 0 };
@ -316,7 +316,7 @@ void et131x_tx_dma_enable(struct et131x_adapter *etdev)
csr.bits.sngl_epkt_mode = 1; csr.bits.sngl_epkt_mode = 1;
csr.bits.halt = 0; csr.bits.halt = 0;
csr.bits.cache_thrshld = etdev->RegistryDMACache; csr.bits.cache_thrshld = etdev->RegistryDMACache;
writel(csr.value, &etdev->CSRAddress->txdma.csr.value); writel(csr.value, &etdev->regs->txdma.csr.value);
} }
DBG_LEAVE(et131x_dbginfo); DBG_LEAVE(et131x_dbginfo);
@ -788,14 +788,14 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb)
/* Write the new write pointer back to the device. */ /* Write the new write pointer back to the device. */
writel(etdev->TxRing.txDmaReadyToSend.value, writel(etdev->TxRing.txDmaReadyToSend.value,
&etdev->CSRAddress->txdma.service_request.value); &etdev->regs->txdma.service_request.value);
/* For Gig only, we use Tx Interrupt coalescing. Enable the software /* For Gig only, we use Tx Interrupt coalescing. Enable the software
* timer to wake us up if this packet isn't followed by N more. * timer to wake us up if this packet isn't followed by N more.
*/ */
if (etdev->uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) { if (etdev->uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) {
writel(etdev->RegistryTxTimeInterval * NANO_IN_A_MICRO, writel(etdev->RegistryTxTimeInterval * NANO_IN_A_MICRO,
&etdev->CSRAddress->global.watchdog_timer); &etdev->regs->global.watchdog_timer);
} }
spin_unlock_irqrestore(&etdev->SendHWLock, flags); spin_unlock_irqrestore(&etdev->SendHWLock, flags);
@ -837,7 +837,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb)
DBG_TX_ENTER(et131x_dbginfo); DBG_TX_ENTER(et131x_dbginfo);
ServiceComplete.value = ServiceComplete.value =
readl(&etdev->CSRAddress->txdma.NewServiceComplete.value); readl(&etdev->regs->txdma.NewServiceComplete.value);
/* /*
* Attempt to fix TWO hardware bugs: * Attempt to fix TWO hardware bugs:
@ -1202,7 +1202,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb)
/* Write the new write pointer back to the device. */ /* Write the new write pointer back to the device. */
writel(etdev->TxRing.txDmaReadyToSend.value, writel(etdev->TxRing.txDmaReadyToSend.value,
&etdev->CSRAddress->txdma.service_request.value); &etdev->regs->txdma.service_request.value);
#ifdef CONFIG_ET131X_DEBUG #ifdef CONFIG_ET131X_DEBUG
DumpDeviceBlock(DBG_TX_ON, etdev, 1); DumpDeviceBlock(DBG_TX_ON, etdev, 1);
@ -1213,7 +1213,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb)
*/ */
if (etdev->uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) { if (etdev->uiLinkSpeed == TRUEPHY_SPEED_1000MBPS) {
writel(etdev->RegistryTxTimeInterval * NANO_IN_A_MICRO, writel(etdev->RegistryTxTimeInterval * NANO_IN_A_MICRO,
&etdev->CSRAddress->global.watchdog_timer); &etdev->regs->global.watchdog_timer);
} }
spin_unlock_irqrestore(&etdev->SendHWLock, flags); spin_unlock_irqrestore(&etdev->SendHWLock, flags);
@ -1434,7 +1434,7 @@ static void et131x_update_tcb_list(struct et131x_adapter *etdev)
PMP_TCB pMpTcb; PMP_TCB pMpTcb;
ServiceComplete.value = ServiceComplete.value =
readl(&etdev->CSRAddress->txdma.NewServiceComplete.value); readl(&etdev->regs->txdma.NewServiceComplete.value);
/* Has the ring wrapped? Process any descriptors that do not have /* Has the ring wrapped? Process any descriptors that do not have
* the same "wrap" indicator as the current completion indicator * the same "wrap" indicator as the current completion indicator

2
drivers/staging/et131x/et131x_adapter.h
View file

@ -248,7 +248,7 @@ struct et131x_adapter {
TXMAC_TXTEST_t TxMacTest; TXMAC_TXTEST_t TxMacTest;
/* Pointer to the device's PCI register space */ /* Pointer to the device's PCI register space */
ADDRESS_MAP_t __iomem *CSRAddress; ADDRESS_MAP_t __iomem *regs;
/* Registry parameters */ /* Registry parameters */
u8 SpeedDuplex; /* speed/duplex */ u8 SpeedDuplex; /* speed/duplex */

8
drivers/staging/et131x/et131x_debug.c
View file

@ -110,7 +110,7 @@ extern dbg_info_t *et131x_dbginfo;
*/ */
void DumpTxQueueContents(int dbgLvl, struct et131x_adapter *etdev) void DumpTxQueueContents(int dbgLvl, struct et131x_adapter *etdev)
{ {
MMC_t __iomem *mmc = &etdev->CSRAddress->mmc; MMC_t __iomem *mmc = &etdev->regs->mmc;
uint32_t TxQueueAddr; uint32_t TxQueueAddr;
if (DBG_FLAGS(et131x_dbginfo) & dbgLvl) { if (DBG_FLAGS(et131x_dbginfo) & dbgLvl) {
@ -134,7 +134,7 @@ void DumpTxQueueContents(int dbgLvl, struct et131x_adapter *etdev)
} }
DBG_PRINT("Shadow Pointers 0x%08x\n", DBG_PRINT("Shadow Pointers 0x%08x\n",
readl(&etdev->CSRAddress->txmac.shadow_ptr.value)); readl(&etdev->regs->txmac.shadow_ptr.value));
} }
} }
@ -151,7 +151,7 @@ void DumpDeviceBlock(int dbgLvl, struct et131x_adapter *etdev,
{ {
uint32_t Address1, Address2; uint32_t Address1, Address2;
uint32_t __iomem *BigDevicePointer = uint32_t __iomem *BigDevicePointer =
(uint32_t __iomem *) etdev->CSRAddress; (uint32_t __iomem *) etdev->regs;
const char *BlockNames[NUM_BLOCKS] = { const char *BlockNames[NUM_BLOCKS] = {
"Global", "Tx DMA", "Rx DMA", "Tx MAC", "Global", "Tx DMA", "Rx DMA", "Tx MAC",
"Rx MAC", "MAC", "MAC Stat", "MMC" "Rx MAC", "MAC", "MAC Stat", "MMC"
@ -189,7 +189,7 @@ void DumpDeviceReg(int dbgLvl, struct et131x_adapter *etdev)
uint32_t Address1, Address2; uint32_t Address1, Address2;
uint32_t Block; uint32_t Block;
uint32_t __iomem *BigDevicePointer = uint32_t __iomem *BigDevicePointer =
(uint32_t __iomem *) etdev->CSRAddress; (uint32_t __iomem *) etdev->regs;
uint32_t __iomem *Pointer; uint32_t __iomem *Pointer;
const char *BlockNames[NUM_BLOCKS] = { const char *BlockNames[NUM_BLOCKS] = {
"Global", "Tx DMA", "Rx DMA", "Tx MAC", "Global", "Tx DMA", "Rx DMA", "Tx MAC",

20
drivers/staging/et131x/et131x_initpci.c
View file

@ -440,7 +440,7 @@ void et131x_error_timer_handler(unsigned long data)
struct et131x_adapter *etdev = (struct et131x_adapter *) data; struct et131x_adapter *etdev = (struct et131x_adapter *) data;
PM_CSR_t pm_csr; PM_CSR_t pm_csr;
pm_csr.value = readl(&etdev->CSRAddress->global.pm_csr.value); pm_csr.value = readl(&etdev->regs->global.pm_csr.value);
if (pm_csr.bits.pm_phy_sw_coma == 0) { if (pm_csr.bits.pm_phy_sw_coma == 0) {
if (etdev->RegistryMACStat) if (etdev->RegistryMACStat)
@ -615,12 +615,12 @@ void et131x_soft_reset(struct et131x_adapter *adapter)
DBG_ENTER(et131x_dbginfo); DBG_ENTER(et131x_dbginfo);
/* Disable MAC Core */ /* Disable MAC Core */
writel(0xc00f0000, &adapter->CSRAddress->mac.cfg1.value); writel(0xc00f0000, &adapter->regs->mac.cfg1.value);
/* Set everything to a reset value */ /* Set everything to a reset value */
writel(0x7F, &adapter->CSRAddress->global.sw_reset.value); writel(0x7F, &adapter->regs->global.sw_reset.value);
writel(0x000f0000, &adapter->CSRAddress->mac.cfg1.value); writel(0x000f0000, &adapter->regs->mac.cfg1.value);
writel(0x00000000, &adapter->CSRAddress->mac.cfg1.value); writel(0x00000000, &adapter->regs->mac.cfg1.value);
DBG_LEAVE(et131x_dbginfo); DBG_LEAVE(et131x_dbginfo);
} }
@ -741,7 +741,7 @@ void __devexit et131x_pci_remove(struct pci_dev *pdev)
/* Perform device cleanup */ /* Perform device cleanup */
unregister_netdev(netdev); unregister_netdev(netdev);
et131x_adapter_memory_free(adapter); et131x_adapter_memory_free(adapter);
iounmap(adapter->CSRAddress); iounmap(adapter->regs);
pci_dev_put(adapter->pdev); pci_dev_put(adapter->pdev);
free_netdev(netdev); free_netdev(netdev);
pci_release_regions(pdev); pci_release_regions(pdev);
@ -915,9 +915,9 @@ int __devinit et131x_pci_setup(struct pci_dev *pdev,
DBG_TRACE(et131x_dbginfo, DBG_TRACE(et131x_dbginfo,
"Mapping bus-relative registers to virtual memory...\n"); "Mapping bus-relative registers to virtual memory...\n");
adapter->CSRAddress = ioremap_nocache(pci_resource_start(pdev, 0), adapter->regs = ioremap_nocache(pci_resource_start(pdev, 0),
pci_resource_len(pdev, 0)); pci_resource_len(pdev, 0));
if (adapter->CSRAddress == NULL) { if (adapter->regs == NULL) {
DBG_ERROR(et131x_dbginfo, "Cannot map device registers\n"); DBG_ERROR(et131x_dbginfo, "Cannot map device registers\n");
result = -ENOMEM; result = -ENOMEM;
goto err_free_dev; goto err_free_dev;
@ -933,7 +933,7 @@ int __devinit et131x_pci_setup(struct pci_dev *pdev,
GlobalPmCSR.bits.pm_txclk_gate = 1; GlobalPmCSR.bits.pm_txclk_gate = 1;
GlobalPmCSR.bits.pm_rxclk_gate = 1; GlobalPmCSR.bits.pm_rxclk_gate = 1;
writel(GlobalPmCSR.value, writel(GlobalPmCSR.value,
&adapter->CSRAddress->global.pm_csr.value); &adapter->regs->global.pm_csr.value);
} }
/* Issue a global reset to the et1310 */ /* Issue a global reset to the et1310 */
@ -1021,7 +1021,7 @@ int __devinit et131x_pci_setup(struct pci_dev *pdev,
err_mem_free: err_mem_free:
et131x_adapter_memory_free(adapter); et131x_adapter_memory_free(adapter);
err_iounmap: err_iounmap:
iounmap(adapter->CSRAddress); iounmap(adapter->regs);
err_free_dev: err_free_dev:
pci_dev_put(pdev); pci_dev_put(pdev);
free_netdev(netdev); free_netdev(netdev);

6
drivers/staging/et131x/et131x_isr.c
View file

@ -129,7 +129,7 @@ irqreturn_t et131x_isr(int irq, void *dev_id)
/* Get a copy of the value in the interrupt status register /* Get a copy of the value in the interrupt status register
* so we can process the interrupting section * so we can process the interrupting section
*/ */
status.value = readl(&adapter->CSRAddress->global.int_status.value); status.value = readl(&adapter->regs->global.int_status.value);
if (adapter->FlowControl == TxOnly || if (adapter->FlowControl == TxOnly ||
adapter->FlowControl == Both) { adapter->FlowControl == Both) {
@ -168,7 +168,7 @@ irqreturn_t et131x_isr(int irq, void *dev_id)
if (adapter->RxRing.UnfinishedReceives) if (adapter->RxRing.UnfinishedReceives)
status.bits.rxdma_xfr_done = 1; status.bits.rxdma_xfr_done = 1;
else if (pMpTcb == NULL) else if (pMpTcb == NULL)
writel(0, &adapter->CSRAddress->global.watchdog_timer); writel(0, &adapter->regs->global.watchdog_timer);
status.bits.watchdog_interrupt = 0; status.bits.watchdog_interrupt = 0;
#ifdef CONFIG_ET131X_DEBUG #ifdef CONFIG_ET131X_DEBUG
@ -214,7 +214,7 @@ void et131x_isr_handler(struct work_struct *work)
struct et131x_adapter *etdev = struct et131x_adapter *etdev =
container_of(work, struct et131x_adapter, task); container_of(work, struct et131x_adapter, task);
INTERRUPT_t GlobStatus = etdev->Stats.InterruptStatus; INTERRUPT_t GlobStatus = etdev->Stats.InterruptStatus;
ADDRESS_MAP_t __iomem *iomem = etdev->CSRAddress; ADDRESS_MAP_t __iomem *iomem = etdev->regs;
/* /*
* These first two are by far the most common. Once handled, we clear * These first two are by far the most common. Once handled, we clear

8
drivers/staging/et131x/et131x_netdev.c
View file

@ -393,8 +393,8 @@ int et131x_set_packet_filter(struct et131x_adapter *adapter)
DBG_ENTER(et131x_dbginfo); DBG_ENTER(et131x_dbginfo);
ctrl.value = readl(&adapter->CSRAddress->rxmac.ctrl.value); ctrl.value = readl(&adapter->regs->rxmac.ctrl.value);
pf_ctrl.value = readl(&adapter->CSRAddress->rxmac.pf_ctrl.value); pf_ctrl.value = readl(&adapter->regs->rxmac.pf_ctrl.value);
/* Default to disabled packet filtering. Enable it in the individual /* Default to disabled packet filtering. Enable it in the individual
* case statements that require the device to filter something * case statements that require the device to filter something
@ -450,8 +450,8 @@ int et131x_set_packet_filter(struct et131x_adapter *adapter)
* in the control reg. * in the control reg.
*/ */
writel(pf_ctrl.value, writel(pf_ctrl.value,
&adapter->CSRAddress->rxmac.pf_ctrl.value); &adapter->regs->rxmac.pf_ctrl.value);
writel(ctrl.value, &adapter->CSRAddress->rxmac.ctrl.value); writel(ctrl.value, &adapter->regs->rxmac.ctrl.value);
} }
DBG_LEAVE(et131x_dbginfo); DBG_LEAVE(et131x_dbginfo);