Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 07:10:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds 2012-05-05 10:06:06 -07:00
commit 59068e369b
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/power.c
View File

@ -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 * We know a device's inferred power state when all the resources
* required for a given D-state are 'on'. * 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; list = &device->power.states[i].resources;
if (list->count < 1) if (list->count < 1)
continue; continue;

17
drivers/acpi/scan.c
View File

@ -869,7 +869,7 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
/* /*
* Enumerate supported power management states * 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]; struct acpi_device_power_state *ps = &device->power.states[i];
char object_name[5] = { '_', 'P', 'R', '0' + i, '\0' }; 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]); 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 */ /* Evaluate "_PSx" to see if we can do explicit sets */
object_name[2] = 'S'; object_name[2] = 'S';
status = acpi_get_handle(device->handle, object_name, &handle); status = acpi_get_handle(device->handle, object_name, &handle);
if (ACPI_SUCCESS(status)) if (ACPI_SUCCESS(status))
ps->flags.explicit_set = 1; 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->flags.valid = 1;
ps->power = -1; /* Unknown - driver assigned */ ps->power = -1; /* Unknown - driver assigned */

4
drivers/pci/pci-acpi.c
View File

@ -200,7 +200,7 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
return PCI_D1; return PCI_D1;
case ACPI_STATE_D2: case ACPI_STATE_D2:
return PCI_D2; return PCI_D2;
case ACPI_STATE_D3: case ACPI_STATE_D3_HOT:
return PCI_D3hot; return PCI_D3hot;
case ACPI_STATE_D3_COLD: case ACPI_STATE_D3_COLD:
return PCI_D3cold; 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_D0] = ACPI_STATE_D0,
[PCI_D1] = ACPI_STATE_D1, [PCI_D1] = ACPI_STATE_D1,
[PCI_D2] = ACPI_STATE_D2, [PCI_D2] = ACPI_STATE_D2,
[PCI_D3hot] = ACPI_STATE_D3, [PCI_D3hot] = ACPI_STATE_D3_HOT,
[PCI_D3cold] = ACPI_STATE_D3 [PCI_D3cold] = ACPI_STATE_D3
}; };
int error = -EINVAL; int error = -EINVAL;

7
include/acpi/actypes.h
View File

@ -499,9 +499,10 @@ typedef u64 acpi_integer;
#define ACPI_STATE_D0 (u8) 0 #define ACPI_STATE_D0 (u8) 0
#define ACPI_STATE_D1 (u8) 1 #define ACPI_STATE_D1 (u8) 1
#define ACPI_STATE_D2 (u8) 2 #define ACPI_STATE_D2 (u8) 2
#define ACPI_STATE_D3 (u8) 3 #define ACPI_STATE_D3_HOT (u8) 3
#define ACPI_STATE_D3_COLD (u8) 4 #define ACPI_STATE_D3 (u8) 4
#define ACPI_D_STATES_MAX ACPI_STATE_D3_COLD #define ACPI_STATE_D3_COLD ACPI_STATE_D3
#define ACPI_D_STATES_MAX ACPI_STATE_D3
#define ACPI_D_STATE_COUNT 5 #define ACPI_D_STATE_COUNT 5
#define ACPI_STATE_C0 (u8) 0 #define ACPI_STATE_C0 (u8) 0