Commit 0a84c2e4 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'acpi-5.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki:
 "These fix an ACPI tables management issue, an issue related to the
  ACPI enumeration of devices and CPU wakeup in the ACPI processor
  driver.

  Specifics:

   - Ensure that the memory occupied by ACPI tables on x86 will always
     be reserved to prevent it from being allocated for other purposes
     which was possible in some cases (Rafael Wysocki).

   - Fix the ACPI device enumeration code to prevent it from attempting
     to evaluate the _STA control method for devices with unmet
     dependencies which is likely to fail (Hans de Goede).

   - Fix the handling of CPU0 wakeup in the ACPI processor driver to
     prevent CPU0 online failures from occurring (Vitaly Kuznetsov)"

* tag 'acpi-5.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: processor: Fix CPU0 wakeup in acpi_idle_play_dead()
  ACPI: scan: Fix _STA getting called on devices with unmet dependencies
  ACPI: tables: x86: Reserve memory occupied by ACPI tables
parents 9314a0e9 91463ebf
...@@ -132,6 +132,7 @@ void native_play_dead(void); ...@@ -132,6 +132,7 @@ void native_play_dead(void);
void play_dead_common(void); void play_dead_common(void);
void wbinvd_on_cpu(int cpu); void wbinvd_on_cpu(int cpu);
int wbinvd_on_all_cpus(void); int wbinvd_on_all_cpus(void);
bool wakeup_cpu0(void);
void native_smp_send_reschedule(int cpu); void native_smp_send_reschedule(int cpu);
void native_send_call_func_ipi(const struct cpumask *mask); void native_send_call_func_ipi(const struct cpumask *mask);
......
...@@ -1554,10 +1554,18 @@ void __init acpi_boot_table_init(void) ...@@ -1554,10 +1554,18 @@ void __init acpi_boot_table_init(void)
/* /*
* Initialize the ACPI boot-time table parser. * Initialize the ACPI boot-time table parser.
*/ */
if (acpi_table_init()) { if (acpi_locate_initial_tables())
disable_acpi(); disable_acpi();
return; else
} acpi_reserve_initial_tables();
}
int __init early_acpi_boot_init(void)
{
if (acpi_disabled)
return 1;
acpi_table_init_complete();
acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf); acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);
...@@ -1570,18 +1578,9 @@ void __init acpi_boot_table_init(void) ...@@ -1570,18 +1578,9 @@ void __init acpi_boot_table_init(void)
} else { } else {
printk(KERN_WARNING PREFIX "Disabling ACPI support\n"); printk(KERN_WARNING PREFIX "Disabling ACPI support\n");
disable_acpi(); disable_acpi();
return; return 1;
} }
} }
}
int __init early_acpi_boot_init(void)
{
/*
* If acpi_disabled, bail out
*/
if (acpi_disabled)
return 1;
/* /*
* Process the Multiple APIC Description Table (MADT), if present * Process the Multiple APIC Description Table (MADT), if present
......
...@@ -1045,6 +1045,9 @@ void __init setup_arch(char **cmdline_p) ...@@ -1045,6 +1045,9 @@ void __init setup_arch(char **cmdline_p)
cleanup_highmap(); cleanup_highmap();
/* Look for ACPI tables and reserve memory occupied by them. */
acpi_boot_table_init();
memblock_set_current_limit(ISA_END_ADDRESS); memblock_set_current_limit(ISA_END_ADDRESS);
e820__memblock_setup(); e820__memblock_setup();
...@@ -1136,11 +1139,6 @@ void __init setup_arch(char **cmdline_p) ...@@ -1136,11 +1139,6 @@ void __init setup_arch(char **cmdline_p)
early_platform_quirks(); early_platform_quirks();
/*
* Parse the ACPI tables for possible boot-time SMP configuration.
*/
acpi_boot_table_init();
early_acpi_boot_init(); early_acpi_boot_init();
initmem_init(); initmem_init();
......
...@@ -1659,7 +1659,7 @@ void play_dead_common(void) ...@@ -1659,7 +1659,7 @@ void play_dead_common(void)
local_irq_disable(); local_irq_disable();
} }
static bool wakeup_cpu0(void) bool wakeup_cpu0(void)
{ {
if (smp_processor_id() == 0 && enable_start_cpu0) if (smp_processor_id() == 0 && enable_start_cpu0)
return true; return true;
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
*/ */
#ifdef CONFIG_X86 #ifdef CONFIG_X86
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/cpu.h>
#endif #endif
#define _COMPONENT ACPI_PROCESSOR_COMPONENT #define _COMPONENT ACPI_PROCESSOR_COMPONENT
...@@ -541,6 +542,12 @@ static int acpi_idle_play_dead(struct cpuidle_device *dev, int index) ...@@ -541,6 +542,12 @@ static int acpi_idle_play_dead(struct cpuidle_device *dev, int index)
wait_for_freeze(); wait_for_freeze();
} else } else
return -ENODEV; return -ENODEV;
#if defined(CONFIG_X86) && defined(CONFIG_HOTPLUG_CPU)
/* If NMI wants to wake up CPU0, start CPU0. */
if (wakeup_cpu0())
start_cpu0();
#endif
} }
/* Never reached */ /* Never reached */
......
...@@ -1670,6 +1670,8 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle, ...@@ -1670,6 +1670,8 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
device_initialize(&device->dev); device_initialize(&device->dev);
dev_set_uevent_suppress(&device->dev, true); dev_set_uevent_suppress(&device->dev, true);
acpi_init_coherency(device); acpi_init_coherency(device);
/* Assume there are unmet deps to start with. */
device->dep_unmet = 1;
} }
void acpi_device_add_finalize(struct acpi_device *device) void acpi_device_add_finalize(struct acpi_device *device)
...@@ -1933,6 +1935,8 @@ static void acpi_scan_dep_init(struct acpi_device *adev) ...@@ -1933,6 +1935,8 @@ static void acpi_scan_dep_init(struct acpi_device *adev)
{ {
struct acpi_dep_data *dep; struct acpi_dep_data *dep;
adev->dep_unmet = 0;
mutex_lock(&acpi_dep_list_lock); mutex_lock(&acpi_dep_list_lock);
list_for_each_entry(dep, &acpi_dep_list, node) { list_for_each_entry(dep, &acpi_dep_list, node) {
...@@ -1980,7 +1984,13 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, bool check_dep, ...@@ -1980,7 +1984,13 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, bool check_dep,
return AE_CTRL_DEPTH; return AE_CTRL_DEPTH;
acpi_scan_init_hotplug(device); acpi_scan_init_hotplug(device);
if (!check_dep) /*
* If check_dep is true at this point, the device has no dependencies,
* or the creation of the device object would have been postponed above.
*/
if (check_dep)
device->dep_unmet = 0;
else
acpi_scan_dep_init(device); acpi_scan_dep_init(device);
out: out:
......
...@@ -780,7 +780,7 @@ acpi_status acpi_os_table_override(struct acpi_table_header *existing_table, ...@@ -780,7 +780,7 @@ acpi_status acpi_os_table_override(struct acpi_table_header *existing_table,
} }
/* /*
* acpi_table_init() * acpi_locate_initial_tables()
* *
* find RSDP, find and checksum SDT/XSDT. * find RSDP, find and checksum SDT/XSDT.
* checksum all tables, print SDT/XSDT * checksum all tables, print SDT/XSDT
...@@ -788,7 +788,7 @@ acpi_status acpi_os_table_override(struct acpi_table_header *existing_table, ...@@ -788,7 +788,7 @@ acpi_status acpi_os_table_override(struct acpi_table_header *existing_table,
* result: sdt_entry[] is initialized * result: sdt_entry[] is initialized
*/ */
int __init acpi_table_init(void) int __init acpi_locate_initial_tables(void)
{ {
acpi_status status; acpi_status status;
...@@ -803,9 +803,45 @@ int __init acpi_table_init(void) ...@@ -803,9 +803,45 @@ int __init acpi_table_init(void)
status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0); status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status))
return -EINVAL; return -EINVAL;
acpi_table_initrd_scan();
return 0;
}
void __init acpi_reserve_initial_tables(void)
{
int i;
for (i = 0; i < ACPI_MAX_TABLES; i++) {
struct acpi_table_desc *table_desc = &initial_tables[i];
u64 start = table_desc->address;
u64 size = table_desc->length;
if (!start || !size)
break;
pr_info("Reserving %4s table memory at [mem 0x%llx-0x%llx]\n",
table_desc->signature.ascii, start, start + size - 1);
memblock_reserve(start, size);
}
}
void __init acpi_table_init_complete(void)
{
acpi_table_initrd_scan();
check_multiple_madt(); check_multiple_madt();
}
int __init acpi_table_init(void)
{
int ret;
ret = acpi_locate_initial_tables();
if (ret)
return ret;
acpi_table_init_complete();
return 0; return 0;
} }
......
...@@ -222,10 +222,14 @@ void __iomem *__acpi_map_table(unsigned long phys, unsigned long size); ...@@ -222,10 +222,14 @@ void __iomem *__acpi_map_table(unsigned long phys, unsigned long size);
void __acpi_unmap_table(void __iomem *map, unsigned long size); void __acpi_unmap_table(void __iomem *map, unsigned long size);
int early_acpi_boot_init(void); int early_acpi_boot_init(void);
int acpi_boot_init (void); int acpi_boot_init (void);
void acpi_boot_table_prepare (void);
void acpi_boot_table_init (void); void acpi_boot_table_init (void);
int acpi_mps_check (void); int acpi_mps_check (void);
int acpi_numa_init (void); int acpi_numa_init (void);
int acpi_locate_initial_tables (void);
void acpi_reserve_initial_tables (void);
void acpi_table_init_complete (void);
int acpi_table_init (void); int acpi_table_init (void);
int acpi_table_parse(char *id, acpi_tbl_table_handler handler); int acpi_table_parse(char *id, acpi_tbl_table_handler handler);
int __init acpi_table_parse_entries(char *id, unsigned long table_size, int __init acpi_table_parse_entries(char *id, unsigned long table_size,
...@@ -814,9 +818,12 @@ static inline int acpi_boot_init(void) ...@@ -814,9 +818,12 @@ static inline int acpi_boot_init(void)
return 0; return 0;
} }
static inline void acpi_boot_table_prepare(void)
{
}
static inline void acpi_boot_table_init(void) static inline void acpi_boot_table_init(void)
{ {
return;
} }
static inline int acpi_mps_check(void) static inline int acpi_mps_check(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment