Commit 7ece03b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ACPI fixes from Rafael Wysocki:
 "These fix two issues related to IOAPIC hotplug, an overzealous build
  optimization that prevents the function graph tracer from working with
  the ACPI subsystem correctly and an RCU synchronization issue in the
  ACPI APEI code.

  Specifics:

   - drop the unconditional setting of the '-Os' gcc flag from the ACPI
     Makefile to make the function graph tracer work correctly with the
     ACPI subsystem (Josh Poimboeuf).

   - add missing synchronize_rcu() to ghes_remove() which removes an
     element from an RCU-protected list, but fails to synchronize it
     properly afterward (James Morse).

   - fix two problems related to IOAPIC hotplug, a local variable
     initialization in setup_res() and the creation of platform device
     objects for IO(x)APICs which are (a) unused and (b) leaked on
     hot-removal (Joerg Roedel)"

* tag 'acpi-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: Fix incompatibility with mcount-based function graph tracing
  ACPI / APEI: Add missing synchronize_rcu() on NOTIFY_SCI removal
  ACPI: Do not create a platform_device for IOAPIC/IOxAPIC
  ACPI: ioapic: Clear on-stack resource before using it
parents 0d2ceec6 a0793066

drivers/acpi/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
# Makefile for the Linux ACPI interpreter

#



ccflags-y			:= -Os

ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT



#

drivers/acpi/acpi_platform.c

+5 −3
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ static const struct acpi_device_id forbidden_id_list[] = { 
	{"PNP0000",  0},	/* PIC */

	{"PNP0100",  0},	/* Timer */

	{"PNP0200",  0},	/* AT DMA Controller */

	{"ACPI0009", 0},	/* IOxAPIC */

	{"ACPI000A", 0},	/* IOAPIC */

	{"", 0},

};

drivers/acpi/apei/ghes.c

+1 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,7 @@ static int ghes_remove(struct platform_device *ghes_dev) 
		if (list_empty(&ghes_sci))

			unregister_acpi_hed_notifier(&ghes_notifier_sci);

		mutex_unlock(&ghes_list_mutex);

		synchronize_rcu();

		break;

	case ACPI_HEST_NOTIFY_NMI:

		ghes_nmi_remove(ghes);

drivers/acpi/ioapic.c

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,12 @@ static acpi_status setup_res(struct acpi_resource *acpi_res, void *data) 
	struct resource *res = data;

	struct resource_win win;



	/*

	 * We might assign this to 'res' later, make sure all pointers are

	 * cleared before the resource is added to the global list

	 */

	memset(&win, 0, sizeof(win));



	res->flags = 0;

	if (acpi_dev_filter_resource_type(acpi_res, IORESOURCE_MEM))

		return AE_OK;

CRA Git | Maintained and supported by SUSTech CRA and CCSE