From nobody Tue Apr 29 18:30:50 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 4Zn85S2yqFz5vMvy; Tue, 29 Apr 2025 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zn85R13sfz4Hks; Tue, 29 Apr 2025 18:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745951451; 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=MMUXOBFTKD4OuWLW2rbgy6lKN2R+oik/LwTEHnShgzU=; b=WXLS5FQITdxZdTdmX3R0jtWNaOdG0oUgRltnZWOdd95ZInGF5FdMVqnNjVxpf+MOjvUzUq LsCN/ltSdc+zqDcvxeh5hwKAxqZQNWbJA25bNuSm1nuVPvTr51gdQCZFmfpWD8lhGeeDXr yVDPIqN1GSB4DAxpKskWpxU0RkKjK3YiiuovB4BgMug5VrIi3MHeOvMKMXjnOcOlRtc3ko Xb0YV9NcVzv9ik7Qf7R0pBa9GaYpGvTp63PkEXeDi5sEtcHTk8rLCsLjowEFph2MngVhxA DeTg4J96ii7G/Ql2oiB173+RhkkocWPW8NeVggsgQwlKxxE8bwu6wUiB/1tVdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745951451; a=rsa-sha256; cv=none; b=BQLdYm0bGNTBI7mNeYRPeTFGnYGSTXNvwB05/vR3X0bNOt5ehvz/tgRgAfxnE8tIG/BFUj Ox7phT01h445jh0tZVL1njYRpOaN2An0xaNAVHCE9dIND/WUy9EvLjCg+SKpz90p8nSTBG AOf+CxMCpJp+pgVlZBmDy7p9cAuCmEKP8T77/aykyXtx40eSMfmaUzfGuimSipPk8/7Z7A vvtZTsWZKZs8wf3r0GzkH/lTVL4XpcVRXKafRXGptkcLiym5owOMtBj0dr+hS/JMFLsusn bTuHZBF5GSy+nGqh3RcaoJwV/UITAZN/WxPQ3lPm0O+ZTR7bUf+J5FnxjpDVqw== 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=1745951451; 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=MMUXOBFTKD4OuWLW2rbgy6lKN2R+oik/LwTEHnShgzU=; b=YE4efglfTJq44hM/2xCht+u/0sBgpdMO53RiWgHDZ3J6+q7xmF79zPNyd8TfealnkkTq8k RV1ucpqWi7pzclkBaiPeNril+TCqQBcVy9yunYuGSlq3VG5cwxZATwlA3R7F4wPzjUMKzb ymuqpTnY5tPYvQRneexZkk6GLhpkU6geXC72Pxfo6xCey3BiOJ8LI8MR7JP7vJUJhNVuQq NeS9lZcn6FQLwMnVpiedrz333P2eylji4PQcyntGCRN2Z8lm9p9PRnAYJRRTvQTflXaEMY bvKZ0SQr8K8Y7E352+M4urWccbSWBH5sUUXDrhxELHkU2BJ1lnNBdtCr2zsi4g== 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 4Zn85R0VB5zXRN; Tue, 29 Apr 2025 18:30:51 +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 53TIUot8022981; Tue, 29 Apr 2025 18:30:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TIUowr022978; Tue, 29 Apr 2025 18:30:50 GMT (envelope-from git) Date: Tue, 29 Apr 2025 18:30:50 GMT Message-Id: <202504291830.53TIUowr022978@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a2de254b2007 - stable/14 - acpi_pci: Use pci_has_pm and pci_clear_pme 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a2de254b2007856d987556102806dc7b5bb9729e Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a2de254b2007856d987556102806dc7b5bb9729e commit a2de254b2007856d987556102806dc7b5bb9729e Author: John Baldwin AuthorDate: 2025-03-27 20:56:08 +0000 Commit: John Baldwin CommitDate: 2025-04-29 14:45:14 +0000 acpi_pci: Use pci_has_pm and pci_clear_pme Differential Revision: https://reviews.freebsd.org/D49266 (cherry picked from commit 931baeb62b03029cb57459736851c4e8141e672e) --- sys/dev/acpica/acpi_pci.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c index b7a2bf70b4e0..646295f9eecc 100644 --- a/sys/dev/acpica/acpi_pci.c +++ b/sys/dev/acpica/acpi_pci.c @@ -391,8 +391,6 @@ acpi_pci_device_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context) { device_t child, dev; ACPI_STATUS status; - int pmc; - uint16_t pmstat; int error; dev = context; @@ -419,12 +417,8 @@ acpi_pci_device_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context) return; } if ((acpi_quirks & ACPI_Q_CLEAR_PME_ON_DETACH) && - (pci_find_cap(child, PCIY_PMG, &pmc) == 0)) { - pmstat = pci_read_config(child, pmc + PCIR_POWER_STATUS, 2); - pmstat &= ~PCIM_PSTAT_PMEENABLE; - pmstat |= PCIM_PSTAT_PME; - pci_write_config(child, pmc + PCIR_POWER_STATUS, pmstat, 2); - } + pci_has_pm(child)) + pci_clear_pme(child); status = acpi_SetInteger(h, "_EJ0", 1); if (ACPI_FAILURE(status)) { bus_topo_unlock();