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

Merge branch 'acpica' 

* acpica:
  ACPICA: Add PRMT module header to facilitate parsing
  ACPICA: Update version to 20210604
  ACPICA: Add support for PlatformRtMechanism OperationRegion handler
  ACPICA: iASL: add disassembler support for PRMT
  ACPICA: Add the CFMWS structure definition to the CEDT table
  ACPICA: Add defines for the CXL Host Bridge Structure (CHBS)
  ACPICA: iASL: Add support for the BDAT ACPI table
  ACPICA: Add _PLD panel positions
  ACPICA: Use ACPI_FALLTHROUGH
  ACPICA: iASL Table Compiler: Add full support for RGRT ACPI table
  ACPICA: iASL: Add support for the SVKL table
  ACPICA: iASL: Finish support for the IVRS ACPI table
  ACPICA: Fix memory leak caused by _CID repair function
  ACPICA: Add SVKL table headers
  ACPICA: ACPI 6.4: MADT: add Multiprocessor Wakeup Mailbox Structure
parents 49b9441a 9f8c7bae

drivers/acpi/acpica/acutils.h

+2 −0
Original line number Diff line number Diff line
@@ -737,6 +737,8 @@ const char *acpi_ah_match_uuid(u8 *data); 
 */

#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP || defined ACPI_HELP_APP)

void acpi_ut_convert_string_to_uuid(char *in_string, u8 *uuid_buffer);



acpi_status acpi_ut_convert_uuid_to_string(char *uuid_buffer, char *out_string);

#endif



#endif				/* _ACUTILS_H */

drivers/acpi/acpica/exfield.c

+6 −2
Original line number Diff line number Diff line
@@ -139,7 +139,9 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state, 
		    || obj_desc->field.region_obj->region.space_id ==

		    ACPI_ADR_SPACE_GSBUS

		    || obj_desc->field.region_obj->region.space_id ==

		    ACPI_ADR_SPACE_IPMI)) {

		    ACPI_ADR_SPACE_IPMI

		    || obj_desc->field.region_obj->region.space_id ==

		    ACPI_ADR_SPACE_PLATFORM_RT)) {



		/* SMBus, GSBus, IPMI serial */
@@ -301,7 +303,9 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc, 
		    || obj_desc->field.region_obj->region.space_id ==

		    ACPI_ADR_SPACE_GSBUS

		    || obj_desc->field.region_obj->region.space_id ==

		    ACPI_ADR_SPACE_IPMI)) {

		    ACPI_ADR_SPACE_IPMI

		    || obj_desc->field.region_obj->region.space_id ==

		    ACPI_ADR_SPACE_PLATFORM_RT)) {



		/* SMBus, GSBus, IPMI serial */

drivers/acpi/acpica/exserial.c

+12 −0
Original line number Diff line number Diff line
@@ -195,6 +195,12 @@ acpi_ex_read_serial_bus(union acpi_operand_object *obj_desc, 
		function = ACPI_READ | (accessor_type << 16);

		break;



	case ACPI_ADR_SPACE_PLATFORM_RT:



		buffer_length = ACPI_PRM_INPUT_BUFFER_SIZE;

		function = ACPI_READ;

		break;



	default:

		return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);

	}
@@ -311,6 +317,12 @@ acpi_ex_write_serial_bus(union acpi_operand_object *source_desc, 
		function = ACPI_WRITE | (accessor_type << 16);

		break;



	case ACPI_ADR_SPACE_PLATFORM_RT:



		buffer_length = ACPI_PRM_INPUT_BUFFER_SIZE;

		function = ACPI_WRITE;

		break;



	default:

		return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);

	}

drivers/acpi/acpica/nsrepair2.c

+7 −0
Original line number Diff line number Diff line
@@ -379,6 +379,13 @@ acpi_ns_repair_CID(struct acpi_evaluate_info *info, 


			(*element_ptr)->common.reference_count =

			    original_ref_count;



			/*

			 * The original_element holds a reference from the package object

			 * that represents _HID. Since a new element was created by _HID,

			 * remove the reference from the _CID package.

			 */

			acpi_ut_remove_reference(original_element);

		}



		element_ptr++;

drivers/acpi/acpica/utprint.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ int vsnprintf(char *string, acpi_size size, const char *format, va_list args) 
		case 'X':



			type |= ACPI_FORMAT_UPPER;

			/* FALLTHROUGH */

			ACPI_FALLTHROUGH;



		case 'x':