Commit c8f6c77d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Space-cleanup' 



Arnd Bergmann says:

====================
drivers/net/Space.c cleanup

I discovered that there are still a couple of drivers that rely on
beiong statically initialized from drivers/net/Space.c the way
we did in the last century. As it turns out, there are a couple
of simplifications that can be made here, as well as some minor
bugfixes.

There are four classes of drivers that use this:

- most 10mbit ISA bus ethernet drivers (and one 100mbit one)
- both ISA localtalk drivers
- several m68k ethernet drivers
- one obsolete WAN driver

I found that the drivers using in arch/m68k/ don't actually benefit
from being probed this way as they do not rely on the netdev= command
line arguments, they have simply never been changed to work like a
modern driver.

I had previously sent a patch to remove the sbni/granch driver, and
there were no objections to this patch but forgot to resend it after
some discussion about another patch in the same series.

For the ISA drivers, there is usually no way to probe multiple devices
at boot time other than the netdev= arguments, so all that logic is left
in place for the moment, but centralized in a single file that only gets
included in the kernel build if one or more of the drivers are built-in.

I'm also changing the old-style init_module() functions in these drivers
to static functions with a module_init() annotation, to more closely
resemble modern drivers. These are the last drivers in the kernel to
still use init_module/cleanup_module, removing those may enable future
cleanups to the module loading process.

       Arnd

Changes in v2:

- replace xsurf100 change with Michael's version
- make it PATCH instead of RFC
- rebase to net-next as of August 3
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2dbf4c2e a07d8ecf

Documentation/admin-guide/kernel-parameters.txt

+0 −2
Original line number Diff line number Diff line
@@ -4945,8 +4945,6 @@ 
	sa1100ir	[NET]

			See drivers/net/irda/sa1100_ir.c.



	sbni=		[NET] Granch SBNI12 leased line adapter



	sched_verbose	[KNL] Enables verbose scheduler debug messages.



	schedstats=	[KNL,X86] Enable or disable scheduled statistics.

drivers/net/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -606,4 +606,11 @@ config NET_FAILOVER 
	  a VM with direct attached VF by failing over to the paravirtual

	  datapath when the VF is unplugged.



config NETDEV_LEGACY_INIT

	bool

	depends on ISA

	help

	  Drivers that call netdev_boot_setup_check() should select this

	  symbol, everything else no longer needs it.



endif # NETDEVICES

drivers/net/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ obj-$(CONFIG_MACVLAN) += macvlan.o 
obj-$(CONFIG_MACVTAP) += macvtap.o

obj-$(CONFIG_MII) += mii.o

obj-$(CONFIG_MDIO) += mdio.o

obj-$(CONFIG_NET) += Space.o loopback.o

obj-$(CONFIG_NET) += loopback.o

obj-$(CONFIG_NETDEV_LEGACY_INIT) += Space.o

obj-$(CONFIG_NETCONSOLE) += netconsole.o

obj-y += phy/

obj-y += mdio/

drivers/net/Space.c

+144 −34
Original line number Diff line number Diff line
@@ -30,6 +30,148 @@ 
#include <linux/netlink.h>

#include <net/Space.h>



/*

 * This structure holds boot-time configured netdevice settings. They

 * are then used in the device probing.

 */

struct netdev_boot_setup {

	char name[IFNAMSIZ];

	struct ifmap map;

};

#define NETDEV_BOOT_SETUP_MAX 8





/******************************************************************************

 *

 *		      Device Boot-time Settings Routines

 *

 ******************************************************************************/



/* Boot time configuration table */

static struct netdev_boot_setup dev_boot_setup[NETDEV_BOOT_SETUP_MAX];



/**

 *	netdev_boot_setup_add	- add new setup entry

 *	@name: name of the device

 *	@map: configured settings for the device

 *

 *	Adds new setup entry to the dev_boot_setup list.  The function

 *	returns 0 on error and 1 on success.  This is a generic routine to

 *	all netdevices.

 */

static int netdev_boot_setup_add(char *name, struct ifmap *map)

{

	struct netdev_boot_setup *s;

	int i;



	s = dev_boot_setup;

	for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++) {

		if (s[i].name[0] == '\0' || s[i].name[0] == ' ') {

			memset(s[i].name, 0, sizeof(s[i].name));

			strlcpy(s[i].name, name, IFNAMSIZ);

			memcpy(&s[i].map, map, sizeof(s[i].map));

			break;

		}

	}



	return i >= NETDEV_BOOT_SETUP_MAX ? 0 : 1;

}



/**

 * netdev_boot_setup_check	- check boot time settings

 * @dev: the netdevice

 *

 * Check boot time settings for the device.

 * The found settings are set for the device to be used

 * later in the device probing.

 * Returns 0 if no settings found, 1 if they are.

 */

int netdev_boot_setup_check(struct net_device *dev)

{

	struct netdev_boot_setup *s = dev_boot_setup;

	int i;



	for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++) {

		if (s[i].name[0] != '\0' && s[i].name[0] != ' ' &&

		    !strcmp(dev->name, s[i].name)) {

			dev->irq = s[i].map.irq;

			dev->base_addr = s[i].map.base_addr;

			dev->mem_start = s[i].map.mem_start;

			dev->mem_end = s[i].map.mem_end;

			return 1;

		}

	}

	return 0;

}

EXPORT_SYMBOL(netdev_boot_setup_check);



/**

 * netdev_boot_base	- get address from boot time settings

 * @prefix: prefix for network device

 * @unit: id for network device

 *

 * Check boot time settings for the base address of device.

 * The found settings are set for the device to be used

 * later in the device probing.

 * Returns 0 if no settings found.

 */

static unsigned long netdev_boot_base(const char *prefix, int unit)

{

	const struct netdev_boot_setup *s = dev_boot_setup;

	char name[IFNAMSIZ];

	int i;



	sprintf(name, "%s%d", prefix, unit);



	/*

	 * If device already registered then return base of 1

	 * to indicate not to probe for this interface

	 */

	if (__dev_get_by_name(&init_net, name))

		return 1;



	for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++)

		if (!strcmp(name, s[i].name))

			return s[i].map.base_addr;

	return 0;

}



/*

 * Saves at boot time configured settings for any netdevice.

 */

static int __init netdev_boot_setup(char *str)

{

	int ints[5];

	struct ifmap map;



	str = get_options(str, ARRAY_SIZE(ints), ints);

	if (!str || !*str)

		return 0;



	/* Save settings */

	memset(&map, 0, sizeof(map));

	if (ints[0] > 0)

		map.irq = ints[1];

	if (ints[0] > 1)

		map.base_addr = ints[2];

	if (ints[0] > 2)

		map.mem_start = ints[3];

	if (ints[0] > 3)

		map.mem_end = ints[4];



	/* Add new entry to the list */

	return netdev_boot_setup_add(str, &map);

}



__setup("netdev=", netdev_boot_setup);



static int __init ether_boot_setup(char *str)

{

	return netdev_boot_setup(str);

}

__setup("ether=", ether_boot_setup);





/* A unified ethernet device probe.  This is the easiest way to have every

 * ethernet adaptor have the name "eth[0123...]".

 */
@@ -77,39 +219,15 @@ static struct devprobe2 isa_probes[] __initdata = { 
#ifdef CONFIG_SMC9194

	{smc_init, 0},

#endif

#ifdef CONFIG_CS89x0

#ifndef CONFIG_CS89x0_PLATFORM

#ifdef CONFIG_CS89x0_ISA

	{cs89x0_probe, 0},

#endif

#endif

#if defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET)	/* Intel */

	{i82596_probe, 0},					/* I82596 */

#endif

#ifdef CONFIG_NI65

	{ni65_probe, 0},

#endif

	{NULL, 0},

};



static struct devprobe2 m68k_probes[] __initdata = {

#ifdef CONFIG_ATARILANCE	/* Lance-based Atari ethernet boards */

	{atarilance_probe, 0},

#endif

#ifdef CONFIG_SUN3LANCE         /* sun3 onboard Lance chip */

	{sun3lance_probe, 0},

#endif

#ifdef CONFIG_SUN3_82586        /* sun3 onboard Intel 82586 chip */

	{sun3_82586_probe, 0},

#endif

#ifdef CONFIG_APNE		/* A1200 PCMCIA NE2000 */

	{apne_probe, 0},

#endif

#ifdef CONFIG_MVME147_NET	/* MVME147 internal Ethernet */

	{mvme147lance_probe, 0},

#endif

	{NULL, 0},

};



/* Unified ethernet device probe, segmented per architecture and

 * per bus interface. This drives the legacy devices only for now.

 */
@@ -121,8 +239,7 @@ static void __init ethif_probe2(int unit) 
	if (base_addr == 1)

		return;



	(void)(probe_list2(unit, m68k_probes, base_addr == 0) &&

		probe_list2(unit, isa_probes, base_addr == 0));

	probe_list2(unit, isa_probes, base_addr == 0);

}



/*  Statically configured drivers -- order matters here. */
@@ -130,10 +247,6 @@ static int __init net_olddevs_init(void) 
{

	int num;



#ifdef CONFIG_SBNI

	for (num = 0; num < 8; ++num)

		sbni_probe(num);

#endif

	for (num = 0; num < 8; ++num)

		ethif_probe2(num);
@@ -142,9 +255,6 @@ static int __init net_olddevs_init(void) 
	cops_probe(1);

	cops_probe(2);

#endif

#ifdef CONFIG_LTPC

	ltpc_probe();

#endif



	return 0;

}

drivers/net/appletalk/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -52,7 +52,9 @@ config LTPC 


config COPS

	tristate "COPS LocalTalk PC support"

	depends on DEV_APPLETALK && (ISA || EISA)

	depends on DEV_APPLETALK && ISA

	depends on NETDEVICES

	select NETDEV_LEGACY_INIT

	help

	  This allows you to use COPS AppleTalk cards to connect to LocalTalk

	  networks. You also need version 1.3.3 or later of the netatalk