From nobody Thu Mar 27 20:59:51 2025 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 4ZNwyc3J8Kz5rtkS; Thu, 27 Mar 2025 20:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZNwyb61hMz3ntd; Thu, 27 Mar 2025 20:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743109191; 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=rrYut5alV833pbaUwRddN6pRemoOdbCPuckJQZ9yPDc=; b=cw4zTrv2EYXSAAD5Gh5pI/7LSV4+0eoCPwwHnF1aOUyXEU5hAmKcpjZPbRc2tw+gpfrSBT /JIjd3k/oUPeMsH0xEepS0L7RdWeWXrJbNq5+cdmrQpcBX7oUU8etyt44bEY5CJa8pUTZ2 XIITnOP4FcaWctu7nBZqmJhO6VK4xWpwPfMUqinXW7Rok6pJAvstoXDzaM4dopr8leJkMM N5cVGqRaAWebA7H5Wxp1wK6blIV2XVjt5YI2fKX5h9iScut6/S0GtkEUYYMZEYc+3Pv7YK xz/SGVyHiUbZL3DqhupLVpJpJ6YR8Brsq8EVGhlznjIEtW1TUeHqpPm9ghbL+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743109191; a=rsa-sha256; cv=none; b=xYZtHaKEMb4DegO2Mrz9uxZ7GdA2MOeL2RbDCmC7iL+2hbOmPglGv9AltxgVOKp09/Xq2O ujWt5cdhlV5aVYvgiIfXVx4k0MIAxh6WVoJyCnZNUUYio5TBwcx2DqapH+2d2Pw0RJj0LE V26I7mgIrAkPF+QerQ1bCnONGwiAKJRDlYl25yNKLx1zWQ9QPbeHi/Ie2ecjB4YwN+RSBS pM/00jyp7pCoXroQ8QTut2AbDEpJBa5GPojNeT7xOwmC0lSIoKOX0XeIQsuRNGo26j3oG6 6XMo2E30fTs/mp6Oh2rdRy101hKXSCu64O15M2rNh/DNJQc6ImhEDLV4nCHi9Q== 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=1743109191; 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=rrYut5alV833pbaUwRddN6pRemoOdbCPuckJQZ9yPDc=; b=BLtTyie8oAD1UPirYKwiAvauIgroEtnwqsj3GpjV10OUjlnJjBK1XF8p7YLaBC8oCCjAfl OJlBcL8+sQzXADICsGGbM9SmYGDzHpFEDhKizgsGkTyMJrdHDNBtBjAgzjx7sy2FXGcPFt kEFgD1+ESj/N4Z3eku9rAtwq0INu1popbBEoXJLcbzBgDR0CCdRwFZXaGHUu14RIepRk7L P7k8FPxA77nrI7cCt9MJtsKmqsXMJx/xVfSyATiS5QkfIZqxB3mWlniBBP0jXYhWyaXvrY Rul9lniEBJacFoI8HGA8Dl2MpNPIZUSbapujBhQccpMbfdC5QGxtQuHRYxZ0cA== 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 4ZNwyb5GtGz1Bs9; Thu, 27 Mar 2025 20:59: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 52RKxpTc031878; Thu, 27 Mar 2025 20:59:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52RKxpGO031875; Thu, 27 Mar 2025 20:59:51 GMT (envelope-from git) Date: Thu, 27 Mar 2025 20:59:51 GMT Message-Id: <202503272059.52RKxpGO031875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 931baeb62b03 - main - acpi_pci: Use pci_has_pm and pci_clear_pme 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 931baeb62b03029cb57459736851c4e8141e672e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=931baeb62b03029cb57459736851c4e8141e672e commit 931baeb62b03029cb57459736851c4e8141e672e Author: John Baldwin AuthorDate: 2025-03-27 20:56:08 +0000 Commit: John Baldwin CommitDate: 2025-03-27 20:56:08 +0000 acpi_pci: Use pci_has_pm and pci_clear_pme Differential Revision: https://reviews.freebsd.org/D49266 --- 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();