From nobody Mon Apr 24 11:52:09 2023 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 4Q4k556nhVz46jyV; Mon, 24 Apr 2023 11:52:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q4k5555nvz3j96; Mon, 24 Apr 2023 11:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682337129; 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=H2vV2h2uWG2/BkgK0j5MnCOd2LaezNecPMTjmqNBkKo=; b=ldRUXiiXp5rk6vH0IOcjRExOmAOwdo8eApUI+eaNZCECSQFM1m8gt/i1/B7fquED1TfPlC X9S8Kh4qz9D0Q8IQuIfoqZJz0uLFJtG0QGuM03Q0Ft+ASjNDT7Yhw96Hq1IIlbNvCEQlwN 0syQGwt/h/OQzr00s7ZPE8DymJdSIeNf84Zf6SFboL4BUg8ISoRuiPmTSYdJNq/6jKrDqE yOTvEGf9hx48bCcgqO/r+gm9McSj/EMj+C76ncgSZWdkHG4L8cTBW/xlW2KIqQtI7Th0XP m2rW/iXyJWBl0ZiwvBsvOG5RUtQ3wYSNbzJpB5Xg/7dA2cgv8ovG/M27hxyMOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682337129; 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=H2vV2h2uWG2/BkgK0j5MnCOd2LaezNecPMTjmqNBkKo=; b=I86oQsd1xfek1S38orJAIfMQxSjis4pRd0Uchdbd05PnywR2GeApElQxGLnGXCXhJpHMyM L7uhX1fopQ9A4/lmR8ZjITZHOIN3o87FrPtJEPW2KENyBPIH0hAwfc2nhZUG8mrx9BIFrI PU8Ncb64j40pYlPUp4lOmYCf1BU+PZ9SihCzLjYxv3s8iMY2K58GKo4gncy40VuTgZmq8C VmuZfwTTGmvPL9N9h954dW15zfdSYjdulQUZALJVdSkzaIN95VM5BVRi9jwJBE1TF/8tSa bvEWUdm7vapiO/jcnT3F6wSBc3BGAIu8N9p35BJEAADf+yJWu8DcjdNMdOrkOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682337129; a=rsa-sha256; cv=none; b=xGTDoU4JTbcJkSJmPccAn+T/bGOlYXSh0ksWyaXz8fpWlgzxb4ltrPpo3LCfiH4WEiDhb5 8CZlgp+k1Q2qkjNh9wtvRQyAyIzfxagSDjdHoD5Hec4BIGIBbkRcHaoOOfuTWHbGvt3lLn /8AANCzM37dpbN+r8o4ZwI2fKO/Tk2BXrVgxtaMime1mmiwaEjedeLrceZthWhDU+zRwV9 vI3Aueb1GwGnSQqslsdMPkNHCMxWGpPdHHWclzUQaVf+Y3c6ZusIHBB5Zj5lO327NYTc7o SWwPZv0aaevR0vDQPG2c6b7E55fyKnv+JJU4De9yKQG0MIZLf4k5VWeeZGdNrw== 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 4Q4k553xRNzPd3; Mon, 24 Apr 2023 11:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33OBq9k0003166; Mon, 24 Apr 2023 11:52:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OBq9ho003165; Mon, 24 Apr 2023 11:52:09 GMT (envelope-from git) Date: Mon, 24 Apr 2023 11:52:09 GMT Message-Id: <202304241152.33OBq9ho003165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 913d04deedda - main - Add PCI_ID_OFW_IOMMU to the pci ecam ACPI driver 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 913d04deeddaeb3b2e4545657d688404835b2e1a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=913d04deeddaeb3b2e4545657d688404835b2e1a commit 913d04deeddaeb3b2e4545657d688404835b2e1a Author: Andrew Turner AuthorDate: 2023-04-24 11:47:38 +0000 Commit: Andrew Turner CommitDate: 2023-04-24 11:47:38 +0000 Add PCI_ID_OFW_IOMMU to the pci ecam ACPI driver Teach the pci host generic ACPI attachment about PCI_ID_OFW_IOMMU. This will be used by the arm64 smmu IOMMU driver to read the xref and ID this interface provides in a bus-agnostic way. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D39182 --- sys/dev/pci/pci_host_generic_acpi.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/sys/dev/pci/pci_host_generic_acpi.c b/sys/dev/pci/pci_host_generic_acpi.c index 8ef97a3ae1ae..0ac3e7d16a5d 100644 --- a/sys/dev/pci/pci_host_generic_acpi.c +++ b/sys/dev/pci/pci_host_generic_acpi.c @@ -412,6 +412,31 @@ generic_pcie_map_id(device_t pci, device_t child, uintptr_t *id) return (0); } +static int +generic_pcie_get_iommu(device_t pci, device_t child, uintptr_t *id) +{ + struct generic_pcie_acpi_softc *sc; + struct pci_id_ofw_iommu *iommu; + u_int iommu_sid, iommu_xref; + uintptr_t rid; + int err; + + iommu = (struct pci_id_ofw_iommu *)id; + + sc = device_get_softc(pci); + err = pcib_get_id(pci, child, PCI_ID_RID, &rid); + if (err != 0) + return (err); + err = acpi_iort_map_pci_smmuv3(sc->base.ecam, rid, &iommu_xref, + &iommu_sid); + if (err == 0) { + iommu->id = iommu_sid; + iommu->xref = iommu_xref; + } + + return (err); +} + static int generic_pcie_acpi_alloc_msi(device_t pci, device_t child, int count, int maxcount, int *irqs) @@ -479,11 +504,13 @@ static int generic_pcie_acpi_get_id(device_t pci, device_t child, enum pci_id_type type, uintptr_t *id) { + if (type == PCI_ID_OFW_IOMMU) + return (generic_pcie_get_iommu(pci, child, id)); if (type == PCI_ID_MSI) return (generic_pcie_map_id(pci, child, id)); - else - return (pcib_get_id(pci, child, type, id)); + + return (pcib_get_id(pci, child, type, id)); } static device_method_t generic_pcie_acpi_methods[] = {