[PATCH 2.6.27-rc6] PCI: Fix pcie_aspm=force

[PATCH 2.6.27-rc6] PCI: Fix pcie_aspm=force

[Sitsofe Wheeler]

From: Sitsofe Wheeler <sitsofe@yahoo.com>

pcie_aspm=force did not work because aspm_force was being double negated
leading to the sanity check failing. Moving a bracket should fix this.

Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>

---
 drivers/pci/pcie/aspm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 9a7c9e1..851f5b8 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -527,7 +527,7 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
 		 */
 		pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP,
 			&reg32);
-		if (!(reg32 & PCI_EXP_DEVCAP_RBER && !aspm_force)) {
+		if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) {
 			printk("Pre-1.1 PCIe device detected, "
 				"disable ASPM for %s. It can be enabled forcedly"
 				" with 'pcie_aspm=force'\n", pci_name(pdev));

Re: [PATCH 2.6.27-rc6] PCI: Fix pcie_aspm=force

[Alan Cox]

On Tue, 16 Sep 2008 14:27:13 +0100
Sitsofe Wheeler <sitsofe@yahoo.com> wrote:

> From: Sitsofe Wheeler <sitsofe@yahoo.com>
> 
> pcie_aspm=force did not work because aspm_force was being double negated
> leading to the sanity check failing. Moving a bracket should fix this.
> 
> Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>

Acked-by: Alan Cox <alan@redhat.com>

Re: [PATCH 2.6.27-rc6] PCI: Fix pcie_aspm=force

[Jesse Barnes]

On Tuesday, September 16, 2008 6:27 am Sitsofe Wheeler wrote:
> From: Sitsofe Wheeler <sitsofe@yahoo.com>
>
> pcie_aspm=force did not work because aspm_force was being double negated
> leading to the sanity check failing. Moving a bracket should fix this.
>
> Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>

Thanks, I applied this to my for-linus branch so we can try to get this fixed 
for 2.6.27.

Jesse

Re: [PATCH 2.6.27-rc6] PCI: Fix pcie_aspm=force

[Jesse Barnes]

On Tuesday, September 16, 2008 7:08 am Alan Cox wrote:
> On Tue, 16 Sep 2008 14:27:13 +0100
>
> Sitsofe Wheeler <sitsofe@yahoo.com> wrote:
> > From: Sitsofe Wheeler <sitsofe@yahoo.com>
> >
> > pcie_aspm=force did not work because aspm_force was being double negated
> > leading to the sanity check failing. Moving a bracket should fix this.
> >
> > Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>
>
> Acked-by: Alan Cox <alan@redhat.com>

Not sure if I already sent you a note, but this is queued up in my for-linus 
branch.  I'll be sending Linus a pull request later today for it.

Thanks,
Jesse

Re: [PATCH 2.6.27-rc6] PCI: Fix pcie_aspm=force

[Sitsofe Wheeler]

> From: Jesse Barnes <jbarnes@virtuousgeek.org>
> Not sure if I already sent you a note, but this is queued up in my for-linus 
> branch.  I'll be sending Linus a pull request later today for it.


Yes you did - cheers!