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

Commit b8a848ed authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'bugzilla-13620-revert' into release

parents ed680c4a 7cb7f45c

drivers/acpi/acpica/acobject.h

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
#define AOPOBJ_OBJECT_INITIALIZED   0x08

#define AOPOBJ_SETUP_COMPLETE       0x10

#define AOPOBJ_SINGLE_DATUM         0x20

#define AOPOBJ_INVALID              0x40	/* Used if host OS won't allow an op_region address */



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

 *

drivers/acpi/acpica/dsopcode.c

+24 −0
Original line number Diff line number Diff line
@@ -397,6 +397,30 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc) 
	status = acpi_ds_execute_arguments(node, acpi_ns_get_parent_node(node),

					   extra_desc->extra.aml_length,

					   extra_desc->extra.aml_start);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}



	/* Validate the region address/length via the host OS */



	status = acpi_os_validate_address(obj_desc->region.space_id,

					  obj_desc->region.address,

					  (acpi_size) obj_desc->region.length,

					  acpi_ut_get_node_name(node));



	if (ACPI_FAILURE(status)) {

		/*

		 * Invalid address/length. We will emit an error message and mark

		 * the region as invalid, so that it will cause an additional error if

		 * it is ever used. Then return AE_OK.

		 */

		ACPI_EXCEPTION((AE_INFO, status,

				"During address validation of OpRegion [%4.4s]",

				node->name.ascii));

		obj_desc->common.flags |= AOPOBJ_INVALID;

		status = AE_OK;

	}



	return_ACPI_STATUS(status);

}

drivers/acpi/acpica/exfldio.c

+6 −0
Original line number Diff line number Diff line
@@ -113,6 +113,12 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc, 
		}

	}



	/* Exit if Address/Length have been disallowed by the host OS */



	if (rgn_desc->common.flags & AOPOBJ_INVALID) {

		return_ACPI_STATUS(AE_AML_ILLEGAL_ADDRESS);

	}



	/*

	 * Exit now for SMBus address space, it has a non-linear address space

	 * and the request cannot be directly validated

include/acpi/acpiosxf.h

+4 −0
Original line number Diff line number Diff line
@@ -242,6 +242,10 @@ acpi_os_derive_pci_id(acpi_handle rhandle, 
acpi_status acpi_os_validate_interface(char *interface);

acpi_status acpi_osi_invalidate(char* interface);



acpi_status

acpi_os_validate_address(u8 space_id, acpi_physical_address address,

			 acpi_size length, char *name);



u64 acpi_os_get_timer(void);



acpi_status acpi_os_signal(u32 function, void *info);