Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74e59ea0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm+acpi-3.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management and ACPI fixes from Rafael Wysocki:
 "These are an ACPI device power management initialization fix (-stable
  material), two commits renaming stuff in the ACPI processor driver to
  make it more suitable for ARM64 processors and a new ACPI backlight
  blacklist entry.

  Specifics:

   - Fix ACPI power management intialization for device objects
     corresponding to devices that are not present at the init time (the
     _STA control method returns 0 for them) and therefore should not be
     regarded as power manageable (Rafael J Wysocki).

   - Rename a structure field and two functions used by the ACPI
     processor driver to make them less tied to architectures that use
     APICs (both x86 and ia64) and more suitable for ARM64 processors
     (Hanjun Guo).

   - Add a disable_native_backlight quirk for Dell XPS15 L521X designed
     in an unusual way preventing native backlight from working on that
     machine (Hans de Goede)"

* tag 'pm+acpi-3.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / video: Add disable_native_backlight quirk for Dell XPS15 L521X
  ACPI / processor: Rename acpi_(un)map_lsapic() to acpi_(un)map_cpu()
  ACPI / processor: Convert apic_id to phys_id to make it arch agnostic
  ACPI / PM: Fix PM initialization for devices that are not present
parents 086b2a94 794c3a0a

arch/ia64/kernel/acpi.c

+4 −5
Original line number Diff line number Diff line
@@ -893,13 +893,13 @@ static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) 
}



/* wrapper to silence section mismatch warning */

int __ref acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu)

int __ref acpi_map_cpu(acpi_handle handle, int physid, int *pcpu)

{

	return _acpi_map_lsapic(handle, physid, pcpu);

}

EXPORT_SYMBOL(acpi_map_lsapic);

EXPORT_SYMBOL(acpi_map_cpu);



int acpi_unmap_lsapic(int cpu)

int acpi_unmap_cpu(int cpu)

{

	ia64_cpu_to_sapicid[cpu] = -1;

	set_cpu_present(cpu, false);
@@ -910,8 +910,7 @@ int acpi_unmap_lsapic(int cpu) 


	return (0);

}



EXPORT_SYMBOL(acpi_unmap_lsapic);

EXPORT_SYMBOL(acpi_unmap_cpu);

#endif				/* CONFIG_ACPI_HOTPLUG_CPU */



#ifdef CONFIG_ACPI_NUMA

arch/x86/kernel/acpi/boot.c

+4 −5
Original line number Diff line number Diff line
@@ -750,13 +750,13 @@ static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) 
}



/* wrapper to silence section mismatch warning */

int __ref acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu)

int __ref acpi_map_cpu(acpi_handle handle, int physid, int *pcpu)

{

	return _acpi_map_lsapic(handle, physid, pcpu);

}

EXPORT_SYMBOL(acpi_map_lsapic);

EXPORT_SYMBOL(acpi_map_cpu);



int acpi_unmap_lsapic(int cpu)

int acpi_unmap_cpu(int cpu)

{

#ifdef CONFIG_ACPI_NUMA

	set_apicid_to_node(per_cpu(x86_cpu_to_apicid, cpu), NUMA_NO_NODE);
@@ -768,8 +768,7 @@ int acpi_unmap_lsapic(int cpu) 


	return (0);

}



EXPORT_SYMBOL(acpi_unmap_lsapic);

EXPORT_SYMBOL(acpi_unmap_cpu);

#endif				/* CONFIG_ACPI_HOTPLUG_CPU */



int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base)

drivers/acpi/acpi_processor.c

+14 −11
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr) 
	acpi_status status;

	int ret;



	if (pr->apic_id == -1)

	if (pr->phys_id == -1)

		return -ENODEV;



	status = acpi_evaluate_integer(pr->handle, "_STA", NULL, &sta);
