Commit fedb3d27 authored Dec 18, 2009 by Ondrej Zary Committed by Rusty Russell May 19, 2010

MODULE_DEVICE_TABLE(isapnp, ...) does nothing



On Monday 23 November 2009 04:29:53 Rusty Russell wrote:
> On Mon, 23 Nov 2009 07:31:57 am Ondrej Zary wrote:
> > The problem is that
> > scripts/mod/file2alias.c simply ignores isapnp.
>
> AFAICT it always has, and noone has complained until now.  Perhaps
> something was still reading /lib/modules/`uname -r`/modules.isapnpmap?

The patch below works fine (at least with Debian). It needs your first
patch that moves the definitions to mod_devicetable.h. Verified that
aliases for these modules are generated correctly:

drivers/media/radio/radio-sf16fmi.c
drivers/net/ne.c
drivers/net/3c515.c
drivers/net/smc-ultra.c
drivers/pcmcia/i82365.c
drivers/scsi/aha1542.c
drivers/scsi/aha152x.c
drivers/scsi/sym53c416.c
drivers/scsi/g_NCR5380.c

Tested with RTL8019AS (ne), AVA-1505AE (aha152x) and dtc436e (g_NCR5380)
cards - they now work automatically.

Generate pnp:d aliases for isapnp_device_tables. This allows udev to load
these modules automatically.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

parent 031ffd17

scripts/mod/file2alias.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -806,6 +806,19 @@ static int do_zorro_entry(const char filename, struct zorro_device_id id,
		return 1;
		}

		/* looks like: "pnp:dD" */
		static int do_isapnp_entry(const char *filename,
		struct isapnp_device_id id, char alias)
		{
		sprintf(alias, "pnp:d%c%c%c%x%x%x%x*",
		'A' + ((id->vendor >> 2) & 0x3f) - 1,
		'A' + (((id->vendor & 3) << 3) \| ((id->vendor >> 13) & 7)) - 1,
		'A' + ((id->vendor >> 8) & 0x1f) - 1,
		(id->function >> 4) & 0x0f, id->function & 0x0f,
		(id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
		return 1;
		}

		/* Ignore any prefix, eg. some architectures prepend _ */
		static inline int sym_is(const char symbol, const char name)
		{
		@@ -957,6 +970,10 @@ void handle_moddevtable(struct module mod, struct elf_info info,
		do_table(symval, sym->st_size,
		sizeof(struct zorro_device_id), "zorro",
		do_zorro_entry, mod);
		else if (sym_is(symname, "__mod_isapnp_device_table"))
		do_table(symval, sym->st_size,
		sizeof(struct isapnp_device_id), "isa",
		do_isapnp_entry, mod);
		free(zeros);
		}

Admin message