korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 05:04:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

net-next: ax88796: add interrupt status callback to platform data

Browse Source 
To be able to tell the ax88796 driver whether it is sensible to enter
the 8390 interrupt handler, an "is this interrupt caused by the 88796"
callback has been added to the ax_plat_data structure (with NULL being
compatible to the previous behaviour).

Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Karcher 2018-04-19 14:05:23 +12:00 committed by David S. Miller
parent 27cced2019
commit cec4c1c54a
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/ethernet/8390/ax88796.c
View File

@ -163,6 +163,21 @@ static void ax_reset_8390(struct net_device *dev)
ei_outb(ENISR_RESET, addr + EN0_ISR); /* Ack intr. */
}
/* Wrapper for __ei_interrupt for platforms that have a platform-specific
* way to find out whether the interrupt request might be caused by
* the ax88796 chip.
*/
static irqreturn_t ax_ei_interrupt_filtered(int irq, void *dev_id)
{
struct net_device *dev = dev_id;
struct ax_device *ax = to_ax_dev(dev);
struct platform_device *pdev = to_platform_device(dev->dev.parent);
if (!ax->plat->check_irq(pdev))
return IRQ_NONE;
return ax_ei_interrupt(irq, dev_id);
}
static void ax_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
int ring_page)
@ -482,8 +497,12 @@ static int ax_open(struct net_device *dev)
if (ret)
goto failed_mii;
ret = request_irq(dev->irq, ax_ei_interrupt, ax->irqflags,
dev->name, dev);
if (ax->plat->check_irq)
ret = request_irq(dev->irq, ax_ei_interrupt_filtered,
ax->irqflags, dev->name, dev);
else
ret = request_irq(dev->irq, ax_ei_interrupt, ax->irqflags,
dev->name, dev);
if (ret)
goto failed_request_irq;

5
include/net/ax88796.h
View File

@ -14,6 +14,7 @@
struct sk_buff;
struct net_device;
struct platform_device;
#define AXFLG_HAS_EEPROM (1<<0)
#define AXFLG_MAC_FROMDEV (1<<1) /* device already has MAC */
@ -35,6 +36,10 @@ struct ax_plat_data {
const unsigned char *buf, int star_page);
void (*block_input)(struct net_device *dev, int count,
struct sk_buff *skb, int ring_offset);
/* returns nonzero if a pending interrupt request might by caused by
* the ax88786. Handles all interrupts if set to NULL
*/
int (*check_irq)(struct platform_device *pdev);
};
#endif /* __NET_AX88796_PLAT_H */