@@ -180,13 +180,13 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr) 
	cpu_maps_update_begin();

	cpu_hotplug_begin();



	ret = acpi_map_lsapic(pr->handle, pr->apic_id, &pr->id);

	ret = acpi_map_cpu(pr->handle, pr->phys_id, &pr->id);

	if (ret)

		goto out;



	ret = arch_register_cpu(pr->id);

	if (ret) {

		acpi_unmap_lsapic(pr->id);

		acpi_unmap_cpu(pr->id);

		goto out;

	}
@@ -215,7 +215,7 @@ static int acpi_processor_get_info(struct acpi_device *device) 
	union acpi_object object = { 0 };

	struct acpi_buffer buffer = { sizeof(union acpi_object), &object };

	struct acpi_processor *pr = acpi_driver_data(device);

	int apic_id, cpu_index, device_declaration = 0;

	int phys_id, cpu_index, device_declaration = 0;

	acpi_status status = AE_OK;

	static int cpu0_initialized;

	unsigned long long value;
@@ -262,15 +262,18 @@ static int acpi_processor_get_info(struct acpi_device *device) 
		pr->acpi_id = value;

	}



	apic_id = acpi_get_apicid(pr->handle, device_declaration, pr->acpi_id);

	if (apic_id < 0)

		acpi_handle_debug(pr->handle, "failed to get CPU APIC ID.\n");

	pr->apic_id = apic_id;

	phys_id = acpi_get_phys_id(pr->handle, device_declaration, pr->acpi_id);

	if (phys_id < 0)

		acpi_handle_debug(pr->handle, "failed to get CPU physical ID.\n");

	pr->phys_id = phys_id;



	cpu_index = acpi_map_cpuid(pr->apic_id, pr->acpi_id);

	cpu_index = acpi_map_cpuid(pr->phys_id, pr->acpi_id);

	if (!cpu0_initialized && !acpi_has_cpu_in_madt()) {

		cpu0_initialized = 1;

		/* Handle UP system running SMP kernel, with no LAPIC in MADT */

		/*

		 * Handle UP system running SMP kernel, with no CPU

		 * entry in MADT

		 */

		if ((cpu_index == -1) && (num_online_cpus() == 1))

			cpu_index = 0;

	}
@@ -458,7 +461,7 @@ static void acpi_processor_remove(struct acpi_device *device) 


	/* Remove the CPU. */

	arch_unregister_cpu(pr->id);

	acpi_unmap_lsapic(pr->id);

	acpi_unmap_cpu(pr->id);



	cpu_hotplug_done();

	cpu_maps_update_done();

drivers/acpi/device_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ int acpi_bus_init_power(struct acpi_device *device) 


	device->power.state = ACPI_STATE_UNKNOWN;

	if (!acpi_device_is_present(device))

		return 0;

		return -ENXIO;



	result = acpi_device_get_power(device, &state);

	if (result)

drivers/acpi/processor_core.c

+28 −28
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int map_madt_entry(int type, u32 acpi_id) 
	unsigned long madt_end, entry;

	static struct acpi_table_madt *madt;

	static int read_madt;

	int apic_id = -1;

	int phys_id = -1;	/* CPU hardware ID */



	if (!read_madt) {

		if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0,
@@ -79,7 +79,7 @@ static int map_madt_entry(int type, u32 acpi_id) 
	}



	if (!madt)

		return apic_id;

		return phys_id;



	entry = (unsigned long)madt;

	madt_end = entry + madt->header.length;
@@ -91,18 +91,18 @@ static int map_madt_entry(int type, u32 acpi_id) 
		struct acpi_subtable_header *header =

			(struct acpi_subtable_header *)entry;

		if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) {

			if (!map_lapic_id(header, acpi_id, &apic_id))

			if (!map_lapic_id(header, acpi_id, &phys_id))

				break;

		} else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) {

			if (!map_x2apic_id(header, type, acpi_id, &apic_id))

			if (!map_x2apic_id(header, type, acpi_id, &phys_id))

				break;

		} else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {

			if (!map_lsapic_id(header, type, acpi_id, &apic_id))

			if (!map_lsapic_id(header, type, acpi_id, &phys_id))

				break;

		}

		entry += header->length;

	}

	return apic_id;

	return phys_id;

}



