From nobody Mon Oct 10 15:29:56 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 4MmNBw1326z4fdg6 for ; Mon, 10 Oct 2022 15:30:00 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MmNBv2v0Yz474g for ; Mon, 10 Oct 2022 15:29:59 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wr1-f54.google.com with SMTP id a3so17631001wrt.0 for ; Mon, 10 Oct 2022 08:29:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZuM98QLd4czXCQALjp11J/NCVH/N56Pwrw4VXdJ1C8k=; b=vJsa5JJpvCivtf6bogrxM1C78WvfDhsWg+1uyF9fAbp8gGb5NSq9H7+My1vhIq4b/c 4vu7CFkQpxLtyns6uYAncTOkgF5XufUpG4+PccR4UaUxHCYHHJw0Ndu6QkgStWCmkg6p 6wtWqsfwhKF1pBh1l+vOo5mD1Tu+rl4OckXT6oA3/Dd8686F2a4Mz1lQrAjj0mGrKImg WP1weeJ9sSsgvcHyhzFXfWSM1w8i9AbrqJI3yTbBk4lbcPfJY6MededNqCpBH/X3JcXC Doy7qeRfCeUZXwM/AUAMLRKL88hf1vHrMdOinhckJjBRi/jd8lthKNUviEd13utAGdcp T8Nw== X-Gm-Message-State: ACrzQf30wuZlXWvCjKHE2C5HWQbBO0M/Sl+N0LNBsvJ9tNMWfzh2CdEp BQMzAOxSwjoJHROW2vr8lo3sfQ== X-Google-Smtp-Source: AMsMyM5DKwowtE3KW5L82Z7gnNgOPHKwVf/sdi4Wu2trxJ4fe5d0MD+dZAICJ751iNGr+dvIXMZSXg== X-Received: by 2002:a05:6000:144d:b0:22a:f4ef:c900 with SMTP id v13-20020a056000144d00b0022af4efc900mr12298910wrx.678.1665415798091; Mon, 10 Oct 2022 08:29:58 -0700 (PDT) Received: from smtpclient.apple (global-5-142.n-2.net.cam.ac.uk. [131.111.5.142]) by smtp.gmail.com with ESMTPSA id j3-20020a5d6043000000b0022f864164edsm5761363wrt.6.2022.10.10.08.29.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Oct 2022 08:29:57 -0700 (PDT) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3696.80.82.1.1\)) Subject: Re: git: 67f2a563bfca - main - acpi: Tell SMM we will handle CPPC notifications From: Jessica Clarke In-Reply-To: <202210101353.29ADrhXG012590@gitrepo.freebsd.org> Date: Mon, 10 Oct 2022 16:29:56 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <2963DD27-E730-445D-BD59-0DB728CDA203@freebsd.org> References: <202210101353.29ADrhXG012590@gitrepo.freebsd.org> To: Tom Jones X-Mailer: Apple Mail (2.3696.80.82.1.1) X-Rspamd-Queue-Id: 4MmNBv2v0Yz474g X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-2.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_THREE(0.00)[4]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_DN_EQ_ADDR_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.54:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; MIME_TRACE(0.00)[0:+]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.54:from] X-ThisMailContainsUnwantedMimeParts: N On 10 Oct 2022, at 14:53, Tom Jones wrote: >=20 > The branch main has been updated by thj: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D67f2a563bfcad75c16536ca500b06ddc= 9306dfa0 >=20 > commit 67f2a563bfcad75c16536ca500b06ddc9306dfa0 > Author: Tom Jones > AuthorDate: 2022-10-10 13:46:25 +0000 > Commit: Tom Jones > CommitDate: 2022-10-10 13:53:15 +0000 >=20 > acpi: Tell SMM we will handle CPPC notifications >=20 > Buggy SMM implementations can hang while processing CPPC = notifications. > This leads to some laptops (notably Thinkpads) hanging when the > hwpstate_intel driver is loaded. >=20 > Tell the SMM that we will handle CPPC notifications as described = in: >=20 > - Intel=C2=AE Processor Vendor-Specific ACPI > - Intel=C2=AE 64 and IA-32 Architectures Software Developer=E2=80=99s= Manual >=20 > CPPC events default to masked (disabled) so while we do not do any > handling right now this does not seem to lead to any issues. >=20 > This approach was found via this Linux Kernel patch: > https://lkml.org/lkml/2016/3/17/563 >=20 > PR: 253288 > Reviewed by: imp, jhb > Sponsored by: Modirum > Sponsored by: Klara, Inc. > Differential Revision: https://reviews.freebsd.org/D36699 > --- > sys/dev/acpica/acpi_cpu.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) >=20 > diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c > index 762ea37cfa34..49d2bd11fdaa 100644 > --- a/sys/dev/acpica/acpi_cpu.c > +++ b/sys/dev/acpica/acpi_cpu.c > @@ -153,6 +153,7 @@ static struct sysctl_ctx_list cpu_sysctl_ctx; > static struct sysctl_oid *cpu_sysctl_tree; > static int cpu_cx_generic; > static int cpu_cx_lowest_lim; > +static bool cppc_notify; >=20 > static struct acpi_cpu_softc **cpu_softc; > ACPI_SERIAL_DECL(cpu, "ACPI CPU"); > @@ -396,6 +397,13 @@ acpi_cpu_attach(device_t dev) > */ > if (!acpi_disabled("mwait") && cpu_mwait_usable()) > sc->cpu_features |=3D ACPI_CAP_SMP_C1_NATIVE | = ACPI_CAP_SMP_C3_NATIVE; > + > + /* > + * Work around a lingering SMM bug which leads to freezes when = handling > + * CPPC notifications. Tell the SMM we will handle any CPPC = notifications. > + */ > + if ((cpu_power_eax & CPUTPM1_HWP_NOTIFICATION) && cppc_notify) > + sc->cpu_features |=3D ACPI_CAP_INTR_CPPC; > #endif >=20 > if (devclass_get_drivers(device_get_devclass(dev), &drivers, > @@ -977,6 +985,12 @@ acpi_cpu_startup(void *arg) > NULL, 0, acpi_cpu_global_cx_lowest_sysctl, "A", > "Global lowest Cx sleep state to use"); >=20 > + /* Add sysctl handler to control registering for CPPC = notifications */ > + cppc_notify =3D 1; > + SYSCTL_ADD_BOOL(&cpu_sysctl_ctx, = SYSCTL_CHILDREN(cpu_sysctl_tree), > + OID_AUTO, "cppc_notify", CTLFLAG_RDTUN | CTLFLAG_MPSAFE, > + &cppc_notify, 0, "Register for CPPC Notifications"); > + This isn=E2=80=99t under an ifdef? Jess > /* Take over idling from cpu_idle_default(). */ > cpu_cx_lowest_lim =3D 0; > CPU_FOREACH(i) {