Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 055e5110 authored by Alan Cox's avatar Alan Cox Committed by Jeff Garzik
Browse files

8390: Split 8390 support into a pausing and a non pausing driver core 



Only a few ISA controllers need the pausing version of the 8390 core
while PCMCIA, later ISA and PCI do not. More importantly the ISA delays
can break non ISA boxes so we must use a different build of 8390.c for
the two sets of controllers.

No changes since last time as all the points of concerns raised proved to
be invalid

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 141766cf

drivers/net/3c503.c

+7 −7
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ el2_pio_probe(struct net_device *dev) 
#ifndef MODULE

struct net_device * __init el2_probe(int unit)

{

	struct net_device *dev = alloc_ei_netdev();

	struct net_device *dev = alloc_eip_netdev();

	int err;



	if (!dev)
@@ -340,7 +340,7 @@ el2_probe1(struct net_device *dev, int ioaddr) 
    dev->stop = &el2_close;

    dev->ethtool_ops = &netdev_ethtool_ops;

#ifdef CONFIG_NET_POLL_CONTROLLER

    dev->poll_controller = ei_poll;

    dev->poll_controller = eip_poll;

#endif



    retval = register_netdev(dev);
@@ -386,7 +386,7 @@ el2_open(struct net_device *dev) 
		outb_p(0x00, E33G_IDCFR);

		if (*irqp == probe_irq_off(cookie)	/* It's a good IRQ line! */

		    && ((retval = request_irq(dev->irq = *irqp,

		    ei_interrupt, 0, dev->name, dev)) == 0))

		    eip_interrupt, 0, dev->name, dev)) == 0))

		    break;

	    }

	} while (*++irqp);
@@ -395,13 +395,13 @@ el2_open(struct net_device *dev) 
	    return retval;

	}

    } else {

	if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) {

	if ((retval = request_irq(dev->irq, eip_interrupt, 0, dev->name, dev))) {

	    return retval;

	}

    }



    el2_init_card(dev);

    ei_open(dev);

    eip_open(dev);

    return 0;

}
@@ -412,7 +412,7 @@ el2_close(struct net_device *dev) 
    dev->irq = ei_status.saved_irq;

    outb(EGACFR_IRQOFF, E33G_GACFR);	/* disable interrupts. */



    ei_close(dev);

    eip_close(dev);

    return 0;

}
@@ -698,7 +698,7 @@ init_module(void) 
			if (this_dev != 0) break; /* only autoprobe 1st one */

			printk(KERN_NOTICE "3c503.c: Presently autoprobing (not recommended) for a single card.\n");

		}

		dev = alloc_ei_netdev();

		dev = alloc_eip_netdev();

		if (!dev)

			break;

		dev->irq = irq[this_dev];

drivers/net/8390.h

+16 −2
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ extern int ei_debug; 


#ifdef CONFIG_NET_POLL_CONTROLLER

extern void ei_poll(struct net_device *dev);

extern void eip_poll(struct net_device *dev);

#endif



/* Without I/O delay - non ISA or later chips */

extern void NS8390_init(struct net_device *dev, int startp);

extern int ei_open(struct net_device *dev);

extern int ei_close(struct net_device *dev);
@@ -42,6 +44,17 @@ static inline struct net_device *alloc_ei_netdev(void) 
	return __alloc_ei_netdev(0);

}



/* With I/O delay form */

extern void NS8390p_init(struct net_device *dev, int startp);

extern int eip_open(struct net_device *dev);

extern int eip_close(struct net_device *dev);

extern irqreturn_t eip_interrupt(int irq, void *dev_id);

extern struct net_device *__alloc_eip_netdev(int size);

static inline struct net_device *alloc_eip_netdev(void)

{

	return __alloc_eip_netdev(0);

}



/* You have one of these per-board */

struct ei_device {

