Merge remote-tracking branch 'linus/master' into x86/urgent

1 files changed, 169 insertions, 117 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index f936d1fa969d..c0e14b3f2306 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -28,6 +28,7 @@ typedef Elf64_Addr	kernel_ulong_t;
 #endif
 
 #include <ctype.h>
+#include <stdbool.h>
 
 typedef uint32_t        __u32;
 typedef uint16_t        __u16;
@@ -38,6 +39,35 @@ typedef unsigned char	__u8;
  * we handle those differences explicitly below */
 #include "../../include/linux/mod_devicetable.h"
 
+/* This array collects all instances that use the generic do_table */
+struct devtable {
+        const char *device_id; /* name of table, __mod_<name>_device_table. */
+        unsigned long id_size;
+        void *function;
+};
+
+/* We construct a table of pointers in an ELF section (pointers generally
+ * go unpadded by gcc).  ld creates boundary syms for us. */
+extern struct devtable *__start___devtable[], *__stop___devtable[];
+#define ___cat(a,b) a ## b
+#define __cat(a,b) ___cat(a,b)
+
+#if __GNUC__ == 3 && __GNUC_MINOR__ < 3
+# define __used                 __attribute__((__unused__))
+#else
+# define __used                 __attribute__((__used__))
+#endif
+
+/* Add a table entry.  We test function type matches while we're here. */
+#define ADD_TO_DEVTABLE(device_id, type, function) \
+        static struct devtable __cat(devtable,__LINE__) = {     \
+                device_id + 0*sizeof((function)((const char *)NULL,     \
+                                                (type *)NULL,           \
+                                                (char *)NULL)),         \
+                sizeof(type), (function) };                             \
+        static struct devtable *__attribute__((section("__devtable"))) \
+                __used __cat(devtable_ptr,__LINE__) = &__cat(devtable,__LINE__)
+
 #define ADD(str, sep, cond, field)                              \
 do {                                                            \
         strcat(str, sep);                                       \
@@ -289,6 +319,7 @@ static int do_hid_entry(const char *filename,
 
         return 1;
 }
+ADD_TO_DEVTABLE("hid", struct hid_device_id, do_hid_entry);
 
 /* Looks like: ieee1394:venNmoNspNverN */
 static int do_ieee1394_entry(const char *filename,
@@ -313,6 +344,7 @@ static int do_ieee1394_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("ieee1394", struct ieee1394_device_id, do_ieee1394_entry);
 
 /* Looks like: pci:vNdNsvNsdNbcNscNiN. */
 static int do_pci_entry(const char *filename,
@@ -356,6 +388,7 @@ static int do_pci_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("pci", struct pci_device_id, do_pci_entry);
 
 /* looks like: "ccw:tNmNdtNdmN" */
 static int do_ccw_entry(const char *filename,
@@ -379,6 +412,7 @@ static int do_ccw_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("ccw", struct ccw_device_id, do_ccw_entry);
 
 /* looks like: "ap:tN" */
 static int do_ap_entry(const char *filename,
@@ -387,6 +421,7 @@ static int do_ap_entry(const char *filename,
         sprintf(alias, "ap:t%02X*", id->dev_type);
         return 1;
 }
+ADD_TO_DEVTABLE("ap", struct ap_device_id, do_ap_entry);
 
 /* looks like: "css:tN" */
 static int do_css_entry(const char *filename,
@@ -395,6 +430,7 @@ static int do_css_entry(const char *filename,
         sprintf(alias, "css:t%01X", id->type);
         return 1;
 }
+ADD_TO_DEVTABLE("css", struct css_device_id, do_css_entry);
 
 /* Looks like: "serio:tyNprNidNexN" */
 static int do_serio_entry(const char *filename,
@@ -414,6 +450,7 @@ static int do_serio_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("serio", struct serio_device_id, do_serio_entry);
 
 /* looks like: "acpi:ACPI0003 or acpi:PNP0C0B" or "acpi:LNXVIDEO" */
 static int do_acpi_entry(const char *filename,
@@ -422,6 +459,7 @@ static int do_acpi_entry(const char *filename,
         sprintf(alias, "acpi*:%s:*", id->id);
         return 1;
 }
+ADD_TO_DEVTABLE("acpi", struct acpi_device_id, do_acpi_entry);
 
 /* looks like: "pnp:dD" */
 static void do_pnp_device_entry(void *symval, unsigned long size,
@@ -544,8 +582,7 @@ static int do_pcmcia_entry(const char *filename,
         add_wildcard(alias);
        return 1;
 }
-
-
+ADD_TO_DEVTABLE("pcmcia", struct pcmcia_device_id, do_pcmcia_entry);
 
 static int do_of_entry (const char *filename, struct of_device_id *of, char *alias)
 {
@@ -568,6 +605,7 @@ static int do_of_entry (const char *filename, struct of_device_id *of, char *ali
     add_wildcard(alias);
     return 1;
 }
+ADD_TO_DEVTABLE("of", struct of_device_id, do_of_entry);
 
 static int do_vio_entry(const char *filename, struct vio_device_id *vio,
                 char *alias)
@@ -585,6 +623,7 @@ static int do_vio_entry(const char *filename, struct vio_device_id *vio,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("vio", struct vio_device_id, do_vio_entry);
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
@@ -640,6 +679,7 @@ static int do_input_entry(const char *filename, struct input_device_id *id,
                 do_input(alias, id->swbit, 0, INPUT_DEVICE_ID_SW_MAX);
         return 1;
 }
+ADD_TO_DEVTABLE("input", struct input_device_id, do_input_entry);
 
 static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa,
                 char *alias)
@@ -650,6 +690,7 @@ static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa,
                 strcat(alias, "*");
         return 1;
 }
+ADD_TO_DEVTABLE("eisa", struct eisa_device_id, do_eisa_entry);
 
 /* Looks like: parisc:tNhvNrevNsvN */
 static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
@@ -669,6 +710,7 @@ static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("parisc", struct parisc_device_id, do_parisc_entry);
 
 /* Looks like: sdio:cNvNdN. */
 static int do_sdio_entry(const char *filename,
@@ -685,6 +727,7 @@ static int do_sdio_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("sdio", struct sdio_device_id, do_sdio_entry);
 
 /* Looks like: ssb:vNidNrevN. */
 static int do_ssb_entry(const char *filename,
@@ -701,6 +744,7 @@ static int do_ssb_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("ssb", struct ssb_device_id, do_ssb_entry);
 
 /* Looks like: bcma:mNidNrevNclN. */
 static int do_bcma_entry(const char *filename,
@@ -719,6 +763,7 @@ static int do_bcma_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("bcma", struct bcma_device_id, do_bcma_entry);
 
 /* Looks like: virtio:dNvN */
 static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
@@ -734,6 +779,7 @@ static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("virtio", struct virtio_device_id, do_virtio_entry);
 
 /*
  * Looks like: vmbus:guid
@@ -755,6 +801,7 @@ static int do_vmbus_entry(const char *filename, struct hv_vmbus_device_id *id,
 
         return 1;
 }
+ADD_TO_DEVTABLE("vmbus", struct hv_vmbus_device_id, do_vmbus_entry);
 
 /* Looks like: i2c:S */
 static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
@@ -764,6 +811,7 @@ static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
 
         return 1;
 }
+ADD_TO_DEVTABLE("i2c", struct i2c_device_id, do_i2c_entry);
 
 /* Looks like: spi:S */
 static int do_spi_entry(const char *filename, struct spi_device_id *id,
@@ -773,6 +821,17 @@ static int do_spi_entry(const char *filename, struct spi_device_id *id,
 
         return 1;
 }
+ADD_TO_DEVTABLE("spi", struct spi_device_id, do_spi_entry);
+
+/* Looks like: mcp:S */
+static int do_mcp_entry(const char *filename, struct mcp_device_id *id,
+                        char *alias)
+{
+        sprintf(alias, MCP_MODULE_PREFIX "%s", id->name);
+
+        return 1;
+}
+ADD_TO_DEVTABLE("mcp", struct mcp_device_id, do_mcp_entry); 
 
 static const struct dmifield {
         const char *prefix;
@@ -827,6 +886,7 @@ static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
         strcat(alias, ":");
         return 1;
 }
+ADD_TO_DEVTABLE("dmi", struct dmi_system_id, do_dmi_entry);
 
 static int do_platform_entry(const char *filename,
                              struct platform_device_id *id, char *alias)
@@ -834,6 +894,7 @@ static int do_platform_entry(const char *filename,
         sprintf(alias, PLATFORM_MODULE_PREFIX "%s", id->name);
         return 1;
 }
+ADD_TO_DEVTABLE("platform", struct platform_device_id, do_platform_entry);
 
 static int do_mdio_entry(const char *filename,
                          struct mdio_device_id *id, char *alias)
@@ -856,6 +917,7 @@ static int do_mdio_entry(const char *filename,
 
         return 1;
 }
+ADD_TO_DEVTABLE("mdio", struct mdio_device_id, do_mdio_entry);
 
 /* Looks like: zorro:iN. */
 static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
@@ -866,6 +928,7 @@ static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
         ADD(alias, "i", id->id != ZORRO_WILDCARD, id->id);
         return 1;
 }
+ADD_TO_DEVTABLE("zorro", struct zorro_device_id, do_zorro_entry);
 
 /* looks like: "pnp:dD" */
 static int do_isapnp_entry(const char *filename,
@@ -879,16 +942,84 @@ static int do_isapnp_entry(const char *filename,
                 (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
         return 1;
 }
+ADD_TO_DEVTABLE("isa", struct isapnp_device_id, do_isapnp_entry);
 
-/* Ignore any prefix, eg. some architectures prepend _ */
-static inline int sym_is(const char *symbol, const char *name)
+/*
+ * Append a match expression for a single masked hex digit.
+ * outp points to a pointer to the character at which to append.
+ *      *outp is updated on return to point just after the appended text,
+ *      to facilitate further appending.
+ */
+static void append_nibble_mask(char **outp,
+                               unsigned int nibble, unsigned int mask)
 {
-        const char *match;
+        char *p = *outp;
+        unsigned int i;
 
-        match = strstr(symbol, name);
-        if (!match)
-                return 0;
-        return match[strlen(name)] == '\0';
+        switch (mask) {
+        case 0:
+                *p++ = '?';
+                break;
+
+        case 0xf:
+                p += sprintf(p, "%X",  nibble);
+                break;
+
+        default:
+                /*
+                 * Dumbly emit a match pattern for all possible matching
+                 * digits.  This could be improved in some cases using ranges,
+                 * but it has the advantage of being trivially correct, and is
+                 * often optimal.
+                 */
+                *p++ = '[';
+                for (i = 0; i < 0x10; i++)
+                        if ((i & mask) == nibble)
+                                p += sprintf(p, "%X", i);
+                *p++ = ']';
+        }
+
+        /* Ensure that the string remains NUL-terminated: */
+        *p = '\0';
+
+        /* Advance the caller's end-of-string pointer: */
+        *outp = p;
+}
+
+/*
+ * looks like: "amba:dN"
+ *
+ * N is exactly 8 digits, where each is an upper-case hex digit, or
+ *      a ? or [] pattern matching exactly one digit.
+ */
+static int do_amba_entry(const char *filename,
+                         struct amba_id *id, char *alias)
+{
+        unsigned int digit;
+        char *p = alias;
+
+        if ((id->id & id->mask) != id->id)
+                fatal("%s: Masked-off bit(s) of AMBA device ID are non-zero: "
+                      "id=0x%08X, mask=0x%08X.  Please fix this driver.\n",
+                      filename, id->id, id->mask);
+
+        p += sprintf(alias, "amba:d");
+        for (digit = 0; digit < 8; digit++)
+                append_nibble_mask(&p,
+                                   (id->id >> (4 * (7 - digit))) & 0xf,
+                                   (id->mask >> (4 * (7 - digit))) & 0xf);
+
+        return 1;
+}
+ADD_TO_DEVTABLE("amba", struct amba_id, do_amba_entry);
+
+/* Does namelen bytes of name exactly match the symbol? */
+static bool sym_is(const char *name, unsigned namelen, const char *symbol)
+{
+        if (namelen != strlen(symbol))
+                return false;
+
+        return memcmp(name, symbol, namelen) == 0;
 }
 
 static void do_table(void *symval, unsigned long size,
@@ -921,11 +1052,25 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
 {
         void *symval;
         char *zeros = NULL;
+        const char *name;
+        unsigned int namelen;
 
         /* We're looking for a section relative symbol */
         if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)
                 return;
 
+        /* All our symbols are of form <prefix>__mod_XXX_device_table. */
+        name = strstr(symname, "__mod_");
+        if (!name)
+                return;
+        name += strlen("__mod_");
+        namelen = strlen(name);
+        if (namelen < strlen("_device_table"))
+                return;
+        if (strcmp(name + namelen - strlen("_device_table"), "_device_table"))
+                return;
+        namelen -= strlen("_device_table");
+
         /* Handle all-NULL symbols allocated into .bss */
         if (info->sechdrs[get_secindex(info, sym)].sh_type & SHT_NOBITS) {
                 zeros = calloc(1, sym->st_size);
@@ -936,117 +1081,24 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                         + sym->st_value;
         }
 
-        if (sym_is(symname, "__mod_pci_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct pci_device_id), "pci",
-                         do_pci_entry, mod);
-        else if (sym_is(symname, "__mod_usb_device_table"))
-                /* special case to handle bcdDevice ranges */
+        /* First handle the "special" cases */
+        if (sym_is(name, namelen, "usb"))
                 do_usb_table(symval, sym->st_size, mod);
-        else if (sym_is(symname, "__mod_hid_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct hid_device_id), "hid",
-                         do_hid_entry, mod);
-        else if (sym_is(symname, "__mod_ieee1394_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct ieee1394_device_id), "ieee1394",
-                         do_ieee1394_entry, mod);
-        else if (sym_is(symname, "__mod_ccw_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct ccw_device_id), "ccw",
-                         do_ccw_entry, mod);
-        else if (sym_is(symname, "__mod_ap_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct ap_device_id), "ap",
-                         do_ap_entry, mod);
-        else if (sym_is(symname, "__mod_css_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct css_device_id), "css",
-                         do_css_entry, mod);
-        else if (sym_is(symname, "__mod_serio_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct serio_device_id), "serio",
-                         do_serio_entry, mod);
-        else if (sym_is(symname, "__mod_acpi_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct acpi_device_id), "acpi",
-                         do_acpi_entry, mod);
-        else if (sym_is(symname, "__mod_pnp_device_table"))
+        else if (sym_is(name, namelen, "pnp"))
                 do_pnp_device_entry(symval, sym->st_size, mod);
-        else if (sym_is(symname, "__mod_pnp_card_device_table"))
+        else if (sym_is(name, namelen, "pnp_card"))
                 do_pnp_card_entries(symval, sym->st_size, mod);
-        else if (sym_is(symname, "__mod_pcmcia_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct pcmcia_device_id), "pcmcia",
-                         do_pcmcia_entry, mod);
-        else if (sym_is(symname, "__mod_of_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct of_device_id), "of",
-                         do_of_entry, mod);
-        else if (sym_is(symname, "__mod_vio_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct vio_device_id), "vio",
-                         do_vio_entry, mod);
-        else if (sym_is(symname, "__mod_input_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct input_device_id), "input",
-                         do_input_entry, mod);
-        else if (sym_is(symname, "__mod_eisa_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct eisa_device_id), "eisa",
-                         do_eisa_entry, mod);
-        else if (sym_is(symname, "__mod_parisc_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct parisc_device_id), "parisc",
-                         do_parisc_entry, mod);
-        else if (sym_is(symname, "__mod_sdio_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct sdio_device_id), "sdio",
-                         do_sdio_entry, mod);
-        else if (sym_is(symname, "__mod_ssb_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct ssb_device_id), "ssb",
-                         do_ssb_entry, mod);
-        else if (sym_is(symname, "__mod_bcma_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct bcma_device_id), "bcma",
-                         do_bcma_entry, mod);
-        else if (sym_is(symname, "__mod_virtio_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct virtio_device_id), "virtio",
-                         do_virtio_entry, mod);
-        else if (sym_is(symname, "__mod_vmbus_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct hv_vmbus_device_id), "vmbus",
-                         do_vmbus_entry, mod);
-        else if (sym_is(symname, "__mod_i2c_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct i2c_device_id), "i2c",
-                         do_i2c_entry, mod);
-        else if (sym_is(symname, "__mod_spi_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct spi_device_id), "spi",
-                         do_spi_entry, mod);
-        else if (sym_is(symname, "__mod_dmi_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct dmi_system_id), "dmi",
-                         do_dmi_entry, mod);
-        else if (sym_is(symname, "__mod_platform_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct platform_device_id), "platform",
-                         do_platform_entry, mod);
-        else if (sym_is(symname, "__mod_mdio_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct mdio_device_id), "mdio",
-                         do_mdio_entry, mod);
-        else if (sym_is(symname, "__mod_zorro_device_table"))
-                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);
+        else {
+                struct devtable **p;
+
+                for (p = __start___devtable; p < __stop___devtable; p++) {
+                        if (sym_is(name, namelen, (*p)->device_id)) {
+                                do_table(symval, sym->st_size, (*p)->id_size,
+                                         (*p)->device_id, (*p)->function, mod);
+                                break;
+                        }
+                }
+        }
         free(zeros);
 }