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

Commit 4bec3d80 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Improve exception handling for GPE block installation. 

1) Return an actual status value from acpi_ev_get_gpe_xrupt_block.
2) Don't clobber the status when exiting acpi_ev_install_gpe_block.

References: https://bugs.acpica.org/show_bug.cgi?id=1019


Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 36f36151

drivers/acpi/acpica/acevents.h

+3 −1
Original line number Diff line number Diff line
@@ -149,7 +149,9 @@ acpi_status 
acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,

		       struct acpi_gpe_block_info *gpe_block, void *context);



struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number);

acpi_status

acpi_ev_get_gpe_xrupt_block(u32 interrupt_number,

			    struct acpi_gpe_xrupt_info **gpe_xrupt_block);



acpi_status acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt);

drivers/acpi/acpica/evgpeblk.c

+4 −4
Original line number Diff line number Diff line
@@ -87,9 +87,9 @@ acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block, 
		return_ACPI_STATUS(status);

	}



	gpe_xrupt_block = acpi_ev_get_gpe_xrupt_block(interrupt_number);

	if (!gpe_xrupt_block) {

		status = AE_NO_MEMORY;

	status =

	    acpi_ev_get_gpe_xrupt_block(interrupt_number, &gpe_xrupt_block);

	if (ACPI_FAILURE(status)) {

		goto unlock_and_exit;

	}
@@ -112,7 +112,7 @@ acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block, 
	acpi_os_release_lock(acpi_gbl_gpe_lock, flags);



unlock_and_exit:

	status = acpi_ut_release_mutex(ACPI_MTX_EVENTS);

	(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);

	return_ACPI_STATUS(status);

}

drivers/acpi/acpica/evgpeutil.c

+15 −9
Original line number Diff line number Diff line
@@ -197,8 +197,9 @@ acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info, 
 * FUNCTION:    acpi_ev_get_gpe_xrupt_block

 *

 * PARAMETERS:  interrupt_number            - Interrupt for a GPE block

 *              gpe_xrupt_block             - Where the block is returned

 *

 * RETURN:      A GPE interrupt block

 * RETURN:      Status

 *

 * DESCRIPTION: Get or Create a GPE interrupt block. There is one interrupt

 *              block per unique interrupt level used for GPEs. Should be
@@ -207,7 +208,9 @@ acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info, 
 *

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



struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number)

acpi_status

acpi_ev_get_gpe_xrupt_block(u32 interrupt_number,

			    struct acpi_gpe_xrupt_info ** gpe_xrupt_block)

{

	struct acpi_gpe_xrupt_info *next_gpe_xrupt;

	struct acpi_gpe_xrupt_info *gpe_xrupt;
@@ -221,7 +224,8 @@ struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number) 
	next_gpe_xrupt = acpi_gbl_gpe_xrupt_list_head;

	while (next_gpe_xrupt) {

		if (next_gpe_xrupt->interrupt_number == interrupt_number) {

			return_PTR(next_gpe_xrupt);

			*gpe_xrupt_block = next_gpe_xrupt;

			return_ACPI_STATUS(AE_OK);

		}



		next_gpe_xrupt = next_gpe_xrupt->next;
@@ -231,7 +235,7 @@ struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number) 


	gpe_xrupt = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_xrupt_info));

	if (!gpe_xrupt) {

		return_PTR(NULL);

		return_ACPI_STATUS(AE_NO_MEMORY);

	}



	gpe_xrupt->interrupt_number = interrupt_number;
@@ -250,6 +254,7 @@ struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number) 
	} else {

		acpi_gbl_gpe_xrupt_list_head = gpe_xrupt;

	}



	acpi_os_release_lock(acpi_gbl_gpe_lock, flags);



	/* Install new interrupt handler if not SCI_INT */
@@ -259,14 +264,15 @@ struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number) 
							   acpi_ev_gpe_xrupt_handler,

							   gpe_xrupt);

		if (ACPI_FAILURE(status)) {

			ACPI_ERROR((AE_INFO,

			ACPI_EXCEPTION((AE_INFO, status,

					"Could not install GPE interrupt handler at level 0x%X",

					interrupt_number));

			return_PTR(NULL);

			return_ACPI_STATUS(status);

		}

	}



	return_PTR(gpe_xrupt);

	*gpe_xrupt_block = gpe_xrupt;

	return_ACPI_STATUS(AE_OK);

}



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