From nobody Thu Feb 27 14:16:28 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 4Z3YL51xsKz5qGJd; Thu, 27 Feb 2025 14:16:29 +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 4Z3YL51Mdcz3wx3; Thu, 27 Feb 2025 14:16:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665789; 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=TSthiYhtrbHcclTcLw0XB8zN6U9/x+yQ52PxCo38lEE=; b=knyQsjhgHgFdLi7YCKOKrQ9iuWhMkZRDyA6oPgxU3hX9uIN6K3Pf1Z/4AGTNMpK8acfZrM C6fuQbEEvNNG6BOFzZeW/0GH+CeS3lDgLa+oeQbPOEFZ6io24aHu91jwCwGC+e5Z4NQ7ho 2vHD6/sjMg0wrl6JfaLzgYSLOGdkt5qDgccRYA02vSzcB2cTqpei+A3oo3oQW46/H/2GuU /qFVbvTE48+m0kyMFlnUd7AZYxwUWbdcZYyICI2N/NiyB1D0f85CcQpghhgbjE0WbDDhhM XYpRnPdSGxwuSnRN5/whAd8rkfuZEkXbD5Ti7PEjN4TE36D42bdLY07OlDO/qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665789; a=rsa-sha256; cv=none; b=hNB+2mdMUKHyI2XT7ZzeD0B9TaGbPOOwg25420jBYwG81RG8VBZjpMXp2IkviolgA3FVKn 6qSphlZHPtsW7YwZvV8J7vmoibYdVHRczu8/hGs0872qDDFa7T9LfeK1oPoI/5knNmiCec xUrQJ3tPUhtQ3JnOLA/tzern0TfAAkd/f+n0fxO53z1IIrpWtLos4aJF9t+kX7lz4IuKTr EmgAjiy1Jf0tScxagFG74OyMI4/pq9fgQW32pZaFm3uPL0Y7rOj9AdAS43eGt/YDazxK2f Ww69yzNqq4LWTvnikvFopSQQZptM9kMn77E117z0t70jyX0HN1mN3M57zIkU6A== 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=1740665789; 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=TSthiYhtrbHcclTcLw0XB8zN6U9/x+yQ52PxCo38lEE=; b=XIWs1C+2mWFDbUxxTTspvGDy4OblBUTZ3GxbNOxaHOn1qgzipMHA4//+cwekKIHD7E8Jm9 XjluMAKWli7Uh1n9cyZ7POk43wIOknTD4BVMnbwVHgsJgjfKlMYb4kLuj4zknhbUemoTWp 8Nzz2YohhiPsMXODu30OHtoxIdmy8awlT9XIuCYwNjRMYsfBw+HL+DnB349n4lzc55QNNm wVKeQfE3EHWiLlg4/fjhvCa54NwlIA6zX5e9lpDf8jbx+/s6c18XCiCH3Yty8/6A88Ay+4 Bvfy7AOMTAyYwIM27U1eNVxMe77YMTj5+yLcrmuDzVtnBeDUfON7dGbGWlZLXg== 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 4Z3YL50fz8zmpW; Thu, 27 Feb 2025 14:16:29 +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 51REGSvT015551; Thu, 27 Feb 2025 14:16:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REGSDh015548; Thu, 27 Feb 2025 14:16:28 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:16:28 GMT Message-Id: <202502271416.51REGSDh015548@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: 959c3d77be1f - stable/14 - acpi_pcib: Use pci_domain_[de]activate_bus for PCI_RES_BUS resources 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: 959c3d77be1ff1146cfee8da1bdcacc15cdaf0c7 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=959c3d77be1ff1146cfee8da1bdcacc15cdaf0c7 commit 959c3d77be1ff1146cfee8da1bdcacc15cdaf0c7 Author: John Baldwin AuthorDate: 2024-01-23 17:35:22 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:19 +0000 acpi_pcib: Use pci_domain_[de]activate_bus for PCI_RES_BUS resources Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43428 (cherry picked from commit c2d4fef658e0dfd998115f1395cd8705b432e3c8) --- sys/dev/acpica/acpi_pcib_acpi.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 06e6bc233720..451a8d8b736d 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -103,6 +103,12 @@ static int acpi_pcib_acpi_adjust_resource(device_t dev, static int acpi_pcib_acpi_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r); +static int acpi_pcib_acpi_activate_resource(device_t dev, + device_t child, int type, int rid, + struct resource *r); +static int acpi_pcib_acpi_deactivate_resource(device_t dev, + device_t child, int type, int rid, + struct resource *r); #endif #endif static int acpi_pcib_request_feature(device_t pcib, device_t dev, @@ -128,11 +134,13 @@ static device_method_t acpi_pcib_acpi_methods[] = { #endif #if defined(NEW_PCIB) && defined(PCI_RES_BUS) DEVMETHOD(bus_release_resource, acpi_pcib_acpi_release_resource), + DEVMETHOD(bus_activate_resource, acpi_pcib_acpi_activate_resource), + DEVMETHOD(bus_deactivate_resource, acpi_pcib_acpi_deactivate_resource), #else DEVMETHOD(bus_release_resource, bus_generic_release_resource), -#endif DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), +#endif DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_get_cpus, acpi_pcib_get_cpus), @@ -764,6 +772,31 @@ acpi_pcib_acpi_release_resource(device_t dev, device_t child, int type, int rid, return (pci_domain_release_bus(sc->ap_segment, child, rid, r)); return (bus_generic_release_resource(dev, child, type, rid, r)); } + +int +acpi_pcib_acpi_activate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + struct acpi_hpcib_softc *sc; + + sc = device_get_softc(dev); + if (type == PCI_RES_BUS) + return (pci_domain_activate_bus(sc->ap_segment, child, rid, r)); + return (bus_generic_activate_resource(dev, child, type, rid, r)); +} + +int +acpi_pcib_acpi_deactivate_resource(device_t dev, device_t child, int type, + int rid, struct resource *r) +{ + struct acpi_hpcib_softc *sc; + + sc = device_get_softc(dev); + if (type == PCI_RES_BUS) + return (pci_domain_deactivate_bus(sc->ap_segment, child, rid, + r)); + return (bus_generic_deactivate_resource(dev, child, type, rid, r)); +} #endif #endif