public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Janne Kulmala <janne.t.kulmala@tut.fi>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Subject: x86: Fix HPET for Fujitsu u9200
Date: Tue, 16 Dec 2008 13:39:57 +0200	[thread overview]
Message-ID: <4947938D.3010004@tut.fi> (raw)

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>

--- linux-2.6.28/arch/x86/kernel/quirks.c~	2008-12-16 12:58:48.000000000 +0200
+++ linux-2.6.28/arch/x86/kernel/quirks.c	2008-12-16 12:59:14.000000000 +0200
@@ -168,6 +168,8 @@
  			 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);

--- linux-2.6.28/arch/x86/kernel/hpet.c~	2008-12-16 13:08:06.000000000 +0200
+++ linux-2.6.28/arch/x86/kernel/hpet.c	2008-12-16 13:10:29.000000000 +0200
@@ -811,7 +811,7 @@

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



             reply	other threads:[~2008-12-16 12:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-16 11:39 Janne Kulmala [this message]
2008-12-16 19:38 ` x86: Fix HPET for Fujitsu u9200 Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4947938D.3010004@tut.fi \
    --to=janne.t.kulmala@tut.fi \
    --cc=linux-kernel@vger.kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox