* [PATCH] x86/quirks: disable HPET on Intel Coffee Lake Refresh platforms
@ 2019-12-03 20:57 Jason A. Donenfeld
2019-12-09 13:52 ` Jason A. Donenfeld
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Jason A. Donenfeld @ 2019-12-03 20:57 UTC (permalink / raw)
To: linux-kernel
Cc: Jason A. Donenfeld, Feng Tang, Kai-Heng Feng, Thomas Gleixner, stable
This is a follow up of fc5db58539b4 ("x86/quirks: Disable HPET on Intel
Coffe Lake platforms"), which addressed the issue for 8th generation
Coffee Lake. Intel has released Coffee Lake again for 9th generation,
apparently still with the same bug:
clocksource: timekeeping watchdog on CPU3: Marking clocksource 'tsc' as unstable because the skew is too large:
clocksource: 'hpet' wd_now: 24f422b8 wd_last: 247dea41 mask: ffffffff
clocksource: 'tsc' cs_now: 144d927c4e cs_last: 140ba6e2a0 mask: ffffffffffffffff
tsc: Marking TSC unstable due to clocksource watchdog
TSC found unstable after boot, most likely due to broken BIOS. Use 'tsc=unstable'.
sched_clock: Marking unstable (26553416234, 4203921)<-(26567277071, -9656937)
clocksource: Switched to clocksource hpet
So, we add another quirk for the chipset
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
---
arch/x86/kernel/early-quirks.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 4cba91ec8049..a73f88dd7f86 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -712,6 +712,8 @@ static struct chipset early_qrk[] __initdata = {
PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
{ PCI_VENDOR_ID_INTEL, 0x3ec4,
PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
+ { PCI_VENDOR_ID_INTEL, 0x3e20,
+ PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
{ PCI_VENDOR_ID_BROADCOM, 0x4331,
PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset},
{}
--
2.24.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] x86/quirks: disable HPET on Intel Coffee Lake Refresh platforms
2019-12-03 20:57 [PATCH] x86/quirks: disable HPET on Intel Coffee Lake Refresh platforms Jason A. Donenfeld
@ 2019-12-09 13:52 ` Jason A. Donenfeld
2019-12-09 15:45 ` Jason A. Donenfeld
[not found] ` <20191211163646.13A212073D@mail.kernel.org>
2 siblings, 0 replies; 8+ messages in thread
From: Jason A. Donenfeld @ 2019-12-09 13:52 UTC (permalink / raw)
To: Thomas Gleixner; +Cc: Feng Tang, LKML, Kai-Heng Feng, stable
Hey Thomas,
Can we perhaps get this into 5.5-rc2?
It'd be nice if Intel could give us a list of SKUs that are affected
(as you asked in another email thread), but barring that, the best we
can do is whack-a-mole like this. I'm typing you this email on the
hardware that this patch addresses.
Jason
On Tue, Dec 3, 2019 at 9:57 PM Jason A. Donenfeld <Jason@zx2c4.com> wrote:
>
> This is a follow up of fc5db58539b4 ("x86/quirks: Disable HPET on Intel
> Coffe Lake platforms"), which addressed the issue for 8th generation
> Coffee Lake. Intel has released Coffee Lake again for 9th generation,
> apparently still with the same bug:
>
> clocksource: timekeeping watchdog on CPU3: Marking clocksource 'tsc' as unstable because the skew is too large:
> clocksource: 'hpet' wd_now: 24f422b8 wd_last: 247dea41 mask: ffffffff
> clocksource: 'tsc' cs_now: 144d927c4e cs_last: 140ba6e2a0 mask: ffffffffffffffff
> tsc: Marking TSC unstable due to clocksource watchdog
> TSC found unstable after boot, most likely due to broken BIOS. Use 'tsc=unstable'.
> sched_clock: Marking unstable (26553416234, 4203921)<-(26567277071, -9656937)
> clocksource: Switched to clocksource hpet
>
> So, we add another quirk for the chipset
>
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> Cc: Feng Tang <feng.tang@intel.com>
> Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: stable@vger.kernel.org
> ---
> arch/x86/kernel/early-quirks.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index 4cba91ec8049..a73f88dd7f86 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -712,6 +712,8 @@ static struct chipset early_qrk[] __initdata = {
> PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
> { PCI_VENDOR_ID_INTEL, 0x3ec4,
> PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
> + { PCI_VENDOR_ID_INTEL, 0x3e20,
> + PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
> { PCI_VENDOR_ID_BROADCOM, 0x4331,
> PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset},
> {}
> --
> 2.24.0
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH] x86/quirks: disable HPET on Intel Coffee Lake Refresh platforms
2019-12-03 20:57 [PATCH] x86/quirks: disable HPET on Intel Coffee Lake Refresh platforms Jason A. Donenfeld
2019-12-09 13:52 ` Jason A. Donenfeld
@ 2019-12-09 15:45 ` Jason A. Donenfeld
2019-12-20 1:42 ` Jason A. Donenfeld
[not found] ` <20191211163646.13A212073D@mail.kernel.org>
2 siblings, 1 reply; 8+ messages in thread
From: Jason A. Donenfeld @ 2019-12-09 15:45 UTC (permalink / raw)
To: x86; +Cc: Jason A. Donenfeld, Feng Tang, Kai-Heng Feng, Thomas Gleixner, stable
This is a follow up of fc5db58539b4 ("x86/quirks: Disable HPET on Intel
Coffe Lake platforms"), which addressed the issue for 8th generation
Coffee Lake. Intel has released Coffee Lake again for 9th generation,
apparently still with the same bug:
clocksource: timekeeping watchdog on CPU3: Marking clocksource 'tsc' as unstable because the skew is too large:
clocksource: 'hpet' wd_now: 24f422b8 wd_last: 247dea41 mask: ffffffff
clocksource: 'tsc' cs_now: 144d927c4e cs_last: 140ba6e2a0 mask: ffffffffffffffff
tsc: Marking TSC unstable due to clocksource watchdog
TSC found unstable after boot, most likely due to broken BIOS. Use 'tsc=unstable'.
sched_clock: Marking unstable (26553416234, 4203921)<-(26567277071, -9656937)
clocksource: Switched to clocksource hpet
So, we add another quirk for the chipset
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
---
arch/x86/kernel/early-quirks.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 4cba91ec8049..a73f88dd7f86 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -712,6 +712,8 @@ static struct chipset early_qrk[] __initdata = {
PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
{ PCI_VENDOR_ID_INTEL, 0x3ec4,
PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
+ { PCI_VENDOR_ID_INTEL, 0x3e20,
+ PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
{ PCI_VENDOR_ID_BROADCOM, 0x4331,
PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset},
{}
--
2.24.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] x86/quirks: disable HPET on Intel Coffee Lake Refresh platforms
2019-12-09 15:45 ` Jason A. Donenfeld
@ 2019-12-20 1:42 ` Jason A. Donenfeld
2019-12-20 1:43 ` Andy Lutomirski
2019-12-20 10:07 ` Peter Zijlstra
0 siblings, 2 replies; 8+ messages in thread
From: Jason A. Donenfeld @ 2019-12-20 1:42 UTC (permalink / raw)
To: X86 ML; +Cc: Feng Tang, Kai-Heng Feng, Thomas Gleixner, stable
Hi,
Thought I should give a poke here so that this doesn't slip through
the cracks again. Could we get this in for rc3?
Thanks,
Jason
On Mon, Dec 9, 2019 at 4:45 PM Jason A. Donenfeld <Jason@zx2c4.com> wrote:
>
> This is a follow up of fc5db58539b4 ("x86/quirks: Disable HPET on Intel
> Coffe Lake platforms"), which addressed the issue for 8th generation
> Coffee Lake. Intel has released Coffee Lake again for 9th generation,
> apparently still with the same bug:
>
> clocksource: timekeeping watchdog on CPU3: Marking clocksource 'tsc' as unstable because the skew is too large:
> clocksource: 'hpet' wd_now: 24f422b8 wd_last: 247dea41 mask: ffffffff
> clocksource: 'tsc' cs_now: 144d927c4e cs_last: 140ba6e2a0 mask: ffffffffffffffff
> tsc: Marking TSC unstable due to clocksource watchdog
> TSC found unstable after boot, most likely due to broken BIOS. Use 'tsc=unstable'.
> sched_clock: Marking unstable (26553416234, 4203921)<-(26567277071, -9656937)
> clocksource: Switched to clocksource hpet
>
> So, we add another quirk for the chipset
>
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> Cc: Feng Tang <feng.tang@intel.com>
> Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: stable@vger.kernel.org
> ---
> arch/x86/kernel/early-quirks.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index 4cba91ec8049..a73f88dd7f86 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -712,6 +712,8 @@ static struct chipset early_qrk[] __initdata = {
> PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
> { PCI_VENDOR_ID_INTEL, 0x3ec4,
> PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
> + { PCI_VENDOR_ID_INTEL, 0x3e20,
> + PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
> { PCI_VENDOR_ID_BROADCOM, 0x4331,
> PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset},
> {}
> --
> 2.24.0
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] x86/quirks: disable HPET on Intel Coffee Lake Refresh platforms
2019-12-20 1:42 ` Jason A. Donenfeld
@ 2019-12-20 1:43 ` Andy Lutomirski
2019-12-20 10:07 ` Peter Zijlstra
1 sibling, 0 replies; 8+ messages in thread
From: Andy Lutomirski @ 2019-12-20 1:43 UTC (permalink / raw)
To: Jason A. Donenfeld
Cc: X86 ML, Feng Tang, Kai-Heng Feng, Thomas Gleixner, stable
On Thu, Dec 19, 2019 at 5:43 PM Jason A. Donenfeld <Jason@zx2c4.com> wrote:
>
> Hi,
>
> Thought I should give a poke here so that this doesn't slip through
> the cracks again. Could we get this in for rc3?
Thomas?
BTW, you forgot LKML.
>
> Thanks,
> Jason
>
> On Mon, Dec 9, 2019 at 4:45 PM Jason A. Donenfeld <Jason@zx2c4.com> wrote:
> >
> > This is a follow up of fc5db58539b4 ("x86/quirks: Disable HPET on Intel
> > Coffe Lake platforms"), which addressed the issue for 8th generation
> > Coffee Lake. Intel has released Coffee Lake again for 9th generation,
> > apparently still with the same bug:
> >
> > clocksource: timekeeping watchdog on CPU3: Marking clocksource 'tsc' as unstable because the skew is too large:
> > clocksource: 'hpet' wd_now: 24f422b8 wd_last: 247dea41 mask: ffffffff
> > clocksource: 'tsc' cs_now: 144d927c4e cs_last: 140ba6e2a0 mask: ffffffffffffffff
> > tsc: Marking TSC unstable due to clocksource watchdog
> > TSC found unstable after boot, most likely due to broken BIOS. Use 'tsc=unstable'.
> > sched_clock: Marking unstable (26553416234, 4203921)<-(26567277071, -9656937)
> > clocksource: Switched to clocksource hpet
> >
> > So, we add another quirk for the chipset
> >
> > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> > Cc: Feng Tang <feng.tang@intel.com>
> > Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: stable@vger.kernel.org
> > ---
> > arch/x86/kernel/early-quirks.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> > index 4cba91ec8049..a73f88dd7f86 100644
> > --- a/arch/x86/kernel/early-quirks.c
> > +++ b/arch/x86/kernel/early-quirks.c
> > @@ -712,6 +712,8 @@ static struct chipset early_qrk[] __initdata = {
> > PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
> > { PCI_VENDOR_ID_INTEL, 0x3ec4,
> > PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
> > + { PCI_VENDOR_ID_INTEL, 0x3e20,
> > + PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
> > { PCI_VENDOR_ID_BROADCOM, 0x4331,
> > PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset},
> > {}
> > --
> > 2.24.0
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] x86/quirks: disable HPET on Intel Coffee Lake Refresh platforms
2019-12-20 1:42 ` Jason A. Donenfeld
2019-12-20 1:43 ` Andy Lutomirski
@ 2019-12-20 10:07 ` Peter Zijlstra
2019-12-20 11:14 ` Jason A. Donenfeld
1 sibling, 1 reply; 8+ messages in thread
From: Peter Zijlstra @ 2019-12-20 10:07 UTC (permalink / raw)
To: Jason A. Donenfeld
Cc: X86 ML, Feng Tang, Kai-Heng Feng, Thomas Gleixner, stable
On Fri, Dec 20, 2019 at 02:42:59AM +0100, Jason A. Donenfeld wrote:
> Hi,
>
> Thought I should give a poke here so that this doesn't slip through
> the cracks again. Could we get this in for rc3?
I think another version of this patch made it in recently, see commit:
f8edbde885bb ("x86/intel: Disable HPET on Intel Coffee Lake H platforms")
> On Mon, Dec 9, 2019 at 4:45 PM Jason A. Donenfeld <Jason@zx2c4.com> wrote:
> >
> > This is a follow up of fc5db58539b4 ("x86/quirks: Disable HPET on Intel
> > Coffe Lake platforms"), which addressed the issue for 8th generation
> > Coffee Lake. Intel has released Coffee Lake again for 9th generation,
> > apparently still with the same bug:
> >
> > clocksource: timekeeping watchdog on CPU3: Marking clocksource 'tsc' as unstable because the skew is too large:
> > clocksource: 'hpet' wd_now: 24f422b8 wd_last: 247dea41 mask: ffffffff
> > clocksource: 'tsc' cs_now: 144d927c4e cs_last: 140ba6e2a0 mask: ffffffffffffffff
> > tsc: Marking TSC unstable due to clocksource watchdog
> > TSC found unstable after boot, most likely due to broken BIOS. Use 'tsc=unstable'.
> > sched_clock: Marking unstable (26553416234, 4203921)<-(26567277071, -9656937)
> > clocksource: Switched to clocksource hpet
> >
> > So, we add another quirk for the chipset
> >
> > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> > Cc: Feng Tang <feng.tang@intel.com>
> > Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: stable@vger.kernel.org
> > ---
> > arch/x86/kernel/early-quirks.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> > index 4cba91ec8049..a73f88dd7f86 100644
> > --- a/arch/x86/kernel/early-quirks.c
> > +++ b/arch/x86/kernel/early-quirks.c
> > @@ -712,6 +712,8 @@ static struct chipset early_qrk[] __initdata = {
> > PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
> > { PCI_VENDOR_ID_INTEL, 0x3ec4,
> > PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
> > + { PCI_VENDOR_ID_INTEL, 0x3e20,
> > + PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
> > { PCI_VENDOR_ID_BROADCOM, 0x4331,
> > PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset},
> > {}
> > --
> > 2.24.0
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] x86/quirks: disable HPET on Intel Coffee Lake Refresh platforms
2019-12-20 10:07 ` Peter Zijlstra
@ 2019-12-20 11:14 ` Jason A. Donenfeld
0 siblings, 0 replies; 8+ messages in thread
From: Jason A. Donenfeld @ 2019-12-20 11:14 UTC (permalink / raw)
To: Peter Zijlstra; +Cc: X86 ML, Feng Tang, Kai-Heng Feng, Thomas Gleixner, stable
On Fri, Dec 20, 2019 at 11:08 AM Peter Zijlstra <peterz@infradead.org> wrote:
>
> On Fri, Dec 20, 2019 at 02:42:59AM +0100, Jason A. Donenfeld wrote:
> > Hi,
> >
> > Thought I should give a poke here so that this doesn't slip through
> > the cracks again. Could we get this in for rc3?
>
> I think another version of this patch made it in recently, see commit:
>
> f8edbde885bb ("x86/intel: Disable HPET on Intel Coffee Lake H platforms")
Oh, good. Glad to see it came from somewhere. Thanks.
Jason
^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <20191211163646.13A212073D@mail.kernel.org>]
* Re: [PATCH] x86/quirks: disable HPET on Intel Coffee Lake Refresh platforms
[not found] ` <20191211163646.13A212073D@mail.kernel.org>
@ 2019-12-11 19:24 ` Jason A. Donenfeld
0 siblings, 0 replies; 8+ messages in thread
From: Jason A. Donenfeld @ 2019-12-11 19:24 UTC (permalink / raw)
To: Sasha Levin; +Cc: LKML, Feng Tang, Kai-Heng Feng, Thomas Gleixner, stable
Hi Sasha,
On Wed, Dec 11, 2019 at 6:36 PM Sasha Levin <sashal@kernel.org> wrote:
>
> Hi,
>
> [This is an automated email]
>
> This commit has been processed because it contains a -stable tag.
> The stable tag indicates that it's relevant for the following trees: all
>
> The bot has tested the following trees: v5.4.2, v5.3.15, v4.19.88, v4.14.158, v4.9.206, v4.4.206.
>
> v5.4.2: Build OK!
> v5.3.15: Build OK!
> v4.19.88: Failed to apply! Possible dependencies:
> fc5db58539b4 ("x86/quirks: Disable HPET on Intel Coffe Lake platforms")
>
> v4.14.158: Failed to apply! Possible dependencies:
> fc5db58539b4 ("x86/quirks: Disable HPET on Intel Coffe Lake platforms")
>
> v4.9.206: Failed to apply! Possible dependencies:
> fc5db58539b4 ("x86/quirks: Disable HPET on Intel Coffe Lake platforms")
>
> v4.4.206: Failed to apply! Possible dependencies:
> fc5db58539b4 ("x86/quirks: Disable HPET on Intel Coffe Lake platforms")
>
>
> NOTE: The patch will not be queued to stable trees until it is upstream.
>
> How should we proceed with this patch?
It probably makes sense to backport the dependency commit mentioned.
Jason
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-12-20 11:14 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-03 20:57 [PATCH] x86/quirks: disable HPET on Intel Coffee Lake Refresh platforms Jason A. Donenfeld
2019-12-09 13:52 ` Jason A. Donenfeld
2019-12-09 15:45 ` Jason A. Donenfeld
2019-12-20 1:42 ` Jason A. Donenfeld
2019-12-20 1:43 ` Andy Lutomirski
2019-12-20 10:07 ` Peter Zijlstra
2019-12-20 11:14 ` Jason A. Donenfeld
[not found] ` <20191211163646.13A212073D@mail.kernel.org>
2019-12-11 19:24 ` Jason A. Donenfeld
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.