ACPICA: Remove duplicate table definitions (non-conflicting), cont (15a58ed1) · Commits · e / devices / android_kernel_fairphone_FP5

arch/i386/kernel/acpi/boot.c

+7 −11

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ char *__acpi_map_table(unsigned long phys, unsigned long size)

		#ifdef CONFIG_PCI_MMCONFIG
		/* The physical address of the MMCONFIG aperture. Set from ACPI tables. */
		struct acpi_table_mcfg_config *pci_mmcfg_config;
		struct acpi_mcfg_allocation *pci_mmcfg_config;
		int pci_mmcfg_config_num;

		int __init acpi_parse_mcfg(struct acpi_table_header *header)
		@@ -179,17 +179,13 @@ int __init acpi_parse_mcfg(struct acpi_table_header *header)
		return -EINVAL;

		mcfg = (struct acpi_table_mcfg *)header;
		if (!mcfg) {
		printk(KERN_WARNING PREFIX "Unable to map MCFG\n");
		return -ENODEV;
		}

		/* how many config structures do we have */
		pci_mmcfg_config_num = 0;
		i = header->length - sizeof(struct acpi_table_mcfg);
		while (i >= sizeof(struct acpi_table_mcfg_config)) {
		while (i >= sizeof(struct acpi_mcfg_allocation)) {
		++pci_mmcfg_config_num;
		i -= sizeof(struct acpi_table_mcfg_config);
		i -= sizeof(struct acpi_mcfg_allocation);
		};
		if (pci_mmcfg_config_num == 0) {
		printk(KERN_ERR PREFIX "MMCONFIG has no entries\n");
		@@ -206,7 +202,7 @@ int __init acpi_parse_mcfg(struct acpi_table_header *header)

		memcpy(pci_mmcfg_config, &mcfg[1], config_size);
		for (i = 0; i < pci_mmcfg_config_num; ++i) {
		if (pci_mmcfg_config[i].base_reserved) {
		if (pci_mmcfg_config[i].address > 0xFFFFFFFF) {
		printk(KERN_ERR PREFIX
		"MMCONFIG not in low 4GB of memory\n");
		kfree(pci_mmcfg_config);
		@@ -220,14 +216,14 @@ int __init acpi_parse_mcfg(struct acpi_table_header *header)
		#endif /* CONFIG_PCI_MMCONFIG */

		#ifdef CONFIG_X86_LOCAL_APIC
		static int __init acpi_parse_madt(struct acpi_table_header *header)
		static int __init acpi_parse_madt(struct acpi_table_header *table)
		{
		struct acpi_table_madt *madt = NULL;

		if (!header\|\| !cpu_has_apic)
		if (!cpu_has_apic)
		return -EINVAL;

		madt = (struct acpi_table_madt *)header;
		madt = (struct acpi_table_madt *)table;
		if (!madt) {
		printk(KERN_WARNING PREFIX "Unable to map MADT\n");
		return -ENODEV;

arch/i386/kernel/acpi/earlyquirk.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ static int __init check_bridge(int vendor, int device)
		is enabled. */
		if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {
		nvidia_hpet_detected = 0;
		acpi_table_parse("HPET", nvidia_hpet_check);
		acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check);
		if (nvidia_hpet_detected == 0) {
		acpi_skip_timer_override = 1;
		printk(KERN_INFO "Nvidia board "

arch/i386/pci/mmconfig.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ static DECLARE_BITMAP(fallback_slots, MAX_CHECK_BUS*32);
		static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn)
		{
		int cfg_num = -1;
		struct acpi_table_mcfg_config *cfg;
		struct acpi_mcfg_allocation *cfg;

		if (seg == 0 && bus < MAX_CHECK_BUS &&
		test_bit(PCI_SLOT(devfn) + 32*bus, fallback_slots))
		@@ -48,11 +48,11 @@ static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn)
		break;
		}
		cfg = &pci_mmcfg_config[cfg_num];
		if (cfg->pci_segment_group_number != seg)
		if (cfg->pci_segment != seg)
		continue;
		if ((cfg->start_bus_number <= bus) &&
		(cfg->end_bus_number >= bus))
		return cfg->base_address;
		return cfg->address;
		}

		/* Handle more broken MCFG tables on Asus etc.
		@@ -60,9 +60,9 @@ static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn)
		this applies to all busses. */
		cfg = &pci_mmcfg_config[0];
		if (pci_mmcfg_config_num == 1 &&
		cfg->pci_segment_group_number == 0 &&
		cfg->pci_segment == 0 &&
		(cfg->start_bus_number \| cfg->end_bus_number) == 0)
		return cfg->base_address;
		return cfg->address;

		/* Fall back to type 0 */
		return 0;
		@@ -199,19 +199,19 @@ void __init pci_mmcfg_init(int type)
		if ((pci_probe & PCI_PROBE_MMCONF) == 0)
		return;

		acpi_table_parse("MCFG", acpi_parse_mcfg);
		acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg);
		if ((pci_mmcfg_config_num == 0) \|\|
		(pci_mmcfg_config == NULL) \|\|
		(pci_mmcfg_config[0].base_address == 0))
		(pci_mmcfg_config[0].address == 0))
		return;

		/* Only do this check when type 1 works. If it doesn't work
		assume we run on a Mac and always use MCFG */
		if (type == 1 && !e820_all_mapped(pci_mmcfg_config[0].base_address,
		pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,
		if (type == 1 && !e820_all_mapped(pci_mmcfg_config[0].address,
		pci_mmcfg_config[0].address + MMCONFIG_APER_MIN,
		E820_RESERVED)) {
		printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n",
		pci_mmcfg_config[0].base_address);
		printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %lx is not E820-reserved\n",
		(unsigned long)pci_mmcfg_config[0].address);
		printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
		return;
		}

arch/x86_64/kernel/early-quirks.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ static void via_bugs(void)

		static int nvidia_hpet_detected __initdata;

		static int __init nvidia_hpet_check(unsigned long phys, unsigned long size)
		static int __init nvidia_hpet_check(struct acpi_table_header *header)
		{
		nvidia_hpet_detected = 1;
		return 0;
		@@ -53,7 +53,7 @@ static void nvidia_bugs(void)
		return;

		nvidia_hpet_detected = 0;
		acpi_table_parse(ACPI_HPET, nvidia_hpet_check);
		acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check);
		if (nvidia_hpet_detected == 0) {
		acpi_skip_timer_override = 1;
		printk(KERN_INFO "Nvidia board "

arch/x86_64/mm/srat.c

+25 −23

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ static __init inline int srat_disabled(void)
		static __init int slit_valid(struct acpi_table_slit *slit)
		{
		int i, j;
		int d = slit->localities;
		int d = slit->locality_count;
		for (i = 0; i < d; i++) {
		for (j = 0; j < d; j++) {
		u8 val = slit->entry[d*i + j];
		@@ -127,18 +127,18 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)

		/* Callback for Proximity Domain -> LAPIC mapping */
		void __init
		acpi_numa_processor_affinity_init(struct acpi_table_processor_affinity *pa)
		acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
		{
		int pxm, node;
		if (srat_disabled())
		return;
		if (pa->header.length != sizeof(struct acpi_table_processor_affinity)) {
		if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) {
		bad_srat();
		return;
		}
		if (pa->flags.enabled == 0)
		if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
		return;
		pxm = pa->proximity_domain;
		pxm = pa->proximity_domain_lo;
		node = setup_node(pxm);
		if (node < 0) {
		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
		@@ -279,7 +279,7 @@ static int reserve_hotadd(int node, unsigned long start, unsigned long end)

		/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
		void __init
		acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
		acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
		{
		struct bootnode *nd, oldnode;
		unsigned long start, end;
		@@ -288,16 +288,17 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)

		if (srat_disabled())
		return;
		if (ma->header.length != sizeof(struct acpi_table_memory_affinity)) {
		if (ma->header.length != sizeof(struct acpi_srat_mem_affinity)) {
		bad_srat();
		return;
		}
		if (ma->flags.enabled == 0)
		if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)
		return;
		if (ma->flags.hot_pluggable && !save_add_info())

		if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())
		return;
		start = ma->base_addr_lo \| ((u64)ma->base_addr_hi << 32);
		end = start + (ma->length_lo \| ((u64)ma->length_hi << 32));
		start = ma->base_address;
		end = start + ma->length;
		pxm = ma->proximity_domain;
		node = setup_node(pxm);
		if (node < 0) {
		@@ -337,7 +338,8 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
		push_node_boundaries(node, nd->start >> PAGE_SHIFT,
		nd->end >> PAGE_SHIFT);

		if (ma->flags.hot_pluggable && (reserve_hotadd(node, start, end) < 0)) {
		if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) &&
		(reserve_hotadd(node, start, end) < 0)) {
		/* Ignore hotadd region. Undo damage */
		printk(KERN_NOTICE "SRAT: Hotplug region ignored\n");
		*nd = oldnode;
		@@ -461,7 +463,7 @@ int __node_distance(int a, int b)

		if (!acpi_slit)
		return a == b ? 10 : 20;
		index = acpi_slit->localities * node_to_pxm(a);
		index = acpi_slit->locality_count * node_to_pxm(a);
		return acpi_slit->entry[index + node_to_pxm(b)];
		}