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

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

Pull ACPI updates from Rafael Wysocki:
 "These rework the handling of notifications in ACPI button drivers (to
  enable future simplifications and cleanups), clean up the ACPI thermal
  driver, update the ACPI backlight driver, add quirks working around
  AML bugs on some systems, fix some assorted issues and clean up code.

  Specifics:

   - Reduce ACPI device enumeration overhead related to devices with
     dependencies (Rafael Wysocki)

   - Fix the handling of Microsoft LPS0 _DSM for suspend-to-idle (Mario
     Limonciello)

   - Fix section mismatch warning in the ACPI suspend-to-idle code (Arnd
     Bergmann)

   - Drop several ACPI resource management quirks related to IRQ
     ovverides on AMD "Zen" systems (Mario Limonciello)

   - Modify the ACPI EC driver to make it only clear the EC GPE status
     when handling the GPE (Jeremy Compostella)

   - Add quirks to work around ACPI tables defects on Lenovo Yoga Book
     yb1-x90f/l and Nextbook Ares 8A (Hans de Goede)

   - Add ACPi backlight quirks for Dell Studio 1569, Lenovo ThinkPad
     X131e (3371 AMD version) and Apple iMac11,3 and stop trying to use
     vendor backlight control on relatively recent systems (Hans de
     Goede)

   - Add pwm_lookup_table entry for second PWM on CHT/BSW devices in the
     ACPI LPSS (Intel SoC) driver (Hans de Goede)

   - Add nfit_intel_shutdown_status() declaration to a local header to
     avoid a "missing prototypes" build warning (Arnd Bergmann)

   - Clean up the ACPI thermal driver and drop some dead or otherwise
     unneded code from it (Rafael Wysocki)

   - Rework the handling of notifications in the ACPI button drivers so
     as to allow the common notification handling code for devices to be
     simplified (Rafael Wysocki)

   - Make ghes_get_devices() return NULL to indicate that there are no
     GHES devices so as to allow vendor-specific EDAC drivers to probe
     then (Li Yang)

   - Mark bert_disable() as __initdata and drop an unused function from
     the APEI GHES code (Miaohe Lin)

   - Make the ACPI PAD (Processor Aggregator Device) driver realize that
     Zhaoxin CPUs support nonstop TSC (Tony W Wang-oc)

   - Drop the certainly unnecessary and likely incorrect inclusion of
     linux/arm-smccc.h from acpi_ffh.c (Sudeep Holla)"

* tag 'acpi-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (30 commits)
  ACPI: video: Add backlight=native DMI quirk for Dell Studio 1569
  ACPI: thermal: Drop struct acpi_thermal_flags
  ACPI: thermal: Drop struct acpi_thermal_state
  ACPI: bus: Simplify installation and removal of notify callback
  ACPI: tiny-power-button: Eliminate the driver notify callback
  ACPI: button: Use different notify handlers for lid and buttons
  ACPI: button: Eliminate the driver notify callback
  ACPI: thermal: Eliminate struct acpi_thermal_state_flags
  ACPI: thermal: Move acpi_thermal_driver definition
  ACPI: thermal: Move symbol definitions to one place
  ACPI: thermal: Drop redundant ACPI_TRIPS_REFRESH_DEVICES symbol
  ACPI: thermal: Use BIT() macro for defining flags
  APEI: GHES: correctly return NULL for ghes_get_devices()
  ACPI: FFH: Drop the inclusion of linux/arm-smccc.h
  ACPI: PAD: mark Zhaoxin CPUs NONSTOP TSC correctly
  ACPI: APEI: mark bert_disable as __initdata
  ACPI: EC: Clear GPE on interrupt handling only
  ACPI: video: Stop trying to use vendor backlight control on laptops from after ~2012
  ACPI: x86: s2idle: Adjust Microsoft LPS0 _DSM handling sequence
  ACPI: resource: Remove "Zen" specific match and quirks
  ...
parents 2605e80d 01fee479

drivers/acpi/acpi_ffh.c

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 
#include <linux/idr.h>

#include <linux/io.h>



#include <linux/arm-smccc.h>



static struct acpi_ffh_info ffh_ctx;



int __weak acpi_ffh_address_space_arch_setup(void *handler_ctxt,

drivers/acpi/acpi_lpss.c

+9 −1
Original line number Diff line number Diff line
@@ -201,11 +201,19 @@ static void byt_i2c_setup(struct lpss_private_data *pdata) 
	writel(0, pdata->mmio_base + LPSS_I2C_ENABLE);

}



/* BSW PWM used for backlight control by the i915 driver */

/*

 * BSW PWM1 is used for backlight control by the i915 driver

 * BSW PWM2 is used for backlight control for fixed (etched into the glass)

 * touch controls on some models. These touch-controls have specialized

 * drivers which know they need the "pwm_soc_lpss_2" con-id.

 */

static struct pwm_lookup bsw_pwm_lookup[] = {

	PWM_LOOKUP_WITH_MODULE("80862288:00", 0, "0000:00:02.0",

			       "pwm_soc_backlight", 0, PWM_POLARITY_NORMAL,

			       "pwm-lpss-platform"),

	PWM_LOOKUP_WITH_MODULE("80862289:00", 0, NULL,

			       "pwm_soc_lpss_2", 0, PWM_POLARITY_NORMAL,

			       "pwm-lpss-platform"),

};



static void bsw_pwm_setup(struct lpss_private_data *pdata)

drivers/acpi/acpi_pad.c

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ static void power_saving_mwait_init(void) 
	case X86_VENDOR_AMD:

	case X86_VENDOR_INTEL:

	case X86_VENDOR_ZHAOXIN:

	case X86_VENDOR_CENTAUR:

		/*

		 * AMD Fam10h TSC will tick in all

		 * C/P/S0/S1 states when this bit is set.

drivers/acpi/apei/bert.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#define ACPI_BERT_PRINT_MAX_RECORDS 5

#define ACPI_BERT_PRINT_MAX_LEN 1024



static int bert_disable;

static int bert_disable __initdata;



/*

 * Print "all" the error records in the BERT table, but avoid huge spam to

drivers/acpi/apei/ghes.c

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ struct ghes_vendor_record_entry { 
};



static struct gen_pool *ghes_estatus_pool;

static unsigned long ghes_estatus_pool_size_request;



static struct ghes_estatus_cache __rcu *ghes_estatus_caches[GHES_ESTATUS_CACHES_SIZE];

static atomic_t ghes_estatus_cache_alloced;
@@ -191,7 +190,6 @@ int ghes_estatus_pool_init(unsigned int num_ghes) 
	len = GHES_ESTATUS_CACHE_AVG_SIZE * GHES_ESTATUS_CACHE_ALLOCED_MAX;

	len += (num_ghes * GHES_ESOURCE_PREALLOC_MAX_SIZE);



	ghes_estatus_pool_size_request = PAGE_ALIGN(len);

	addr = (unsigned long)vmalloc(PAGE_ALIGN(len));

	if (!addr)

		goto err_pool_alloc;
@@ -1544,6 +1542,8 @@ struct list_head *ghes_get_devices(void) 


			pr_warn_once("Force-loading ghes_edac on an unsupported platform. You're on your own!\n");

		}

	} else if (list_empty(&ghes_devs)) {

		return NULL;

	}



	return &ghes_devs;