From 79c6b7d3270106aa2a242da0b12a971742fcdac7 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Thu, 3 Jun 2004 21:59:56 -0700 Subject: [PATCH] [PATCH] apply nForce2 fixup only if C1 Halt Disconnect is enabled Some boards don't support C1 Halt Disconnect. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Linus Torvalds --- arch/i386/pci/fixup.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c index ac6acb3cef759..a8b1954aec9e0 100644 --- a/arch/i386/pci/fixup.c +++ b/arch/i386/pci/fixup.c @@ -226,7 +226,12 @@ static void __init pci_fixup_nforce2(struct pci_dev *dev) fixed_val = rev < 0xC1 ? 0x1F01FF01 : 0x9F01FF01; pci_read_config_dword(dev, 0x6c, &val); - if (val != fixed_val) { + + /* + * Apply fixup only if C1 Halt Disconnect is enabled + * (bit28) because it is not supported on some boards. + */ + if ((val & (1 << 28)) && val != fixed_val) { printk(KERN_WARNING "PCI: nForce2 C1 Halt Disconnect fixup\n"); pci_write_config_dword(dev, 0x6c, fixed_val); } -- 2.53.0