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

Commit c067affc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ACPI fixes from Rafael Wysocki:
 "These fix recent ACPICA regressions, an older PCI IRQ management
  regression, and an incorrect return value of a function in the APEI
  code.

  Specifics:

   - Fix three ACPICA issues related to the interpreter locking and
     introduced by recent changes in that area (Lv Zheng).

   - Fix a PCI IRQ management regression introduced during the 4.7 cycle
     and related to the configuration of shared IRQs on systems with an
     ISA bus (Sinan Kaya).

   - Fix up a return value of one function in the APEI code (Punit
     Agrawal)"

* tag 'acpi-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPICA: Dispatcher: Fix interpreter locking around acpi_ev_initialize_region()
  ACPICA: Dispatcher: Fix an unbalanced lock exit path in acpi_ds_auto_serialize_method()
  ACPICA: Dispatcher: Fix order issue of method termination
  ACPI / APEI: Fix incorrect return value of ghes_proc()
  ACPI/PCI: pci_link: Include PIRQ_PENALTY_PCI_USING for ISA IRQs
  ACPI/PCI: pci_link: penalize SCI correctly
  ACPI/PCI/IRQ: assign ISA IRQ directly during early boot stages
parents b546e0c2 21e2d9d5

arch/x86/kernel/acpi/boot.c

+1 −0
Original line number Diff line number Diff line
@@ -454,6 +454,7 @@ static void __init acpi_sci_ioapic_setup(u8 bus_irq, u16 polarity, u16 trigger, 
		polarity = acpi_sci_flags & ACPI_MADT_POLARITY_MASK;



	mp_override_legacy_irq(bus_irq, polarity, trigger, gsi);

	acpi_penalize_sci_irq(bus_irq, trigger, polarity);



	/*

	 * stash over-ride to indicate we've been here

drivers/acpi/acpica/dsinit.c

+3 −8
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "acdispat.h"

#include "acnamesp.h"

#include "actables.h"

#include "acinterp.h"



#define _COMPONENT          ACPI_DISPATCHER

ACPI_MODULE_NAME("dsinit")
@@ -214,23 +215,17 @@ acpi_ds_initialize_objects(u32 table_index, 


	/* Walk entire namespace from the supplied root */



	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}



	/*

	 * We don't use acpi_walk_namespace since we do not want to acquire

	 * the namespace reader lock.

	 */

	status =

	    acpi_ns_walk_namespace(ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX,

				   ACPI_NS_WALK_UNLOCK, acpi_ds_init_one_object,

				   NULL, &info, NULL);

				   0, acpi_ds_init_one_object, NULL, &info,

				   NULL);

	if (ACPI_FAILURE(status)) {

		ACPI_EXCEPTION((AE_INFO, status, "During WalkNamespace"));

	}

	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);



	status = acpi_get_table_by_index(table_index, &table);

	if (ACPI_FAILURE(status)) {

drivers/acpi/acpica/dsmethod.c

+22 −28
Original line number Diff line number Diff line
@@ -99,14 +99,11 @@ acpi_ds_auto_serialize_method(struct acpi_namespace_node *node, 
			  "Method auto-serialization parse [%4.4s] %p\n",

			  acpi_ut_get_node_name(node), node));



	acpi_ex_enter_interpreter();



	/* Create/Init a root op for the method parse tree */



	op = acpi_ps_alloc_op(AML_METHOD_OP, obj_desc->method.aml_start);

	if (!op) {

		status = AE_NO_MEMORY;

		goto unlock;

		return_ACPI_STATUS(AE_NO_MEMORY);

	}



	acpi_ps_set_name(op, node->name.integer);
@@ -118,8 +115,7 @@ acpi_ds_auto_serialize_method(struct acpi_namespace_node *node, 
	    acpi_ds_create_walk_state(node->owner_id, NULL, NULL, NULL);

	if (!walk_state) {

		acpi_ps_free_op(op);

		status = AE_NO_MEMORY;

		goto unlock;

		return_ACPI_STATUS(AE_NO_MEMORY);

	}



	status = acpi_ds_init_aml_walk(walk_state, op, node,
@@ -138,8 +134,6 @@ acpi_ds_auto_serialize_method(struct acpi_namespace_node *node, 
	status = acpi_ps_parse_aml(walk_state);



	acpi_ps_delete_parse_tree(op);

unlock:

	acpi_ex_exit_interpreter();

	return_ACPI_STATUS(status);

}
@@ -730,26 +724,6 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc, 


		acpi_ds_method_data_delete_all(walk_state);



		/*

		 * If method is serialized, release the mutex and restore the

		 * current sync level for this thread

		 */

		if (method_desc->method.mutex) {



			/* Acquisition Depth handles recursive calls */



			method_desc->method.mutex->mutex.acquisition_depth--;

			if (!method_desc->method.mutex->mutex.acquisition_depth) {

				walk_state->thread->current_sync_level =

				    method_desc->method.mutex->mutex.

				    original_sync_level;



				acpi_os_release_mutex(method_desc->method.

						      mutex->mutex.os_mutex);

				method_desc->method.mutex->mutex.thread_id = 0;

			}

		}



		/*

		 * Delete any namespace objects created anywhere within the

		 * namespace by the execution of this method. Unless:
@@ -786,6 +760,26 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc, 
				    ~ACPI_METHOD_MODIFIED_NAMESPACE;

			}

		}



		/*

		 * If method is serialized, release the mutex and restore the

		 * current sync level for this thread

		 */

		if (method_desc->method.mutex) {



			/* Acquisition Depth handles recursive calls */



			method_desc->method.mutex->mutex.acquisition_depth--;

			if (!method_desc->method.mutex->mutex.acquisition_depth) {

				walk_state->thread->current_sync_level =

				    method_desc->method.mutex->mutex.

				    original_sync_level;



				acpi_os_release_mutex(method_desc->method.

						      mutex->mutex.os_mutex);

				method_desc->method.mutex->mutex.thread_id = 0;

			}

		}

	}



	/* Decrement the thread count on the method */

drivers/acpi/acpica/dswload2.c

+0 −2
Original line number Diff line number Diff line
@@ -607,11 +607,9 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state) 
				}

			}



			acpi_ex_exit_interpreter();

			status =

			    acpi_ev_initialize_region

			    (acpi_ns_get_attached_object(node), FALSE);

			acpi_ex_enter_interpreter();



			if (ACPI_FAILURE(status)) {

				/*

drivers/acpi/acpica/evrgnini.c

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "accommon.h"

#include "acevents.h"

#include "acnamesp.h"

#include "acinterp.h"



#define _COMPONENT          ACPI_EVENTS

ACPI_MODULE_NAME("evrgnini")
@@ -597,9 +598,11 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj, 
					}

				}



				acpi_ex_exit_interpreter();

				status =

				    acpi_ev_execute_reg_method(region_obj,

							       ACPI_REG_CONNECT);

				acpi_ex_enter_interpreter();



				if (acpi_ns_locked) {

					status =