evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

via-rhine: factor out tx_thresh handling

Browse source 
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
This commit is contained in:
Francois Romieu 2011-12-30 14:43:54 +01:00
parent 356b95424c
commit 269f3114b5
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/net/ethernet/via/via-rhine.c
View file

@ -657,6 +657,16 @@ static void rhine_poll(struct net_device *dev)
} }
#endif #endif
static void rhine_kick_tx_threshold(struct rhine_private *rp)
{
if (rp->tx_thresh < 0xe0) {
void __iomem *ioaddr = rp->base;
rp->tx_thresh += 0x20;
BYTE_REG_BITS_SET(rp->tx_thresh, 0x80, ioaddr + TxConfig);
}
}
static int rhine_napipoll(struct napi_struct *napi, int budget) static int rhine_napipoll(struct napi_struct *napi, int budget)
{ {
struct rhine_private *rp = container_of(napi, struct rhine_private, napi); struct rhine_private *rp = container_of(napi, struct rhine_private, napi);
@ -1910,8 +1920,7 @@ static void rhine_error(struct net_device *dev, int intr_status)
intr_status); intr_status);
} }
if (intr_status & IntrTxUnderrun) { if (intr_status & IntrTxUnderrun) {
if (rp->tx_thresh < 0xE0) rhine_kick_tx_threshold(rp);
BYTE_REG_BITS_SET((rp->tx_thresh += 0x20), 0x80, ioaddr + TxConfig);
if (debug > 1) if (debug > 1)
netdev_info(dev, "Transmitter underrun, Tx threshold now %02x\n", netdev_info(dev, "Transmitter underrun, Tx threshold now %02x\n",
rp->tx_thresh); rp->tx_thresh);
@ -1923,9 +1932,7 @@ static void rhine_error(struct net_device *dev, int intr_status)
if ((intr_status & IntrTxError) && if ((intr_status & IntrTxError) &&
(intr_status & (IntrTxAborted | (intr_status & (IntrTxAborted |
IntrTxUnderrun | IntrTxDescRace)) == 0) { IntrTxUnderrun | IntrTxDescRace)) == 0) {
if (rp->tx_thresh < 0xE0) { rhine_kick_tx_threshold(rp);
BYTE_REG_BITS_SET((rp->tx_thresh += 0x20), 0x80, ioaddr + TxConfig);
}
if (debug > 1) if (debug > 1)
netdev_info(dev, "Unspecified error. Tx threshold now %02x\n", netdev_info(dev, "Unspecified error. Tx threshold now %02x\n",
rp->tx_thresh); rp->tx_thresh);