Commit 45494d77 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-scan', 'acpi-bus', 'acpi-tables' and 'acpi-sysfs' 

Merge ACPI changes related to device enumeration, device object
managenet, operation region handling, table parsing and sysfs
interface:

 - Use ZERO_PAGE(0) instead of empty_zero_page in the ACPI device
   enumeration code (Giulio Benetti).

 - Change the return type of the ACPI driver remove callback to void and
   update its users accordingly (Dawei Li).

 - Add general support for FFH address space type and implement the low-
   level part of it for ARM64 (Sudeep Holla).

 - Fix stale comments in the ACPI tables parsing code and make it print
   more messages related to MADT (Hanjun Guo, Huacai Chen).

 - Replace invocations of generic library functions with more kernel-
   specific counterparts in the ACPI sysfs interface (Christophe JAILLET,
   Xu Panda).

* acpi-scan:
  ACPI: scan: substitute empty_zero_page with helper ZERO_PAGE(0)

* acpi-bus:
  ACPI: FFH: Silence missing prototype warnings
  ACPI: make remove callback of ACPI driver void
  ACPI: bus: Fix the _OSC capability check for FFH OpRegion
  arm64: Add architecture specific ACPI FFH Opregion callbacks
  ACPI: Implement a generic FFH Opregion handler

* acpi-tables:
  ACPI: tables: Fix the stale comments for acpi_locate_initial_tables()
  ACPI: tables: Print CORE_PIC information when MADT is parsed

* acpi-sysfs:
  ACPI: sysfs: use sysfs_emit() to instead of scnprintf()
  ACPI: sysfs: Use kstrtobool() instead of strtobool()
parents 888bc86e 9256dac0 3223417d 062c0e36 82d08d61

arch/arm64/kernel/acpi.c

+106 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#define pr_fmt(fmt) "ACPI: " fmt



#include <linux/acpi.h>

#include <linux/arm-smccc.h>

#include <linux/cpumask.h>

#include <linux/efi.h>

#include <linux/efi-bgrt.h>
@@ -411,3 +412,108 @@ void arch_reserve_mem_area(acpi_physical_address addr, size_t size) 
{

	memblock_mark_nomap(addr, size);

}



#ifdef CONFIG_ACPI_FFH

/*

 * Implements ARM64 specific callbacks to support ACPI FFH Operation Region as

 * specified in https://developer.arm.com/docs/den0048/latest

 */

struct acpi_ffh_data {

	struct acpi_ffh_info info;

	void (*invoke_ffh_fn)(unsigned long a0, unsigned long a1,

			      unsigned long a2, unsigned long a3,

			      unsigned long a4, unsigned long a5,

			      unsigned long a6, unsigned long a7,

			      struct arm_smccc_res *args,

			      struct arm_smccc_quirk *res);

	void (*invoke_ffh64_fn)(const struct arm_smccc_1_2_regs *args,

				struct arm_smccc_1_2_regs *res);

};



int acpi_ffh_address_space_arch_setup(void *handler_ctxt, void **region_ctxt)

{

	enum arm_smccc_conduit conduit;

	struct acpi_ffh_data *ffh_ctxt;



	ffh_ctxt = kzalloc(sizeof(*ffh_ctxt), GFP_KERNEL);

	if (!ffh_ctxt)

		return -ENOMEM;



	if (arm_smccc_get_version() < ARM_SMCCC_VERSION_1_2)

		return -EOPNOTSUPP;



	conduit = arm_smccc_1_1_get_conduit();

	if (conduit == SMCCC_CONDUIT_NONE) {

		pr_err("%s: invalid SMCCC conduit\n", __func__);

		return -EOPNOTSUPP;

	}



	if (conduit == SMCCC_CONDUIT_SMC) {

		ffh_ctxt->invoke_ffh_fn = __arm_smccc_smc;

		ffh_ctxt->invoke_ffh64_fn = arm_smccc_1_2_smc;

	} else {

		ffh_ctxt->invoke_ffh_fn = __arm_smccc_hvc;

		ffh_ctxt->invoke_ffh64_fn = arm_smccc_1_2_hvc;

	}



	memcpy(ffh_ctxt, handler_ctxt, sizeof(ffh_ctxt->info));



	*region_ctxt = ffh_ctxt;

	return AE_OK;

}



static bool acpi_ffh_smccc_owner_allowed(u32 fid)

