From nobody Tue Aug 09 07:08:51 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M241J0lydz4YmHh; Tue, 9 Aug 2022 07:08:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M241J0Gymz46wd; Tue, 9 Aug 2022 07:08:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660028932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a2XmOd2zjiZOEGzV97aAlUeLWTGrbyl6VzOR2Dfk6vU=; b=PMBEAaq8nDnfavs8NRo0sCxhD5UJ6doqtWFK93pSk9ghXanV7QxURgJW1Unj3uj8jOWar0 pOyQzG4JxpZTGg6JSmn9CN4DbWoMoZa5kztowU/zSdPSw5Vl+QdeC8yRCSf2ks/GBRkuIS ire37gGIzG/IJQIkAU7KvjEneyyFRnzUvsA7s7Q+8SltifRTDdJUiFTlCp5mpap6hDCkbT jFV5zjsvWOCKDmHYMX3UVyGSSKgo9TyHJ6TTpLzyWJijQ0ux7UZkSgMbGx6xGQ7jfpVbYu WQRA2nGR33cdHBhOyCq21QPy1Q7xSsXZpCwgeyuCyawfXR3IvTRZ49SBTg8a8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M241H6F4SzNBR; Tue, 9 Aug 2022 07:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27978pbd075034; Tue, 9 Aug 2022 07:08:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27978pmp075033; Tue, 9 Aug 2022 07:08:51 GMT (envelope-from git) Date: Tue, 9 Aug 2022 07:08:51 GMT Message-Id: <202208090708.27978pmp075033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: b223c1f1a0ac - main - x86: Add another cpuid for Apollo Lake errata APL30 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b223c1f1a0ac83a3bd1475add9b794bad1749b2f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660028932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a2XmOd2zjiZOEGzV97aAlUeLWTGrbyl6VzOR2Dfk6vU=; b=jcEUx0/4lVO/IPx36IQ35w0aXmsmY9ERPlR9fwRQBY8siur+K/CULfxSUjsVytcK+wcSvZ p6vs5nOQUofWig45EInvK++hD614meZSmPogR/iduLuwoH1uaD6jXANEq+I3Q+9jsiKt+W q5VU8xjCVAro9xyCIxOMJxR/KJJJPH+h1KFmk83eIMZDgShxGR1LQ5vXJE94l/HLnvIyfY NiCWStDhSS2E1vfbuFdinSZIpwhJbrT3U82pmTXTbbZF4oSb5hN88CML4w0B3Dc9SX4W9o XxDaUJpnzCdsyWsUG2u/MRHZg8DCuXJS7vRnWQm3f8p8NLSjVZNogAlxZECw9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660028932; a=rsa-sha256; cv=none; b=NwdcNWjRc0POkeAknOtfuim/aHZzbVnsp1XtRGBPXhzRSQbLEAk2WJdshIyUfLXytSVMSh O8DmkXCvuyffl/BLF6afboosGacLDT39fStxI2cgCuRxjg3TiSZ2sKXUHfF4gKqADHJkA7 GQEa+Fr78pwAcCBEvVG0pTF5+OCTD5m2Xzyu/I1gQbqNNc7WIn5svaMGz424mkejRSFb74 TJUVB1LNz3CTn++/mLpgX/bz8I8+beW6Wp1HreCyYaM1IzalD4EEy7Av9RwElK93M02ZkU Ar6EKXJNoSpASStP2PvUPeum6yFIsiM7IEQBHukxHjn+Ko7DQj1O6qQ640Tdjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=b223c1f1a0ac83a3bd1475add9b794bad1749b2f commit b223c1f1a0ac83a3bd1475add9b794bad1749b2f Author: Corvin Köhne AuthorDate: 2022-08-09 07:07:59 +0000 Commit: Emmanuel Vadot CommitDate: 2022-08-09 07:07:59 +0000 x86: Add another cpuid for Apollo Lake errata APL30 Sponsored by: Beckhoff Automation GmbH & Co. KG MFC after: 1 week --- sys/x86/x86/cpu_machdep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index b96e50d785fa..cf3365acbc92 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -827,7 +827,8 @@ cpu_idle_tun(void *unused __unused) mwait_cpustop_broken = true; } - if (cpu_vendor_id == CPU_VENDOR_INTEL && cpu_id == 0x506c9) { + if (cpu_vendor_id == CPU_VENDOR_INTEL && + ((cpu_id == 0x506c9) || cpu_id == 0x506ca)) { /* * Apollo Lake errata APL31 (public errata APL30). * Stores to the armed address range may not trigger