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

Commit 15b8dd53 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Major update for acpi_get_object_info external interface 



Completed a major update for the acpi_get_object_info external interface.
Changes include:
 - Support for variable, unlimited length HID, UID, and CID strings
 - Support Processor objects the same as Devices (HID,UID,CID,ADR,STA, etc.)
 - Call the _SxW power methods on behalf of a device object
 - Determine if a device is a PCI root bridge
 - Change the ACPI_BUFFER parameter to ACPI_DEVICE_INFO.
These changes will require an update to all callers of this interface.
See the ACPICA Programmer Reference for details.

Also, update all invocations of acpi_get_object_info interface

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 9c61b34c

arch/ia64/hp/common/sba_iommu.c

+2 −5
Original line number Diff line number Diff line
@@ -2026,24 +2026,21 @@ acpi_sba_ioc_add(struct acpi_device *device) 
	struct ioc *ioc;

	acpi_status status;

	u64 hpa, length;

	struct acpi_buffer buffer;

	struct acpi_device_info *dev_info;



	status = hp_acpi_csr_space(device->handle, &hpa, &length);

	if (ACPI_FAILURE(status))

		return 1;



	buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;

	status = acpi_get_object_info(device->handle, &buffer);

	status = acpi_get_object_info(device->handle, &dev_info);

	if (ACPI_FAILURE(status))

		return 1;

	dev_info = buffer.pointer;



	/*

	 * For HWP0001, only SBA appears in ACPI namespace.  It encloses the PCI

	 * root bridges, and its CSR space includes the IOC function.

	 */

	if (strncmp("HWP0001", dev_info->hardware_id.value, 7) == 0) {

	if (strncmp("HWP0001", dev_info->hardware_id.string, 7) == 0) {

		hpa += ZX1_IOC_OFFSET;

		/* zx1 based systems default to kernel page size iommu pages */

		if (!iovp_shift)

drivers/acpi/acpi_memhotplug.c

+4 −7
Original line number Diff line number Diff line
@@ -481,26 +481,23 @@ static acpi_status is_memory_device(acpi_handle handle) 
{

	char *hardware_id;

	acpi_status status;

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	struct acpi_device_info *info;





	status = acpi_get_object_info(handle, &buffer);

	status = acpi_get_object_info(handle, &info);

	if (ACPI_FAILURE(status))

		return status;



	info = buffer.pointer;

	if (!(info->valid & ACPI_VALID_HID)) {

		kfree(buffer.pointer);

		kfree(info);

		return AE_ERROR;

	}



	hardware_id = info->hardware_id.value;

	hardware_id = info->hardware_id.string;

	if ((hardware_id == NULL) ||

	    (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID)))

		status = AE_ERROR;



	kfree(buffer.pointer);

	kfree(info);

	return status;

}

drivers/acpi/acpica/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -44,4 +44,4 @@ acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o 


acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \

		utcopy.o utdelete.o utglobal.o utmath.o utobject.o \

		utstate.o utmutex.o utobject.o utresrc.o utlock.o
 
		utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o

drivers/acpi/acpica/acconfig.h

+5 −0
Original line number Diff line number Diff line
@@ -203,6 +203,11 @@ 


#define ACPI_SMBUS_BUFFER_SIZE          34



/* _sx_d and _sx_w control methods */



#define ACPI_NUM_sx_d_METHODS           4

#define ACPI_NUM_sx_w_METHODS           5



/******************************************************************************

 *

 * ACPI AML Debugger

drivers/acpi/acpica/acglobal.h

+2 −1
Original line number Diff line number Diff line
@@ -265,7 +265,8 @@ ACPI_EXTERN u8 acpi_gbl_osi_data; 
extern u8 acpi_gbl_shutdown;

extern u32 acpi_gbl_startup_flags;

extern const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT];

extern const char *acpi_gbl_highest_dstate_names[4];

extern const char *acpi_gbl_lowest_dstate_names[ACPI_NUM_sx_w_METHODS];

extern const char *acpi_gbl_highest_dstate_names[ACPI_NUM_sx_d_METHODS];

extern const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES];

extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];