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

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

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

Pull more ACPI updates from Rafael Wysocki:
 "This includes a couple of fixes needed after recent changes, two ACPI
  driver fixes (fan and "Processor Aggregator"), an update of the ACPI
  device properties handling code and a new MAINTAINERS entry for ACPI
  on ARM64.

  Specifics:

   - Fix an unused function warning that started to appear after recent
     changes in the ACPI EC driver (Eric Biggers).

   - Fix the KERN_CONT usage in acpi_os_vprintf() that has become
     (particularly) annoying recently (Joe Perches).

   - Fix the fan status checking in the ACPI fan driver to avoid
     returning incorrect error codes sometimes (Srinivas Pandruvada).

   - Fix the ACPI Processor Aggregator driver (PAD) to always let the
     special processor_aggregator driver from Xen take over when running
     as Xen dom0 (Juergen Gross).

   - Update the handling of reference device properties in ACPI by
     allowing empty rows ("holes") to appear in reference property lists
     (Mika Westerberg).

   - Add a new MAINTAINERS entry for ACPI on ARM64 (Lorenzo Pieralisi)"

* tag 'acpi-extra-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  acpi_os_vprintf: Use printk_get_level() to avoid unnecessary KERN_CONT
  ACPI / PAD: don't register acpi_pad driver if running as Xen dom0
  ACPI / property: Allow holes in reference properties
  MAINTAINERS: Add ARM64-specific ACPI maintainers entry
  ACPI / EC: Fix unused function warning when CONFIG_PM_SLEEP=n
  ACPI / fan: Fix error reading cur_state
parents ef98988b 522533f3

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -316,6 +316,14 @@ W: https://01.org/linux-acpi 
S:	Supported

F:	drivers/acpi/fan.c



ACPI FOR ARM64 (ACPI/arm64)

M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

M:	Hanjun Guo <hanjun.guo@linaro.org>

M:	Sudeep Holla <sudeep.holla@arm.com>

L:	linux-acpi@vger.kernel.org

S:	Maintained

F:	drivers/acpi/arm64



ACPI THERMAL DRIVER

M:	Zhang Rui <rui.zhang@intel.com>

L:	linux-acpi@vger.kernel.org

drivers/acpi/acpi_pad.c

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/slab.h>

#include <linux/acpi.h>

#include <asm/mwait.h>

#include <xen/xen.h>



#define ACPI_PROCESSOR_AGGREGATOR_CLASS	"acpi_pad"

#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
@@ -477,6 +478,10 @@ static struct acpi_driver acpi_pad_driver = { 


static int __init acpi_pad_init(void)

{

	/* Xen ACPI PAD is used when running as Xen Dom0. */

	if (xen_initial_domain())

		return -ENODEV;



	power_saving_mwait_init();

	if (power_saving_mwait_eax == 0)

		return -EINVAL;

drivers/acpi/ec.c

+2 −0
Original line number Diff line number Diff line
@@ -526,6 +526,7 @@ static void acpi_ec_enable_event(struct acpi_ec *ec) 
		acpi_ec_clear(ec);

}



#ifdef CONFIG_PM_SLEEP

static bool acpi_ec_query_flushed(struct acpi_ec *ec)

{

	bool flushed;
@@ -557,6 +558,7 @@ static void acpi_ec_disable_event(struct acpi_ec *ec) 
	spin_unlock_irqrestore(&ec->lock, flags);

	__acpi_ec_flush_event(ec);

}

#endif /* CONFIG_PM_SLEEP */



static bool acpi_ec_guard_event(struct acpi_ec *ec)

{

drivers/acpi/fan.c

+11 −1
Original line number Diff line number Diff line
@@ -129,8 +129,18 @@ static int fan_get_state_acpi4(struct acpi_device *device, unsigned long *state) 


	control = obj->package.elements[1].integer.value;

	for (i = 0; i < fan->fps_count; i++) {

		if (control == fan->fps[i].control)

		/*

		 * When Fine Grain Control is set, return the state

		 * corresponding to maximum fan->fps[i].control

		 * value compared to the current speed. Here the

		 * fan->fps[] is sorted array with increasing speed.

		 */

		if (fan->fif.fine_grain_ctrl && control < fan->fps[i].control) {

			i = (i > 0) ? i - 1 : 0;

			break;

		} else if (control == fan->fps[i].control) {

			break;

		}

	}

	if (i == fan->fps_count) {

		dev_dbg(&device->dev, "Invalid control value returned\n");

drivers/acpi/osl.c

+10 −3
Original line number Diff line number Diff line
@@ -162,11 +162,18 @@ void acpi_os_vprintf(const char *fmt, va_list args) 
	if (acpi_in_debugger) {

		kdb_printf("%s", buffer);

	} else {

		if (printk_get_level(buffer))

			printk("%s", buffer);

		else

			printk(KERN_CONT "%s", buffer);

	}

#else

	if (acpi_debugger_write_log(buffer) < 0)

	if (acpi_debugger_write_log(buffer) < 0) {

		if (printk_get_level(buffer))

			printk("%s", buffer);

		else

			printk(KERN_CONT "%s", buffer);

	}

#endif

}