Commit 78f32668 authored by Daniel Walker's avatar Daniel Walker Committed by Linus Torvalds

[PATCH] clocksource: acpi_pm: add another greylist chipset

I have an acpi_pm that goes backwards, but it's not intel.  I tested the
verified read and my acpi_pm started to function properly.  So I added it
to the greylist.  I'm assuming that's the right spot.

I also added an unlikely() to the while, cause it seems appropriate.
Signed-off-by: default avatarDaniel Walker <dwalker@mvista.com>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Acked-by: default avatarOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4f2e639a
...@@ -54,8 +54,8 @@ static cycle_t acpi_pm_read_verified(void) ...@@ -54,8 +54,8 @@ static cycle_t acpi_pm_read_verified(void)
v1 = read_pmtmr(); v1 = read_pmtmr();
v2 = read_pmtmr(); v2 = read_pmtmr();
v3 = read_pmtmr(); v3 = read_pmtmr();
} while ((v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1) } while (unlikely((v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1)
|| (v3 > v1 && v3 < v2)); || (v3 > v1 && v3 < v2)));
return (cycle_t)v2; return (cycle_t)v2;
} }
...@@ -138,6 +138,8 @@ static void __devinit acpi_pm_check_graylist(struct pci_dev *dev) ...@@ -138,6 +138,8 @@ static void __devinit acpi_pm_check_graylist(struct pci_dev *dev)
} }
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0,
acpi_pm_check_graylist); acpi_pm_check_graylist);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE,
acpi_pm_check_graylist);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment