From nobody Fri May 1 21:15:22 2026 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 4g6kMt6JtWz6cJcm for ; Fri, 01 May 2026 21:15:22 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g6kMt2pQxz3rH8 for ; Fri, 01 May 2026 21:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777670122; 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=a9d/rmDrPKhjoi8S32oafqkbr54PqmayeyV27GDSvZ0=; b=QZYo/zNy2/OVA/3rJXw5gEoW8GYw2x2VO9mwV39kzttFgd+s22LT58hHaML0KTo4jL/w1q yUTsvVd6HvGJBwaBOpaMRRMjscSKbZFvRY8a66Oy3rN4/o6b2nMhg6hCzlgsF/oyh1grP+ TIaIn8GJeZd9H0kbWsRNNIA91RBwoXGSKJmB/YWL+vk2Hv7qb8U69Mj7OJOs+rZpt+d4zt qSGem3kJJGSebSwxPbur5US2+nwDzs+mZrOzwljc0H868TVHFiDWmhsrdnhRNIq/1lD6QI MRf/zVdu8+h/tVrl4jwJCaNNUwuiANpsSVvPVyBsrahUwm2ZkMRYsRfikLcXCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777670122; a=rsa-sha256; cv=none; b=n7Pjns6+t/wnoQH7lYU6mJSOM6RJlV5FN5QJZ2tuXrEWDpfHqT6OZVPXiP1aM82w9W3UgL k6cS2AQIWrPajaON6zH1iuLt/79thG0e+fNDmAyHIOgmBmmuEnzRsgtoKtmZDUAleqVi4L HjmJlKFdJDvxhFrb93cs3rbAoUETi66OGeixGZ/28mqxY3zDFkVsw7TEcmjZ9HcMh07hp+ RzwoVovEETOuIiCd9Hpb4aW9rNzFGyq90qc/hzPeF12wyAXApjk3h8J4Wn5UPExXCHFtlu 3wt+ZiBTVjLOD3FLXGC2U1E0C5t1E/x1XyEgSoR+Jlk7dHky76wGaCJPVlcMFw== 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=1777670122; 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=a9d/rmDrPKhjoi8S32oafqkbr54PqmayeyV27GDSvZ0=; b=Fk5Jgs01053pu+clE0U3pV7sBAGME4t6FQO0b2QK/SPuIKFPxTPHMrohEKtKJKZeuM2sYl qRBc/nEI2lwQMomY0/DUEp9C24u4EmJWIRkMnGTaVy/HFJkUOoZysmQKlBtO1G43KkzFSm Xeo9bOTFm3T79i8j0zCZCbRZA05k+0p5KTGhkw+33IxbaPDpjctwri/KHdtdCJcsN7DlJN FCv8mAGuSsRgE1ex3SA48EUpFORtgePbAeX77ReodO0fycnLxxaa8Rfbm9pvqRcbq3paXg 0rUbTX80d64W0LL9+2LyNONhczkZDKtQnFsIouUgftrbja4V5ajTJftrxmMe1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g6kMt2Hjvz1WC for ; Fri, 01 May 2026 21:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18a06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 01 May 2026 21:15:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: c7040d3eaa03 - main - powerpc: busdma declaration shuffling 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7040d3eaa03a9dd27fde69ccf585a76dfbb2c6c Auto-Submitted: auto-generated Date: Fri, 01 May 2026 21:15:22 +0000 Message-Id: <69f517ea.18a06.2a9a5b6@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=c7040d3eaa03a9dd27fde69ccf585a76dfbb2c6c commit c7040d3eaa03a9dd27fde69ccf585a76dfbb2c6c Author: Adrian Chadd AuthorDate: 2026-04-01 00:23:56 +0000 Commit: Adrian Chadd CommitDate: 2026-05-01 21:14:59 +0000 powerpc: busdma declaration shuffling Shuffle some of the declarations around to match other implementations. Expected to be a no-op. Differential Revision: https://reviews.freebsd.org/D56243 --- sys/powerpc/powerpc/busdma_bounce.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/sys/powerpc/powerpc/busdma_bounce.c b/sys/powerpc/powerpc/busdma_bounce.c index df66f69b9f02..39e40b3a4284 100644 --- a/sys/powerpc/powerpc/busdma_bounce.c +++ b/sys/powerpc/powerpc/busdma_bounce.c @@ -32,9 +32,9 @@ #include #include +#include #include #include -#include #include #include #include @@ -68,6 +68,18 @@ enum { BF_COHERENT = 0x10, }; +struct bounce_page; +struct bounce_zone; + +struct bus_dma_tag { + struct bus_dma_tag_common common; + int map_count; + int bounce_flags; + struct bounce_zone *bounce_zone; + device_t iommu; + void *iommu_cookie; +}; + struct bus_dmamap { STAILQ_HEAD(, bounce_page) bpages; int pagesneeded; @@ -86,8 +98,7 @@ struct bus_dmamap { static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata"); #define dmat_alignment(dmat) ((dmat)->common.alignment) -/* XXX TODO: bounce flags? */ -#define dmat_bounce_flags(dmat) (0) +#define dmat_bounce_flags(dmat) ((dmat)->bounce_flags) #define dmat_boundary(dmat) ((dmat)->common.boundary) #define dmat_domain(dmat) ((dmat)->common.domain) #define dmat_flags(dmat) ((dmat)->common.flags) @@ -98,20 +109,6 @@ static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata"); #define dmat_maxsegsz(dmat) ((dmat)->common.maxsegsz) #define dmat_nsegments(dmat) ((dmat)->common.nsegments) -/* - * Note: at this point the code requires a 'struct bus_dma_tag' to exist - * or the included code will not function correctly. - */ - -struct bus_dma_tag { - struct bus_dma_tag_common common; - int map_count; - int bounce_flags; - struct bounce_zone *bounce_zone; - device_t iommu; - void *iommu_cookie; -}; - static SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Busdma parameters");