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

Merge branch 'acpica' 

Merge ACPICA changes for 6.3-rc1:

 - Drop port I/O validation for some regions to avoid AML failures due
   to rejections of legitimate port I/O writes (Mario Limonciello).

 - Constify acpi_get_handle() pathname argument to allow its callers to
   pass conts pathnames to it (Sakari Ailus).

 - Prevent acpi_ns_simple_repair() from crashing in some cases when
   AE_AML_NO_RETURN_VALUE should be returned (Daniil Tatianin).

 - Fix typo in CDAT DSMAS struct definition (Lukas Wunner).

* acpica:
  ACPICA: Fix typo in CDAT DSMAS struct definition
  ACPICA: nsrepair: handle cases without a return value correctly
  ACPICA: Constify pathname argument for acpi_get_handle()
  ACPICA: Drop port I/O validation for some regions
parents fda7be20 5a9e358f

drivers/acpi/acpica/hwvalid.c

+4 −3
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width); 
 *

 * The table is used to implement the Microsoft port access rules that

 * first appeared in Windows XP. Some ports are always illegal, and some

 * ports are only illegal if the BIOS calls _OSI with a win_XP string or

 * later (meaning that the BIOS itelf is post-XP.)

 * ports are only illegal if the BIOS calls _OSI with nothing newer than

 * the specific _OSI strings.

 *

 * This provides ACPICA with the desired port protections and

 * Microsoft compatibility.
@@ -145,7 +145,8 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) 


			/* Port illegality may depend on the _OSI calls made by the BIOS */



			if (acpi_gbl_osi_data >= port_info->osi_dependency) {

			if (port_info->osi_dependency == ACPI_ALWAYS_ILLEGAL ||

			    acpi_gbl_osi_data == port_info->osi_dependency) {

				ACPI_DEBUG_PRINT((ACPI_DB_VALUES,

						  "Denied AML access to port 0x%8.8X%8.8X/%X (%s 0x%.4X-0x%.4X)\n",

						  ACPI_FORMAT_UINT64(address),

drivers/acpi/acpica/nsrepair.c

+7 −5
Original line number Diff line number Diff line
@@ -181,8 +181,9 @@ acpi_ns_simple_repair(struct acpi_evaluate_info *info, 
	 * Try to fix if there was no return object. Warning if failed to fix.

	 */

	if (!return_object) {

		if (expected_btypes && (!(expected_btypes & ACPI_RTYPE_NONE))) {

			if (package_index != ACPI_NOT_PACKAGE_ELEMENT) {

		if (expected_btypes) {

			if (!(expected_btypes & ACPI_RTYPE_NONE) &&

			    package_index != ACPI_NOT_PACKAGE_ELEMENT) {

				ACPI_WARN_PREDEFINED((AE_INFO,

						      info->full_pathname,

						      ACPI_WARN_ALWAYS,
@@ -196,16 +197,17 @@ acpi_ns_simple_repair(struct acpi_evaluate_info *info, 
				if (ACPI_SUCCESS(status)) {

					return (AE_OK);	/* Repair was successful */

				}

			} else {

			}



			if (expected_btypes != ACPI_RTYPE_NONE) {

				ACPI_WARN_PREDEFINED((AE_INFO,

						      info->full_pathname,

						      ACPI_WARN_ALWAYS,

						      "Missing expected return value"));

			}



				return (AE_AML_NO_RETURN_VALUE);

			}

		}

	}



	if (expected_btypes & ACPI_RTYPE_INTEGER) {

		status = acpi_ns_convert_to_integer(return_object, &new_object);

drivers/acpi/acpica/nsxfname.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest, 


acpi_status

acpi_get_handle(acpi_handle parent,

		acpi_string pathname, acpi_handle *ret_handle)

		const char *pathname, acpi_handle *ret_handle)

{

	acpi_status status;

	struct acpi_namespace_node *node = NULL;

include/acpi/acpixf.h

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status 
					   struct acpi_buffer *ret_path_ptr))

ACPI_EXTERNAL_RETURN_STATUS(acpi_status

			     acpi_get_handle(acpi_handle parent,

					     acpi_string pathname,

					     const char *pathname,

					     acpi_handle *ret_handle))

ACPI_EXTERNAL_RETURN_STATUS(acpi_status

			     acpi_attach_data(acpi_handle object,

include/acpi/actbl1.h

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ enum acpi_cdat_type { 


/* Subtable 0: Device Scoped Memory Affinity Structure (DSMAS) */



struct acpi_cadt_dsmas {

struct acpi_cdat_dsmas {

	u8 dsmad_handle;

	u8 flags;

	u16 reserved;