pci: Fix the definition of PCI_PM_CTRL_NO_SOFT_RESET
PATCH 1/1 pci: Fix the definition of PCI_PM_CTRL_NO_SOFT_RESET
From: Dexuan Cui <[email protected]>
As per PCI Bus Power Management Interface Specification Revision 1.2 this is bit 3, not bit 2, of the Power Management Control/Status register.
--- include/linux/pci_regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/pci_regs.h +1 -1
@@ -235,7 +235,7 @@#define PCI_PM_CAP_PME_SHIFT 11/* Start of the PME Mask in PMC */ #define PCI_PM_CTRL 4/* PM control and status register */ #define PCI_PM_CTRL_STATE_MASK 0x0003/* Current power state (D0 to D3) */ -#define PCI_PM_CTRL_NO_SOFT_RESET 0x0004/* No reset for D3hot->D0 */ +#define PCI_PM_CTRL_NO_SOFT_RESET 0x0008/* No reset for D3hot->D0 */ #define PCI_PM_CTRL_PME_ENABLE 0x0100/* PME pin enable */ #define PCI_PM_CTRL_DATA_SEL_MASK 0x1e00/* Data select (??) */ #define PCI_PM_CTRL_DATA_SCALE_MASK 0x6000/* Data scale (??) */
Quoted 5 lines · Jan Beulich
From: Dexuan Cui <[email protected]>
As per PCI Bus Power Management Interface Specification Revision 1.2 this is bit 3, not bit 2, of the Power Management Control/Status register.
The same patch was already posted by Yu Zhao on February 25th and I reviewed it for Jesse. I don't see it in any of the trees yet though ... (arguably, I should have picked it up for the fixes tree that I did while Jesse was away).
Signature · 4 lines
Matthew Wilcox Intel Open Source Technology Centre "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Quoted 11 lines · On Tue, 17 Mar 2009 11:38:45 -0600 Matthew Wilcox <[email protected]> wrote:
Quoted 5 lines · Jan Beulich
From: Dexuan Cui <[email protected]>
As per PCI Bus Power Management Interface Specification Revision 1.2 this is bit 3, not bit 2, of the Power Management Control/Status register.
The same patch was already posted by Yu Zhao on February 25th and I reviewed it for Jesse. I don't see it in any of the trees yet though ... (arguably, I should have picked it up for the fixes tree that I did while Jesse was away).
Yeah I've got it in my queue but haven't pushed it yet. Thanks.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Quoted 11 lines · Matthew Wilcox
Quoted 5 lines · Jan Beulich
From: Dexuan Cui <[email protected]>
As per PCI Bus Power Management Interface Specification Revision 1.2 this is bit 3, not bit 2, of the Power Management Control/Status register.
The same patch was already posted by Yu Zhao on February 25th and I reviewed it for Jesse. I don't see it in any of the trees yet though ... (arguably, I should have picked it up for the fixes tree that I did while Jesse was away).
Sorry, I didn't bother you to pick it up for the rc because the wrong mask doesn't cause any known problem so far (fortunately the wrong bit used as No_Soft_Reset is hardwired to 0, which means PM restores the config space for all the devices).