{

	int owner = ARM_SMCCC_OWNER_NUM(fid);



	if (owner == ARM_SMCCC_OWNER_STANDARD ||

	    owner == ARM_SMCCC_OWNER_SIP || owner == ARM_SMCCC_OWNER_OEM)

		return true;



	return false;

}



int acpi_ffh_address_space_arch_handler(acpi_integer *value, void *region_context)

{

	int ret = 0;

	struct acpi_ffh_data *ffh_ctxt = region_context;



	if (ffh_ctxt->info.offset == 0) {

		/* SMC/HVC 32bit call */

		struct arm_smccc_res res;

		u32 a[8] = { 0 }, *ptr = (u32 *)value;



		if (!ARM_SMCCC_IS_FAST_CALL(*ptr) || ARM_SMCCC_IS_64(*ptr) ||

		    !acpi_ffh_smccc_owner_allowed(*ptr) ||

		    ffh_ctxt->info.length > 32) {

			ret = AE_ERROR;

		} else {

			int idx, len = ffh_ctxt->info.length >> 2;



			for (idx = 0; idx < len; idx++)

				a[idx] = *(ptr + idx);



			ffh_ctxt->invoke_ffh_fn(a[0], a[1], a[2], a[3], a[4],

						a[5], a[6], a[7], &res, NULL);

			memcpy(value, &res, sizeof(res));

		}



	} else if (ffh_ctxt->info.offset == 1) {

		/* SMC/HVC 64bit call */

		struct arm_smccc_1_2_regs *r = (struct arm_smccc_1_2_regs *)value;



		if (!ARM_SMCCC_IS_FAST_CALL(r->a0) || !ARM_SMCCC_IS_64(r->a0) ||

		    !acpi_ffh_smccc_owner_allowed(r->a0) ||

		    ffh_ctxt->info.length > sizeof(*r)) {

			ret = AE_ERROR;

		} else {

			ffh_ctxt->invoke_ffh64_fn(r, r);

			memcpy(value, r, ffh_ctxt->info.length);

		}

	} else {

		ret = AE_ERROR;

	}



	return ret;

}

#endif /* CONFIG_ACPI_FFH */

arch/ia64/hp/common/aml_nfw.c

+2 −2
Original line number Diff line number Diff line
@@ -187,9 +187,9 @@ static int aml_nfw_add(struct acpi_device *device) 
	return aml_nfw_add_global_handler();

}



static int aml_nfw_remove(struct acpi_device *device)

static void aml_nfw_remove(struct acpi_device *device)

{

	return aml_nfw_remove_global_handler();

	aml_nfw_remove_global_handler();

}



static const struct acpi_device_id aml_nfw_ids[] = {

arch/x86/platform/olpc/olpc-xo15-sci.c

+1 −2
Original line number Diff line number Diff line
@@ -183,13 +183,12 @@ static int xo15_sci_add(struct acpi_device *device) 
	return r;

}



static int xo15_sci_remove(struct acpi_device *device)

static void xo15_sci_remove(struct acpi_device *device)

{

	acpi_disable_gpe(NULL, xo15_sci_gpe);

	acpi_remove_gpe_handler(NULL, xo15_sci_gpe, xo15_sci_gpe_handler);

	cancel_work_sync(&sci_work);

	sysfs_remove_file(&device->dev.kobj, &lid_wake_on_close_attr.attr);

	return 0;

}



#ifdef CONFIG_PM_SLEEP

drivers/acpi/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -564,6 +564,16 @@ config ACPI_PCC 
	  Enable this feature if you want to set up and install the PCC Address

	  Space handler to handle PCC OpRegion in the firmware.



config ACPI_FFH

	bool "ACPI FFH Address Space"

	default n

	help

	  The FFH(Fixed Function Hardware) Address Space also referred as FFH

	  Operation Region allows to define platform specific opregion.



	  Enable this feature if you want to set up and install the FFH Address

	  Space handler to handle FFH OpRegion in the firmware.



source "drivers/acpi/pmic/Kconfig"



config ACPI_VIOT

drivers/acpi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ acpi-$(CONFIG_ACPI_GENERIC_GSI) += irq.o 
acpi-$(CONFIG_ACPI_WATCHDOG)	+= acpi_watchdog.o

acpi-$(CONFIG_ACPI_PRMT)	+= prmt.o

acpi-$(CONFIG_ACPI_PCC)		+= acpi_pcc.o

acpi-$(CONFIG_ACPI_FFH)		+= acpi_ffh.o



# Address translation

acpi-$(CONFIG_ACPI_ADXL)	+= acpi_adxl.o