lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

atl1: do not process interrupts in cycle in handler

Browse Source 
As the rx/tx handled inside napi handler, the cycle is
not needed now, because only the rx/tx need such kind of
processing.

Signed-off-by: Tony Zelenoff <antonz@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tony Zelenoff
2012-04-13 06:09:53 +00:00
committed by David S. Miller
parent 73650f28ae
commit 2a9bc71e9a
2 changed files with 49 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
drivers/net/ethernet/atheros/atlx/atl1.c
View File

@@ -2499,77 +2499,68 @@ static irqreturn_t atl1_intr(int irq, void *data)
{ {
struct atl1_adapter *adapter = netdev_priv(data); struct atl1_adapter *adapter = netdev_priv(data);
u32 status; u32 status;
int max_ints = 10;
status = adapter->cmb.cmb->int_stats; status = adapter->cmb.cmb->int_stats;
if (!status) if (!status)
return IRQ_NONE; return IRQ_NONE;
do { /* clear CMB interrupt status at once */
/* clear CMB interrupt status at once */ adapter->cmb.cmb->int_stats = 0;
adapter->cmb.cmb->int_stats = 0;
if (status & ISR_GPHY) /* clear phy status */ if (status & ISR_GPHY) /* clear phy status */
atlx_clear_phy_int(adapter); atlx_clear_phy_int(adapter);
/* clear ISR status, and Enable CMB DMA/Disable Interrupt */ /* clear ISR status, and Enable CMB DMA/Disable Interrupt */
iowrite32(status | ISR_DIS_INT, adapter->hw.hw_addr + REG_ISR); iowrite32(status | ISR_DIS_INT, adapter->hw.hw_addr + REG_ISR);
/* check if SMB intr */ /* check if SMB intr */
if (status & ISR_SMB) if (status & ISR_SMB)
atl1_inc_smb(adapter); atl1_inc_smb(adapter);
/* check if PCIE PHY Link down */ /* check if PCIE PHY Link down */
if (status & ISR_PHY_LINKDOWN) { if (status & ISR_PHY_LINKDOWN) {
if (netif_msg_intr(adapter)) if (netif_msg_intr(adapter))
dev_printk(KERN_DEBUG, &adapter->pdev->dev, dev_printk(KERN_DEBUG, &adapter->pdev->dev,
"pcie phy link down %x\n", status); "pcie phy link down %x\n", status);
if (netif_running(adapter->netdev)) { /* reset MAC */ if (netif_running(adapter->netdev)) { /* reset MAC */
atlx_irq_disable(adapter);
schedule_work(&adapter->pcie_dma_to_rst_task);
return IRQ_HANDLED;
}
}
/* check if DMA read/write error ? */
if (status & (ISR_DMAR_TO_RST | ISR_DMAW_TO_RST)) {
if (netif_msg_intr(adapter))
dev_printk(KERN_DEBUG, &adapter->pdev->dev,
"pcie DMA r/w error (status = 0x%x)\n",
status);
atlx_irq_disable(adapter); atlx_irq_disable(adapter);
schedule_work(&adapter->pcie_dma_to_rst_task); schedule_work(&adapter->pcie_dma_to_rst_task);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
}
/* link event */ /* check if DMA read/write error ? */
if (status & ISR_GPHY) { if (status & (ISR_DMAR_TO_RST | ISR_DMAW_TO_RST)) {
adapter->soft_stats.tx_carrier_errors++; if (netif_msg_intr(adapter))
atl1_check_for_link(adapter); dev_printk(KERN_DEBUG, &adapter->pdev->dev,
} "pcie DMA r/w error (status = 0x%x)\n",
status);
atlx_irq_disable(adapter);
schedule_work(&adapter->pcie_dma_to_rst_task);
return IRQ_HANDLED;
}
/* transmit or receive event */ /* link event */
if (status & (ISR_CMB_TX | ISR_CMB_RX) && if (status & ISR_GPHY) {
atl1_sched_rings_clean(adapter)) adapter->soft_stats.tx_carrier_errors++;
break; atl1_check_for_link(adapter);
}
/* rx exception */ /* transmit or receive event */
if (unlikely(status & (ISR_RXF_OV | ISR_RFD_UNRUN | if (status & (ISR_CMB_TX | ISR_CMB_RX))
ISR_RRD_OV | ISR_HOST_RFD_UNRUN | atl1_sched_rings_clean(adapter);
ISR_HOST_RRD_OV))) {
if (netif_msg_intr(adapter))
dev_printk(KERN_DEBUG,
&adapter->pdev->dev,
"rx exception, ISR = 0x%x\n",
status);
if (atl1_sched_rings_clean(adapter))
break;
}
if (--max_ints < 0) /* rx exception */
break; if (unlikely(status & (ISR_RXF_OV | ISR_RFD_UNRUN |
ISR_RRD_OV | ISR_HOST_RFD_UNRUN |
} while ((status = adapter->cmb.cmb->int_stats)); ISR_HOST_RRD_OV))) {
if (netif_msg_intr(adapter))
dev_printk(KERN_DEBUG,
&adapter->pdev->dev,
"rx exception, ISR = 0x%x\n",
status);
atl1_sched_rings_clean(adapter);
}
/* re-enable Interrupt */ /* re-enable Interrupt */
iowrite32(ISR_DIS_SMB | ISR_DIS_DMA, adapter->hw.hw_addr + REG_ISR); iowrite32(ISR_DIS_SMB | ISR_DIS_DMA, adapter->hw.hw_addr + REG_ISR);

4
scripts/mod/file2alias.c
View File

@@ -1100,6 +1100,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections) if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)
return; return;
/* We're looking for an object */
if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT)
return;
/* All our symbols are of form <prefix>__mod_XXX_device_table. */ /* All our symbols are of form <prefix>__mod_XXX_device_table. */
name = strstr(symname, "__mod_"); name = strstr(symname, "__mod_");
if (!name) if (!name)