mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
m32r: Fix ei_tx_timeout() in drivers/net/lib8390.c
Change INT0 trigger mode from edge-sense mode to level-sense mode, in order to fix the following timeout error: 'NETDEV WATCHDOG: eth0: transmit timed out'. This patch is required only for the Mappi platform. Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Cc: Hitoshi Yamamoto <hitoshiy@linux-m32r.org> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
b5445f956e
commit
4fc09385c7
2 changed files with 3 additions and 11 deletions
|
@ -45,7 +45,8 @@ static void mask_and_ack_mappi(unsigned int irq)
|
||||||
|
|
||||||
static void end_mappi_irq(unsigned int irq)
|
static void end_mappi_irq(unsigned int irq)
|
||||||
{
|
{
|
||||||
enable_mappi_irq(irq);
|
if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
|
||||||
|
enable_mappi_irq(irq);
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned int startup_mappi_irq(unsigned int irq)
|
static unsigned int startup_mappi_irq(unsigned int irq)
|
||||||
|
@ -88,7 +89,7 @@ void __init init_IRQ(void)
|
||||||
irq_desc[M32R_IRQ_INT0].chip = &mappi_irq_type;
|
irq_desc[M32R_IRQ_INT0].chip = &mappi_irq_type;
|
||||||
irq_desc[M32R_IRQ_INT0].action = NULL;
|
irq_desc[M32R_IRQ_INT0].action = NULL;
|
||||||
irq_desc[M32R_IRQ_INT0].depth = 1;
|
irq_desc[M32R_IRQ_INT0].depth = 1;
|
||||||
icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
|
icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD11;
|
||||||
disable_mappi_irq(M32R_IRQ_INT0);
|
disable_mappi_irq(M32R_IRQ_INT0);
|
||||||
#endif /* CONFIG_M32R_NE2000 */
|
#endif /* CONFIG_M32R_NE2000 */
|
||||||
|
|
||||||
|
|
|
@ -219,15 +219,6 @@ static void ei_tx_timeout(struct net_device *dev)
|
||||||
int txsr, isr, tickssofar = jiffies - dev->trans_start;
|
int txsr, isr, tickssofar = jiffies - dev->trans_start;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
#if defined(CONFIG_M32R) && defined(CONFIG_SMP)
|
|
||||||
unsigned long icucr;
|
|
||||||
|
|
||||||
local_irq_save(flags);
|
|
||||||
icucr = inl(M32R_ICU_CR1_PORTL);
|
|
||||||
icucr |= M32R_ICUCR_ISMOD11;
|
|
||||||
outl(icucr, M32R_ICU_CR1_PORTL);
|
|
||||||
local_irq_restore(flags);
|
|
||||||
#endif
|
|
||||||
ei_local->stat.tx_errors++;
|
ei_local->stat.tx_errors++;
|
||||||
|
|
||||||
spin_lock_irqsave(&ei_local->page_lock, flags);
|
spin_lock_irqsave(&ei_local->page_lock, flags);
|
||||||
|
|
Loading…
Reference in a new issue