Commit 53937340 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ACPI fixes from Rafael Wysocki:
 "These fix a regression from the 4.18 cycle in the ACPI driver for
  Intel SoCs (LPSS) and prevent dmi_check_system() from being called on
  non-x86 systems in the ACPI core.

  Specifics:

   - Fix a power management regression in the ACPI driver for Intel SoCs
     (LPSS) introduced by a system-wide suspend/resume fix during the
     4.18 cycle (Zhang Rui).

   - Prevent dmi_check_system() from being called on non-x86 systems in
     the ACPI core (Jean Delvare)"

* tag 'acpi-4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / LPSS: Force LPSS quirks on boot
  ACPI / bus: Only call dmi_check_system() on X86
parents 69ddce94 a6b7eb3b

drivers/acpi/acpi_lpss.c

+1 −1
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ static void acpi_lpss_dismiss(struct device *dev) 
#define LPSS_GPIODEF0_DMA_LLP		BIT(13)



static DEFINE_MUTEX(lpss_iosf_mutex);

static bool lpss_iosf_d3_entered;

static bool lpss_iosf_d3_entered = true;



static void lpss_iosf_enter_d3_state(void)

{

drivers/acpi/bus.c

+7 −6
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ 
#include <linux/delay.h>

#ifdef CONFIG_X86

#include <asm/mpspec.h>

#include <linux/dmi.h>

#endif

#include <linux/acpi_iort.h>

#include <linux/pci.h>

#include <acpi/apei.h>

#include <linux/dmi.h>

#include <linux/suspend.h>



#include "internal.h"
@@ -82,10 +82,6 @@ static const struct dmi_system_id dsdt_dmi_table[] __initconst = { 
	},

	{}

};

#else

static const struct dmi_system_id dsdt_dmi_table[] __initconst = {

	{}

};

#endif



/* --------------------------------------------------------------------------
@@ -1033,11 +1029,16 @@ void __init acpi_early_init(void) 


	acpi_permanent_mmap = true;



#ifdef CONFIG_X86

	/*

	 * If the machine falls into the DMI check table,

	 * DSDT will be copied to memory

	 * DSDT will be copied to memory.

	 * Note that calling dmi_check_system() here on other architectures

	 * would not be OK because only x86 initializes dmi early enough.

	 * Thankfully only x86 systems need such quirks for now.

	 */

	dmi_check_system(dsdt_dmi_table);

#endif



	status = acpi_reallocate_root_table();

	if (ACPI_FAILURE(status)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE