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

Commit 9bd59183 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-4.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fix from Rafael Wysocki:
 "Fix a recent ACPICA regression causing the AML parser to get confused
  and fail in some situations involving incorrect AML in an ACPI table
  (Erik Schmauss)"

* tag 'acpi-4.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPICA: AML Parser: ignore dispatcher error status during table load
parents 99015e94 73c2a01c

drivers/acpi/acpica/psloop.c

+26 −0
Original line number Diff line number Diff line
@@ -497,6 +497,18 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) 
			status =

			    acpi_ps_create_op(walk_state, aml_op_start, &op);

			if (ACPI_FAILURE(status)) {

				/*

				 * ACPI_PARSE_MODULE_LEVEL means that we are loading a table by

				 * executing it as a control method. However, if we encounter

				 * an error while loading the table, we need to keep trying to

				 * load the table rather than aborting the table load. Set the

				 * status to AE_OK to proceed with the table load.

				 */

				if ((walk_state->

				     parse_flags & ACPI_PARSE_MODULE_LEVEL)

				    && status == AE_ALREADY_EXISTS) {

					status = AE_OK;

				}

				if (status == AE_CTRL_PARSE_CONTINUE) {

					continue;

				}
@@ -694,6 +706,20 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) 
			    acpi_ps_next_parse_state(walk_state, op, status);

			if (status == AE_CTRL_PENDING) {

				status = AE_OK;

			} else

			    if ((walk_state->

				 parse_flags & ACPI_PARSE_MODULE_LEVEL)

				&& ACPI_FAILURE(status)) {

				/*

				 * ACPI_PARSE_MODULE_LEVEL means that we are loading a table by

				 * executing it as a control method. However, if we encounter

				 * an error while loading the table, we need to keep trying to

				 * load the table rather than aborting the table load. Set the

				 * status to AE_OK to proceed with the table load. If we get a

				 * failure at this point, it means that the dispatcher got an

				 * error while processing Op (most likely an AML operand error.

				 */

				status = AE_OK;

			}

		}