static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id)
@@ -110,7 +110,7 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id) 
	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	union acpi_object *obj;

	struct acpi_subtable_header *header;

	int apic_id = -1;

	int phys_id = -1;



	if (ACPI_FAILURE(acpi_evaluate_object(handle, "_MAT", NULL, &buffer)))

		goto exit;
@@ -126,38 +126,38 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id) 


	header = (struct acpi_subtable_header *)obj->buffer.pointer;

	if (header->type == ACPI_MADT_TYPE_LOCAL_APIC)

		map_lapic_id(header, acpi_id, &apic_id);

		map_lapic_id(header, acpi_id, &phys_id);

	else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC)

		map_lsapic_id(header, type, acpi_id, &apic_id);

		map_lsapic_id(header, type, acpi_id, &phys_id);

	else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC)

		map_x2apic_id(header, type, acpi_id, &apic_id);

		map_x2apic_id(header, type, acpi_id, &phys_id);



exit:

	kfree(buffer.pointer);

	return apic_id;

	return phys_id;

}



int acpi_get_apicid(acpi_handle handle, int type, u32 acpi_id)

int acpi_get_phys_id(acpi_handle handle, int type, u32 acpi_id)

{

	int apic_id;

	int phys_id;



	apic_id = map_mat_entry(handle, type, acpi_id);

	if (apic_id == -1)

		apic_id = map_madt_entry(type, acpi_id);

	phys_id = map_mat_entry(handle, type, acpi_id);

	if (phys_id == -1)

		phys_id = map_madt_entry(type, acpi_id);



	return apic_id;

	return phys_id;

}



int acpi_map_cpuid(int apic_id, u32 acpi_id)

int acpi_map_cpuid(int phys_id, u32 acpi_id)

{

#ifdef CONFIG_SMP

	int i;

#endif



	if (apic_id == -1) {

	if (phys_id == -1) {

		/*

		 * On UP processor, there is no _MAT or MADT table.

		 * So above apic_id is always set to -1.

		 * So above phys_id is always set to -1.

		 *

		 * BIOS may define multiple CPU handles even for UP processor.

		 * For example,
@@ -170,7 +170,7 @@ int acpi_map_cpuid(int apic_id, u32 acpi_id) 
		 *     Processor (CPU3, 0x03, 0x00000410, 0x06) {}

		 * }

		 *

		 * Ignores apic_id and always returns 0 for the processor

		 * Ignores phys_id and always returns 0 for the processor

		 * handle with acpi id 0 if nr_cpu_ids is 1.

		 * This should be the case if SMP tables are not found.

		 * Return -1 for other CPU's handle.
@@ -178,28 +178,28 @@ int acpi_map_cpuid(int apic_id, u32 acpi_id) 
		if (nr_cpu_ids <= 1 && acpi_id == 0)

			return acpi_id;

		else

			return apic_id;

			return phys_id;

	}



#ifdef CONFIG_SMP

	for_each_possible_cpu(i) {

		if (cpu_physical_id(i) == apic_id)

		if (cpu_physical_id(i) == phys_id)

			return i;

	}

#else

	/* In UP kernel, only processor 0 is valid */

	if (apic_id == 0)

		return apic_id;

	if (phys_id == 0)

		return phys_id;

#endif

	return -1;

}



int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)

{

	int apic_id;

	int phys_id;



	apic_id = acpi_get_apicid(handle, type, acpi_id);

	phys_id = acpi_get_phys_id(handle, type, acpi_id);



	return acpi_map_cpuid(apic_id, acpi_id);

	return acpi_map_cpuid(phys_id, acpi_id);

}

EXPORT_SYMBOL_GPL(acpi_get_cpuid);