From nobody Tue Apr 1 17:46:13 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 4ZRwQs73qYz5rsW7; Tue, 01 Apr 2025 17:46:13 +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 4ZRwQs2Lysz3L88; Tue, 01 Apr 2025 17:46:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743529573; 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=msZiYxftCzCSlMZfw+FNcS3VnV5R0zccEDPlC+/tZPQ=; b=aq27FdfXb+CqtyV9pdV/SPz6ymbKTwI+3FyZgxI3yaCqk4wouL+rthBpCRplhvHZAo+0GU jXp4/jCnt+MKcpo2Xflp2/6U1rZLXTdtl8eutMROSiB4NIqTcQbUueCfhG2B1xKch+OwxX rpX1LIW5zYDEqrM2bXdwW38giHV4aea0kkL50OT4uvgP0wtzsvmq4zySeFoQsSjKvrDKjS yKDTjbAaLg33gdOo4n7AJ1Zpdqs/qvPyYzzUL3sm93n+glOfUPtdOJ6vBjyZ+GiTUjqo9k DRej6LyjdUORjZRJi6ATvxZxMJ8cO9OkMeGMlcderulW9uiztl0OQsptOsc8pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743529573; a=rsa-sha256; cv=none; b=PxGZFbDSXaQHj8vtk5ht/y2r3NHTa5Zsrnd7NtgMESHPlfG9Na+9TkZynN6KFi5JkU0RqO dktpZB4u25TcX2uRHECF9modJlXYyDrDVDXgW1/GhL7N68Qa3D3JB4z1hHvdowUh+ar0/M MWdhQfvceuTIOgGyQsUNY1qxGQgGOJUGE0aP6TUTZ4TQAUEW7eqCSTIGD9GyhZmd5ofQuV OKF5MT2t9BH1PiX2y+zTc83lhhUBgDQBtf95p+XHAagNpOhK3VxCPPPZ7nkCr5ID4BNht5 5oPxw71lAeRqv28edXlsy3+kvWjY/R0dMfRcDFWtlSEhNMFiTjP97Rf424L6Aw== 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=1743529573; 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=msZiYxftCzCSlMZfw+FNcS3VnV5R0zccEDPlC+/tZPQ=; b=LvVP81toDX5C8l6qN24b+K1N+L46GDP9aMaAsiV5PiC3LPSpRJ1HETVoZ/waSSL3BnWoOX 8j8iFbzOFcz8CVBRMoMIN2quHQhr9oT90MD8LbOllM3FQCE26gnLkrok5N8CP6pVBDX6SK qVdtWq96KfOqQ/gwyCKictygN+k37N+n44SmwsckgVbSxJzl1OkPNqrVs+b2ckSgOxtEy6 Rz86r+WnbrDHb7kOEN0U51hdJcMVJYxujo4kMmQW+jNPbu5AQZU7VnygsB+r/Q9PyU/oc2 QL86PYKS5Sd+W7R8pP5kjeezlXXM6NTd5hF8PNA9qi6TgEFcO4tFbVDEoj5MqA== 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 4ZRwQs1yDTzhXn; Tue, 01 Apr 2025 17:46:13 +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 531HkD1t050194; Tue, 1 Apr 2025 17:46:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 531HkDCV050191; Tue, 1 Apr 2025 17:46:13 GMT (envelope-from git) Date: Tue, 1 Apr 2025 17:46:13 GMT Message-Id: <202504011746.531HkDCV050191@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: 479872ce9194 - stable/14 - pci_host_generic: Support ACPI_IVAR_HANDLE 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: 479872ce91942466a4c421541acbe5865da66bd8 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=479872ce91942466a4c421541acbe5865da66bd8 commit 479872ce91942466a4c421541acbe5865da66bd8 Author: Andrew Turner AuthorDate: 2024-12-12 16:30:28 +0000 Commit: Colin Percival CommitDate: 2025-04-01 17:43:57 +0000 pci_host_generic: Support ACPI_IVAR_HANDLE In the ACPI attachment support the ACPI_IVAR_HANDLE ivar. While here use the common ivar function to support the common ivars. Reviewed by: imp, jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48047 (cherry picked from commit deb36d0c65436d16b04f99cc2a27bd0f3980a6f0) --- sys/dev/pci/pci_host_generic_acpi.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/sys/dev/pci/pci_host_generic_acpi.c b/sys/dev/pci/pci_host_generic_acpi.c index 0cd17d5f5555..b389eeb16fcf 100644 --- a/sys/dev/pci/pci_host_generic_acpi.c +++ b/sys/dev/pci/pci_host_generic_acpi.c @@ -343,23 +343,16 @@ static int generic_pcie_acpi_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) { - struct generic_pcie_acpi_softc *sc; - - sc = device_get_softc(dev); - - if (index == PCIB_IVAR_BUS) { - *result = sc->base.bus_start; - return (0); - } + ACPI_HANDLE handle; - if (index == PCIB_IVAR_DOMAIN) { - *result = sc->base.ecam; + switch (index) { + case ACPI_IVAR_HANDLE: + handle = acpi_get_handle(dev); + *result = (uintptr_t)handle; return (0); } - if (bootverbose) - device_printf(dev, "ERROR: Unknown index %d.\n", index); - return (ENOENT); + return (generic_pcie_read_ivar(dev, child, index, result)); } static int