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

Commit 82a1b7cb authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Update internal address SpaceID for DataTable regions 



Moved this internal space id in preparation for ACPI 5.0 changes
that will include some new space IDs.

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 945488b9

drivers/acpi/acpica/acconfig.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ 


/* Operation regions */



#define ACPI_NUM_PREDEFINED_REGIONS     9

#define ACPI_NUM_PREDEFINED_REGIONS     8

#define ACPI_USER_REGION_BEGIN          0x80



/* Maximum space_ids for Operation Regions */

drivers/acpi/acpica/amlcode.h

+0 −15
Original line number Diff line number Diff line
@@ -394,21 +394,6 @@ 
#define AML_CLASS_METHOD_CALL       0x09

#define AML_CLASS_UNKNOWN           0x0A



/* Predefined Operation Region space_iDs */



typedef enum {

	REGION_MEMORY = 0,

	REGION_IO,

	REGION_PCI_CONFIG,

	REGION_EC,

	REGION_SMBUS,

	REGION_CMOS,

	REGION_PCI_BAR,

	REGION_IPMI,

	REGION_DATA_TABLE,	/* Internal use only */

	REGION_FIXED_HW = 0x7F

} AML_REGION_TYPES;



/* Comparison operation codes for match_op operator */



typedef enum {

drivers/acpi/acpica/dswload.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state) 
			status =

			    acpi_ex_create_region(op->named.data,

						  op->named.length,

						  REGION_DATA_TABLE,

						  ACPI_ADR_SPACE_DATA_TABLE,

						  walk_state);

			if (ACPI_FAILURE(status)) {

				return_ACPI_STATUS(status);

drivers/acpi/acpica/dswload2.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state) 
				    ((op->common.value.arg)->common.value.

				     integer);

			} else {

				region_space = REGION_DATA_TABLE;

				region_space = ACPI_ADR_SPACE_DATA_TABLE;

			}



			/*

drivers/acpi/acpica/excreate.c

+2 −1
Original line number Diff line number Diff line
@@ -305,7 +305,8 @@ acpi_ex_create_region(u8 * aml_start, 
	 * range

	 */

	if ((region_space >= ACPI_NUM_PREDEFINED_REGIONS) &&

	    (region_space < ACPI_USER_REGION_BEGIN)) {

	    (region_space < ACPI_USER_REGION_BEGIN) &&

	    (region_space != ACPI_ADR_SPACE_DATA_TABLE)) {

		ACPI_ERROR((AE_INFO, "Invalid AddressSpace type 0x%X",

			    region_space));

		return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);