Skip to content

L
linux
Commit a85b9422 authored by Olof Johansson's avatar Olof Johansson Committed by David S. Miller
Browse files
Options

pasemi_mac: Abstract out register access 

Abstract out the PCI config read/write accesses into reg read/write ones,
still calling the pci accessors on the back end.
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ced13330
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 94 deletions
drivers/net/pasemi_mac.c
View file @ a85b9422
...@@ -81,6 +81,48 @@ MODULE_PARM_DESC(debug, "PA Semi MAC bitmapped debugging message enable value"); ...@@ -81,6 +81,48 @@ MODULE_PARM_DESC(debug, "PA Semi MAC bitmapped debugging message enable value");
static struct pasdma_status *dma_status; static struct pasdma_status *dma_status;
static unsigned int read_iob_reg(struct pasemi_mac *mac, unsigned int reg)
{
unsigned int val;
pci_read_config_dword(mac->iob_pdev, reg, &val);
return val;
}
static void write_iob_reg(struct pasemi_mac *mac, unsigned int reg,
unsigned int val)
{
pci_write_config_dword(mac->iob_pdev, reg, val);
}
static unsigned int read_mac_reg(struct pasemi_mac *mac, unsigned int reg)
{
unsigned int val;
pci_read_config_dword(mac->pdev, reg, &val);
return val;
}
static void write_mac_reg(struct pasemi_mac *mac, unsigned int reg,
unsigned int val)
{
pci_write_config_dword(mac->pdev, reg, val);
}
static unsigned int read_dma_reg(struct pasemi_mac *mac, unsigned int reg)
{
unsigned int val;
pci_read_config_dword(mac->dma_pdev, reg, &val);
return val;
}
static void write_dma_reg(struct pasemi_mac *mac, unsigned int reg,
unsigned int val)
{
pci_write_config_dword(mac->dma_pdev, reg, val);
}
static int pasemi_get_mac_addr(struct pasemi_mac *mac) static int pasemi_get_mac_addr(struct pasemi_mac *mac)
{ {
struct pci_dev *pdev = mac->pdev; struct pci_dev *pdev = mac->pdev;
...@@ -166,22 +208,21 @@ static int pasemi_mac_setup_rx_resources(struct net_device *dev) ...@@ -166,22 +208,21 @@ static int pasemi_mac_setup_rx_resources(struct net_device *dev)
memset(ring->buffers, 0, RX_RING_SIZE * sizeof(u64)); memset(ring->buffers, 0, RX_RING_SIZE * sizeof(u64));
pci_write_config_dword(mac->dma_pdev, PAS_DMA_RXCHAN_BASEL(chan_id), write_dma_reg(mac, PAS_DMA_RXCHAN_BASEL(chan_id), PAS_DMA_RXCHAN_BASEL_BRBL(ring->dma));
PAS_DMA_RXCHAN_BASEL_BRBL(ring->dma));
pci_write_config_dword(mac->dma_pdev, PAS_DMA_RXCHAN_BASEU(chan_id), write_dma_reg(mac, PAS_DMA_RXCHAN_BASEU(chan_id),
PAS_DMA_RXCHAN_BASEU_BRBH(ring->dma >> 32) | PAS_DMA_RXCHAN_BASEU_BRBH(ring->dma >> 32) |
PAS_DMA_RXCHAN_BASEU_SIZ(RX_RING_SIZE >> 2)); PAS_DMA_RXCHAN_BASEU_SIZ(RX_RING_SIZE >> 2));
pci_write_config_dword(mac->dma_pdev, PAS_DMA_RXCHAN_CFG(chan_id), write_dma_reg(mac, PAS_DMA_RXCHAN_CFG(chan_id),
PAS_DMA_RXCHAN_CFG_HBU(1)); PAS_DMA_RXCHAN_CFG_HBU(1));
pci_write_config_dword(mac->dma_pdev, PAS_DMA_RXINT_BASEL(mac->dma_if), write_dma_reg(mac, PAS_DMA_RXINT_BASEL(mac->dma_if),
PAS_DMA_RXINT_BASEL_BRBL(__pa(ring->buffers))); PAS_DMA_RXINT_BASEL_BRBL(__pa(ring->buffers)));
pci_write_config_dword(mac->dma_pdev, PAS_DMA_RXINT_BASEU(mac->dma_if), write_dma_reg(mac, PAS_DMA_RXINT_BASEU(mac->dma_if),
PAS_DMA_RXINT_BASEU_BRBH(__pa(ring->buffers) >> 32) | PAS_DMA_RXINT_BASEU_BRBH(__pa(ring->buffers) >> 32) |
PAS_DMA_RXINT_BASEU_SIZ(RX_RING_SIZE >> 3)); PAS_DMA_RXINT_BASEU_SIZ(RX_RING_SIZE >> 3));
ring->next_to_fill = 0; ring->next_to_fill = 0;
ring->next_to_clean = 0; ring->next_to_clean = 0;
...@@ -233,18 +274,18 @@ static int pasemi_mac_setup_tx_resources(struct net_device *dev) ...@@ -233,18 +274,18 @@ static int pasemi_mac_setup_tx_resources(struct net_device *dev)
memset(ring->desc, 0, TX_RING_SIZE * sizeof(struct pas_dma_xct_descr)); memset(ring->desc, 0, TX_RING_SIZE * sizeof(struct pas_dma_xct_descr));
pci_write_config_dword(mac->dma_pdev, PAS_DMA_TXCHAN_BASEL(chan_id), write_dma_reg(mac, PAS_DMA_TXCHAN_BASEL(chan_id),
PAS_DMA_TXCHAN_BASEL_BRBL(ring->dma)); PAS_DMA_TXCHAN_BASEL_BRBL(ring->dma));
val = PAS_DMA_TXCHAN_BASEU_BRBH(ring->dma >> 32); val = PAS_DMA_TXCHAN_BASEU_BRBH(ring->dma >> 32);
val |= PAS_DMA_TXCHAN_BASEU_SIZ(TX_RING_SIZE >> 2); val |= PAS_DMA_TXCHAN_BASEU_SIZ(TX_RING_SIZE >> 2);
pci_write_config_dword(mac->dma_pdev, PAS_DMA_TXCHAN_BASEU(chan_id), val); write_dma_reg(mac, PAS_DMA_TXCHAN_BASEU(chan_id), val);
pci_write_config_dword(mac->dma_pdev, PAS_DMA_TXCHAN_CFG(chan_id), write_dma_reg(mac, PAS_DMA_TXCHAN_CFG(chan_id),
PAS_DMA_TXCHAN_CFG_TY_IFACE | PAS_DMA_TXCHAN_CFG_TY_IFACE |
PAS_DMA_TXCHAN_CFG_TATTR(mac->dma_if) | PAS_DMA_TXCHAN_CFG_TATTR(mac->dma_if) |
PAS_DMA_TXCHAN_CFG_UP | PAS_DMA_TXCHAN_CFG_UP |
PAS_DMA_TXCHAN_CFG_WT(2)); PAS_DMA_TXCHAN_CFG_WT(2));
ring->next_to_use = 0; ring->next_to_use = 0;
ring->next_to_clean = 0; ring->next_to_clean = 0;
...@@ -383,12 +424,8 @@ static void pasemi_mac_replenish_rx_ring(struct net_device *dev) ...@@ -383,12 +424,8 @@ static void pasemi_mac_replenish_rx_ring(struct net_device *dev)
wmb(); wmb();
pci_write_config_dword(mac->dma_pdev, write_dma_reg(mac, PAS_DMA_RXCHAN_INCR(mac->dma_rxch), limit - count);
PAS_DMA_RXCHAN_INCR(mac->dma_rxch), write_dma_reg(mac, PAS_DMA_RXINT_INCR(mac->dma_if), limit - count);
limit - count);
pci_write_config_dword(mac->dma_pdev,
PAS_DMA_RXINT_INCR(mac->dma_if),
limit - count);
mac->rx->next_to_fill += limit - count; mac->rx->next_to_fill += limit - count;
} }
...@@ -404,9 +441,7 @@ static void pasemi_mac_restart_rx_intr(struct pasemi_mac *mac) ...@@ -404,9 +441,7 @@ static void pasemi_mac_restart_rx_intr(struct pasemi_mac *mac)
reg = PAS_IOB_DMA_RXCH_RESET_PCNT(pcnt) | PAS_IOB_DMA_RXCH_RESET_PINTC; reg = PAS_IOB_DMA_RXCH_RESET_PCNT(pcnt) | PAS_IOB_DMA_RXCH_RESET_PINTC;
pci_write_config_dword(mac->iob_pdev, write_iob_reg(mac, PAS_IOB_DMA_RXCH_RESET(mac->dma_rxch), reg);
PAS_IOB_DMA_RXCH_RESET(mac->dma_rxch),
reg);
} }
static void pasemi_mac_restart_tx_intr(struct pasemi_mac *mac) static void pasemi_mac_restart_tx_intr(struct pasemi_mac *mac)
...@@ -418,8 +453,7 @@ static void pasemi_mac_restart_tx_intr(struct pasemi_mac *mac) ...@@ -418,8 +453,7 @@ static void pasemi_mac_restart_tx_intr(struct pasemi_mac *mac)
reg = PAS_IOB_DMA_TXCH_RESET_PCNT(pcnt) | PAS_IOB_DMA_TXCH_RESET_PINTC; reg = PAS_IOB_DMA_TXCH_RESET_PCNT(pcnt) | PAS_IOB_DMA_TXCH_RESET_PINTC;
pci_write_config_dword(mac->iob_pdev, write_iob_reg(mac, PAS_IOB_DMA_TXCH_RESET(mac->dma_txch), reg);
PAS_IOB_DMA_TXCH_RESET(mac->dma_txch), reg);
} }
...@@ -574,8 +608,6 @@ static irqreturn_t pasemi_mac_rx_intr(int irq, void *data) ...@@ -574,8 +608,6 @@ static irqreturn_t pasemi_mac_rx_intr(int irq, void *data)
* all others. * all others.
*/ */
pci_read_config_dword(mac->dma_pdev, PAS_DMA_RXINT_RCMDSTA(mac->dma_if), &reg);
reg = 0; reg = 0;
if (*mac->rx_status & PAS_STATUS_SOFT) if (*mac->rx_status & PAS_STATUS_SOFT)
reg |= PAS_IOB_DMA_RXCH_RESET_SINTC; reg |= PAS_IOB_DMA_RXCH_RESET_SINTC;
...@@ -586,9 +618,7 @@ static irqreturn_t pasemi_mac_rx_intr(int irq, void *data) ...@@ -586,9 +618,7 @@ static irqreturn_t pasemi_mac_rx_intr(int irq, void *data)
netif_rx_schedule(dev, &mac->napi); netif_rx_schedule(dev, &mac->napi);
pci_write_config_dword(mac->iob_pdev, write_iob_reg(mac, PAS_IOB_DMA_RXCH_RESET(mac->dma_rxch), reg);
PAS_IOB_DMA_RXCH_RESET(mac->dma_rxch), reg);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -613,9 +643,7 @@ static irqreturn_t pasemi_mac_tx_intr(int irq, void *data) ...@@ -613,9 +643,7 @@ static irqreturn_t pasemi_mac_tx_intr(int irq, void *data)
if (*mac->tx_status & PAS_STATUS_ERROR) if (*mac->tx_status & PAS_STATUS_ERROR)
reg |= PAS_IOB_DMA_TXCH_RESET_DINTC; reg |= PAS_IOB_DMA_TXCH_RESET_DINTC;
pci_write_config_dword(mac->iob_pdev, write_iob_reg(mac, PAS_IOB_DMA_TXCH_RESET(mac->dma_txch), reg);
PAS_IOB_DMA_TXCH_RESET(mac->dma_txch),
reg);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -641,7 +669,7 @@ static void pasemi_adjust_link(struct net_device *dev) ...@@ -641,7 +669,7 @@ static void pasemi_adjust_link(struct net_device *dev)
} else } else
netif_carrier_on(dev); netif_carrier_on(dev);
pci_read_config_dword(mac->pdev, PAS_MAC_CFG_PCFG, &flags); flags = read_mac_reg(mac, PAS_MAC_CFG_PCFG);
new_flags = flags & ~(PAS_MAC_CFG_PCFG_HD | PAS_MAC_CFG_PCFG_SPD_M | new_flags = flags & ~(PAS_MAC_CFG_PCFG_HD | PAS_MAC_CFG_PCFG_SPD_M |
PAS_MAC_CFG_PCFG_TSR_M); PAS_MAC_CFG_PCFG_TSR_M);
...@@ -673,7 +701,7 @@ static void pasemi_adjust_link(struct net_device *dev) ...@@ -673,7 +701,7 @@ static void pasemi_adjust_link(struct net_device *dev)
mac->link = mac->phydev->link; mac->link = mac->phydev->link;
if (new_flags != flags) if (new_flags != flags)
pci_write_config_dword(mac->pdev, PAS_MAC_CFG_PCFG, new_flags); write_mac_reg(mac, PAS_MAC_CFG_PCFG, new_flags);
if (msg && netif_msg_link(mac)) if (msg && netif_msg_link(mac))
printk(KERN_INFO "%s: Link is up at %d Mbps, %s duplex.\n", printk(KERN_INFO "%s: Link is up at %d Mbps, %s duplex.\n",
...@@ -736,39 +764,37 @@ static int pasemi_mac_open(struct net_device *dev) ...@@ -736,39 +764,37 @@ static int pasemi_mac_open(struct net_device *dev)
int ret; int ret;
/* enable rx section */ /* enable rx section */
pci_write_config_dword(mac->dma_pdev, PAS_DMA_COM_RXCMD, write_dma_reg(mac, PAS_DMA_COM_RXCMD, PAS_DMA_COM_RXCMD_EN);
PAS_DMA_COM_RXCMD_EN);
/* enable tx section */ /* enable tx section */
pci_write_config_dword(mac->dma_pdev, PAS_DMA_COM_TXCMD, write_dma_reg(mac, PAS_DMA_COM_TXCMD, PAS_DMA_COM_TXCMD_EN);
PAS_DMA_COM_TXCMD_EN);
flags = PAS_MAC_CFG_TXP_FCE | PAS_MAC_CFG_TXP_FPC(3) | flags = PAS_MAC_CFG_TXP_FCE | PAS_MAC_CFG_TXP_FPC(3) |
PAS_MAC_CFG_TXP_SL(3) | PAS_MAC_CFG_TXP_COB(0xf) | PAS_MAC_CFG_TXP_SL(3) | PAS_MAC_CFG_TXP_COB(0xf) |
PAS_MAC_CFG_TXP_TIFT(8) | PAS_MAC_CFG_TXP_TIFG(12); PAS_MAC_CFG_TXP_TIFT(8) | PAS_MAC_CFG_TXP_TIFG(12);
pci_write_config_dword(mac->pdev, PAS_MAC_CFG_TXP, flags); write_mac_reg(mac, PAS_MAC_CFG_TXP, flags);
flags = PAS_MAC_CFG_PCFG_S1 | PAS_MAC_CFG_PCFG_PE | flags = PAS_MAC_CFG_PCFG_S1 | PAS_MAC_CFG_PCFG_PE |
PAS_MAC_CFG_PCFG_PR | PAS_MAC_CFG_PCFG_CE; PAS_MAC_CFG_PCFG_PR | PAS_MAC_CFG_PCFG_CE;
flags |= PAS_MAC_CFG_PCFG_TSR_1G | PAS_MAC_CFG_PCFG_SPD_1G; flags |= PAS_MAC_CFG_PCFG_TSR_1G | PAS_MAC_CFG_PCFG_SPD_1G;
pci_write_config_dword(mac->iob_pdev, PAS_IOB_DMA_RXCH_CFG(mac->dma_rxch), write_iob_reg(mac, PAS_IOB_DMA_RXCH_CFG(mac->dma_rxch),
PAS_IOB_DMA_RXCH_CFG_CNTTH(0)); PAS_IOB_DMA_RXCH_CFG_CNTTH(0));
pci_write_config_dword(mac->iob_pdev, PAS_IOB_DMA_TXCH_CFG(mac->dma_txch), write_iob_reg(mac, PAS_IOB_DMA_TXCH_CFG(mac->dma_txch),
PAS_IOB_DMA_TXCH_CFG_CNTTH(32)); PAS_IOB_DMA_TXCH_CFG_CNTTH(32));
/* Clear out any residual packet count state from firmware */ /* Clear out any residual packet count state from firmware */
pasemi_mac_restart_rx_intr(mac); pasemi_mac_restart_rx_intr(mac);
pasemi_mac_restart_tx_intr(mac); pasemi_mac_restart_tx_intr(mac);
/* 0xffffff is max value, about 16ms */ /* 0xffffff is max value, about 16ms */
pci_write_config_dword(mac->iob_pdev, PAS_IOB_DMA_COM_TIMEOUTCFG, write_iob_reg(mac, PAS_IOB_DMA_COM_TIMEOUTCFG,
PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(0xffffff)); PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(0xffffff));
pci_write_config_dword(mac->pdev, PAS_MAC_CFG_PCFG, flags); write_mac_reg(mac, PAS_MAC_CFG_PCFG, flags);
ret = pasemi_mac_setup_rx_resources(dev); ret = pasemi_mac_setup_rx_resources(dev);
if (ret) if (ret)
...@@ -778,25 +804,22 @@ static int pasemi_mac_open(struct net_device *dev) ...@@ -778,25 +804,22 @@ static int pasemi_mac_open(struct net_device *dev)
if (ret) if (ret)
goto out_tx_resources; goto out_tx_resources;
pci_write_config_dword(mac->pdev, PAS_MAC_IPC_CHNL, write_mac_reg(mac, PAS_MAC_IPC_CHNL,
PAS_MAC_IPC_CHNL_DCHNO(mac->dma_rxch) | PAS_MAC_IPC_CHNL_DCHNO(mac->dma_rxch) |
PAS_MAC_IPC_CHNL_BCH(mac->dma_rxch)); PAS_MAC_IPC_CHNL_BCH(mac->dma_rxch));
/* enable rx if */ /* enable rx if */
pci_write_config_dword(mac->dma_pdev, write_dma_reg(mac, PAS_DMA_RXINT_RCMDSTA(mac->dma_if),
PAS_DMA_RXINT_RCMDSTA(mac->dma_if), PAS_DMA_RXINT_RCMDSTA_EN);
PAS_DMA_RXINT_RCMDSTA_EN);
/* enable rx channel */ /* enable rx channel */
pci_write_config_dword(mac->dma_pdev, write_dma_reg(mac, PAS_DMA_RXCHAN_CCMDSTA(mac->dma_rxch),
PAS_DMA_RXCHAN_CCMDSTA(mac->dma_rxch), PAS_DMA_RXCHAN_CCMDSTA_EN |
PAS_DMA_RXCHAN_CCMDSTA_EN | PAS_DMA_RXCHAN_CCMDSTA_DU);
PAS_DMA_RXCHAN_CCMDSTA_DU);
/* enable tx channel */ /* enable tx channel */
pci_write_config_dword(mac->dma_pdev, write_dma_reg(mac, PAS_DMA_TXCHAN_TCMDSTA(mac->dma_txch),
PAS_DMA_TXCHAN_TCMDSTA(mac->dma_txch), PAS_DMA_TXCHAN_TCMDSTA_EN);
PAS_DMA_TXCHAN_TCMDSTA_EN);
pasemi_mac_replenish_rx_ring(dev); pasemi_mac_replenish_rx_ring(dev);
...@@ -876,20 +899,12 @@ static int pasemi_mac_close(struct net_device *dev) ...@@ -876,20 +899,12 @@ static int pasemi_mac_close(struct net_device *dev)
pasemi_mac_clean_rx(mac, RX_RING_SIZE); pasemi_mac_clean_rx(mac, RX_RING_SIZE);
/* Disable interface */ /* Disable interface */
pci_write_config_dword(mac->dma_pdev, write_dma_reg(mac, PAS_DMA_TXCHAN_TCMDSTA(mac->dma_txch), PAS_DMA_TXCHAN_TCMDSTA_ST);
PAS_DMA_TXCHAN_TCMDSTA(mac->dma_txch), write_dma_reg(mac, PAS_DMA_RXINT_RCMDSTA(mac->dma_if), PAS_DMA_RXINT_RCMDSTA_ST);
PAS_DMA_TXCHAN_TCMDSTA_ST); write_dma_reg(mac, PAS_DMA_RXCHAN_CCMDSTA(mac->dma_rxch), PAS_DMA_RXCHAN_CCMDSTA_ST);
pci_write_config_dword(mac->dma_pdev,
PAS_DMA_RXINT_RCMDSTA(mac->dma_if),
PAS_DMA_RXINT_RCMDSTA_ST);
pci_write_config_dword(mac->dma_pdev,
PAS_DMA_RXCHAN_CCMDSTA(mac->dma_rxch),
PAS_DMA_RXCHAN_CCMDSTA_ST);
for (retries = 0; retries < MAX_RETRIES; retries++) { for (retries = 0; retries < MAX_RETRIES; retries++) {
pci_read_config_dword(mac->dma_pdev, stat = read_dma_reg(mac, PAS_DMA_TXCHAN_TCMDSTA(mac->dma_txch));
PAS_DMA_TXCHAN_TCMDSTA(mac->dma_txch),
&stat);
if (!(stat & PAS_DMA_TXCHAN_TCMDSTA_ACT)) if (!(stat & PAS_DMA_TXCHAN_TCMDSTA_ACT))
break; break;
cond_resched(); cond_resched();
...@@ -899,9 +914,7 @@ static int pasemi_mac_close(struct net_device *dev) ...@@ -899,9 +914,7 @@ static int pasemi_mac_close(struct net_device *dev)
dev_err(&mac->dma_pdev->dev, "Failed to stop tx channel\n"); dev_err(&mac->dma_pdev->dev, "Failed to stop tx channel\n");
for (retries = 0; retries < MAX_RETRIES; retries++) { for (retries = 0; retries < MAX_RETRIES; retries++) {
pci_read_config_dword(mac->dma_pdev, stat = read_dma_reg(mac, PAS_DMA_RXCHAN_CCMDSTA(mac->dma_rxch));
PAS_DMA_RXCHAN_CCMDSTA(mac->dma_rxch),
&stat);
if (!(stat & PAS_DMA_RXCHAN_CCMDSTA_ACT)) if (!(stat & PAS_DMA_RXCHAN_CCMDSTA_ACT))
break; break;
cond_resched(); cond_resched();
...@@ -911,9 +924,7 @@ static int pasemi_mac_close(struct net_device *dev) ...@@ -911,9 +924,7 @@ static int pasemi_mac_close(struct net_device *dev)
dev_err(&mac->dma_pdev->dev, "Failed to stop rx channel\n"); dev_err(&mac->dma_pdev->dev, "Failed to stop rx channel\n");
for (retries = 0; retries < MAX_RETRIES; retries++) { for (retries = 0; retries < MAX_RETRIES; retries++) {
pci_read_config_dword(mac->dma_pdev, stat = read_dma_reg(mac, PAS_DMA_RXINT_RCMDSTA(mac->dma_if));
PAS_DMA_RXINT_RCMDSTA(mac->dma_if),
&stat);
if (!(stat & PAS_DMA_RXINT_RCMDSTA_ACT)) if (!(stat & PAS_DMA_RXINT_RCMDSTA_ACT))
break; break;
cond_resched(); cond_resched();
...@@ -926,12 +937,9 @@ static int pasemi_mac_close(struct net_device *dev) ...@@ -926,12 +937,9 @@ static int pasemi_mac_close(struct net_device *dev)
* stopping, since you can't disable when active. * stopping, since you can't disable when active.
*/ */
pci_write_config_dword(mac->dma_pdev, write_dma_reg(mac, PAS_DMA_TXCHAN_TCMDSTA(mac->dma_txch), 0);
PAS_DMA_TXCHAN_TCMDSTA(mac->dma_txch), 0); write_dma_reg(mac, PAS_DMA_RXCHAN_CCMDSTA(mac->dma_rxch), 0);
pci_write_config_dword(mac->dma_pdev, write_dma_reg(mac, PAS_DMA_RXINT_RCMDSTA(mac->dma_if), 0);
PAS_DMA_RXCHAN_CCMDSTA(mac->dma_rxch), 0);
pci_write_config_dword(mac->dma_pdev,
PAS_DMA_RXINT_RCMDSTA(mac->dma_if), 0);
free_irq(mac->tx_irq, dev); free_irq(mac->tx_irq, dev);
free_irq(mac->rx_irq, dev); free_irq(mac->rx_irq, dev);
...@@ -1012,8 +1020,7 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -1012,8 +1020,7 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
spin_unlock_irqrestore(&txring->lock, flags); spin_unlock_irqrestore(&txring->lock, flags);
pci_write_config_dword(mac->dma_pdev, write_dma_reg(mac, PAS_DMA_TXCHAN_INCR(mac->dma_txch), 1);
PAS_DMA_TXCHAN_INCR(mac->dma_txch), 1);
return NETDEV_TX_OK; return NETDEV_TX_OK;
...@@ -1036,7 +1043,7 @@ static void pasemi_mac_set_rx_mode(struct net_device *dev) ...@@ -1036,7 +1043,7 @@ static void pasemi_mac_set_rx_mode(struct net_device *dev)
struct pasemi_mac *mac = netdev_priv(dev); struct pasemi_mac *mac = netdev_priv(dev);
unsigned int flags; unsigned int flags;
pci_read_config_dword(mac->pdev, PAS_MAC_CFG_PCFG, &flags); flags = read_mac_reg(mac, PAS_MAC_CFG_PCFG);
/* Set promiscuous */ /* Set promiscuous */
if (dev->flags & IFF_PROMISC) if (dev->flags & IFF_PROMISC)
...@@ -1044,7 +1051,7 @@ static void pasemi_mac_set_rx_mode(struct net_device *dev) ...@@ -1044,7 +1051,7 @@ static void pasemi_mac_set_rx_mode(struct net_device *dev)
else else
flags &= ~PAS_MAC_CFG_PCFG_PR; flags &= ~PAS_MAC_CFG_PCFG_PR;
pci_write_config_dword(mac->pdev, PAS_MAC_CFG_PCFG, flags); write_mac_reg(mac, PAS_MAC_CFG_PCFG, flags);
} }
......
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