Commit 01d2f105 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-x86', 'acpi-soc', 'acpi-pmic' and 'acpi-apple' 

* acpi-x86:
  ACPI / boot: Add number of legacy IRQs to debug output
  ACPI / boot: Correct address space of __acpi_map_table()
  ACPI / boot: Don't define unused variables

* acpi-soc:
  ACPI / LPSS: Don't abort ACPI scan on missing mem resource

* acpi-pmic:
  ACPI / PMIC: xpower: Do pinswitch magic when reading GPADC

* acpi-apple:
  spi: Use Apple device properties in absence of ACPI resources
  ACPI / scan: Recognize Apple SPI and I2C slaves
  ACPI / property: Support Apple _DSM properties
  ACPI / property: Don't evaluate objects for devices w/o handle
  treewide: Consolidate Apple DMI checks
parents f928a490 42d516ce a4bb2b49 58eefe2f 8a2e487e

arch/arm64/kernel/acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static int __init dt_scan_depth1_nodes(unsigned long node, 
 * __acpi_map_table() will be called before page_init(), so early_ioremap()

 * or early_memremap() should be called here to for ACPI table mapping.

 */

char *__init __acpi_map_table(unsigned long phys, unsigned long size)

void __init __iomem *__acpi_map_table(unsigned long phys, unsigned long size)

{

	if (!size)

		return NULL;
@@ -103,7 +103,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) 
	return early_memremap(phys, size);

}



void __init __acpi_unmap_table(char *map, unsigned long size)

void __init __acpi_unmap_table(void __iomem *map, unsigned long size)

{

	if (!map || !size)

		return;

arch/ia64/kernel/acpi.c

+3 −3
Original line number Diff line number Diff line
@@ -159,12 +159,12 @@ int acpi_request_vector(u32 int_type) 
	return vector;

}



char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)

void __init __iomem *__acpi_map_table(unsigned long phys, unsigned long size)

{

	return __va(phys_addr);

	return __va(phys);

}



void __init __acpi_unmap_table(char *map, unsigned long size)

void __init __acpi_unmap_table(void __iomem *map, unsigned long size)

{

}

arch/x86/include/asm/setup.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static inline void vsmp_init(void) { } 
#endif



void setup_bios_corruption_check(void);

void early_platform_quirks(void);



extern unsigned long saved_video_mode;

arch/x86/kernel/acpi/boot.c

+7 −4
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static u32 isa_irq_to_gsi[NR_IRQS_LEGACY] __read_mostly = { 
 * This is just a simple wrapper around early_ioremap(),

 * with sanity checks for phys == 0 and size == 0.

 */

char *__init __acpi_map_table(unsigned long phys, unsigned long size)

void __init __iomem *__acpi_map_table(unsigned long phys, unsigned long size)

{



	if (!phys || !size)
@@ -127,7 +127,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) 
	return early_ioremap(phys, size);

}



void __init __acpi_unmap_table(char *map, unsigned long size)

void __init __acpi_unmap_table(void __iomem *map, unsigned long size)

{

	if (!map || !size)

		return;
@@ -199,8 +199,10 @@ static int __init 
acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end)

{

	struct acpi_madt_local_x2apic *processor = NULL;

#ifdef CONFIG_X86_X2APIC

	int apic_id;

	u8 enabled;

#endif



	processor = (struct acpi_madt_local_x2apic *)header;
@@ -209,9 +211,10 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end) 


	acpi_table_print_madt_entry(header);



#ifdef CONFIG_X86_X2APIC

	apic_id = processor->local_apic_id;

	enabled = processor->lapic_flags & ACPI_MADT_ENABLED;

#ifdef CONFIG_X86_X2APIC



	/*

	 * We need to register disabled CPU as well to permit

	 * counting disabled CPUs. This allows us to size
@@ -1083,7 +1086,7 @@ static void __init mp_config_acpi_legacy_irqs(void) 
	mp_bus_id_to_type[MP_ISA_BUS] = MP_BUS_ISA;

#endif

	set_bit(MP_ISA_BUS, mp_bus_not_pci);

	pr_debug("Bus #%d is ISA\n", MP_ISA_BUS);

	pr_debug("Bus #%d is ISA (nIRQs: %d)\n", MP_ISA_BUS, nr_legacy_irqs());



	/*

	 * Use the default configuration for the IRQs 0-15.  Unless

arch/x86/kernel/early-quirks.c

+2 −2
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ 
#include <linux/pci.h>

#include <linux/acpi.h>

#include <linux/delay.h>

#include <linux/dmi.h>

#include <linux/pci_ids.h>

#include <linux/bcma/bcma.h>

#include <linux/bcma/bcma_regs.h>

#include <linux/platform_data/x86/apple.h>

#include <drm/i915_drm.h>

#include <asm/pci-direct.h>

#include <asm/dma.h>
@@ -593,7 +593,7 @@ static void __init apple_airport_reset(int bus, int slot, int func) 
	u64 addr;

	int i;



	if (!dmi_match(DMI_SYS_VENDOR, "Apple Inc."))

	if (!x86_apple_machine)

		return;



	/* Card may have been put into PCI_D3hot by grub quirk */

CRA Git | Maintained and supported by SUSTech CRA and CCSE