From patchwork Tue Dec 3 20:57:16 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: 180737 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2039104ile; Tue, 3 Dec 2019 12:57:38 -0800 (PST) X-Google-Smtp-Source: APXvYqxIe8qyxS2TfWNae836if9BUu0b0LzZmrE94W5tOzsQ8xghJzmKR7UiSNmwz5Cmk0tKyCXV X-Received: by 2002:a05:6808:a9c:: with SMTP id q28mr5543141oij.176.1575406658151; Tue, 03 Dec 2019 12:57:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575406658; cv=none; d=google.com; s=arc-20160816; b=jIGp6eXmtkfyq1V0ZgqOIZHxDYCliyGGDPJKlF6uYqmcNynE2uevc9MqeE6hhs5Ctf mPGpfzdMxB2vdCo1VjzD/gpQUoPAAzUV0w8n1e3QuwwJfSUhv9c1X59jMdAFHNl2ie48 tLrgdYCpOq6FvGwZyn0SilV1mZ/d/VayvDAdHeW0nnezm37VozBiyD0utcIUNhF8dAYL G0YOU8DdPKgLz/b6r3fNYFy0KHyjcmIvpcBab/o33X2M/WIlFJZKYkm3bGRPJFbP+BEi L4lEJTYrlux0CATt02quINMfIQN8hznwy3kBrZkIghNbUgbbOf9s64Kxp7FLJxyXy45N g87Q== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=j/rgq9xZYfZ/2C/M/mlOxvrzMDe8R8argqq8qfx/P0Q=; b=Ks7Mf1mFHaZDIDG1nqBVFlsj8YaHzf00ObchORUUQLZMBU075RteYcNhdex1Vpdcmm 90L5FvRCa2psh7OD1yn9E4Blurh73+AUMbJyuYjLeaf2InuCSwSkVpOQMpzRpqnYnfcn bDHKhZxrDzF/tIyzu940QbOferwfAzMwM0Pe7GAiitr0Whq3UqlnzHWTaNwK+0vMNea0 yQHLzF6mA9ytDUK7TYQ+p3P0y0vNYVCc0+DCvU2oTUo8yI/wpOqhiduie54O+qZ/q9vL W/y+8sY1UneqDYGy5/ZuwISr8l/0hsszuBcSi225sVWghMiHWWqhbxbRtUxTl/Vfx6iH epAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=y2yy33aQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 v67si1761681oia.26.2019.12.03.12.57.37; Tue, 03 Dec 2019 12:57:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=y2yy33aQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1727457AbfLCU50 (ORCPT + 27 others); Tue, 3 Dec 2019 15:57:26 -0500 Received: from frisell.zx2c4.com ([192.95.5.64]:46863 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727244AbfLCU5Z (ORCPT ); Tue, 3 Dec 2019 15:57:25 -0500 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id fb4926cd; Tue, 3 Dec 2019 20:02:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=mail; bh=We/tViqcNSYyTT+iqYw0DQdfrxM=; b=y2yy33aQtdKHY/kHDnHh hsMHQG5pe3IbrbK1MlDFz+yNgFh/zm44ZrAuWW/tcrNL/3qM2SQ6TOzjS1/lS6Vh oltVIUx4FQ5UZ/1RdgJvBcfo/apDl4dseyILbBFqVkau+um8oqkYd1ofeyHhKZrL vWJsHibHM6+lvMKmUrQTHqIKdCZ8LENU44FyRzKj92EtWpB+SxsVA9Xf4NHFoz5E h++KU4dfEJYT72dHveRBF6/0ZRC1RH07JY80mF0pDr3YhKnQfX8UcKWvUVRQO3rq iTETzDmOhiLSQaEmIQrRETnHbjkwzeB20S9b2yVpmfBEwV7e0/GHzsUaGuAxT7Mz KA== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 388e7a3f (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Tue, 3 Dec 2019 20:02:43 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-kernel@vger.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: Tue, 3 Dec 2019 21:57:16 +0100 Message-Id: <20191203205716.1228-1-Jason@zx2c4.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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}, {}