	const char *name;
@@ -115,13 +128,14 @@ struct ei_device { 
/*

 *	Only generate indirect loads given a machine that needs them.

 *      - removed AMIGA_PCMCIA from this list, handled as ISA io now

 *	- the _p for generates no delay by default 8390p.c overrides this.

 */



#ifndef ei_inb

#define ei_inb(_p)	inb(_p)

#define ei_outb(_v,_p)	outb(_v,_p)

#define ei_inb_p(_p)	inb_p(_p)

#define ei_outb_p(_v,_p) outb_p(_v,_p)

#define ei_inb_p(_p)	inb(_p)

#define ei_outb_p(_v,_p) outb(_v,_p)

#endif



#ifndef EI_SHIFT

drivers/net/8390p.c

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/* 8390 core for ISA devices needing bus delays */



static const char version[] =

    "8390p.c:v1.10cvs 9/23/94 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n";



#define ei_inb(_p)	inb(_p)

#define ei_outb(_v,_p)	outb(_v,_p)

#define ei_inb_p(_p)	inb_p(_p)

#define ei_outb_p(_v,_p) outb_p(_v,_p)



#include "lib8390.c"



int eip_open(struct net_device *dev)

{

	return __ei_open(dev);

}



int eip_close(struct net_device *dev)

{

	return __ei_close(dev);

}



irqreturn_t eip_interrupt(int irq, void *dev_id)

{

	return __ei_interrupt(irq, dev_id);

}



#ifdef CONFIG_NET_POLL_CONTROLLER

void eip_poll(struct net_device *dev)

{

	__ei_poll(dev);

}

#endif



struct net_device *__alloc_eip_netdev(int size)

{

	return ____alloc_ei_netdev(size);

}



void NS8390p_init(struct net_device *dev, int startp)

{

	return __NS8390_init(dev, startp);

}



EXPORT_SYMBOL(eip_open);

EXPORT_SYMBOL(eip_close);

EXPORT_SYMBOL(eip_interrupt);

#ifdef CONFIG_NET_POLL_CONTROLLER

EXPORT_SYMBOL(eip_poll);

#endif

EXPORT_SYMBOL(NS8390p_init);

EXPORT_SYMBOL(__alloc_eip_netdev);



#if defined(MODULE)



int init_module(void)

{

	return 0;

}



void cleanup_module(void)

{

}



#endif /* MODULE */

MODULE_LICENSE("GPL");

drivers/net/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -106,11 +106,11 @@ ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y) 
endif

obj-$(CONFIG_68360_ENET) += 68360enet.o

obj-$(CONFIG_WD80x3) += wd.o 8390.o

obj-$(CONFIG_EL2) += 3c503.o 8390.o

obj-$(CONFIG_NE2000) += ne.o 8390.o

obj-$(CONFIG_NE2_MCA) += ne2.o 8390.o

obj-$(CONFIG_HPLAN) += hp.o 8390.o

obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390.o

obj-$(CONFIG_EL2) += 3c503.o 8390p.o

obj-$(CONFIG_NE2000) += ne.o 8390p.o

obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o

obj-$(CONFIG_HPLAN) += hp.o 8390p.o

obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o

obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o

obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o

obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o

drivers/net/hp.c

+7 −7
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static int __init do_hp_probe(struct net_device *dev) 
#ifndef MODULE

struct net_device * __init hp_probe(int unit)

{

	struct net_device *dev = alloc_ei_netdev();

	struct net_device *dev = alloc_eip_netdev();

	int err;



	if (!dev)
@@ -176,7 +176,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr) 
				outb_p(irqmap[irq] | HP_RUN, ioaddr + HP_CONFIGURE);

				outb_p( 0x00 | HP_RUN, ioaddr + HP_CONFIGURE);

				if (irq == probe_irq_off(cookie)		 /* It's a good IRQ line! */

					&& request_irq (irq, ei_interrupt, 0, DRV_NAME, dev) == 0) {

					&& request_irq (irq, eip_interrupt, 0, DRV_NAME, dev) == 0) {

					printk(" selecting IRQ %d.\n", irq);

					dev->irq = *irqp;

					break;
@@ -191,7 +191,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr) 
	} else {

		if (dev->irq == 2)

			dev->irq = 9;

		if ((retval = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev))) {

		if ((retval = request_irq(dev->irq, eip_interrupt, 0, DRV_NAME, dev))) {

			printk (" unable to get IRQ %d.\n", dev->irq);

			goto out;

		}
@@ -202,7 +202,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr) 
	dev->open = &hp_open;

	dev->stop = &hp_close;

#ifdef CONFIG_NET_POLL_CONTROLLER

	dev->poll_controller = ei_poll;

	dev->poll_controller = eip_poll;

#endif



	ei_status.name = name;
@@ -231,14 +231,14 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr) 
static int

hp_open(struct net_device *dev)

{

	ei_open(dev);

	eip_open(dev);

	return 0;

}



static int

hp_close(struct net_device *dev)

{

	ei_close(dev);

	eip_close(dev);

	return 0;

}
@@ -421,7 +421,7 @@ init_module(void) 
			if (this_dev != 0) break; /* only autoprobe 1st one */

			printk(KERN_NOTICE "hp.c: Presently autoprobing (not recommended) for a single card.\n");

		}

		dev = alloc_ei_netdev();

		dev = alloc_eip_netdev();

		if (!dev)

			break;

		dev->irq = irq[this_dev];