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

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

Merge branches 'acpi-scan', 'acpi-utils' and 'acpi-pm' 

* acpi-scan:
  ACPI / scan: Change the level of _DEP-related messages to KERN_DEBUG

* acpi-utils:
  ACPI / utils: Drop error messages from acpi_evaluate_reference()

* acpi-pm:
  ACPI / PM: Do not disable wakeup GPEs that have not been enabled
parents ae5056e8 80167a24 c48cf1b9 175f8e26

drivers/acpi/device_pm.c

+10 −2
Original line number Diff line number Diff line
@@ -680,13 +680,21 @@ static int acpi_device_wakeup(struct acpi_device *adev, u32 target_state, 
		if (error)

			return error;



		if (adev->wakeup.flags.enabled)

			return 0;



		res = acpi_enable_gpe(wakeup->gpe_device, wakeup->gpe_number);

		if (ACPI_FAILURE(res)) {

		if (ACPI_SUCCESS(res)) {

			adev->wakeup.flags.enabled = 1;

		} else {

			acpi_disable_wakeup_device_power(adev);

			return -EIO;

		}

	} else {

		if (adev->wakeup.flags.enabled) {

			acpi_disable_gpe(wakeup->gpe_device, wakeup->gpe_number);

			adev->wakeup.flags.enabled = 0;

		}

		acpi_disable_wakeup_device_power(adev);

	}

	return 0;

drivers/acpi/scan.c

+2 −2
Original line number Diff line number Diff line
@@ -2214,7 +2214,7 @@ static void acpi_device_dep_initialize(struct acpi_device *adev) 
	status = acpi_evaluate_reference(adev->handle, "_DEP", NULL,

					&dep_devices);

	if (ACPI_FAILURE(status)) {

		dev_err(&adev->dev, "Failed to evaluate _DEP.\n");

		dev_dbg(&adev->dev, "Failed to evaluate _DEP.\n");

		return;

	}
@@ -2224,7 +2224,7 @@ static void acpi_device_dep_initialize(struct acpi_device *adev) 


		status = acpi_get_object_info(dep_devices.handles[i], &info);

		if (ACPI_FAILURE(status)) {

			dev_err(&adev->dev, "Error reading device info\n");

			dev_dbg(&adev->dev, "Error reading _DEP device info\n");

			continue;

		}

drivers/acpi/utils.c

+1 −11
Original line number Diff line number Diff line
@@ -346,22 +346,16 @@ acpi_evaluate_reference(acpi_handle handle, 
	package = buffer.pointer;



	if ((buffer.length == 0) || !package) {

		printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",

			    (unsigned)buffer.length, package);

		status = AE_BAD_DATA;

		acpi_util_eval_error(handle, pathname, status);

		goto end;

	}

	if (package->type != ACPI_TYPE_PACKAGE) {

		printk(KERN_ERR PREFIX "Expecting a [Package], found type %X\n",

			    package->type);

		status = AE_BAD_DATA;

		acpi_util_eval_error(handle, pathname, status);

		goto end;

	}

	if (!package->package.count) {

		printk(KERN_ERR PREFIX "[Package] has zero elements (%p)\n",

			    package);

		status = AE_BAD_DATA;

		acpi_util_eval_error(handle, pathname, status);

		goto end;
@@ -380,17 +374,13 @@ acpi_evaluate_reference(acpi_handle handle, 


		if (element->type != ACPI_TYPE_LOCAL_REFERENCE) {

			status = AE_BAD_DATA;

			printk(KERN_ERR PREFIX

				    "Expecting a [Reference] package element, found type %X\n",

				    element->type);

			acpi_util_eval_error(handle, pathname, status);

			break;

		}



		if (!element->reference.handle) {

			printk(KERN_WARNING PREFIX "Invalid reference in"

			       " package %s\n", pathname);

			status = AE_NULL_ENTRY;

			acpi_util_eval_error(handle, pathname, status);

			break;

		}

		/* Get the  acpi_handle. */

include/acpi/acpi_bus.h

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ struct acpi_device_wakeup_flags { 
	u8 valid:1;		/* Can successfully enable wakeup? */

	u8 run_wake:1;		/* Run-Wake GPE devices */

	u8 notifier_present:1;  /* Wake-up notify handler has been installed */

	u8 enabled:1;		/* Enabled for wakeup */

};



struct acpi_device_wakeup_context {