[PATCH] m32r: modify drivers/net/ne.c for m32r

This patch updates drivers/net/ne.c and merges m32r support to it.

- Add m32r support.

Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/m32r/kernel/setup_mappi.c b/arch/m32r/kernel/setup_mappi.c
index 8e52adda4cdfb0dcb0e46e433df198e9234664d5..ae2f4b3ebd7b41cf7f59470ebaabfb5c4dd07957 100644 (file)
--- a/arch/m32r/kernel/setup_mappi.c
+++ b/arch/m32r/kernel/setup_mappi.c
@@ -92,7 +92,7 @@ void __init init_IRQ(void)
        else
                once++;
 
-#ifdef CONFIG_M32R_NE2000
+#ifdef CONFIG_NE2000
        /* INT0 : LAN controller (RTL8019AS) */
        irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED;
        irq_desc[M32R_IRQ_INT0].handler = &mappi_irq_type;

diff --git a/arch/m32r/kernel/setup_oaks32r.c b/arch/m32r/kernel/setup_oaks32r.c
index 1b5e6d3d88d18f04ba6960bea8f7caa8cb983c33..b0875755b21af53c933ba22b5b8a06a8fdc38680 100644 (file)
--- a/arch/m32r/kernel/setup_oaks32r.c
+++ b/arch/m32r/kernel/setup_oaks32r.c
@@ -92,7 +92,7 @@ void __init init_IRQ(void)
        else
                once++;
 
-#ifdef CONFIG_M32R_NE2000
+#ifdef CONFIG_NE2000
        /* INT3 : LAN controller (RTL8019AS) */
        irq_desc[M32R_IRQ_INT3].status = IRQ_DISABLED;
        irq_desc[M32R_IRQ_INT3].handler = &oaks32r_irq_type;

diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index 4f95132c7b3d3fd27e8a564398149aa063faf43e..04dcacda870d000deecec934312c3cfc258db3ed 100644 (file)
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -42,6 +42,7 @@
   Alan Cox             : Spinlocking work, added 'BUG_83C690'
   Paul Gortmaker       : Separate out Tx timeout code from Tx path.
   Paul Gortmaker       : Remove old unused single Tx buffer code.
+  Hayato Fujiwara      : Add m32r support.
 
   Sources:
   The National Semiconductor LAN Databook, and the 3Com 3c503 databook.
@@ -219,6 +220,15 @@ 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(ICUCR1);
+       icucr |= M32R_ICUCR_ISMOD11;
+       outl(icucr, ICUCR1);
+       local_irq_restore(flags);
+#endif
        ei_local->stat.tx_errors++;
 
        spin_lock_irqsave(&ei_local->page_lock, flags);

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6de5016a9c54b805fbc12d1c6fc8ac3ae9e8f383..aaf126674b4f78cf7262dc5096dfd30f540098a2 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1075,7 +1075,7 @@ config ETH16I
 
 config NE2000
        tristate "NE2000/NE1000 support"
-       depends on NET_ISA || (Q40 && m)
+       depends on NET_ISA || (Q40 && m) || M32R
        select CRC32
        ---help---
          If you have a network (Ethernet) card of this type, say Y and read

diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index a4116f1360a7f5b9adb6f25988c9acba12e8cd96..d9a9a0bb70a1d9eec927bb8d6c5493011d82f4ff 100644 (file)
--- a/drivers/net/ne.c
+++ b/drivers/net/ne.c
@@ -29,6 +29,7 @@
     last in cleanup_modue()
     Richard Guenther    : Added support for ISAPnP cards
     Paul Gortmaker     : Discontinued PCI support - use ne2k-pci.c instead.
+    Hayato Fujiwara    : Add m32r support.
 
 */
 
@@ -128,6 +129,14 @@ bad_clone_list[] __initdata = {
 #define NESM_START_PG  0x40    /* First page of TX buffer */
 #define NESM_STOP_PG   0x80    /* Last page +1 of RX ring */
 
+#ifdef CONFIG_PLAT_MAPPI
+#  define DCR_VAL 0x4b
+#elif CONFIG_PLAT_OAKS32R
+#  define DCR_VAL 0x48
+#else
+#  define DCR_VAL 0x49
+#endif
+
 static int ne_probe1(struct net_device *dev, int ioaddr);
 static int ne_probe_isapnp(struct net_device *dev);
 
@@ -387,7 +396,7 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
                for (i = 0; i < 16; i++)
                        SA_prom[i] = SA_prom[i+i];
                /* We must set the 8390 for word mode. */
-               outb_p(0x49, ioaddr + EN0_DCFG);
+               outb_p(DCR_VAL, ioaddr + EN0_DCFG);
                start_page = NESM_START_PG;
                stop_page = NESM_STOP_PG;
        } else {
@@ -395,7 +404,12 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
                stop_page = NE1SM_STOP_PG;
        }
 
+#if  defined(CONFIG_PLAT_MAPPI) || defined(CONFIG_PLAT_OAKS32R)
+       neX000 = ((SA_prom[14] == 0x57  &&  SA_prom[15] == 0x57)
+               || (SA_prom[14] == 0x42 && SA_prom[15] == 0x42));
+#else
        neX000 = (SA_prom[14] == 0x57  &&  SA_prom[15] == 0x57);
+#endif
        ctron =  (SA_prom[0] == 0x00 && SA_prom[1] == 0x00 && SA_prom[2] == 0x1d);
        copam =  (SA_prom[14] == 0x49 && SA_prom[15] == 0x00);
 
@@ -476,10 +490,20 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
 
        dev->base_addr = ioaddr;
 
+#ifdef CONFIG_PLAT_MAPPI
+       outb_p(E8390_NODMA + E8390_PAGE1 + E8390_STOP,
+               ioaddr + E8390_CMD); /* 0x61 */
+       for (i = 0 ; i < ETHER_ADDR_LEN ; i++) {
+               dev->dev_addr[i] = SA_prom[i]
+                       = inb_p(ioaddr + EN1_PHYS_SHIFT(i));
+               printk(" %2.2x", SA_prom[i]);
+       }
+#else
        for(i = 0; i < ETHER_ADDR_LEN; i++) {
                printk(" %2.2x", SA_prom[i]);
                dev->dev_addr[i] = SA_prom[i];
        }
+#endif
 
        printk("\n%s: %s found at %#x, using IRQ %d.\n",
                dev->name, name, ioaddr, dev->irq);
@@ -487,7 +511,11 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
        ei_status.name = name;
        ei_status.tx_start_page = start_page;
        ei_status.stop_page = stop_page;
+#ifdef CONFIG_PLAT_OAKS32R
+       ei_status.word16 = 0;
+#else
        ei_status.word16 = (wordlength == 2);
+#endif
 
        ei_status.rx_start_page = start_page + TX_PAGES;
 #ifdef PACKETBUF_MEMSIZE