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

ACPICA: Validate GPE blocks at init time 



Some of the checks done by acpi_hw_read() and acpi_hw_write(),
which are used for accessing GPE registers, are redundant in the
specific case of GPE registers and the ones that are not redundant
can be done upfront at the initialization time so as to fail the
initialization if they are not passed instead of failing every
access to the affected GPE registers going forward (including
accesses from the SCI interrupt handler).

Modify the GPE blocks initialization code accordingly.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f75aef39

drivers/acpi/acpica/achware.h

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width); 


acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width);



acpi_status acpi_hw_validate_io_block(u64 address, u32 bit_width, u32 count);



/*

 * hwgpe - GPE support

 */

drivers/acpi/acpica/evgpeblk.c

+17 −0
Original line number Diff line number Diff line
@@ -317,6 +317,23 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device, 
		return_ACPI_STATUS(AE_OK);

	}



	/* Validate the space_ID */



	if ((space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &&

	    (space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {

		ACPI_ERROR((AE_INFO,

			    "Unsupported address space: 0x%X", space_id));

		return_ACPI_STATUS(AE_SUPPORT);

	}



	if (space_id == ACPI_ADR_SPACE_SYSTEM_IO) {

		status = acpi_hw_validate_io_block(address,

						   ACPI_GPE_REGISTER_WIDTH,

						   register_count);

		if (ACPI_FAILURE(status))

			return_ACPI_STATUS(status);

	}



	/* Allocate a new GPE block */



	gpe_block = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_block_info));

drivers/acpi/acpica/hwvalid.c

+30 −0
Original line number Diff line number Diff line
@@ -292,3 +292,33 @@ acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width) 


	return (AE_OK);

}



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

 *

 * FUNCTION:    acpi_hw_validate_io_block

 *

 * PARAMETERS:  Address             Address of I/O port/register blobk

 *              bit_width           Number of bits (8,16,32) in each register

 *              count               Number of registers in the block

 *

 * RETURN:      Status

 *

 * DESCRIPTION: Validates a block of I/O ports/registers.

 *

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



acpi_status acpi_hw_validate_io_block(u64 address, u32 bit_width, u32 count)

{

	acpi_status status;



	while (count--) {

		status = acpi_hw_validate_io_request((acpi_io_address)address,

						     bit_width);

		if (ACPI_FAILURE(status))

			return_ACPI_STATUS(status);



		address += ACPI_DIV_8(bit_width);

	}



	return_ACPI_STATUS(AE_OK);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE