From nobody Tue Nov 18 18:02:35 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 4d9ss83Fkmz6HWsK for ; Tue, 18 Nov 2025 18:02:36 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9ss80Rz4z3HnJ for ; Tue, 18 Nov 2025 18:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488956; 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=prfEOP0RN2DXzBbHJTPKm7TgDHF68xP2a1BG9r1J8Lc=; b=Rxlc3pu0bctCDdDgOvroAnnRVVd3n6dipCid2GvsBEUDoURxW3wZtiJ/issLsujdgkh1aQ 4EFsOoGYuwm3S90rfb1/+rpcvhP4lAbWi03fRKdIGV+2EEi3WAShz4OGqzQESY8bC0YhGr TytO2en1xtRQS8JolLoovpE+KB7o+1r9Y7vr2s9d6+Gs5AI78m7F8hemXdotglCCuABjas 4T6iXMvT4KXbkTyYfNI0f1dUYG8kxsLf4WWezyMWpLgRoOEzQhmYD/VPnFguE7YNJ+1M4I zlCEFEsBkbT3bZHkz00LpQ7tZfNLeD1JbWyHsomoiOPbeAwiZl4erfpfvQkGTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488956; 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=prfEOP0RN2DXzBbHJTPKm7TgDHF68xP2a1BG9r1J8Lc=; b=sYd1ef0c6tBdhf5O2se8Ek/bCAIj9+2RWSvPUoBrZy+7pKvbS9ly0p74NXab3VHLbz6blv DYiJicbAt9Qng17LVxw7u5SKynbFl2M/0RKby8bENREh+hC5vOYJDon8NUTKaXIyYVFVy0 fgZDTo10OcMguoenKT1m0JRbMTrL3ydeNEwMzdUmes/6MnMy6Yt7hLBTbZvK1EEtj4mRFe twP59LeTlCfu29eJCNtq3/bF0rO4b0ET78FV/XbWM2FOUANEWwQzCNXGkXXZ4FWew8vVel kuTTv0zb35b0XsLV7LNcsIfNnWoTs/Q0s+79ttvGkl8EddOPsl3wKlfDybz0cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488956; a=rsa-sha256; cv=none; b=b/SpyuFbIlWNNU6NK7wi+JhvTLJWJKw6r4y2L8mLNYgIRksLkFh/U/NbmFn5f4hbmwBaBt I/FU+78OwC8KADK9otwMSBEJxnv82yRl1uz/X6HoMZuYdS9n9vrR+WPJGF4S0GjckY0dkI obFQ4IW4c+NBT6chi2rQBdF0lZpsZsM52KR17PiESvEnlSGhF2X68AAKSKrYW5CdUNcKHd Tr3Vf/NzjfATU9TE+szOiW595+mEOLo443lvbojQIZqcKw5nRUfZx9p7KUNnFiwS6Mh+x2 QBayojtu+cp2EHP9AY6xPwYDWM//y1zukWzI1ZFA0Qm7o17T8wJbH1pqopmbJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9ss7725Nz14Bc for ; Tue, 18 Nov 2025 18:02:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22c59 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:02:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 4713f5401317 - main - arm64: Add non-PCI MSI support 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4713f54013176fc73ada29cf094016fd3b328c80 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:02:35 +0000 Message-Id: <691cb4bb.22c59.19cdc0e7@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4713f54013176fc73ada29cf094016fd3b328c80 commit 4713f54013176fc73ada29cf094016fd3b328c80 Author: Andrew Turner AuthorDate: 2025-11-18 18:00:30 +0000 Commit: Andrew Turner CommitDate: 2025-11-18 18:00:30 +0000 arm64: Add non-PCI MSI support Add the arm64 parts to support for non-PCI MSI and MSI-X interrupts. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53331 --- sys/arm64/arm64/nexus.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c index 26b3389db172..012bf859eb3c 100644 --- a/sys/arm64/arm64/nexus.c +++ b/sys/arm64/arm64/nexus.c @@ -72,6 +72,8 @@ #include "acpi_bus_if.h" #endif +#include "pcib_if.h" + extern struct bus_space memmap_bus; static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); @@ -123,6 +125,15 @@ static bus_get_bus_tag_t nexus_get_bus_tag; #ifdef FDT static ofw_bus_map_intr_t nexus_ofw_map_intr; +/* + * PCIB interface + */ +static pcib_alloc_msi_t nexus_fdt_pcib_alloc_msi; +static pcib_release_msi_t nexus_fdt_pcib_release_msi; +static pcib_alloc_msix_t nexus_fdt_pcib_alloc_msix; +static pcib_release_msix_t nexus_fdt_pcib_release_msix; +static pcib_map_msi_t nexus_fdt_pcib_map_msi; + #endif static device_method_t nexus_methods[] = { @@ -441,6 +452,13 @@ static device_method_t nexus_fdt_methods[] = { /* OFW interface */ DEVMETHOD(ofw_bus_map_intr, nexus_ofw_map_intr), + /* PCIB interface */ + DEVMETHOD(pcib_alloc_msi, nexus_fdt_pcib_alloc_msi), + DEVMETHOD(pcib_release_msi, nexus_fdt_pcib_release_msi), + DEVMETHOD(pcib_alloc_msix, nexus_fdt_pcib_alloc_msix), + DEVMETHOD(pcib_release_msix, nexus_fdt_pcib_release_msix), + DEVMETHOD(pcib_map_msi, nexus_fdt_pcib_map_msi), + DEVMETHOD_END, }; @@ -518,6 +536,73 @@ nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells, irq = intr_map_irq(NULL, iparent, (struct intr_map_data *)fdt_data); return (irq); } + +static int +nexus_fdt_pcib_alloc_msi(device_t dev, device_t child, int count, int maxcount, + int *irqs) +{ + phandle_t msi_parent; + int error; + + error = ofw_bus_msimap(ofw_bus_get_node(child), 0, &msi_parent, NULL); + if (error != 0) + return (error); + + return (intr_alloc_msi(dev, child, msi_parent, count, maxcount, irqs)); +} + +static int +nexus_fdt_pcib_release_msi(device_t dev, device_t child, int count, int *irqs) +{ + phandle_t msi_parent; + int error; + + error = ofw_bus_msimap(ofw_bus_get_node(child), 0, &msi_parent, NULL); + if (error != 0) + return (error); + + return (intr_release_msi(dev, child, msi_parent, count, irqs)); +} + +static int +nexus_fdt_pcib_alloc_msix(device_t dev, device_t child, int *irq) +{ + phandle_t msi_parent; + int error; + + error = ofw_bus_msimap(ofw_bus_get_node(child), 0, &msi_parent, NULL); + if (error != 0) + return (error); + + return (intr_alloc_msix(dev, child, msi_parent, irq)); +} + +static int +nexus_fdt_pcib_release_msix(device_t dev, device_t child, int irq) +{ + phandle_t msi_parent; + int error; + + error = ofw_bus_msimap(ofw_bus_get_node(child), 0, &msi_parent, NULL); + if (error != 0) + return (error); + + return (intr_release_msix(dev, child, msi_parent, irq)); +} + +static int +nexus_fdt_pcib_map_msi(device_t dev, device_t child, int irq, uint64_t *addr, + uint32_t *data) +{ + phandle_t msi_parent; + int error; + + error = ofw_bus_msimap(ofw_bus_get_node(child), 0, &msi_parent, NULL); + if (error != 0) + return (error); + + return (intr_map_msi(dev, child, msi_parent, irq, addr, data)); +} #endif #ifdef DEV_ACPI