| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20090421180037.GA2763@alberich.amd.com>
Date: Tue, 21 Apr 2009 20:00:37 +0200
From: Andreas Herrmann <andreas.herrmann3@....com>
To: Jeff Mahoney <jeffm@...e.com>
CC: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Ingo Molnar <mingo@...e.hu>
Subject: Re: [BUG] IO-APIC + timer doesn't work!
On Mon, Apr 20, 2009 at 10:23:18AM -0400, Jeff Mahoney wrote:
> Andreas Herrmann wrote:
> > On Fri, Apr 17, 2009 at 11:15:39AM -0400, Jeff Mahoney wrote:
> >> -----BEGIN PGP SIGNED MESSAGE-----
> >> Hash: SHA1
> >>
> >> Hi all -
> >>
> >> I saw this while booting 2.6.30-rc1, -rc2, and today's git, on one of
> >> my development nodes. This output is with apic=debug. With noapic,
> >> it still hung. Both outputs follow.
> >>
> >> git bisect leads to commit 8d6f0c8214928f7c5083dd54ecb69c5d615b516e,
> >> but I'm not seeing anything obvious there. Backing just that change
> >> out doesn't fix it.
> >>
> >> - -Jeff
> >
> > This looks similar to http://bugzilla.kernel.org/show_bug.cgi?id=12961
> >
> > Can you please provide lspci -nnxxx and dmesg when booting with hpet=verbose.
>
> Sure, attached.
>
> -Jeff
>
> --
> Jeff Mahoney
> SUSE Labs
> [ 0.004000] hpet: hpet_enable(842):
> [ 0.004000] hpet: ID: 0x10228203, PERIOD: 0x429b17f
> [ 0.004000] hpet: CFG: 0x0, STATUS: 0x0
> [ 0.004000] hpet: COUNTER_l: 0x0, COUNTER_h: 0x0
> [ 0.004000] hpet: T0: CFG_l: 0x10, CFG_h: 0xfdefa
> [ 0.004000] hpet: T0: CMP_l: 0xffffffff, CMP_h: 0x0
> [ 0.004000] hpet: T0 ROUTE_l: 0x0, ROUTE_h: 0x0
> [ 0.004000] hpet: T1: CFG_l: 0x0, CFG_h: 0xfdefa
> [ 0.004000] hpet: T1: CMP_l: 0xffffffff, CMP_h: 0x0
> [ 0.004000] hpet: T1 ROUTE_l: 0x0, ROUTE_h: 0x0
> [ 0.004000] hpet: T2: CFG_l: 0x0, CFG_h: 0xfdefa
> [ 0.004000] hpet: T2: CMP_l: 0xffffffff, CMP_h: 0x0
> [ 0.004000] hpet: T2 ROUTE_l: 0x0, ROUTE_h: 0x0
> [ 0.004000] hpet: hpet_set_mode(328):
> [ 0.004000] hpet: ID: 0x10228203, PERIOD: 0x429b17f
> [ 0.004000] hpet: CFG: 0x3, STATUS: 0x1
> [ 0.004000] hpet: COUNTER_l: 0x2b4a5, COUNTER_h: 0x0
^^^^^^^
> [ 0.004000] hpet: T0: CFG_l: 0x261c, CFG_h: 0xfdefa
> [ 0.004000] hpet: T0: CMP_l: 0xdfb7, CMP_h: 0x0
^^^^^^
Same as in above mentioned bugzilla (and btw with similar chipset).
First I thought that reset of HPET_COUNTER had no effect but in fact
this worked. HPET implementation on that chipset differs from
other implementation wrt setting the delta when programmed in
periodic mode. T0_CMP is less than COUNTER (next interrupt
usually happens after COUNTER overflows). But this does
not matter as the kernel detected that timer does not properly
work:
..TIMER: vector=0x30 apic1=0 pin1=2 apic2=0 pin2=0
..MP-BIOS bug: 8254 timer not connected to IO-APIC
...
See for instance
www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/24674.pdf
I suggest to partially revert my last hpet-commit. See attached patch.
Attached patch was tested on a system with AMD81xx chipset and also on
the system where I've encountered the system hang when main counter
was neither reset or stopped during programming of HPET in periodic mode.
Regards,
Andreas
---
x86: hpet: fix periodic mode programming on AMD 81xx
Impact: fix boot time hang on machines with AMD 81xx chipset
(See http://bugzilla.kernel.org/show_bug.cgi?id=12961)
It partially reverts commit c23e253e67c9d8a91a0ffa33c1f571a17f0a2403
(x86: hpet: stop HPET_COUNTER when programming periodic mode)
HPET on AMD 81xx chipset needs a second write (with HPET_TN_SETVAL
cleared) to T0_CMP register to set the period in periodic mode.
With this patch HPET_COUNTER is still stopped but not reset when HPET
is programmed in periodic mode. This should help to avoid races when
HPET is programmed in periodic mode and fixes a boot time hang that
I've observed on a machine when using 1000HZ.
Signed-off-by: Andreas Herrmann <andreas.herrmann3@....com>
---
arch/x86/kernel/hpet.c | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 648b3a2..b30f79c 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -236,6 +236,10 @@ static void hpet_stop_counter(void)
unsigned long cfg = hpet_readl(HPET_CFG);
cfg &= ~HPET_CFG_ENABLE;
hpet_writel(cfg, HPET_CFG);
+}
+
+static void hpet_reset_counter(void)
+{
hpet_writel(0, HPET_COUNTER);
hpet_writel(0, HPET_COUNTER + 4);
}
@@ -250,6 +254,7 @@ static void hpet_start_counter(void)
static void hpet_restart_counter(void)
{
hpet_stop_counter();
+ hpet_reset_counter();
hpet_start_counter();
}
@@ -309,7 +314,7 @@ static int hpet_setup_msi_irq(unsigned int irq);
static void hpet_set_mode(enum clock_event_mode mode,
struct clock_event_device *evt, int timer)
{
- unsigned long cfg;
+ unsigned long cfg, cmp, now;
uint64_t delta;
switch (mode) {
@@ -317,12 +322,23 @@ static void hpet_set_mode(enum clock_event_mode mode,
hpet_stop_counter();
delta = ((uint64_t)(NSEC_PER_SEC/HZ)) * evt->mult;
delta >>= evt->shift;
+ now = hpet_readl(HPET_COUNTER);
+ cmp = now + (unsigned long) delta;
cfg = hpet_readl(HPET_Tn_CFG(timer));
/* Make sure we use edge triggered interrupts */
cfg &= ~HPET_TN_LEVEL;
cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC |
HPET_TN_SETVAL | HPET_TN_32BIT;
hpet_writel(cfg, HPET_Tn_CFG(timer));
+ hpet_writel(cmp, HPET_Tn_CMP(timer));
+ udelay(1);
+ /*
+ * HPET on AMD 81xx needs a second write (with HPET_TN_SETVAL
+ * cleared) to T0_CMP to set the period. The HPET_TN_SETVAL
+ * bit is automatically cleared after the first write.
+ * (See AMD-8111 HyperTransport I/O Hub Data Sheet,
+ * Publication # 24674)
+ */
hpet_writel((unsigned long) delta, HPET_Tn_CMP(timer));
hpet_start_counter();
hpet_print_config();
--
1.6.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists