x86: enable HPET on Fujitsu u9200 (bacbe999) · Commits · 戴 / test

Impact: auto-enable HPET on Fujitsu u9200 HPET timer is listed in the ACPI table, but needs a quirk entry in order to work. Unfortunately, the quirk code runs after first HPET hpet_enable() which has already determined that the timer doesn't work (reads 0xFFFFFFFF). This patch allows hpet_enable() to be called again after running the quirk code. Signed-off-by:

Janne Kulmala <janne.t.kulmala@tut.fi> Signed-off-by:

Ingo Molnar <mingo@elte.hu>

arch/x86/kernel/hpet.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -811,7 +811,7 @@ int __init hpet_enable(void)

		out_nohpet:
		hpet_clear_mapping();
		boot_hpet_disable = 1;
		hpet_address = 0;
		return 0;
		}

arch/x86/kernel/quirks.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_31,
		ich_force_enable_hpet);
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_1,
		ich_force_enable_hpet);
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_4,
		ich_force_enable_hpet);
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7,
		ich_force_enable_hpet);

Admin message