m32r: Fix ei_tx_timeout() in drivers/net/lib8390.c
PATCH 1/1 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 <[email protected]>
Cc Hitoshi Yamamoto <[email protected]>
--- arch/m32r/kernel/setup_mappi.c | 5 +++-- drivers/net/lib8390.c | 9 --------- 2 files changed, 3 insertions(+), 11 deletions(-)
arch/m32r/kernel/setup_mappi.c +3 -2
@@ -45,7 +45,8 @@ static void mask_and_ack_mappi(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)
@@ -88,7 +89,7 @@ void __init init_IRQ(void) irq_desc[M32R_IRQ_INT0 ].chip = &mappi_irq_type; irq_desc[M32R_IRQ_INT0 ].action =NULL ; 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 );#endif /* CONFIG_M32R_NE2000 */
drivers/net/lib8390.c +0 -9
@@ -219,15 +219,6 @@ static void ei_tx_timeout(struct net_device *dev)int txsr, isr, tickssofar = jiffies - dev->trans_start;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++;spin_lock_irqsave (&ei_local->page_lock, flags);
Signature · 5 lines
1.5.2.3 -- Hirokazu Takata <[email protected]> Linux/M32R Project: http://www.linux-m32r.org/