Skip to content

L
linux-davinci
Commit 582806be authored by Ayaz Abdulla's avatar Ayaz Abdulla Committed by David S. Miller
Browse files
Options

forcedeth: save irq events for napi processing 

This patch will save the irq events in the driver's context so that the
napi routine knows which interrupts have occurred. Subsequent changes
will be moving all interrupt processing into the napi poll routine.
Signed-off-by: default avatarAyaz Abdulla <aabdulla@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d41c628c
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 24 deletions
drivers/net/forcedeth.c
View file @ 582806be
...@@ -759,6 +759,7 @@ struct fe_priv { ...@@ -759,6 +759,7 @@ struct fe_priv {
dma_addr_t ring_addr; dma_addr_t ring_addr;
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
u32 orig_mac[2]; u32 orig_mac[2];
u32 events;
u32 irqmask; u32 irqmask;
u32 desc_ver; u32 desc_ver;
u32 txrxctl_bits; u32 txrxctl_bits;
...@@ -3417,21 +3418,20 @@ static irqreturn_t nv_nic_irq(int foo, void *data) ...@@ -3417,21 +3418,20 @@ static irqreturn_t nv_nic_irq(int foo, void *data)
struct net_device *dev = (struct net_device *) data; struct net_device *dev = (struct net_device *) data;
struct fe_priv *np = netdev_priv(dev); struct fe_priv *np = netdev_priv(dev);
u8 __iomem *base = get_hwbase(dev); u8 __iomem *base = get_hwbase(dev);
u32 events;
int i; int i;
dprintk(KERN_DEBUG "%s: nv_nic_irq\n", dev->name); dprintk(KERN_DEBUG "%s: nv_nic_irq\n", dev->name);
for (i=0; ; i++) { for (i=0; ; i++) {
if (!(np->msi_flags & NV_MSI_X_ENABLED)) { if (!(np->msi_flags & NV_MSI_X_ENABLED)) {
events = readl(base + NvRegIrqStatus) & NVREG_IRQSTAT_MASK; np->events = readl(base + NvRegIrqStatus) & NVREG_IRQSTAT_MASK;
writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus); writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
} else { } else {
events = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQSTAT_MASK; np->events = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQSTAT_MASK;
writel(NVREG_IRQSTAT_MASK, base + NvRegMSIXIrqStatus); writel(NVREG_IRQSTAT_MASK, base + NvRegMSIXIrqStatus);
} }
dprintk(KERN_DEBUG "%s: irq: %08x\n", dev->name, events); dprintk(KERN_DEBUG "%s: irq: %08x\n", dev->name, np->events);
if (!(events & np->irqmask)) if (!(np->events & np->irqmask))
break; break;
nv_msi_workaround(np); nv_msi_workaround(np);
...@@ -3441,7 +3441,7 @@ static irqreturn_t nv_nic_irq(int foo, void *data) ...@@ -3441,7 +3441,7 @@ static irqreturn_t nv_nic_irq(int foo, void *data)
spin_unlock(&np->lock); spin_unlock(&np->lock);
#ifdef CONFIG_FORCEDETH_NAPI #ifdef CONFIG_FORCEDETH_NAPI
if (events & NVREG_IRQ_RX_ALL) { if (np->events & NVREG_IRQ_RX_ALL) {
spin_lock(&np->lock); spin_lock(&np->lock);
napi_schedule(&np->napi); napi_schedule(&np->napi);
...@@ -3464,7 +3464,7 @@ static irqreturn_t nv_nic_irq(int foo, void *data) ...@@ -3464,7 +3464,7 @@ static irqreturn_t nv_nic_irq(int foo, void *data)
} }
} }
#endif #endif
if (unlikely(events & NVREG_IRQ_LINK)) { if (unlikely(np->events & NVREG_IRQ_LINK)) {
spin_lock(&np->lock); spin_lock(&np->lock);
nv_link_irq(dev); nv_link_irq(dev);
spin_unlock(&np->lock); spin_unlock(&np->lock);
...@@ -3475,15 +3475,15 @@ static irqreturn_t nv_nic_irq(int foo, void *data) ...@@ -3475,15 +3475,15 @@ static irqreturn_t nv_nic_irq(int foo, void *data)
spin_unlock(&np->lock); spin_unlock(&np->lock);
np->link_timeout = jiffies + LINK_TIMEOUT; np->link_timeout = jiffies + LINK_TIMEOUT;
} }
if (unlikely(events & (NVREG_IRQ_TX_ERR))) { if (unlikely(np->events & (NVREG_IRQ_TX_ERR))) {
dprintk(KERN_DEBUG "%s: received irq with events 0x%x. Probably TX fail.\n", dprintk(KERN_DEBUG "%s: received irq with events 0x%x. Probably TX fail.\n",
dev->name, events); dev->name, np->events);
} }
if (unlikely(events & (NVREG_IRQ_UNKNOWN))) { if (unlikely(np->events & (NVREG_IRQ_UNKNOWN))) {
printk(KERN_DEBUG "%s: received irq with unknown events 0x%x. Please report\n", printk(KERN_DEBUG "%s: received irq with unknown events 0x%x. Please report\n",
dev->name, events); dev->name, np->events);
} }
if (unlikely(events & NVREG_IRQ_RECOVER_ERROR)) { if (unlikely(np->events & NVREG_IRQ_RECOVER_ERROR)) {
spin_lock(&np->lock); spin_lock(&np->lock);
/* disable interrupts on the nic */ /* disable interrupts on the nic */
if (!(np->msi_flags & NV_MSI_X_ENABLED)) if (!(np->msi_flags & NV_MSI_X_ENABLED))
...@@ -3534,21 +3534,20 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data) ...@@ -3534,21 +3534,20 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data)
struct net_device *dev = (struct net_device *) data; struct net_device *dev = (struct net_device *) data;
struct fe_priv *np = netdev_priv(dev); struct fe_priv *np = netdev_priv(dev);
u8 __iomem *base = get_hwbase(dev); u8 __iomem *base = get_hwbase(dev);
u32 events;
int i; int i;
dprintk(KERN_DEBUG "%s: nv_nic_irq_optimized\n", dev->name); dprintk(KERN_DEBUG "%s: nv_nic_irq_optimized\n", dev->name);
for (i=0; ; i++) { for (i=0; ; i++) {
if (!(np->msi_flags & NV_MSI_X_ENABLED)) { if (!(np->msi_flags & NV_MSI_X_ENABLED)) {
events = readl(base + NvRegIrqStatus) & NVREG_IRQSTAT_MASK; np->events = readl(base + NvRegIrqStatus) & NVREG_IRQSTAT_MASK;
writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus); writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
} else { } else {
events = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQSTAT_MASK; np->events = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQSTAT_MASK;
writel(NVREG_IRQSTAT_MASK, base + NvRegMSIXIrqStatus); writel(NVREG_IRQSTAT_MASK, base + NvRegMSIXIrqStatus);
} }
dprintk(KERN_DEBUG "%s: irq: %08x\n", dev->name, events); dprintk(KERN_DEBUG "%s: irq: %08x\n", dev->name, np->events);
if (!(events & np->irqmask)) if (!(np->events & np->irqmask))
break; break;
nv_msi_workaround(np); nv_msi_workaround(np);
...@@ -3558,7 +3557,7 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data) ...@@ -3558,7 +3557,7 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data)
spin_unlock(&np->lock); spin_unlock(&np->lock);
#ifdef CONFIG_FORCEDETH_NAPI #ifdef CONFIG_FORCEDETH_NAPI
if (events & NVREG_IRQ_RX_ALL) { if (np->events & NVREG_IRQ_RX_ALL) {
spin_lock(&np->lock); spin_lock(&np->lock);
napi_schedule(&np->napi); napi_schedule(&np->napi);
...@@ -3581,7 +3580,7 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data) ...@@ -3581,7 +3580,7 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data)
} }
} }
#endif #endif
if (unlikely(events & NVREG_IRQ_LINK)) { if (unlikely(np->events & NVREG_IRQ_LINK)) {
spin_lock(&np->lock); spin_lock(&np->lock);
nv_link_irq(dev); nv_link_irq(dev);
spin_unlock(&np->lock); spin_unlock(&np->lock);
...@@ -3592,15 +3591,15 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data) ...@@ -3592,15 +3591,15 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data)
spin_unlock(&np->lock); spin_unlock(&np->lock);
np->link_timeout = jiffies + LINK_TIMEOUT; np->link_timeout = jiffies + LINK_TIMEOUT;
} }
if (unlikely(events & (NVREG_IRQ_TX_ERR))) { if (unlikely(np->events & (NVREG_IRQ_TX_ERR))) {
dprintk(KERN_DEBUG "%s: received irq with events 0x%x. Probably TX fail.\n", dprintk(KERN_DEBUG "%s: received irq with events 0x%x. Probably TX fail.\n",
dev->name, events); dev->name, np->events);
} }
if (unlikely(events & (NVREG_IRQ_UNKNOWN))) { if (unlikely(np->events & (NVREG_IRQ_UNKNOWN))) {
printk(KERN_DEBUG "%s: received irq with unknown events 0x%x. Please report\n", printk(KERN_DEBUG "%s: received irq with unknown events 0x%x. Please report\n",
dev->name, events); dev->name, np->events);
} }
if (unlikely(events & NVREG_IRQ_RECOVER_ERROR)) { if (unlikely(np->events & NVREG_IRQ_RECOVER_ERROR)) {
spin_lock(&np->lock); spin_lock(&np->lock);
/* disable interrupts on the nic */ /* disable interrupts on the nic */
if (!(np->msi_flags & NV_MSI_X_ENABLED)) if (!(np->msi_flags & NV_MSI_X_ENABLED))
......
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