From nobody Tue Apr 01 17:46:16 2025 X-Original-To: dev-commits-src-all@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 4ZRwQx2Hyyz5rsk4; Tue, 01 Apr 2025 17:46:17 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZRwQw5JY9z3L8K; Tue, 01 Apr 2025 17:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743529576; 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=ITbOZEq6NrVNqm+XJ/jezUzjQNi7I6wI14hLo3bnj5M=; b=lvOFeRqLNhrxy3LsFK1VgOkUiUVj++8Piy7sxlj7/3BD2MbxuxVTI++MmAORp1M2dM1TXk gZLIbh9U+DQgbfKGTC7zE6S0PGkeA8uOxhNIsnHLO4JJkcWpz7UYcrjXvakWHEMSvOm+sR L0mPyVBnE6+Mq0II7ajFm2gCaWY1gtrELKOflZemTGVWOkdy4yrDXSssdBirm3GFlWstIx mq5vvHCPzrEta2Gom74xtr/uxn4BGoaUwcYCRVdyEviaQrfHFkdcVi8HOVAcXuwwYHHl/X dnMwFQ1KCHwkCexzg6DPGtNXkgFx/AST2NzZ/I3uqfSZY5jBrVwcYDezbdqlyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743529576; a=rsa-sha256; cv=none; b=gmwcDwXOx4xgDrIDKL7Av5jx7CMxUbN2H7k3uCA90n3U+mOpkuspUYVtYu7Sfv7VlIK3VC e2gkYHZimVUs6WICngomCmL/KGqJnkn8PdyVO1wpWnP/oYULswOPhx7oPU7t67wZijdDLn jud4Y0pDOvvm/SYXlLqiujPv2lI6E4fDAMRbnrkruaiUtyjzPDlnf2Z56oDpCOnDKWd3PF 53CgoMa2XC/dPwz9CgTCH4s9P6LW5rygQ011+V0IUO+nR5eJre9kv63h5rWsi4h7e8kTkz QrI8v8F2Pv/e9lj8Ug8kW5eg32mCGlqdSEwoLSSq1NuasINwo+woeeYsTrMzKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743529576; 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=ITbOZEq6NrVNqm+XJ/jezUzjQNi7I6wI14hLo3bnj5M=; b=N84tBCluqMYXdUoQxzwm0Sps46ABRF9ML3iRiAltqWMhwpgqzpt6MdtW+mzi8OUHoU/2rE jof9hB+ww5JmegOCK4EyOre4hUZpx8DBZca12delXsSbIQ05kgMOimF/vSv+B+oPVOWwdV p8tLUpBH0RRFpeb1sTndw91OIivv+3Qy5xXNPluwyfhivWEOldEMkb4UpwZT9MFY2XQ5BV IBdoGBMJJFqr4SdqkRRgq7tFTaVM4oULSK4SgL9yqqKiu1SIxPVuSxnbFHrj2jgwcbSTmq eceA+bHhudVMd9jg7lK82eCbd6tJpmHDipt6DqJc6UDt3h8YFzR3aGKWdnpqZA== 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 4ZRwQw4MKtzh7f; Tue, 01 Apr 2025 17:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 531HkGJW050299; Tue, 1 Apr 2025 17:46:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 531HkGCF050296; Tue, 1 Apr 2025 17:46:16 GMT (envelope-from git) Date: Tue, 1 Apr 2025 17:46:16 GMT Message-Id: <202504011746.531HkGCF050296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 423362c3d8d6 - stable/14 - pci: Only claim to support PCI ASPM on x86 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 423362c3d8d6a236c49e7f9d667032c05d5c170d Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=423362c3d8d6a236c49e7f9d667032c05d5c170d commit 423362c3d8d6a236c49e7f9d667032c05d5c170d Author: Andrew Turner AuthorDate: 2025-01-03 15:50:38 +0000 Commit: Colin Percival CommitDate: 2025-04-01 17:43:58 +0000 pci: Only claim to support PCI ASPM on x86 We claim to support Active State Power Management, but don't appear to do anything different in the kernel when it's enabled other than tell the firmware we do. This breaks VMware Fusion on Apple Silicon when it's enabled as it expects the kernel to enable the ports. As it is reported to be needed on some x86 servers keep it enabled there, but disable on non-x86 architectures. Reported by: kp, tuexen Reviewed by: tuexen, mav, imp, jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48303 (cherry picked from commit 143dff0f9ce9a6f03ae5701368c7144b30e2dc39) --- sys/dev/pci/pci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index b40a352a4818..102027123976 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -409,7 +409,15 @@ static int pci_enable_ari = 1; SYSCTL_INT(_hw_pci, OID_AUTO, enable_ari, CTLFLAG_RDTUN, &pci_enable_ari, 0, "Enable support for PCIe Alternative RID Interpretation"); +/* + * Some x86 firmware only enables PCIe hotplug if we claim to support aspm, + * however enabling it breaks some arm64 firmware as it powers off devices. + */ +#if defined(__i386__) || defined(__amd64__) int pci_enable_aspm = 1; +#else +int pci_enable_aspm = 0; +#endif SYSCTL_INT(_hw_pci, OID_AUTO, enable_aspm, CTLFLAG_RDTUN, &pci_enable_aspm, 0, "Enable support for PCIe Active State Power Management");