From: Eric Sesterhenn <eric.sesterhenn@lsexperts.de>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>,
Conrad Kostecki <ck@conrad-kostecki.de>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"x86@kernel.org" <x86@kernel.org>,
Peter Neubauer <pneubauer@bluerwhite.org>
Subject: [PATCH] x86: HPET force enable for e6xx based systems
Date: Fri, 12 Sep 2014 13:06:13 +0200 [thread overview]
Message-ID: <5412D3A5.2030909@lsexperts.de> (raw)
In-Reply-To: <alpine.DEB.2.10.1409121221580.4178@nanos>
From: Peter Neubauer <pneubauer@bluerwhite.org>
as the Soekris net6501 and other e6xx based systems do not have
any ACPI implementation, HPET won't get enabled.
This patch enables HPET on such platforms.
[ 0.430149] pci 0000:00:01.0: Force enabled HPET at 0xfed00000
[ 0.644838] HPET: 3 timers in total, 0 timers will be used for per-cpu timer
Original patch by Peter Neubauer (http://www.mail-archive.com/soekris-tech@lists.soekris.com/msg06462.html)
slightly modified by Conrad Kostecki <ck@conrad-kostecki.de> and massaged
accoring to Thomas Gleixners <tglx@linutronix.de> by me.
Signed-off-by: Eric Sesterhenn <eric.sesterhenn@lsexperts.de>
---
I am not quite sure how to include Conrad in the tags and if the
Suggested-by tag would be the right way to do this, therefore I have
included him in the description.
The patch is against Linux current git.
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index ff898bb..176a0f9 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -498,6 +498,24 @@ void force_hpet_resume(void)
}
/*
+ * According to the datasheet e6xx systems have the HPET hardwired to
+ * 0xfed00000
+ */
+static void e6xx_force_enable_hpet(struct pci_dev *dev)
+{
+ if (hpet_address || force_hpet_address)
+ return;
+
+ force_hpet_address = 0xFED00000;
+ force_hpet_resume_type = NONE_FORCE_HPET_RESUME;
+ dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at "
+ "0x%lx\n", force_hpet_address);
+ return;
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E6XX_CU,
+ e6xx_force_enable_hpet);
+
+/*
* HPET MSI on some boards (ATI SB700/SB800) has side effect on
* floppy DMA. Disable HPET MSI on such platforms.
* See erratum #27 (Misinterpreted MSI Requests May Result in
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 6ed0bb7..aa0d390 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2860,6 +2860,7 @@
#define PCI_DEVICE_ID_INTEL_82372FB_1 0x7601
#define PCI_DEVICE_ID_INTEL_SCH_LPC 0x8119
#define PCI_DEVICE_ID_INTEL_SCH_IDE 0x811a
+#define PCI_DEVICE_ID_INTEL_E6XX_CU 0x8183
#define PCI_DEVICE_ID_INTEL_ITC_LPC 0x8186
#define PCI_DEVICE_ID_INTEL_82454GX 0x84c4
#define PCI_DEVICE_ID_INTEL_82450GX 0x84c5
next prev parent reply other threads:[~2014-09-12 11:06 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-14 10:23 [PATCH] x86: HPET force enable for Soekris net6501 Conrad Kostecki
2014-02-14 17:46 ` H. Peter Anvin
2014-02-14 18:06 ` AW: " Conrad Kostecki
2014-02-14 18:08 ` H. Peter Anvin
2014-02-14 18:13 ` AW: " Conrad Kostecki
2014-02-14 18:16 ` H. Peter Anvin
2014-02-14 18:21 ` Thomas Gleixner
2014-02-14 18:22 ` H. Peter Anvin
2014-02-14 18:38 ` Thomas Gleixner
2014-02-14 18:39 ` H. Peter Anvin
2014-02-14 19:15 ` Thomas Gleixner
2014-02-14 19:26 ` H. Peter Anvin
2014-02-14 19:59 ` Thomas Gleixner
2014-02-14 20:06 ` H. Peter Anvin
2014-02-14 21:16 ` Thomas Gleixner
2014-02-14 21:18 ` H. Peter Anvin
2014-02-14 21:47 ` Thomas Gleixner
2014-02-14 21:48 ` H. Peter Anvin
2014-02-17 16:28 ` Thomas Renninger
2014-02-17 17:19 ` H. Peter Anvin
2014-02-17 18:23 ` Thomas Renninger
2014-02-17 18:23 ` [Devel] " Thomas Renninger
2014-02-17 18:47 ` AW: AW: " H. Peter Anvin
2014-02-17 19:25 ` Thomas Renninger
2014-02-17 19:25 ` [Devel] " Thomas Renninger
2014-02-17 19:40 ` AW: AW: " H. Peter Anvin
2014-02-18 18:22 ` ACPI: Also allow ACPI table adding via initrd not only overriding Thomas Renninger
2014-02-18 18:22 ` [Devel] " Thomas Renninger
2014-02-18 18:22 ` [PATCH 1/4] ACPI: Provide support for ACPI table adding via OS Thomas Renninger
2014-02-18 18:22 ` [Devel] " Thomas Renninger
2014-02-18 18:27 ` H. Peter Anvin
2014-02-18 18:44 ` Thomas Renninger
2014-02-18 18:44 ` [Devel] " Thomas Renninger
2014-02-18 20:51 ` H. Peter Anvin
2014-02-19 11:22 ` Thomas Renninger
2014-02-19 11:22 ` [Devel] " Thomas Renninger
2014-02-21 7:24 ` Zheng, Lv
2014-02-21 7:24 ` Zheng, Lv
2014-02-21 7:28 ` Zheng, Lv
2014-02-21 7:28 ` Zheng, Lv
2014-02-18 18:22 ` [PATCH 2/4] ACPICA: Introduce new acpi_os_physical_table_add OS callback Thomas Renninger
2014-02-18 18:22 ` [Devel] " Thomas Renninger
2014-02-18 18:22 ` [PATCH 3/4] ACPICA: Add BGRT signature to known signatures Thomas Renninger
2014-02-18 18:22 ` [Devel] " Thomas Renninger
2014-02-18 18:22 ` [PATCH 4/4] ACPI: Add new table signatures that can be overridden/added Thomas Renninger
2014-02-18 18:22 ` [Devel] " Thomas Renninger
2014-02-18 18:38 ` [Devel] ACPI: Also allow ACPI table adding via initrd not only overriding Moore, Robert
2014-02-18 18:38 ` Moore, Robert
2014-02-18 18:52 ` Thomas Renninger
2014-02-18 18:52 ` Thomas Renninger
2014-02-18 19:59 ` Moore, Robert
2014-02-18 19:59 ` Moore, Robert
2014-02-19 11:14 ` Thomas Renninger
2014-02-19 11:14 ` Thomas Renninger
2014-02-19 13:03 ` Thomas Gleixner
2014-02-14 18:28 ` AW: AW: AW: [PATCH] x86: HPET force enable for Soekris net6501 Conrad Kostecki
2014-09-09 13:56 ` Eric Sesterhenn
2014-09-09 14:54 ` Thomas Gleixner
2014-09-09 15:26 ` H. Peter Anvin
2014-09-09 15:41 ` Thomas Gleixner
2014-09-12 9:41 ` Eric Sesterhenn
2014-09-12 10:37 ` Thomas Gleixner
2014-09-12 11:06 ` Eric Sesterhenn [this message]
2014-09-16 0:58 ` [tip:x86/platform] x86: HPET force enable for e6xx based systems tip-bot for Peter Neubauer
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=5412D3A5.2030909@lsexperts.de \
--to=eric.sesterhenn@lsexperts.de \
--cc=ck@conrad-kostecki.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pneubauer@bluerwhite.org \
--cc=tglx@linutronix.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.