diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-03-27 22:03:43 +0400 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-03-27 22:03:43 +0400 |
commit | 57c6a159364892be5e2596c4ead328a64a868286 (patch) | |
tree | 88f637cf1bd7c31f6b957a271bc24fed480df66b | |
parent | b4a5a6a24749daa70dbb9e02c1cdce0b5d6224f5 (diff) | |
parent | c052d49081c645a59c7fbe3443a36aad56625aaa (diff) |
Merge branch 'tracking-ll-misc-fixes-13.03' into merge-linux-linaro
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | arch/arm/Kconfig.debug | 21 | ||||
-rw-r--r-- | arch/arm/include/asm/cacheflush.h | 1 | ||||
-rw-r--r-- | arch/arm/include/asm/rodata.h | 32 | ||||
-rw-r--r-- | arch/arm/kernel/ftrace.c | 15 | ||||
-rw-r--r-- | arch/arm/mm/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mm/mmu.c | 82 | ||||
-rw-r--r-- | arch/arm/mm/rodata.c | 159 | ||||
-rw-r--r-- | include/linux/mod_devicetable.h | 58 | ||||
-rw-r--r-- | linaro/configs/omap4.conf | 1 | ||||
-rw-r--r-- | scripts/Makefile.modpost | 7 | ||||
-rw-r--r-- | scripts/mod/.gitignore | 1 | ||||
-rw-r--r-- | scripts/mod/Makefile | 35 | ||||
-rw-r--r-- | scripts/mod/devicetable-offsets.c | 178 | ||||
-rw-r--r-- | scripts/mod/file2alias.c | 674 | ||||
-rw-r--r-- | scripts/mod/modpost.c | 5 | ||||
-rw-r--r-- | tools/perf/config/utilities.mak | 2 |
17 files changed, 392 insertions, 881 deletions
@@ -192,6 +192,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \ # "make" in the configured kernel build directory always uses that. # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile +export KBUILD_BUILDHOST := $(SUBARCH) ARCH ?= $(SUBARCH) CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index d04aabae022..ecfcdba2d17 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -63,27 +63,6 @@ config DEBUG_USER 8 - SIGSEGV faults 16 - SIGBUS faults -config DEBUG_RODATA - bool "Write protect kernel text section" - default n - depends on DEBUG_KERNEL && MMU - ---help--- - Mark the kernel text section as write-protected in the pagetables, - in order to catch accidental (and incorrect) writes to such const - data. This will cause the size of the kernel, plus up to 4MB, to - be mapped as pages instead of sections, which will increase TLB - pressure. - If in doubt, say "N". - -config DEBUG_RODATA_TEST - bool "Testcase for the DEBUG_RODATA feature" - depends on DEBUG_RODATA - default n - ---help--- - This option enables a testcase for the DEBUG_RODATA - feature. - If in doubt, say "N" - # These options are only for real kernel hackers who want to get their hands dirty. config DEBUG_LL bool "Kernel low-level debugging functions (read help!)" diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index 4e8217b204a..e1489c54cd1 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -16,7 +16,6 @@ #include <asm/shmparam.h> #include <asm/cachetype.h> #include <asm/outercache.h> -#include <asm/rodata.h> #define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT) diff --git a/arch/arm/include/asm/rodata.h b/arch/arm/include/asm/rodata.h deleted file mode 100644 index 8c8add87bbc..00000000000 --- a/arch/arm/include/asm/rodata.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * arch/arm/include/asm/rodata.h - * - * Copyright (C) 2011 Google, Inc. - * - * Author: Colin Cross <ccross@android.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#ifndef _ASMARM_RODATA_H -#define _ASMARM_RODATA_H - -#ifndef __ASSEMBLY__ - -#ifdef CONFIG_DEBUG_RODATA - -int set_memory_rw(unsigned long virt, int numpages); -int set_memory_ro(unsigned long virt, int numpages); - -void mark_rodata_ro(void); -void set_kernel_text_rw(void); -void set_kernel_text_ro(void); -#else -static inline void set_kernel_text_rw(void) { } -static inline void set_kernel_text_ro(void) { } -#endif - -#endif - -#endif diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c index 6a740a93f4b..34e56647dce 100644 --- a/arch/arm/kernel/ftrace.c +++ b/arch/arm/kernel/ftrace.c @@ -13,7 +13,6 @@ */ #include <linux/ftrace.h> -#include <linux/module.h> #include <linux/uaccess.h> #include <asm/cacheflush.h> @@ -64,20 +63,6 @@ static unsigned long adjust_address(struct dyn_ftrace *rec, unsigned long addr) } #endif -int ftrace_arch_code_modify_prepare(void) -{ - set_kernel_text_rw(); - set_all_modules_text_rw(); - return 0; -} - -int ftrace_arch_code_modify_post_process(void) -{ - set_all_modules_text_ro(); - set_kernel_text_ro(); - return 0; -} - static unsigned long ftrace_call_replace(unsigned long pc, unsigned long addr) { return arm_gen_branch_link(pc, addr); diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index 6698e24c8cd..07fb14cb0f2 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile @@ -7,7 +7,6 @@ obj-y := dma-mapping.o extable.o fault.o init.o \ obj-$(CONFIG_MMU) += fault-armv.o flush.o idmap.o ioremap.o \ mmap.o pgd.o mmu.o -obj-$(CONFIG_DEBUG_RODATA) += rodata.o ifneq ($(CONFIG_MMU),y) obj-y += nommu.o diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index b4f9e2b04b4..bd01ffe3a76 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -604,25 +604,11 @@ static void __init *early_alloc(unsigned long sz) return early_alloc_aligned(sz, sz); } -static pte_t * __init early_pte_alloc(pmd_t *pmd) -{ - if (pmd_none(*pmd) || pmd_bad(*pmd)) - return early_alloc(PTE_HWTABLE_OFF + PTE_HWTABLE_SIZE); - return pmd_page_vaddr(*pmd); -} - -static void __init early_pte_install(pmd_t *pmd, pte_t *pte, unsigned long prot) -{ - __pmd_populate(pmd, __pa(pte), prot); - BUG_ON(pmd_bad(*pmd)); -} - -static pte_t * __init early_pte_alloc_and_install(pmd_t *pmd, - unsigned long addr, unsigned long prot) +static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr, unsigned long prot) { if (pmd_none(*pmd)) { - pte_t *pte = early_pte_alloc(pmd); - early_pte_install(pmd, pte, prot); + pte_t *pte = early_alloc(PTE_HWTABLE_OFF + PTE_HWTABLE_SIZE); + __pmd_populate(pmd, __pa(pte), prot); } BUG_ON(pmd_bad(*pmd)); return pte_offset_kernel(pmd, addr); @@ -632,23 +618,16 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, unsigned long end, unsigned long pfn, const struct mem_type *type) { - pte_t *start_pte = early_pte_alloc(pmd); - pte_t *pte = start_pte + pte_index(addr); - - /* If replacing a section mapping, the whole section must be replaced */ - BUG_ON(pmd_bad(*pmd) && ((addr | end) & ~PMD_MASK)); - + pte_t *pte = early_pte_alloc(pmd, addr, type->prot_l1); do { set_pte_ext(pte, pfn_pte(pfn, __pgprot(type->prot_pte)), 0); pfn++; } while (pte++, addr += PAGE_SIZE, addr != end); - early_pte_install(pmd, start_pte, type->prot_l1); } static void __init alloc_init_section(pud_t *pud, unsigned long addr, unsigned long end, phys_addr_t phys, - const struct mem_type *type, - bool force_pages) + const struct mem_type *type) { pmd_t *pmd = pmd_offset(pud, addr); @@ -658,8 +637,7 @@ static void __init alloc_init_section(pud_t *pud, unsigned long addr, * L1 entries, whereas PGDs refer to a group of L1 entries making * up one logical pointer to an L2 table. */ - if (type->prot_sect && ((addr | end | phys) & ~SECTION_MASK) == 0 && - !force_pages) { + if (type->prot_sect && ((addr | end | phys) & ~SECTION_MASK) == 0) { pmd_t *p = pmd; #ifndef CONFIG_ARM_LPAE @@ -683,15 +661,14 @@ static void __init alloc_init_section(pud_t *pud, unsigned long addr, } static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr, - unsigned long end, unsigned long phys, const struct mem_type *type, - bool force_pages) + unsigned long end, unsigned long phys, const struct mem_type *type) { pud_t *pud = pud_offset(pgd, addr); unsigned long next; do { next = pud_addr_end(addr, end); - alloc_init_section(pud, addr, next, phys, type, force_pages); + alloc_init_section(pud, addr, next, phys, type); phys += next - addr; } while (pud++, addr = next, addr != end); } @@ -765,7 +742,7 @@ static void __init create_36bit_mapping(struct map_desc *md, * offsets, and we take full advantage of sections and * supersections. */ -static void __init create_mapping(struct map_desc *md, bool force_pages) +static void __init create_mapping(struct map_desc *md) { unsigned long addr, length, end; phys_addr_t phys; @@ -815,7 +792,7 @@ static void __init create_mapping(struct map_desc *md, bool force_pages) do { unsigned long next = pgd_addr_end(addr, end); - alloc_init_pud(pgd, addr, next, phys, type, force_pages); + alloc_init_pud(pgd, addr, next, phys, type); phys += next - addr; addr = next; @@ -837,7 +814,7 @@ void __init iotable_init(struct map_desc *io_desc, int nr) svm = early_alloc_aligned(sizeof(*svm) * nr, __alignof__(*svm)); for (md = io_desc; nr; md++, nr--) { - create_mapping(md, false); + create_mapping(md); vm = &svm->vm; vm->addr = (void *)(md->virtual & PAGE_MASK); @@ -958,7 +935,7 @@ void __init debug_ll_io_init(void) map.virtual &= PAGE_MASK; map.length = PAGE_SIZE; map.type = MT_DEVICE; - create_mapping(&map, false); + create_mapping(&map); } #endif @@ -1206,7 +1183,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc) map.virtual = MODULES_VADDR; map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK; map.type = MT_ROM; - create_mapping(&map, false); + create_mapping(&map); #endif /* @@ -1217,14 +1194,14 @@ static void __init devicemaps_init(struct machine_desc *mdesc) map.virtual = FLUSH_BASE; map.length = SZ_1M; map.type = MT_CACHECLEAN; - create_mapping(&map, false); + create_mapping(&map); #endif #ifdef FLUSH_BASE_MINICACHE map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M); map.virtual = FLUSH_BASE_MINICACHE; map.length = SZ_1M; map.type = MT_MINICLEAN; - create_mapping(&map, false); + create_mapping(&map); #endif /* @@ -1236,12 +1213,12 @@ static void __init devicemaps_init(struct machine_desc *mdesc) map.virtual = 0xffff0000; map.length = PAGE_SIZE; map.type = MT_HIGH_VECTORS; - create_mapping(&map, false); + create_mapping(&map); if (!vectors_high()) { map.virtual = 0; map.type = MT_LOW_VECTORS; - create_mapping(&map, false); + create_mapping(&map); } /* @@ -1267,23 +1244,20 @@ static void __init devicemaps_init(struct machine_desc *mdesc) static void __init kmap_init(void) { #ifdef CONFIG_HIGHMEM - pkmap_page_table = early_pte_alloc_and_install(pmd_off_k(PKMAP_BASE), + pkmap_page_table = early_pte_alloc(pmd_off_k(PKMAP_BASE), PKMAP_BASE, _PAGE_KERNEL_TABLE); #endif } - static void __init map_lowmem(void) { struct memblock_region *reg; - phys_addr_t start; - phys_addr_t end; - struct map_desc map; /* Map all the lowmem memory banks. */ for_each_memblock(memory, reg) { - start = reg->base; - end = start + reg->size; + phys_addr_t start = reg->base; + phys_addr_t end = start + reg->size; + struct map_desc map; if (end > arm_lowmem_limit) end = arm_lowmem_limit; @@ -1295,20 +1269,8 @@ static void __init map_lowmem(void) map.length = end - start; map.type = MT_MEMORY; - create_mapping(&map, false); + create_mapping(&map); } - -#ifdef CONFIG_DEBUG_RODATA - start = __pa(_stext) & PMD_MASK; - end = ALIGN(__pa(__end_rodata), PMD_SIZE); - - map.pfn = __phys_to_pfn(start); - map.virtual = __phys_to_virt(start); - map.length = end - start; - map.type = MT_MEMORY; - - create_mapping(&map, true); -#endif } /* diff --git a/arch/arm/mm/rodata.c b/arch/arm/mm/rodata.c deleted file mode 100644 index 9a8eb841c42..00000000000 --- a/arch/arm/mm/rodata.c +++ /dev/null @@ -1,159 +0,0 @@ -/* - * linux/arch/arm/mm/rodata.c - * - * Copyright (C) 2011 Google, Inc. - * - * Author: Colin Cross <ccross@android.com> - * - * Based on x86 implementation in arch/x86/mm/init_32.c - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#include <linux/kernel.h> -#include <linux/mm.h> -#include <linux/module.h> - -#include <asm/cache.h> -#include <asm/pgtable.h> -#include <asm/rodata.h> -#include <asm/sections.h> -#include <asm/tlbflush.h> - -#include "mm.h" - -static int kernel_set_to_readonly __read_mostly; - -#ifdef CONFIG_DEBUG_RODATA_TEST -static const int rodata_test_data = 0xC3; - -static noinline void rodata_test(void) -{ - int result; - - pr_info("%s: attempting to write to read-only section:\n", __func__); - - if (*(volatile int *)&rodata_test_data != 0xC3) { - pr_err("read only data changed before test\n"); - return; - } - - /* - * Attempt to to write to rodata_test_data, trapping the expected - * data abort. If the trap executed, result will be 1. If it didn't, - * result will be 0xFF. - */ - asm volatile( - "0: str %[zero], [%[rodata_test_data]]\n" - " mov %[result], #0xFF\n" - " b 2f\n" - "1: mov %[result], #1\n" - "2:\n" - - /* Exception fixup - if store at label 0 faults, jumps to 1 */ - ".pushsection __ex_table, \"a\"\n" - " .long 0b, 1b\n" - ".popsection\n" - - : [result] "=r" (result) - : [rodata_test_data] "r" (&rodata_test_data), [zero] "r" (0) - : "memory" - ); - - if (result == 1) - pr_info("write to read-only section trapped, success\n"); - else - pr_err("write to read-only section NOT trapped, test failed\n"); - - if (*(volatile int *)&rodata_test_data != 0xC3) - pr_err("read only data changed during write\n"); -} -#else -static inline void rodata_test(void) { } -#endif - -static int set_page_attributes(unsigned long virt, int numpages, - pte_t (*f)(pte_t)) -{ - pmd_t *pmd; - pte_t *pte; - unsigned long start = virt; - unsigned long end = virt + (numpages << PAGE_SHIFT); - unsigned long pmd_end; - - while (virt < end) { - pmd = pmd_off_k(virt); - pmd_end = min(ALIGN(virt + 1, PMD_SIZE), end); - - if ((pmd_val(*pmd) & PMD_TYPE_MASK) != PMD_TYPE_TABLE) { - pr_err("%s: pmd %p=%08lx for %08lx not page table\n", - __func__, pmd, pmd_val(*pmd), virt); - virt = pmd_end; - continue; - } - - while (virt < pmd_end) { - pte = pte_offset_kernel(pmd, virt); - set_pte_ext(pte, f(*pte), 0); - virt += PAGE_SIZE; - } - } - - flush_tlb_kernel_range(start, end); - - return 0; -} - -int set_memory_ro(unsigned long virt, int numpages) -{ - return set_page_attributes(virt, numpages, pte_wrprotect); -} -EXPORT_SYMBOL(set_memory_ro); - -int set_memory_rw(unsigned long virt, int numpages) -{ - return set_page_attributes(virt, numpages, pte_mkwrite); -} -EXPORT_SYMBOL(set_memory_rw); - -void set_kernel_text_rw(void) -{ - unsigned long start = PAGE_ALIGN((unsigned long)_text); - unsigned long size = PAGE_ALIGN((unsigned long)__end_rodata) - start; - - if (!kernel_set_to_readonly) - return; - - pr_debug("Set kernel text: %lx - %lx to read-write\n", - start, start + size); - - set_memory_rw(start, size >> PAGE_SHIFT); -} - -void set_kernel_text_ro(void) -{ - unsigned long start = PAGE_ALIGN((unsigned long)_text); - unsigned long size = PAGE_ALIGN((unsigned long)__end_rodata) - start; - - if (!kernel_set_to_readonly) - return; - - pr_info_once("Write protecting the kernel text section %lx - %lx\n", - start, start + size); - - pr_debug("Set kernel text: %lx - %lx to read only\n", - start, start + size); - - set_memory_ro(start, size >> PAGE_SHIFT); -} - -void mark_rodata_ro(void) -{ - kernel_set_to_readonly = 1; - - set_kernel_text_ro(); - - rodata_test(); -} diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 779cf7c4a3d..fed3def6281 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -33,7 +33,8 @@ struct ieee1394_device_id { __u32 model_id; __u32 specifier_id; __u32 version; - kernel_ulong_t driver_data; + kernel_ulong_t driver_data + __attribute__((aligned(sizeof(kernel_ulong_t)))); }; @@ -147,7 +148,8 @@ struct hid_device_id { __u16 group; __u32 vendor; __u32 product; - kernel_ulong_t driver_data; + kernel_ulong_t driver_data + __attribute__((aligned(sizeof(kernel_ulong_t)))); }; /* s390 CCW devices */ @@ -171,6 +173,8 @@ struct ccw_device_id { struct ap_device_id { __u16 match_flags; /* which fields to match against */ __u8 dev_type; /* device type */ + __u8 pad1; + __u32 pad2; kernel_ulong_t driver_info; }; @@ -180,10 +184,13 @@ struct ap_device_id { struct css_device_id { __u8 match_flags; __u8 type; /* subchannel type */ + __u16 pad2; + __u32 pad3; kernel_ulong_t driver_data; }; -#define ACPI_ID_LEN 9 +#define ACPI_ID_LEN 16 /* only 9 bytes needed here, 16 bytes are used */ + /* to workaround crosscompile issues */ struct acpi_device_id { __u8 id[ACPI_ID_LEN]; @@ -224,7 +231,11 @@ struct of_device_id char name[32]; char type[32]; char compatible[128]; +#ifdef __KERNEL__ const void *data; +#else + kernel_ulong_t data; +#endif }; /* VIO */ @@ -249,14 +260,24 @@ struct pcmcia_device_id { /* for pseudo multi-function devices */ __u8 device_no; - __u32 prod_id_hash[4]; + __u32 prod_id_hash[4] + __attribute__((aligned(sizeof(__u32)))); /* not matched against in kernelspace*/ +#ifdef __KERNEL__ const char * prod_id[4]; +#else + kernel_ulong_t prod_id[4] + __attribute__((aligned(sizeof(kernel_ulong_t)))); +#endif /* not matched against */ kernel_ulong_t driver_info; +#ifdef __KERNEL__ char * cisfile; +#else + kernel_ulong_t cisfile; +#endif }; #define PCMCIA_DEV_ID_MATCH_MANF_ID 0x0001 @@ -352,7 +373,8 @@ struct sdio_device_id { __u8 class; /* Standard interface or SDIO_ANY_ID */ __u16 vendor; /* Vendor or SDIO_ANY_ID */ __u16 device; /* Device ID or SDIO_ANY_ID */ - kernel_ulong_t driver_data; /* Data private to the driver */ + kernel_ulong_t driver_data /* Data private to the driver */ + __attribute__((aligned(sizeof(kernel_ulong_t)))); }; /* SSB core, see drivers/ssb/ */ @@ -398,7 +420,8 @@ struct virtio_device_id { */ struct hv_vmbus_device_id { __u8 guid[16]; - kernel_ulong_t driver_data; /* Data private to the driver */ + kernel_ulong_t driver_data /* Data private to the driver */ + __attribute__((aligned(sizeof(kernel_ulong_t)))); }; /* rpmsg */ @@ -417,7 +440,8 @@ struct rpmsg_device_id { struct i2c_device_id { char name[I2C_NAME_SIZE]; - kernel_ulong_t driver_data; /* Data private to the driver */ + kernel_ulong_t driver_data /* Data private to the driver */ + __attribute__((aligned(sizeof(kernel_ulong_t)))); }; /* spi */ @@ -427,7 +451,8 @@ struct i2c_device_id { struct spi_device_id { char name[SPI_NAME_SIZE]; - kernel_ulong_t driver_data; /* Data private to the driver */ + kernel_ulong_t driver_data /* Data private to the driver */ + __attribute__((aligned(sizeof(kernel_ulong_t)))); }; /* dmi */ @@ -459,6 +484,15 @@ struct dmi_strmatch { char substr[79]; }; +#ifndef __KERNEL__ +struct dmi_system_id { + kernel_ulong_t callback; + kernel_ulong_t ident; + struct dmi_strmatch matches[4]; + kernel_ulong_t driver_data + __attribute__((aligned(sizeof(kernel_ulong_t)))); +}; +#else struct dmi_system_id { int (*callback)(const struct dmi_system_id *); const char *ident; @@ -472,6 +506,7 @@ struct dmi_system_id { * error: storage size of '__mod_dmi_device_table' isn't known */ #define dmi_device_id dmi_system_id +#endif #define DMI_MATCH(a, b) { a, b } @@ -480,7 +515,8 @@ struct dmi_system_id { struct platform_device_id { char name[PLATFORM_NAME_SIZE]; - kernel_ulong_t driver_data; + kernel_ulong_t driver_data + __attribute__((aligned(sizeof(kernel_ulong_t)))); }; #define MDIO_MODULE_PREFIX "mdio:" @@ -536,7 +572,11 @@ struct isapnp_device_id { struct amba_id { unsigned int id; unsigned int mask; +#ifndef __KERNEL__ + kernel_ulong_t data; +#else void *data; +#endif }; /* diff --git a/linaro/configs/omap4.conf b/linaro/configs/omap4.conf index 560f8440c6a..093ae0f49ae 100644 --- a/linaro/configs/omap4.conf +++ b/linaro/configs/omap4.conf @@ -184,3 +184,4 @@ CONFIG_ROOT_NFS=y CONFIG_DEBUG_INFO=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_LIBCRC32C=y +# CONFIG_CPU_FREQ is not set diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index cf82c832458..a1cb0222ebe 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -66,6 +66,10 @@ modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o))) # Stop after building .o files if NOFINAL is set. Makes compile tests quicker _modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules)) +ifneq ($(KBUILD_BUILDHOST),$(ARCH)) + cross_build := 1 +endif + # Step 2), invoke modpost # Includes step 3,4 modpost = scripts/mod/modpost \ @@ -76,7 +80,8 @@ modpost = scripts/mod/modpost \ $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \ $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \ - $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) + $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \ + $(if $(cross_build),-c) quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules cmd_modpost = $(modpost) -s diff --git a/scripts/mod/.gitignore b/scripts/mod/.gitignore index 33bae0df4de..e9b7abe7b95 100644 --- a/scripts/mod/.gitignore +++ b/scripts/mod/.gitignore @@ -1,5 +1,4 @@ elfconfig.h mk_elfconfig modpost -devicetable-offsets.h diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile index 01e783fb93d..258d4ba32d5 100644 --- a/scripts/mod/Makefile +++ b/scripts/mod/Makefile @@ -9,44 +9,9 @@ endif modpost-objs := modpost.o file2alias.o sumversion.o -devicetable-offsets-file := devicetable-offsets.h - -define sed-y - "/^->/{s:->#\(.*\):/* \1 */:; \ - s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:->::; p;}" -endef - -quiet_cmd_offsets = GEN $@ -define cmd_offsets - (set -e; \ - echo "#ifndef __DEVICEVTABLE_OFFSETS_H__"; \ - echo "#define __DEVICEVTABLE_OFFSETS_H__"; \ - echo "/*"; \ - echo " * DO NOT MODIFY."; \ - echo " *"; \ - echo " * This file was generated by Kbuild"; \ - echo " *"; \ - echo " */"; \ - echo ""; \ - sed -ne $(sed-y) $<; \ - echo ""; \ - echo "#endif" ) > $@ -endef - -# We use internal kbuild rules to avoid the "is up to date" message from make -scripts/mod/devicetable-offsets.s: scripts/mod/devicetable-offsets.c FORCE - $(Q)mkdir -p $(dir $@) - $(call if_changed_dep,cc_s_c) - -$(obj)/$(devicetable-offsets-file): scripts/mod/devicetable-offsets.s - $(call cmd,offsets) - # dependencies on generated files need to be listed explicitly $(obj)/modpost.o $(obj)/file2alias.o $(obj)/sumversion.o: $(obj)/elfconfig.h -$(obj)/file2alias.o: $(obj)/$(devicetable-offsets-file) quiet_cmd_elfconfig = MKELF $@ cmd_elfconfig = $(MKELFCONFIG) < $< > $@ diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c deleted file mode 100644 index b45260bfeaa..00000000000 --- a/scripts/mod/devicetable-offsets.c +++ /dev/null @@ -1,178 +0,0 @@ -#include <linux/kbuild.h> -#include <linux/mod_devicetable.h> - -#define DEVID(devid) DEFINE(SIZE_##devid, sizeof(struct devid)) -#define DEVID_FIELD(devid, field) \ - DEFINE(OFF_##devid##_##field, offsetof(struct devid, field)) - -int main(void) -{ - DEVID(usb_device_id); - DEVID_FIELD(usb_device_id, match_flags); - DEVID_FIELD(usb_device_id, idVendor); - DEVID_FIELD(usb_device_id, idProduct); - DEVID_FIELD(usb_device_id, bcdDevice_lo); - DEVID_FIELD(usb_device_id, bcdDevice_hi); - DEVID_FIELD(usb_device_id, bDeviceClass); - DEVID_FIELD(usb_device_id, bDeviceSubClass); - DEVID_FIELD(usb_device_id, bDeviceProtocol); - DEVID_FIELD(usb_device_id, bInterfaceClass); - DEVID_FIELD(usb_device_id, bInterfaceSubClass); - DEVID_FIELD(usb_device_id, bInterfaceProtocol); - DEVID_FIELD(usb_device_id, bInterfaceNumber); - - DEVID(hid_device_id); - DEVID_FIELD(hid_device_id, bus); - DEVID_FIELD(hid_device_id, group); - DEVID_FIELD(hid_device_id, vendor); - DEVID_FIELD(hid_device_id, product); - - DEVID(ieee1394_device_id); - DEVID_FIELD(ieee1394_device_id, match_flags); - DEVID_FIELD(ieee1394_device_id, vendor_id); - DEVID_FIELD(ieee1394_device_id, model_id); - DEVID_FIELD(ieee1394_device_id, specifier_id); - DEVID_FIELD(ieee1394_device_id, version); - - DEVID(pci_device_id); - DEVID_FIELD(pci_device_id, vendor); - DEVID_FIELD(pci_device_id, device); - DEVID_FIELD(pci_device_id, subvendor); - DEVID_FIELD(pci_device_id, subdevice); - DEVID_FIELD(pci_device_id, class); - DEVID_FIELD(pci_device_id, class_mask); - - DEVID(ccw_device_id); - DEVID_FIELD(ccw_device_id, match_flags); - DEVID_FIELD(ccw_device_id, cu_type); - DEVID_FIELD(ccw_device_id, cu_model); - DEVID_FIELD(ccw_device_id, dev_type); - DEVID_FIELD(ccw_device_id, dev_model); - - DEVID(ap_device_id); - DEVID_FIELD(ap_device_id, dev_type); - - DEVID(css_device_id); - DEVID_FIELD(css_device_id, type); - - DEVID(serio_device_id); - DEVID_FIELD(serio_device_id, type); - DEVID_FIELD(serio_device_id, proto); - DEVID_FIELD(serio_device_id, id); - DEVID_FIELD(serio_device_id, extra); - - DEVID(acpi_device_id); - DEVID_FIELD(acpi_device_id, id); - - DEVID(pnp_device_id); - DEVID_FIELD(pnp_device_id, id); - - DEVID(pnp_card_device_id); - DEVID_FIELD(pnp_card_device_id, devs); - - DEVID(pcmcia_device_id); - DEVID_FIELD(pcmcia_device_id, match_flags); - DEVID_FIELD(pcmcia_device_id, manf_id); - DEVID_FIELD(pcmcia_device_id, card_id); - DEVID_FIELD(pcmcia_device_id, func_id); - DEVID_FIELD(pcmcia_device_id, function); - DEVID_FIELD(pcmcia_device_id, device_no); - DEVID_FIELD(pcmcia_device_id, prod_id_hash); - - DEVID(of_device_id); - DEVID_FIELD(of_device_id, name); - DEVID_FIELD(of_device_id, type); - DEVID_FIELD(of_device_id, compatible); - - DEVID(vio_device_id); - DEVID_FIELD(vio_device_id, type); - DEVID_FIELD(vio_device_id, compat); - - DEVID(input_device_id); - DEVID_FIELD(input_device_id, flags); - DEVID_FIELD(input_device_id, bustype); - DEVID_FIELD(input_device_id, vendor); - DEVID_FIELD(input_device_id, product); - DEVID_FIELD(input_device_id, version); - DEVID_FIELD(input_device_id, evbit); - DEVID_FIELD(input_device_id, keybit); - DEVID_FIELD(input_device_id, relbit); - DEVID_FIELD(input_device_id, absbit); - DEVID_FIELD(input_device_id, mscbit); - DEVID_FIELD(input_device_id, ledbit); - DEVID_FIELD(input_device_id, sndbit); - DEVID_FIELD(input_device_id, ffbit); - DEVID_FIELD(input_device_id, swbit); - - DEVID(eisa_device_id); - DEVID_FIELD(eisa_device_id, sig); - - DEVID(parisc_device_id); - DEVID_FIELD(parisc_device_id, hw_type); - DEVID_FIELD(parisc_device_id, hversion); - DEVID_FIELD(parisc_device_id, hversion_rev); - DEVID_FIELD(parisc_device_id, sversion); - - DEVID(sdio_device_id); - DEVID_FIELD(sdio_device_id, class); - DEVID_FIELD(sdio_device_id, vendor); - DEVID_FIELD(sdio_device_id, device); - - DEVID(ssb_device_id); - DEVID_FIELD(ssb_device_id, vendor); - DEVID_FIELD(ssb_device_id, coreid); - DEVID_FIELD(ssb_device_id, revision); - - DEVID(bcma_device_id); - DEVID_FIELD(bcma_device_id, manuf); - DEVID_FIELD(bcma_device_id, id); - DEVID_FIELD(bcma_device_id, rev); - DEVID_FIELD(bcma_device_id, class); - - DEVID(virtio_device_id); - DEVID_FIELD(virtio_device_id, device); - DEVID_FIELD(virtio_device_id, vendor); - - DEVID(hv_vmbus_device_id); - DEVID_FIELD(hv_vmbus_device_id, guid); - - DEVID(i2c_device_id); - DEVID_FIELD(i2c_device_id, name); - - DEVID(spi_device_id); - DEVID_FIELD(spi_device_id, name); - - DEVID(dmi_system_id); - DEVID_FIELD(dmi_system_id, matches); - - DEVID(platform_device_id); - DEVID_FIELD(platform_device_id, name); - - DEVID(mdio_device_id); - DEVID_FIELD(mdio_device_id, phy_id); - DEVID_FIELD(mdio_device_id, phy_id_mask); - - DEVID(zorro_device_id); - DEVID_FIELD(zorro_device_id, id); - - DEVID(isapnp_device_id); - DEVID_FIELD(isapnp_device_id, vendor); - DEVID_FIELD(isapnp_device_id, function); - - DEVID(ipack_device_id); - DEVID_FIELD(ipack_device_id, format); - DEVID_FIELD(ipack_device_id, vendor); - DEVID_FIELD(ipack_device_id, device); - - DEVID(amba_id); - DEVID_FIELD(amba_id, id); - DEVID_FIELD(amba_id, mask); - - DEVID(x86_cpu_id); - DEVID_FIELD(x86_cpu_id, feature); - DEVID_FIELD(x86_cpu_id, family); - DEVID_FIELD(x86_cpu_id, model); - DEVID_FIELD(x86_cpu_id, vendor); - - return 0; -} diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 771ac17f635..df4fc23dd83 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -11,7 +11,6 @@ */ #include "modpost.h" -#include "devicetable-offsets.h" /* We use the ELF typedefs for kernel_ulong_t but bite the bullet and * use either stdint.h or inttypes.h for the rest. */ @@ -85,25 +84,13 @@ extern struct devtable *__start___devtable[], *__stop___devtable[]; # define __used __attribute__((__used__)) #endif -/* Define a variable f that holds the value of field f of struct devid - * based at address m. - */ -#define DEF_FIELD(m, devid, f) \ - typeof(((struct devid *)0)->f) f = TO_NATIVE(*(typeof(f) *)((m) + OFF_##devid##_##f)) -/* Define a variable f that holds the address of field f of struct devid - * based at address m. Due to the way typeof works, for a field of type - * T[N] the variable has type T(*)[N], _not_ T*. - */ -#define DEF_FIELD_ADDR(m, devid, f) \ - typeof(((struct devid *)0)->f) *f = ((m) + OFF_##devid##_##f) - /* 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, \ - (void *)NULL, \ + (type *)NULL, \ (char *)NULL)), \ - SIZE_##type, (function) }; \ + sizeof(type), (function) }; \ static struct devtable *SECTION(__devtable) __used \ __cat(devtable_ptr,__LINE__) = &__cat(devtable,__LINE__) @@ -129,6 +116,7 @@ static inline void add_wildcard(char *str) strcat(str + len, "*"); } +unsigned int cross_build = 0; /** * Check that sizeof(device_id type) are consistent with size of section * in .o file. If in-consistent then userspace and kernel does not agree @@ -143,6 +131,8 @@ static void device_id_check(const char *modname, const char *device_id, int i; if (size % id_size || size < id_size) { + if (cross_build != 0) + return; fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo " "of the size of section __mod_%s_device_table=%lu.\n" "Fix definition of struct %s_device_id " @@ -167,29 +157,17 @@ static void device_id_check(const char *modname, const char *device_id, /* USB is special because the bcdDevice can be matched against a numeric range */ /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipNinN" */ -static void do_usb_entry(void *symval, +static void do_usb_entry(struct usb_device_id *id, unsigned int bcdDevice_initial, int bcdDevice_initial_digits, unsigned char range_lo, unsigned char range_hi, unsigned char max, struct module *mod) { char alias[500]; - DEF_FIELD(symval, usb_device_id, match_flags); - DEF_FIELD(symval, usb_device_id, idVendor); - DEF_FIELD(symval, usb_device_id, idProduct); - DEF_FIELD(symval, usb_device_id, bcdDevice_lo); - DEF_FIELD(symval, usb_device_id, bDeviceClass); - DEF_FIELD(symval, usb_device_id, bDeviceSubClass); - DEF_FIELD(symval, usb_device_id, bDeviceProtocol); - DEF_FIELD(symval, usb_device_id, bInterfaceClass); - DEF_FIELD(symval, usb_device_id, bInterfaceSubClass); - DEF_FIELD(symval, usb_device_id, bInterfaceProtocol); - DEF_FIELD(symval, usb_device_id, bInterfaceNumber); - strcpy(alias, "usb:"); - ADD(alias, "v", match_flags&USB_DEVICE_ID_MATCH_VENDOR, - idVendor); - ADD(alias, "p", match_flags&USB_DEVICE_ID_MATCH_PRODUCT, - idProduct); + ADD(alias, "v", id->match_flags&USB_DEVICE_ID_MATCH_VENDOR, + id->idVendor); + ADD(alias, "p", id->match_flags&USB_DEVICE_ID_MATCH_PRODUCT, + id->idProduct); strcat(alias, "d"); if (bcdDevice_initial_digits) @@ -212,23 +190,29 @@ static void do_usb_entry(void *symval, range_lo); } } - if (bcdDevice_initial_digits < (sizeof(bcdDevice_lo) * 2 - 1)) + if (bcdDevice_initial_digits < (sizeof(id->bcdDevice_lo) * 2 - 1)) strcat(alias, "*"); - ADD(alias, "dc", match_flags&USB_DEVICE_ID_MATCH_DEV_CLASS, - bDeviceClass); - ADD(alias, "dsc", match_flags&USB_DEVICE_ID_MATCH_DEV_SUBCLASS, - bDeviceSubClass); - ADD(alias, "dp", match_flags&USB_DEVICE_ID_MATCH_DEV_PROTOCOL, - bDeviceProtocol); - ADD(alias, "ic", match_flags&USB_DEVICE_ID_MATCH_INT_CLASS, - bInterfaceClass); - ADD(alias, "isc", match_flags&USB_DEVICE_ID_MATCH_INT_SUBCLASS, - bInterfaceSubClass); - ADD(alias, "ip", match_flags&USB_DEVICE_ID_MATCH_INT_PROTOCOL, - bInterfaceProtocol); - ADD(alias, "in", match_flags&USB_DEVICE_ID_MATCH_INT_NUMBER, - bInterfaceNumber); + ADD(alias, "dc", id->match_flags&USB_DEVICE_ID_MATCH_DEV_CLASS, + id->bDeviceClass); + ADD(alias, "dsc", + id->match_flags&USB_DEVICE_ID_MATCH_DEV_SUBCLASS, + id->bDeviceSubClass); + ADD(alias, "dp", + id->match_flags&USB_DEVICE_ID_MATCH_DEV_PROTOCOL, + id->bDeviceProtocol); + ADD(alias, "ic", + id->match_flags&USB_DEVICE_ID_MATCH_INT_CLASS, + id->bInterfaceClass); + ADD(alias, "isc", + id->match_flags&USB_DEVICE_ID_MATCH_INT_SUBCLASS, + id->bInterfaceSubClass); + ADD(alias, "ip", + id->match_flags&USB_DEVICE_ID_MATCH_INT_PROTOCOL, + id->bInterfaceProtocol); + ADD(alias, "in", + id->match_flags&USB_DEVICE_ID_MATCH_INT_NUMBER, + id->bInterfaceNumber); add_wildcard(alias); buf_printf(&mod->dev_table_buf, @@ -274,28 +258,24 @@ static unsigned int incbcd(unsigned int *bcd, return init; } -static void do_usb_entry_multi(void *symval, struct module *mod) +static void do_usb_entry_multi(struct usb_device_id *id, struct module *mod) { unsigned int devlo, devhi; unsigned char chi, clo, max; int ndigits; - DEF_FIELD(symval, usb_device_id, match_flags); - DEF_FIELD(symval, usb_device_id, idVendor); - DEF_FIELD(symval, usb_device_id, idProduct); - DEF_FIELD(symval, usb_device_id, bcdDevice_lo); - DEF_FIELD(symval, usb_device_id, bcdDevice_hi); - DEF_FIELD(symval, usb_device_id, bDeviceClass); - DEF_FIELD(symval, usb_device_id, bInterfaceClass); + id->match_flags = TO_NATIVE(id->match_flags); + id->idVendor = TO_NATIVE(id->idVendor); + id->idProduct = TO_NATIVE(id->idProduct); - devlo = match_flags & USB_DEVICE_ID_MATCH_DEV_LO ? - bcdDevice_lo : 0x0U; - devhi = match_flags & USB_DEVICE_ID_MATCH_DEV_HI ? - bcdDevice_hi : ~0x0U; + devlo = id->match_flags & USB_DEVICE_ID_MATCH_DEV_LO ? + TO_NATIVE(id->bcdDevice_lo) : 0x0U; + devhi = id->match_flags & USB_DEVICE_ID_MATCH_DEV_HI ? + TO_NATIVE(id->bcdDevice_hi) : ~0x0U; /* Figure out if this entry is in bcd or hex format */ max = 0x9; /* Default to decimal format */ - for (ndigits = 0 ; ndigits < sizeof(bcdDevice_lo) * 2 ; ndigits++) { + for (ndigits = 0 ; ndigits < sizeof(id->bcdDevice_lo) * 2 ; ndigits++) { clo = (devlo >> (ndigits << 2)) & 0xf; chi = ((devhi > 0x9999 ? 0x9999 : devhi) >> (ndigits << 2)) & 0xf; if (clo > max || chi > max) { @@ -308,11 +288,11 @@ static void do_usb_entry_multi(void *symval, struct module *mod) * Some modules (visor) have empty slots as placeholder for * run-time specification that results in catch-all alias */ - if (!(idVendor | idProduct | bDeviceClass | bInterfaceClass)) + if (!(id->idVendor | id->idProduct | id->bDeviceClass | id->bInterfaceClass)) return; /* Convert numeric bcdDevice range into fnmatch-able pattern(s) */ - for (ndigits = sizeof(bcdDevice_lo) * 2 - 1; devlo <= devhi; ndigits--) { + for (ndigits = sizeof(id->bcdDevice_lo) * 2 - 1; devlo <= devhi; ndigits--) { clo = devlo & 0xf; chi = devhi & 0xf; if (chi > max) /* If we are in bcd mode, truncate if necessary */ @@ -321,20 +301,20 @@ static void do_usb_entry_multi(void *symval, struct module *mod) devhi >>= 4; if (devlo == devhi || !ndigits) { - do_usb_entry(symval, devlo, ndigits, clo, chi, max, mod); + do_usb_entry(id, devlo, ndigits, clo, chi, max, mod); break; } if (clo > 0x0) - do_usb_entry(symval, + do_usb_entry(id, incbcd(&devlo, 1, max, - sizeof(bcdDevice_lo) * 2), + sizeof(id->bcdDevice_lo) * 2), ndigits, clo, max, max, mod); if (chi < max) - do_usb_entry(symval, + do_usb_entry(id, incbcd(&devhi, -1, max, - sizeof(bcdDevice_lo) * 2), + sizeof(id->bcdDevice_lo) * 2), ndigits, 0x0, chi, max, mod); } } @@ -343,7 +323,7 @@ static void do_usb_table(void *symval, unsigned long size, struct module *mod) { unsigned int i; - const unsigned long id_size = SIZE_usb_device_id; + const unsigned long id_size = sizeof(struct usb_device_id); device_id_check(mod->name, "usb", size, id_size, symval); @@ -356,81 +336,81 @@ static void do_usb_table(void *symval, unsigned long size, /* Looks like: hid:bNvNpN */ static int do_hid_entry(const char *filename, - void *symval, char *alias) + struct hid_device_id *id, char *alias) { - DEF_FIELD(symval, hid_device_id, bus); - DEF_FIELD(symval, hid_device_id, group); - DEF_FIELD(symval, hid_device_id, vendor); - DEF_FIELD(symval, hid_device_id, product); + id->bus = TO_NATIVE(id->bus); + id->group = TO_NATIVE(id->group); + id->vendor = TO_NATIVE(id->vendor); + id->product = TO_NATIVE(id->product); sprintf(alias, "hid:"); - ADD(alias, "b", bus != HID_BUS_ANY, bus); - ADD(alias, "g", group != HID_GROUP_ANY, group); - ADD(alias, "v", vendor != HID_ANY_ID, vendor); - ADD(alias, "p", product != HID_ANY_ID, product); + ADD(alias, "b", id->bus != HID_BUS_ANY, id->bus); + ADD(alias, "g", id->group != HID_GROUP_ANY, id->group); + ADD(alias, "v", id->vendor != HID_ANY_ID, id->vendor); + ADD(alias, "p", id->product != HID_ANY_ID, id->product); return 1; } -ADD_TO_DEVTABLE("hid", hid_device_id, do_hid_entry); +ADD_TO_DEVTABLE("hid", struct hid_device_id, do_hid_entry); /* Looks like: ieee1394:venNmoNspNverN */ static int do_ieee1394_entry(const char *filename, - void *symval, char *alias) + struct ieee1394_device_id *id, char *alias) { - DEF_FIELD(symval, ieee1394_device_id, match_flags); - DEF_FIELD(symval, ieee1394_device_id, vendor_id); - DEF_FIELD(symval, ieee1394_device_id, model_id); - DEF_FIELD(symval, ieee1394_device_id, specifier_id); - DEF_FIELD(symval, ieee1394_device_id, version); + id->match_flags = TO_NATIVE(id->match_flags); + id->vendor_id = TO_NATIVE(id->vendor_id); + id->model_id = TO_NATIVE(id->model_id); + id->specifier_id = TO_NATIVE(id->specifier_id); + id->version = TO_NATIVE(id->version); strcpy(alias, "ieee1394:"); - ADD(alias, "ven", match_flags & IEEE1394_MATCH_VENDOR_ID, - vendor_id); - ADD(alias, "mo", match_flags & IEEE1394_MATCH_MODEL_ID, - model_id); - ADD(alias, "sp", match_flags & IEEE1394_MATCH_SPECIFIER_ID, - specifier_id); - ADD(alias, "ver", match_flags & IEEE1394_MATCH_VERSION, - version); + ADD(alias, "ven", id->match_flags & IEEE1394_MATCH_VENDOR_ID, + id->vendor_id); + ADD(alias, "mo", id->match_flags & IEEE1394_MATCH_MODEL_ID, + id->model_id); + ADD(alias, "sp", id->match_flags & IEEE1394_MATCH_SPECIFIER_ID, + id->specifier_id); + ADD(alias, "ver", id->match_flags & IEEE1394_MATCH_VERSION, + id->version); add_wildcard(alias); return 1; } -ADD_TO_DEVTABLE("ieee1394", ieee1394_device_id, do_ieee1394_entry); +ADD_TO_DEVTABLE("ieee1394", struct ieee1394_device_id, do_ieee1394_entry); /* Looks like: pci:vNdNsvNsdNbcNscNiN. */ static int do_pci_entry(const char *filename, - void *symval, char *alias) + struct pci_device_id *id, char *alias) { /* Class field can be divided into these three. */ unsigned char baseclass, subclass, interface, baseclass_mask, subclass_mask, interface_mask; - DEF_FIELD(symval, pci_device_id, vendor); - DEF_FIELD(symval, pci_device_id, device); - DEF_FIELD(symval, pci_device_id, subvendor); - DEF_FIELD(symval, pci_device_id, subdevice); - DEF_FIELD(symval, pci_device_id, class); - DEF_FIELD(symval, pci_device_id, class_mask); + id->vendor = TO_NATIVE(id->vendor); + id->device = TO_NATIVE(id->device); + id->subvendor = TO_NATIVE(id->subvendor); + id->subdevice = TO_NATIVE(id->subdevice); + id->class = TO_NATIVE(id->class); + id->class_mask = TO_NATIVE(id->class_mask); strcpy(alias, "pci:"); - ADD(alias, "v", vendor != PCI_ANY_ID, vendor); - ADD(alias, "d", device != PCI_ANY_ID, device); - ADD(alias, "sv", subvendor != PCI_ANY_ID, subvendor); - ADD(alias, "sd", subdevice != PCI_ANY_ID, subdevice); - - baseclass = (class) >> 16; - baseclass_mask = (class_mask) >> 16; - subclass = (class) >> 8; - subclass_mask = (class_mask) >> 8; - interface = class; - interface_mask = class_mask; + ADD(alias, "v", id->vendor != PCI_ANY_ID, id->vendor); + ADD(alias, "d", id->device != PCI_ANY_ID, id->device); + ADD(alias, "sv", id->subvendor != PCI_ANY_ID, id->subvendor); + ADD(alias, "sd", id->subdevice != PCI_ANY_ID, id->subdevice); + + baseclass = (id->class) >> 16; + baseclass_mask = (id->class_mask) >> 16; + subclass = (id->class) >> 8; + subclass_mask = (id->class_mask) >> 8; + interface = id->class; + interface_mask = id->class_mask; if ((baseclass_mask != 0 && baseclass_mask != 0xFF) || (subclass_mask != 0 && subclass_mask != 0xFF) || (interface_mask != 0 && interface_mask != 0xFF)) { warn("Can't handle masks in %s:%04X\n", - filename, class_mask); + filename, id->class_mask); return 0; } @@ -440,105 +420,101 @@ static int do_pci_entry(const char *filename, add_wildcard(alias); return 1; } -ADD_TO_DEVTABLE("pci", pci_device_id, do_pci_entry); +ADD_TO_DEVTABLE("pci", struct pci_device_id, do_pci_entry); /* looks like: "ccw:tNmNdtNdmN" */ static int do_ccw_entry(const char *filename, - void *symval, char *alias) + struct ccw_device_id *id, char *alias) { - DEF_FIELD(symval, ccw_device_id, match_flags); - DEF_FIELD(symval, ccw_device_id, cu_type); - DEF_FIELD(symval, ccw_device_id, cu_model); - DEF_FIELD(symval, ccw_device_id, dev_type); - DEF_FIELD(symval, ccw_device_id, dev_model); + id->match_flags = TO_NATIVE(id->match_flags); + id->cu_type = TO_NATIVE(id->cu_type); + id->cu_model = TO_NATIVE(id->cu_model); + id->dev_type = TO_NATIVE(id->dev_type); + id->dev_model = TO_NATIVE(id->dev_model); strcpy(alias, "ccw:"); - ADD(alias, "t", match_flags&CCW_DEVICE_ID_MATCH_CU_TYPE, - cu_type); - ADD(alias, "m", match_flags&CCW_DEVICE_ID_MATCH_CU_MODEL, - cu_model); - ADD(alias, "dt", match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE, - dev_type); - ADD(alias, "dm", match_flags&CCW_DEVICE_ID_MATCH_DEVICE_MODEL, - dev_model); + ADD(alias, "t", id->match_flags&CCW_DEVICE_ID_MATCH_CU_TYPE, + id->cu_type); + ADD(alias, "m", id->match_flags&CCW_DEVICE_ID_MATCH_CU_MODEL, + id->cu_model); + ADD(alias, "dt", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE, + id->dev_type); + ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_MODEL, + id->dev_model); add_wildcard(alias); return 1; } -ADD_TO_DEVTABLE("ccw", ccw_device_id, do_ccw_entry); +ADD_TO_DEVTABLE("ccw", struct ccw_device_id, do_ccw_entry); /* looks like: "ap:tN" */ static int do_ap_entry(const char *filename, - void *symval, char *alias) + struct ap_device_id *id, char *alias) { - DEF_FIELD(symval, ap_device_id, dev_type); - - sprintf(alias, "ap:t%02X*", dev_type); + sprintf(alias, "ap:t%02X*", id->dev_type); return 1; } -ADD_TO_DEVTABLE("ap", ap_device_id, do_ap_entry); +ADD_TO_DEVTABLE("ap", struct ap_device_id, do_ap_entry); /* looks like: "css:tN" */ static int do_css_entry(const char *filename, - void *symval, char *alias) + struct css_device_id *id, char *alias) { - DEF_FIELD(symval, css_device_id, type); - - sprintf(alias, "css:t%01X", type); + sprintf(alias, "css:t%01X", id->type); return 1; } -ADD_TO_DEVTABLE("css", css_device_id, do_css_entry); +ADD_TO_DEVTABLE("css", struct css_device_id, do_css_entry); /* Looks like: "serio:tyNprNidNexN" */ static int do_serio_entry(const char *filename, - void *symval, char *alias) + struct serio_device_id *id, char *alias) { - DEF_FIELD(symval, serio_device_id, type); - DEF_FIELD(symval, serio_device_id, proto); - DEF_FIELD(symval, serio_device_id, id); - DEF_FIELD(symval, serio_device_id, extra); + id->type = TO_NATIVE(id->type); + id->proto = TO_NATIVE(id->proto); + id->id = TO_NATIVE(id->id); + id->extra = TO_NATIVE(id->extra); strcpy(alias, "serio:"); - ADD(alias, "ty", type != SERIO_ANY, type); - ADD(alias, "pr", proto != SERIO_ANY, proto); - ADD(alias, "id", id != SERIO_ANY, id); - ADD(alias, "ex", extra != SERIO_ANY, extra); + ADD(alias, "ty", id->type != SERIO_ANY, id->type); + ADD(alias, "pr", id->proto != SERIO_ANY, id->proto); + ADD(alias, "id", id->id != SERIO_ANY, id->id); + ADD(alias, "ex", id->extra != SERIO_ANY, id->extra); add_wildcard(alias); return 1; } -ADD_TO_DEVTABLE("serio", serio_device_id, do_serio_entry); +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, - void *symval, char *alias) + struct acpi_device_id *id, char *alias) { - DEF_FIELD_ADDR(symval, acpi_device_id, id); - sprintf(alias, "acpi*:%s:*", *id); + sprintf(alias, "acpi*:%s:*", id->id); return 1; } -ADD_TO_DEVTABLE("acpi", acpi_device_id, do_acpi_entry); +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, struct module *mod) { - const unsigned long id_size = SIZE_pnp_device_id; + const unsigned long id_size = sizeof(struct pnp_device_id); const unsigned int count = (size / id_size)-1; + const struct pnp_device_id *devs = symval; unsigned int i; device_id_check(mod->name, "pnp", size, id_size, symval); for (i = 0; i < count; i++) { - DEF_FIELD_ADDR(symval + i*id_size, pnp_device_id, id); - char acpi_id[sizeof(*id)]; + const char *id = (char *)devs[i].id; + char acpi_id[sizeof(devs[0].id)]; int j; buf_printf(&mod->dev_table_buf, - "MODULE_ALIAS(\"pnp:d%s*\");\n", *id); + "MODULE_ALIAS(\"pnp:d%s*\");\n", id); /* fix broken pnp bus lowercasing */ for (j = 0; j < sizeof(acpi_id); j++) - acpi_id[j] = toupper((*id)[j]); + acpi_id[j] = toupper(id[j]); buf_printf(&mod->dev_table_buf, "MODULE_ALIAS(\"acpi*:%s:*\");\n", acpi_id); } @@ -548,18 +524,19 @@ static void do_pnp_device_entry(void *symval, unsigned long size, static void do_pnp_card_entries(void *symval, unsigned long size, struct module *mod) { - const unsigned long id_size = SIZE_pnp_card_device_id; + const unsigned long id_size = sizeof(struct pnp_card_device_id); const unsigned int count = (size / id_size)-1; + const struct pnp_card_device_id *cards = symval; unsigned int i; device_id_check(mod->name, "pnp", size, id_size, symval); for (i = 0; i < count; i++) { unsigned int j; - DEF_FIELD_ADDR(symval + i*id_size, pnp_card_device_id, devs); + const struct pnp_card_device_id *card = &cards[i]; for (j = 0; j < PNP_MAX_DEVICES; j++) { - const char *id = (char *)(*devs)[j].id; + const char *id = (char *)card->devs[j].id; int i2, j2; int dup = 0; @@ -568,10 +545,10 @@ static void do_pnp_card_entries(void *symval, unsigned long size, /* find duplicate, already added value */ for (i2 = 0; i2 < i && !dup; i2++) { - DEF_FIELD_ADDR(symval + i2*id_size, pnp_card_device_id, devs); + const struct pnp_card_device_id *card2 = &cards[i2]; for (j2 = 0; j2 < PNP_MAX_DEVICES; j2++) { - const char *id2 = (char *)(*devs)[j2].id; + const char *id2 = (char *)card2->devs[j2].id; if (!id2[0]) break; @@ -585,7 +562,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size, /* add an individual alias for every device entry */ if (!dup) { - char acpi_id[PNP_ID_LEN]; + char acpi_id[sizeof(card->devs[0].id)]; int k; buf_printf(&mod->dev_table_buf, @@ -603,58 +580,54 @@ static void do_pnp_card_entries(void *symval, unsigned long size, /* Looks like: pcmcia:mNcNfNfnNpfnNvaNvbNvcNvdN. */ static int do_pcmcia_entry(const char *filename, - void *symval, char *alias) + struct pcmcia_device_id *id, char *alias) { unsigned int i; - DEF_FIELD(symval, pcmcia_device_id, match_flags); - DEF_FIELD(symval, pcmcia_device_id, manf_id); - DEF_FIELD(symval, pcmcia_device_id, card_id); - DEF_FIELD(symval, pcmcia_device_id, func_id); - DEF_FIELD(symval, pcmcia_device_id, function); - DEF_FIELD(symval, pcmcia_device_id, device_no); - DEF_FIELD_ADDR(symval, pcmcia_device_id, prod_id_hash); - for (i=0; i<4; i++) { - (*prod_id_hash)[i] = TO_NATIVE((*prod_id_hash)[i]); - } + id->match_flags = TO_NATIVE(id->match_flags); + id->manf_id = TO_NATIVE(id->manf_id); + id->card_id = TO_NATIVE(id->card_id); + id->func_id = TO_NATIVE(id->func_id); + id->function = TO_NATIVE(id->function); + id->device_no = TO_NATIVE(id->device_no); - strcpy(alias, "pcmcia:"); - ADD(alias, "m", match_flags & PCMCIA_DEV_ID_MATCH_MANF_ID, - manf_id); - ADD(alias, "c", match_flags & PCMCIA_DEV_ID_MATCH_CARD_ID, - card_id); - ADD(alias, "f", match_flags & PCMCIA_DEV_ID_MATCH_FUNC_ID, - func_id); - ADD(alias, "fn", match_flags & PCMCIA_DEV_ID_MATCH_FUNCTION, - function); - ADD(alias, "pfn", match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO, - device_no); - ADD(alias, "pa", match_flags & PCMCIA_DEV_ID_MATCH_PROD_ID1, (*prod_id_hash)[0]); - ADD(alias, "pb", match_flags & PCMCIA_DEV_ID_MATCH_PROD_ID2, (*prod_id_hash)[1]); - ADD(alias, "pc", match_flags & PCMCIA_DEV_ID_MATCH_PROD_ID3, (*prod_id_hash)[2]); - ADD(alias, "pd", match_flags & PCMCIA_DEV_ID_MATCH_PROD_ID4, (*prod_id_hash)[3]); + for (i=0; i<4; i++) { + id->prod_id_hash[i] = TO_NATIVE(id->prod_id_hash[i]); + } + + strcpy(alias, "pcmcia:"); + ADD(alias, "m", id->match_flags & PCMCIA_DEV_ID_MATCH_MANF_ID, + id->manf_id); + ADD(alias, "c", id->match_flags & PCMCIA_DEV_ID_MATCH_CARD_ID, + id->card_id); + ADD(alias, "f", id->match_flags & PCMCIA_DEV_ID_MATCH_FUNC_ID, + id->func_id); + ADD(alias, "fn", id->match_flags & PCMCIA_DEV_ID_MATCH_FUNCTION, + id->function); + ADD(alias, "pfn", id->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO, + id->device_no); + ADD(alias, "pa", id->match_flags & PCMCIA_DEV_ID_MATCH_PROD_ID1, id->prod_id_hash[0]); + ADD(alias, "pb", id->match_flags & PCMCIA_DEV_ID_MATCH_PROD_ID2, id->prod_id_hash[1]); + ADD(alias, "pc", id->match_flags & PCMCIA_DEV_ID_MATCH_PROD_ID3, id->prod_id_hash[2]); + ADD(alias, "pd", id->match_flags & PCMCIA_DEV_ID_MATCH_PROD_ID4, id->prod_id_hash[3]); add_wildcard(alias); - return 1; + return 1; } -ADD_TO_DEVTABLE("pcmcia", pcmcia_device_id, do_pcmcia_entry); +ADD_TO_DEVTABLE("pcmcia", struct pcmcia_device_id, do_pcmcia_entry); -static int do_of_entry (const char *filename, void *symval, char *alias) +static int do_of_entry (const char *filename, struct of_device_id *of, char *alias) { int len; char *tmp; - DEF_FIELD_ADDR(symval, of_device_id, name); - DEF_FIELD_ADDR(symval, of_device_id, type); - DEF_FIELD_ADDR(symval, of_device_id, compatible); - len = sprintf (alias, "of:N%sT%s", - (*name)[0] ? *name : "*", - (*type)[0] ? *type : "*"); + of->name[0] ? of->name : "*", + of->type[0] ? of->type : "*"); - if (compatible[0]) + if (of->compatible[0]) sprintf (&alias[len], "%sC%s", - (*type)[0] ? "*" : "", - *compatible); + of->type[0] ? "*" : "", + of->compatible); /* Replace all whitespace with underscores */ for (tmp = alias; tmp && *tmp; tmp++) @@ -664,17 +637,15 @@ static int do_of_entry (const char *filename, void *symval, char *alias) add_wildcard(alias); return 1; } -ADD_TO_DEVTABLE("of", of_device_id, do_of_entry); +ADD_TO_DEVTABLE("of", struct of_device_id, do_of_entry); -static int do_vio_entry(const char *filename, void *symval, +static int do_vio_entry(const char *filename, struct vio_device_id *vio, char *alias) { char *tmp; - DEF_FIELD_ADDR(symval, vio_device_id, type); - DEF_FIELD_ADDR(symval, vio_device_id, compat); - sprintf(alias, "vio:T%sS%s", (*type)[0] ? *type : "*", - (*compat)[0] ? *compat : "*"); + sprintf(alias, "vio:T%sS%s", vio->type[0] ? vio->type : "*", + vio->compat[0] ? vio->compat : "*"); /* Replace all whitespace with underscores */ for (tmp = alias; tmp && *tmp; tmp++) @@ -684,7 +655,7 @@ static int do_vio_entry(const char *filename, void *symval, add_wildcard(alias); return 1; } -ADD_TO_DEVTABLE("vio", vio_device_id, do_vio_entry); +ADD_TO_DEVTABLE("vio", struct vio_device_id, do_vio_entry); #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) @@ -693,172 +664,154 @@ static void do_input(char *alias, { unsigned int i; - for (i = min / BITS_PER_LONG; i < max / BITS_PER_LONG + 1; i++) - arr[i] = TO_NATIVE(arr[i]); for (i = min; i < max; i++) if (arr[i / BITS_PER_LONG] & (1L << (i%BITS_PER_LONG))) sprintf(alias + strlen(alias), "%X,*", i); } /* input:b0v0p0e0-eXkXrXaXmXlXsXfXwX where X is comma-separated %02X. */ -static int do_input_entry(const char *filename, void *symval, +static int do_input_entry(const char *filename, struct input_device_id *id, char *alias) { - DEF_FIELD(symval, input_device_id, flags); - DEF_FIELD(symval, input_device_id, bustype); - DEF_FIELD(symval, input_device_id, vendor); - DEF_FIELD(symval, input_device_id, product); - DEF_FIELD(symval, input_device_id, version); - DEF_FIELD_ADDR(symval, input_device_id, evbit); - DEF_FIELD_ADDR(symval, input_device_id, keybit); - DEF_FIELD_ADDR(symval, input_device_id, relbit); - DEF_FIELD_ADDR(symval, input_device_id, absbit); - DEF_FIELD_ADDR(symval, input_device_id, mscbit); - DEF_FIELD_ADDR(symval, input_device_id, ledbit); - DEF_FIELD_ADDR(symval, input_device_id, sndbit); - DEF_FIELD_ADDR(symval, input_device_id, ffbit); - DEF_FIELD_ADDR(symval, input_device_id, swbit); - sprintf(alias, "input:"); - ADD(alias, "b", flags & INPUT_DEVICE_ID_MATCH_BUS, bustype); - ADD(alias, "v", flags & INPUT_DEVICE_ID_MATCH_VENDOR, vendor); - ADD(alias, "p", flags & INPUT_DEVICE_ID_MATCH_PRODUCT, product); - ADD(alias, "e", flags & INPUT_DEVICE_ID_MATCH_VERSION, version); + ADD(alias, "b", id->flags & INPUT_DEVICE_ID_MATCH_BUS, id->bustype); + ADD(alias, "v", id->flags & INPUT_DEVICE_ID_MATCH_VENDOR, id->vendor); + ADD(alias, "p", id->flags & INPUT_DEVICE_ID_MATCH_PRODUCT, id->product); + ADD(alias, "e", id->flags & INPUT_DEVICE_ID_MATCH_VERSION, id->version); sprintf(alias + strlen(alias), "-e*"); - if (flags & INPUT_DEVICE_ID_MATCH_EVBIT) - do_input(alias, *evbit, 0, INPUT_DEVICE_ID_EV_MAX); + if (id->flags & INPUT_DEVICE_ID_MATCH_EVBIT) + do_input(alias, id->evbit, 0, INPUT_DEVICE_ID_EV_MAX); sprintf(alias + strlen(alias), "k*"); - if (flags & INPUT_DEVICE_ID_MATCH_KEYBIT) - do_input(alias, *keybit, + if (id->flags & INPUT_DEVICE_ID_MATCH_KEYBIT) + do_input(alias, id->keybit, INPUT_DEVICE_ID_KEY_MIN_INTERESTING, INPUT_DEVICE_ID_KEY_MAX); sprintf(alias + strlen(alias), "r*"); - if (flags & INPUT_DEVICE_ID_MATCH_RELBIT) - do_input(alias, *relbit, 0, INPUT_DEVICE_ID_REL_MAX); + if (id->flags & INPUT_DEVICE_ID_MATCH_RELBIT) + do_input(alias, id->relbit, 0, INPUT_DEVICE_ID_REL_MAX); sprintf(alias + strlen(alias), "a*"); - if (flags & INPUT_DEVICE_ID_MATCH_ABSBIT) - do_input(alias, *absbit, 0, INPUT_DEVICE_ID_ABS_MAX); + if (id->flags & INPUT_DEVICE_ID_MATCH_ABSBIT) + do_input(alias, id->absbit, 0, INPUT_DEVICE_ID_ABS_MAX); sprintf(alias + strlen(alias), "m*"); - if (flags & INPUT_DEVICE_ID_MATCH_MSCIT) - do_input(alias, *mscbit, 0, INPUT_DEVICE_ID_MSC_MAX); + if (id->flags & INPUT_DEVICE_ID_MATCH_MSCIT) + do_input(alias, id->mscbit, 0, INPUT_DEVICE_ID_MSC_MAX); sprintf(alias + strlen(alias), "l*"); - if (flags & INPUT_DEVICE_ID_MATCH_LEDBIT) - do_input(alias, *ledbit, 0, INPUT_DEVICE_ID_LED_MAX); + if (id->flags & INPUT_DEVICE_ID_MATCH_LEDBIT) + do_input(alias, id->ledbit, 0, INPUT_DEVICE_ID_LED_MAX); sprintf(alias + strlen(alias), "s*"); - if (flags & INPUT_DEVICE_ID_MATCH_SNDBIT) - do_input(alias, *sndbit, 0, INPUT_DEVICE_ID_SND_MAX); + if (id->flags & INPUT_DEVICE_ID_MATCH_SNDBIT) + do_input(alias, id->sndbit, 0, INPUT_DEVICE_ID_SND_MAX); sprintf(alias + strlen(alias), "f*"); - if (flags & INPUT_DEVICE_ID_MATCH_FFBIT) - do_input(alias, *ffbit, 0, INPUT_DEVICE_ID_FF_MAX); + if (id->flags & INPUT_DEVICE_ID_MATCH_FFBIT) + do_input(alias, id->ffbit, 0, INPUT_DEVICE_ID_FF_MAX); sprintf(alias + strlen(alias), "w*"); - if (flags & INPUT_DEVICE_ID_MATCH_SWBIT) - do_input(alias, *swbit, 0, INPUT_DEVICE_ID_SW_MAX); + if (id->flags & INPUT_DEVICE_ID_MATCH_SWBIT) + do_input(alias, id->swbit, 0, INPUT_DEVICE_ID_SW_MAX); return 1; } -ADD_TO_DEVTABLE("input", input_device_id, do_input_entry); +ADD_TO_DEVTABLE("input", struct input_device_id, do_input_entry); -static int do_eisa_entry(const char *filename, void *symval, +static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa, char *alias) { - DEF_FIELD_ADDR(symval, eisa_device_id, sig); - if (sig[0]) - sprintf(alias, EISA_DEVICE_MODALIAS_FMT "*", *sig); + if (eisa->sig[0]) + sprintf(alias, EISA_DEVICE_MODALIAS_FMT "*", eisa->sig); else strcat(alias, "*"); return 1; } -ADD_TO_DEVTABLE("eisa", eisa_device_id, do_eisa_entry); +ADD_TO_DEVTABLE("eisa", struct eisa_device_id, do_eisa_entry); /* Looks like: parisc:tNhvNrevNsvN */ -static int do_parisc_entry(const char *filename, void *symval, +static int do_parisc_entry(const char *filename, struct parisc_device_id *id, char *alias) { - DEF_FIELD(symval, parisc_device_id, hw_type); - DEF_FIELD(symval, parisc_device_id, hversion); - DEF_FIELD(symval, parisc_device_id, hversion_rev); - DEF_FIELD(symval, parisc_device_id, sversion); + id->hw_type = TO_NATIVE(id->hw_type); + id->hversion = TO_NATIVE(id->hversion); + id->hversion_rev = TO_NATIVE(id->hversion_rev); + id->sversion = TO_NATIVE(id->sversion); strcpy(alias, "parisc:"); - ADD(alias, "t", hw_type != PA_HWTYPE_ANY_ID, hw_type); - ADD(alias, "hv", hversion != PA_HVERSION_ANY_ID, hversion); - ADD(alias, "rev", hversion_rev != PA_HVERSION_REV_ANY_ID, hversion_rev); - ADD(alias, "sv", sversion != PA_SVERSION_ANY_ID, sversion); + ADD(alias, "t", id->hw_type != PA_HWTYPE_ANY_ID, id->hw_type); + ADD(alias, "hv", id->hversion != PA_HVERSION_ANY_ID, id->hversion); + ADD(alias, "rev", id->hversion_rev != PA_HVERSION_REV_ANY_ID, id->hversion_rev); + ADD(alias, "sv", id->sversion != PA_SVERSION_ANY_ID, id->sversion); add_wildcard(alias); return 1; } -ADD_TO_DEVTABLE("parisc", parisc_device_id, do_parisc_entry); +ADD_TO_DEVTABLE("parisc", struct parisc_device_id, do_parisc_entry); /* Looks like: sdio:cNvNdN. */ static int do_sdio_entry(const char *filename, - void *symval, char *alias) + struct sdio_device_id *id, char *alias) { - DEF_FIELD(symval, sdio_device_id, class); - DEF_FIELD(symval, sdio_device_id, vendor); - DEF_FIELD(symval, sdio_device_id, device); + id->class = TO_NATIVE(id->class); + id->vendor = TO_NATIVE(id->vendor); + id->device = TO_NATIVE(id->device); strcpy(alias, "sdio:"); - ADD(alias, "c", class != (__u8)SDIO_ANY_ID, class); - ADD(alias, "v", vendor != (__u16)SDIO_ANY_ID, vendor); - ADD(alias, "d", device != (__u16)SDIO_ANY_ID, device); + ADD(alias, "c", id->class != (__u8)SDIO_ANY_ID, id->class); + ADD(alias, "v", id->vendor != (__u16)SDIO_ANY_ID, id->vendor); + ADD(alias, "d", id->device != (__u16)SDIO_ANY_ID, id->device); add_wildcard(alias); return 1; } -ADD_TO_DEVTABLE("sdio", sdio_device_id, do_sdio_entry); +ADD_TO_DEVTABLE("sdio", struct sdio_device_id, do_sdio_entry); /* Looks like: ssb:vNidNrevN. */ static int do_ssb_entry(const char *filename, - void *symval, char *alias) + struct ssb_device_id *id, char *alias) { - DEF_FIELD(symval, ssb_device_id, vendor); - DEF_FIELD(symval, ssb_device_id, coreid); - DEF_FIELD(symval, ssb_device_id, revision); + id->vendor = TO_NATIVE(id->vendor); + id->coreid = TO_NATIVE(id->coreid); + id->revision = TO_NATIVE(id->revision); strcpy(alias, "ssb:"); - ADD(alias, "v", vendor != SSB_ANY_VENDOR, vendor); - ADD(alias, "id", coreid != SSB_ANY_ID, coreid); - ADD(alias, "rev", revision != SSB_ANY_REV, revision); + ADD(alias, "v", id->vendor != SSB_ANY_VENDOR, id->vendor); + ADD(alias, "id", id->coreid != SSB_ANY_ID, id->coreid); + ADD(alias, "rev", id->revision != SSB_ANY_REV, id->revision); add_wildcard(alias); return 1; } -ADD_TO_DEVTABLE("ssb", ssb_device_id, do_ssb_entry); +ADD_TO_DEVTABLE("ssb", struct ssb_device_id, do_ssb_entry); /* Looks like: bcma:mNidNrevNclN. */ static int do_bcma_entry(const char *filename, - void *symval, char *alias) + struct bcma_device_id *id, char *alias) { - DEF_FIELD(symval, bcma_device_id, manuf); - DEF_FIELD(symval, bcma_device_id, id); - DEF_FIELD(symval, bcma_device_id, rev); - DEF_FIELD(symval, bcma_device_id, class); + id->manuf = TO_NATIVE(id->manuf); + id->id = TO_NATIVE(id->id); + id->rev = TO_NATIVE(id->rev); + id->class = TO_NATIVE(id->class); strcpy(alias, "bcma:"); - ADD(alias, "m", manuf != BCMA_ANY_MANUF, manuf); - ADD(alias, "id", id != BCMA_ANY_ID, id); - ADD(alias, "rev", rev != BCMA_ANY_REV, rev); - ADD(alias, "cl", class != BCMA_ANY_CLASS, class); + ADD(alias, "m", id->manuf != BCMA_ANY_MANUF, id->manuf); + ADD(alias, "id", id->id != BCMA_ANY_ID, id->id); + ADD(alias, "rev", id->rev != BCMA_ANY_REV, id->rev); + ADD(alias, "cl", id->class != BCMA_ANY_CLASS, id->class); add_wildcard(alias); return 1; } -ADD_TO_DEVTABLE("bcma", bcma_device_id, do_bcma_entry); +ADD_TO_DEVTABLE("bcma", struct bcma_device_id, do_bcma_entry); /* Looks like: virtio:dNvN */ -static int do_virtio_entry(const char *filename, void *symval, +static int do_virtio_entry(const char *filename, struct virtio_device_id *id, char *alias) { - DEF_FIELD(symval, virtio_device_id, device); - DEF_FIELD(symval, virtio_device_id, vendor); + id->device = TO_NATIVE(id->device); + id->vendor = TO_NATIVE(id->vendor); strcpy(alias, "virtio:"); - ADD(alias, "d", device != VIRTIO_DEV_ANY_ID, device); - ADD(alias, "v", vendor != VIRTIO_DEV_ANY_ID, vendor); + ADD(alias, "d", id->device != VIRTIO_DEV_ANY_ID, id->device); + ADD(alias, "v", id->vendor != VIRTIO_DEV_ANY_ID, id->vendor); add_wildcard(alias); return 1; } -ADD_TO_DEVTABLE("virtio", virtio_device_id, do_virtio_entry); +ADD_TO_DEVTABLE("virtio", struct virtio_device_id, do_virtio_entry); /* * Looks like: vmbus:guid @@ -866,44 +819,41 @@ ADD_TO_DEVTABLE("virtio", virtio_device_id, do_virtio_entry); * in the name. */ -static int do_vmbus_entry(const char *filename, void *symval, +static int do_vmbus_entry(const char *filename, struct hv_vmbus_device_id *id, char *alias) { int i; - DEF_FIELD_ADDR(symval, hv_vmbus_device_id, guid); - char guid_name[(sizeof(*guid) + 1) * 2]; + char guid_name[((sizeof(id->guid) + 1)) * 2]; - for (i = 0; i < (sizeof(*guid) * 2); i += 2) - sprintf(&guid_name[i], "%02x", TO_NATIVE((*guid)[i/2])); + for (i = 0; i < (sizeof(id->guid) * 2); i += 2) + sprintf(&guid_name[i], "%02x", id->guid[i/2]); strcpy(alias, "vmbus:"); strcat(alias, guid_name); return 1; } -ADD_TO_DEVTABLE("vmbus", hv_vmbus_device_id, do_vmbus_entry); +ADD_TO_DEVTABLE("vmbus", struct hv_vmbus_device_id, do_vmbus_entry); /* Looks like: i2c:S */ -static int do_i2c_entry(const char *filename, void *symval, +static int do_i2c_entry(const char *filename, struct i2c_device_id *id, char *alias) { - DEF_FIELD_ADDR(symval, i2c_device_id, name); - sprintf(alias, I2C_MODULE_PREFIX "%s", *name); + sprintf(alias, I2C_MODULE_PREFIX "%s", id->name); return 1; } -ADD_TO_DEVTABLE("i2c", i2c_device_id, do_i2c_entry); +ADD_TO_DEVTABLE("i2c", struct i2c_device_id, do_i2c_entry); /* Looks like: spi:S */ -static int do_spi_entry(const char *filename, void *symval, +static int do_spi_entry(const char *filename, struct spi_device_id *id, char *alias) { - DEF_FIELD_ADDR(symval, spi_device_id, name); - sprintf(alias, SPI_MODULE_PREFIX "%s", *name); + sprintf(alias, SPI_MODULE_PREFIX "%s", id->name); return 1; } -ADD_TO_DEVTABLE("spi", spi_device_id, do_spi_entry); +ADD_TO_DEVTABLE("spi", struct spi_device_id, do_spi_entry); static const struct dmifield { const char *prefix; @@ -935,21 +885,21 @@ static void dmi_ascii_filter(char *d, const char *s) } -static int do_dmi_entry(const char *filename, void *symval, +static int do_dmi_entry(const char *filename, struct dmi_system_id *id, char *alias) { int i, j; - DEF_FIELD_ADDR(symval, dmi_system_id, matches); + sprintf(alias, "dmi*"); for (i = 0; i < ARRAY_SIZE(dmi_fields); i++) { for (j = 0; j < 4; j++) { - if ((*matches)[j].slot && - (*matches)[j].slot == dmi_fields[i].field) { + if (id->matches[j].slot && + id->matches[j].slot == dmi_fields[i].field) { sprintf(alias + strlen(alias), ":%s*", dmi_fields[i].prefix); dmi_ascii_filter(alias + strlen(alias), - (*matches)[j].substr); + id->matches[j].substr); strcat(alias, "*"); } } @@ -958,30 +908,27 @@ static int do_dmi_entry(const char *filename, void *symval, strcat(alias, ":"); return 1; } -ADD_TO_DEVTABLE("dmi", dmi_system_id, do_dmi_entry); +ADD_TO_DEVTABLE("dmi", struct dmi_system_id, do_dmi_entry); static int do_platform_entry(const char *filename, - void *symval, char *alias) + struct platform_device_id *id, char *alias) { - DEF_FIELD_ADDR(symval, platform_device_id, name); - sprintf(alias, PLATFORM_MODULE_PREFIX "%s", *name); + sprintf(alias, PLATFORM_MODULE_PREFIX "%s", id->name); return 1; } -ADD_TO_DEVTABLE("platform", platform_device_id, do_platform_entry); +ADD_TO_DEVTABLE("platform", struct platform_device_id, do_platform_entry); static int do_mdio_entry(const char *filename, - void *symval, char *alias) + struct mdio_device_id *id, char *alias) { int i; - DEF_FIELD(symval, mdio_device_id, phy_id); - DEF_FIELD(symval, mdio_device_id, phy_id_mask); alias += sprintf(alias, MDIO_MODULE_PREFIX); for (i = 0; i < 32; i++) { - if (!((phy_id_mask >> (31-i)) & 1)) + if (!((id->phy_id_mask >> (31-i)) & 1)) *(alias++) = '?'; - else if ((phy_id >> (31-i)) & 1) + else if ((id->phy_id >> (31-i)) & 1) *(alias++) = '1'; else *(alias++) = '0'; @@ -992,50 +939,47 @@ static int do_mdio_entry(const char *filename, return 1; } -ADD_TO_DEVTABLE("mdio", mdio_device_id, do_mdio_entry); +ADD_TO_DEVTABLE("mdio", struct mdio_device_id, do_mdio_entry); /* Looks like: zorro:iN. */ -static int do_zorro_entry(const char *filename, void *symval, +static int do_zorro_entry(const char *filename, struct zorro_device_id *id, char *alias) { - DEF_FIELD(symval, zorro_device_id, id); + id->id = TO_NATIVE(id->id); strcpy(alias, "zorro:"); - ADD(alias, "i", id != ZORRO_WILDCARD, id); + ADD(alias, "i", id->id != ZORRO_WILDCARD, id->id); return 1; } -ADD_TO_DEVTABLE("zorro", zorro_device_id, do_zorro_entry); +ADD_TO_DEVTABLE("zorro", struct zorro_device_id, do_zorro_entry); /* looks like: "pnp:dD" */ static int do_isapnp_entry(const char *filename, - void *symval, char *alias) + struct isapnp_device_id *id, char *alias) { - DEF_FIELD(symval, isapnp_device_id, vendor); - DEF_FIELD(symval, isapnp_device_id, function); sprintf(alias, "pnp:d%c%c%c%x%x%x%x*", - 'A' + ((vendor >> 2) & 0x3f) - 1, - 'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1, - 'A' + ((vendor >> 8) & 0x1f) - 1, - (function >> 4) & 0x0f, function & 0x0f, - (function >> 12) & 0x0f, (function >> 8) & 0x0f); + '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; } -ADD_TO_DEVTABLE("isapnp", isapnp_device_id, do_isapnp_entry); +ADD_TO_DEVTABLE("isapnp", struct isapnp_device_id, do_isapnp_entry); /* Looks like: "ipack:fNvNdN". */ static int do_ipack_entry(const char *filename, - void *symval, char *alias) + struct ipack_device_id *id, char *alias) { - DEF_FIELD(symval, ipack_device_id, format); - DEF_FIELD(symval, ipack_device_id, vendor); - DEF_FIELD(symval, ipack_device_id, device); + id->vendor = TO_NATIVE(id->vendor); + id->device = TO_NATIVE(id->device); strcpy(alias, "ipack:"); - ADD(alias, "f", format != IPACK_ANY_FORMAT, format); - ADD(alias, "v", vendor != IPACK_ANY_ID, vendor); - ADD(alias, "d", device != IPACK_ANY_ID, device); + ADD(alias, "f", id->format != IPACK_ANY_FORMAT, id->format); + ADD(alias, "v", id->vendor != IPACK_ANY_ID, id->vendor); + ADD(alias, "d", id->device != IPACK_ANY_ID, id->device); add_wildcard(alias); return 1; } -ADD_TO_DEVTABLE("ipack", ipack_device_id, do_ipack_entry); +ADD_TO_DEVTABLE("ipack", struct ipack_device_id, do_ipack_entry); /* * Append a match expression for a single masked hex digit. @@ -1086,27 +1030,25 @@ static void append_nibble_mask(char **outp, * a ? or [] pattern matching exactly one digit. */ static int do_amba_entry(const char *filename, - void *symval, char *alias) + struct amba_id *id, char *alias) { unsigned int digit; char *p = alias; - DEF_FIELD(symval, amba_id, id); - DEF_FIELD(symval, amba_id, mask); - if ((id & mask) != id) + 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, mask); + filename, id->id, id->mask); p += sprintf(alias, "amba:d"); for (digit = 0; digit < 8; digit++) append_nibble_mask(&p, - (id >> (4 * (7 - digit))) & 0xf, - (mask >> (4 * (7 - digit))) & 0xf); + (id->id >> (4 * (7 - digit))) & 0xf, + (id->mask >> (4 * (7 - digit))) & 0xf); return 1; } -ADD_TO_DEVTABLE("amba", amba_id, do_amba_entry); +ADD_TO_DEVTABLE("amba", struct amba_id, do_amba_entry); /* LOOKS like x86cpu:vendor:VVVV:family:FFFF:model:MMMM:feature:*,FEAT,* * All fields are numbers. It would be nicer to use strings for vendor @@ -1114,24 +1056,24 @@ ADD_TO_DEVTABLE("amba", amba_id, do_amba_entry); * complicated. */ -static int do_x86cpu_entry(const char *filename, void *symval, +static int do_x86cpu_entry(const char *filename, struct x86_cpu_id *id, char *alias) { - DEF_FIELD(symval, x86_cpu_id, feature); - DEF_FIELD(symval, x86_cpu_id, family); - DEF_FIELD(symval, x86_cpu_id, model); - DEF_FIELD(symval, x86_cpu_id, vendor); + id->feature = TO_NATIVE(id->feature); + id->family = TO_NATIVE(id->family); + id->model = TO_NATIVE(id->model); + id->vendor = TO_NATIVE(id->vendor); strcpy(alias, "x86cpu:"); - ADD(alias, "vendor:", vendor != X86_VENDOR_ANY, vendor); - ADD(alias, ":family:", family != X86_FAMILY_ANY, family); - ADD(alias, ":model:", model != X86_MODEL_ANY, model); + ADD(alias, "vendor:", id->vendor != X86_VENDOR_ANY, id->vendor); + ADD(alias, ":family:", id->family != X86_FAMILY_ANY, id->family); + ADD(alias, ":model:", id->model != X86_MODEL_ANY, id->model); strcat(alias, ":feature:*"); - if (feature != X86_FEATURE_ANY) - sprintf(alias + strlen(alias), "%04X*", feature); + if (id->feature != X86_FEATURE_ANY) + sprintf(alias + strlen(alias), "%04X*", id->feature); return 1; } -ADD_TO_DEVTABLE("x86cpu", x86_cpu_id, do_x86cpu_entry); +ADD_TO_DEVTABLE("x86cpu", struct x86_cpu_id, do_x86cpu_entry); /* Does namelen bytes of name exactly match the symbol? */ static bool sym_is(const char *name, unsigned namelen, const char *symbol) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 78b30c1548e..1c6fbb1a4f8 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -2128,7 +2128,7 @@ int main(int argc, char **argv) struct ext_sym_list *extsym_iter; struct ext_sym_list *extsym_start = NULL; - while ((opt = getopt(argc, argv, "i:I:e:msSo:awM:K:")) != -1) { + while ((opt = getopt(argc, argv, "i:I:e:cmsSo:awM:K:")) != -1) { switch (opt) { case 'i': kernel_read = optarg; @@ -2137,6 +2137,9 @@ int main(int argc, char **argv) module_read = optarg; external_module = 1; break; + case 'c': + cross_build = 1; + break; case 'e': external_module = 1; extsym_iter = diff --git a/tools/perf/config/utilities.mak b/tools/perf/config/utilities.mak index 8ef3bd30a54..3e897198d1f 100644 --- a/tools/perf/config/utilities.mak +++ b/tools/perf/config/utilities.mak @@ -173,7 +173,7 @@ _ge-abspath = $(if $(is-executable),$(1)) # Usage: absolute-executable-path-or-empty = $(call get-executable-or-default,variable,default) # define get-executable-or-default -$(if $($(1)),$(call _ge_attempt,$($(1)),$(1)),$(call _ge_attempt,$(2),$(1))) +$(if $($(1)),$(call _ge_attempt,$($(1)),$(1)),$(call _ge_attempt,$(2))) endef _ge_attempt = $(if $(get-executable),$(get-executable),$(_gea_warn)$(call _gea_err,$(2))) _gea_warn = $(warning The path '$(1)' is not executable.) |