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

Commit 59068e36 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 

Pull an ACPI patch from Len Brown:
 "It fixes a D3 issue new in 3.4-rc1."

By Lin Ming via Len Brown:
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  ACPI: Fix D3hot v D3cold confusion
parents 377485f6 1cc0c998

drivers/acpi/power.c

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ int acpi_power_get_inferred_state(struct acpi_device *device, int *state) 
	 * We know a device's inferred power state when all the resources

	 * required for a given D-state are 'on'.

	 */

	for (i = ACPI_STATE_D0; i < ACPI_STATE_D3; i++) {

	for (i = ACPI_STATE_D0; i < ACPI_STATE_D3_HOT; i++) {

		list = &device->power.states[i].resources;

		if (list->count < 1)

			continue;

drivers/acpi/scan.c

+7 −10
Original line number Diff line number Diff line
@@ -869,7 +869,7 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) 
	/*

	 * Enumerate supported power management states

	 */

	for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3; i++) {

	for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3_HOT; i++) {

		struct acpi_device_power_state *ps = &device->power.states[i];

		char object_name[5] = { '_', 'P', 'R', '0' + i, '\0' };
@@ -884,21 +884,18 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) 
				acpi_bus_add_power_resource(ps->resources.handles[j]);

		}



		/* The exist of _PR3 indicates D3Cold support */

		if (i == ACPI_STATE_D3) {

			status = acpi_get_handle(device->handle, object_name, &handle);

			if (ACPI_SUCCESS(status))

				device->power.states[ACPI_STATE_D3_COLD].flags.valid = 1;

		}



		/* Evaluate "_PSx" to see if we can do explicit sets */

		object_name[2] = 'S';

		status = acpi_get_handle(device->handle, object_name, &handle);

		if (ACPI_SUCCESS(status))

			ps->flags.explicit_set = 1;



		/* State is valid if we have some power control */

		if (ps->resources.count || ps->flags.explicit_set)

		/*

		 * State is valid if there are means to put the device into it.

		 * D3hot is only valid if _PR3 present.

		 */

		if (ps->resources.count ||

		    (ps->flags.explicit_set && i < ACPI_STATE_D3_HOT))

			ps->flags.valid = 1;



		ps->power = -1;	/* Unknown - driver assigned */

drivers/pci/pci-acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev) 
		return PCI_D1;

	case ACPI_STATE_D2:

		return PCI_D2;

	case ACPI_STATE_D3:

	case ACPI_STATE_D3_HOT:

		return PCI_D3hot;

	case ACPI_STATE_D3_COLD:

		return PCI_D3cold;
@@ -223,7 +223,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state) 
		[PCI_D0] = ACPI_STATE_D0,

		[PCI_D1] = ACPI_STATE_D1,

		[PCI_D2] = ACPI_STATE_D2,

		[PCI_D3hot] = ACPI_STATE_D3,

		[PCI_D3hot] = ACPI_STATE_D3_HOT,

		[PCI_D3cold] = ACPI_STATE_D3

	};

	int error = -EINVAL;

include/acpi/actypes.h

+4 −3
Original line number Diff line number Diff line
@@ -499,9 +499,10 @@ typedef u64 acpi_integer; 
#define ACPI_STATE_D0                   (u8) 0

#define ACPI_STATE_D1                   (u8) 1

#define ACPI_STATE_D2                   (u8) 2

#define ACPI_STATE_D3                   (u8) 3

#define ACPI_STATE_D3_COLD              (u8) 4

#define ACPI_D_STATES_MAX               ACPI_STATE_D3_COLD

#define ACPI_STATE_D3_HOT               (u8) 3

#define ACPI_STATE_D3                   (u8) 4

#define ACPI_STATE_D3_COLD              ACPI_STATE_D3

#define ACPI_D_STATES_MAX               ACPI_STATE_D3

#define ACPI_D_STATE_COUNT              5



#define ACPI_STATE_C0                   (u8) 0