From patchwork Mon Dec 9 15:45:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 181054 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4520126ile; Mon, 9 Dec 2019 07:45:10 -0800 (PST) X-Google-Smtp-Source: APXvYqyHmHXVxeqV0venbUsom5XRpGmDvGuZ+vZyi6836N9uZKBj/LxQccxziBqri9EnDIXFWfzN X-Received: by 2002:aca:d985:: with SMTP id q127mr23940715oig.132.1575906310772; Mon, 09 Dec 2019 07:45:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575906310; cv=none; d=google.com; s=arc-20160816; b=ZVoR1TwKaRi5P920d7eLOrnJ8MG+TmtyJjJ018PVZbWPzZHkiYgV2WXNCgdQDQ5Asx 4fGP8CePqePJ9hioxWXnlE+ZU5JP2jP+OavPs3BBDBvCfRWKtkrSMjn+FYPpOu0/RrTu jlxfjqkC1ekkVs0O8/RNRNJmVSZvkvjl2FGSL1HwY5va/yffWWnrrervVhm4cXFIP/fs WLDHJgGh1s2f1b6T7IUUOIEJzj0SSopDcGxTRPrkNNgdbTpHZkGlMmPBgMjp6tjaHxGi ml56hNMFw93nicp4LMNQ1KiJ9zr83QSkceX9YUG/iYKwMhdICvkUcZ/waxzMHdnEhEez eRew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=j/rgq9xZYfZ/2C/M/mlOxvrzMDe8R8argqq8qfx/P0Q=; b=Y0p2H1UuB08cEtYhB5h64MBuq9XtzSgzQvr1UrINUJbu3/dZ9Bm95d5G2x5aL7jfiI cCaebYNePnr1CLQln/GluY8bZq+b52UilIdcTkSzUsmEYnmQIbD5X7kkqXJhy0b4H8wV WxYP5e8Aj1YnfYXyjUAErqNolK6nG8tgPNCNLkBLyD6r2+6tZeaU5CfUpGlaWpb0unwu 3AmvK4uFlhjx/0jdZYybzP6yfPktAIeLCW2fuV8N5r+sCBXWkZwNhLrMyYHB59L9ht8d 8ynRwfpwtT4FIpVByg9VEJYvQ8iwJ4DN6wOBnnb0MTBmNiLaxH+UcQnX7fQgho5mJ/CG ffrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=Q5OawQr1; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d16si12286895otc.210.2019.12.09.07.45.10; Mon, 09 Dec 2019 07:45:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=Q5OawQr1; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726483AbfLIPpK (ORCPT + 14 others); Mon, 9 Dec 2019 10:45:10 -0500 Received: from frisell.zx2c4.com ([192.95.5.64]:46599 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726197AbfLIPpK (ORCPT ); Mon, 9 Dec 2019 10:45:10 -0500 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 993b7997; Mon, 9 Dec 2019 14:49:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=mail; bh=We/tViqcNSYyTT+iqYw0DQdfr xM=; b=Q5OawQr1HbUwCMdsIf6cI7Zd1M9bVuMDDY9mupyHdR2oGLBox1ui34uYZ Vbkp5g8b4es4z232O7vLpWC41qNeLdoALzyzB4MrvluDYFmoewm1CkbOIW5o0tRg VwbJO3LHYf/umnycOD/ex8veKp6FQkwDC3F5V4pAYcFtQG3sAQCfNzNGSafTMd9D lmFKoxPkA60aKVoiCcp6whXUTlD7TXP338klIkNa8WPXHcLPXpC53FGjOZetYukw NzxQdtkANxUWNQCrNhCz0jOqBpecc0L4y0ZRanmOiq0z2BCYCenmUPmD6B3A/BqX 4wIdwYKY5WNs9SvPO5FH3X93npmCQ== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 561349ab (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 9 Dec 2019 14:49:42 +0000 (UTC) From: "Jason A. Donenfeld" To: x86@kernel.org Cc: "Jason A. Donenfeld" , Feng Tang , Kai-Heng Feng , Thomas Gleixner , stable@vger.kernel.org Subject: [PATCH] x86/quirks: disable HPET on Intel Coffee Lake Refresh platforms Date: Mon, 9 Dec 2019 16:45:05 +0100 Message-Id: <20191209154505.6183-1-Jason@zx2c4.com> In-Reply-To: <20191203205716.1228-1-Jason@zx2c4.com> References: <20191203205716.1228-1-Jason@zx2c4.com> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 Cc: Feng Tang Cc: Kai-Heng Feng Cc: Thomas Gleixner Cc: stable@vger.kernel.org --- arch/x86/kernel/early-quirks.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.24.0 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}, {}