From nobody Fri Jun 17 06:20:04 2022 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 DDE82835AEE; Fri, 17 Jun 2022 06:20:04 +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 4LPTRS5tnkz3kZv; Fri, 17 Jun 2022 06:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655446804; 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=CuYqFoB2W+kQIB9h//ba2z8rMMe30R5lhMVI/06vKFg=; b=KK+N/txVP0WdNNZ78GBVP+WXR/7COHdI3SN+VUiO0o2hhrmPJABzm2sMvJQypusfNYbit3 K1vDCK/w8OprIyuOf4215ItptvxH+0oGMU1lK2EBdel4+cHoIh5P/QwatD47UpcB01Hm9L Xae7132kkAwSjbUgYZF/m3CfH6T9E1ht2i93DW2gJG53lslfGhYEXP+zTGKrVphJTksJ1z 5LFx96ECLN+Ozgfe72m7fVtc1kodALarOQ5NYpnKtYvum0Ou/L0DSqKwov6qPU8IzgTrm8 YfPy/tqUYwfIPQdGXItqJWnC8x9ey6BWhpCG96rKvHm+F9p9AjN9udInL47yaA== 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 A62811A478; Fri, 17 Jun 2022 06:20:04 +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 25H6K4x6032116; Fri, 17 Jun 2022 06:20:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25H6K4G9032113; Fri, 17 Jun 2022 06:20:04 GMT (envelope-from git) Date: Fri, 17 Jun 2022 06:20:04 GMT Message-Id: <202206170620.25H6K4G9032113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: fc2e4f15a904 - main - iommu_gas: Eliminate unnecessary wrappers 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: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc2e4f15a9047bbf546cd675ed590b88e54362bd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655446804; 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=CuYqFoB2W+kQIB9h//ba2z8rMMe30R5lhMVI/06vKFg=; b=q10W4j3lgKZtyyo3RCnCaaPa8V6ScACYBWLfcKlux+GUX7UIto9bJsYF8wjsDO8lu9y6ua BJlqe2P4pxnJIaPEjGC/Q4pF07NTIFBFmNVk43y8kGRo9gM58/xoy6cnbTmtLnAGleur0q e6EH6XWQj9bsFKsTIDdouNFUwU4dHMFhfd6R5MT53ADbmCbJLUTWkBI+E64bdUutC7wAbs ob2vbOkbcpRXO86XgGIKCocBUKHQGyz+ic5arfEnxcuED5CJWVzUPI26h3nnUU8sl/dss7 xBlkLwEbbXMhXDoU/QPr283Qbkd5aSnJJi27ODKtVvGft1Y+YY8mN9tc+foQLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655446804; a=rsa-sha256; cv=none; b=SAfkiR0cmlabn7r6BoERaZ+Fqg/6MeMf6IRrZY9xI2U5609p8x/t2OeMv623G2s1h5BBtl B77WU4hsaqEAQ7vOVltWmN8G7CRwdQG1PSDEbGY8drHM38XEazrf+dwqLpOG3fLG8ceG5f MovgJh+XYWPKix+X4hktJYpeW3zY5tbH0YkhAnC/vhJiqLrQCC/SZAxbe2WDGcgXQfi4y3 uSAu+vFmMZzjQxJfT1Cz3eJIC3j2KOyal4lkCTuEV3SXm0NAkP0fm2ahWaZmvwOmpfOtjD 2BQ6DfrqghA8bFDPpIHfoSixA9Kzfy0GBB+54fjSOQBLJ5MYayssD3WzBnN6KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=fc2e4f15a9047bbf546cd675ed590b88e54362bd commit fc2e4f15a9047bbf546cd675ed590b88e54362bd Author: Alan Cox AuthorDate: 2022-06-14 19:01:36 +0000 Commit: Alan Cox CommitDate: 2022-06-17 06:06:52 +0000 iommu_gas: Eliminate unnecessary wrappers Eliminate trivial wrappers for several iommu_gas functions that serve no functional purpose. Reviewed by: br, dougm, kib MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D35487 --- sys/dev/iommu/busdma_iommu.c | 8 ++++---- sys/dev/iommu/iommu.h | 8 -------- sys/dev/iommu/iommu_gas.c | 41 ----------------------------------------- 3 files changed, 4 insertions(+), 53 deletions(-) diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c index e06d96dad027..ae8c98922e41 100644 --- a/sys/dev/iommu/busdma_iommu.c +++ b/sys/dev/iommu/busdma_iommu.c @@ -594,7 +594,7 @@ iommu_bus_dmamap_load_something1(struct bus_dma_tag_iommu *tag, if (seg + 1 < tag->common.nsegments) gas_flags |= IOMMU_MF_CANSPLIT; - error = iommu_map(domain, &tag->common, buflen1, + error = iommu_gas_map(domain, &tag->common, buflen1, offset, e_flags, gas_flags, ma + idx, &entry); if (error != 0) break; @@ -1046,7 +1046,7 @@ bus_dma_iommu_load_ident(bus_dma_tag_t dmat, bus_dmamap_t map1, map = (struct bus_dmamap_iommu *)map1; waitok = (flags & BUS_DMA_NOWAIT) != 0; - entry = iommu_map_alloc_entry(domain, waitok ? 0 : IOMMU_PGF_WAITOK); + entry = iommu_gas_alloc_entry(domain, waitok ? 0 : IOMMU_PGF_WAITOK); if (entry == NULL) return (ENOMEM); entry->start = start; @@ -1054,14 +1054,14 @@ bus_dma_iommu_load_ident(bus_dma_tag_t dmat, bus_dmamap_t map1, ma = malloc(sizeof(vm_page_t) * atop(length), M_TEMP, waitok ? M_WAITOK : M_NOWAIT); if (ma == NULL) { - iommu_map_free_entry(domain, entry); + iommu_gas_free_entry(domain, entry); return (ENOMEM); } for (i = 0; i < atop(length); i++) { ma[i] = vm_page_getfake(entry->start + PAGE_SIZE * i, VM_MEMATTR_DEFAULT); } - error = iommu_map_region(domain, entry, IOMMU_MAP_ENTRY_READ | + error = iommu_gas_map_region(domain, entry, IOMMU_MAP_ENTRY_READ | ((flags & BUS_DMA_NOWRITE) ? 0 : IOMMU_MAP_ENTRY_WRITE), waitok ? IOMMU_MF_CANWAIT : 0, ma); if (error == 0) { diff --git a/sys/dev/iommu/iommu.h b/sys/dev/iommu/iommu.h index ee1149e6ea8f..3800213a1d64 100644 --- a/sys/dev/iommu/iommu.h +++ b/sys/dev/iommu/iommu.h @@ -162,14 +162,6 @@ struct iommu_ctx *iommu_instantiate_ctx(struct iommu_unit *iommu, device_t iommu_get_requester(device_t dev, uint16_t *rid); int iommu_init_busdma(struct iommu_unit *unit); void iommu_fini_busdma(struct iommu_unit *unit); -struct iommu_map_entry *iommu_map_alloc_entry(struct iommu_domain *iodom, - u_int flags); -void iommu_map_free_entry(struct iommu_domain *, struct iommu_map_entry *); -int iommu_map(struct iommu_domain *iodom, - const struct bus_dma_tag_common *common, iommu_gaddr_t size, int offset, - u_int eflags, u_int flags, vm_page_t *ma, struct iommu_map_entry **res); -int iommu_map_region(struct iommu_domain *domain, - struct iommu_map_entry *entry, u_int eflags, u_int flags, vm_page_t *ma); void iommu_gas_init_domain(struct iommu_domain *domain); void iommu_gas_fini_domain(struct iommu_domain *domain); diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index 27954de9db39..a65bb23e87c5 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -799,36 +799,6 @@ iommu_gas_reserve_region_extend(struct iommu_domain *domain, return (error); } -struct iommu_map_entry * -iommu_map_alloc_entry(struct iommu_domain *domain, u_int flags) -{ - struct iommu_map_entry *res; - - res = iommu_gas_alloc_entry(domain, flags); - - return (res); -} - -void -iommu_map_free_entry(struct iommu_domain *domain, struct iommu_map_entry *entry) -{ - - iommu_gas_free_entry(domain, entry); -} - -int -iommu_map(struct iommu_domain *domain, - const struct bus_dma_tag_common *common, iommu_gaddr_t size, int offset, - u_int eflags, u_int flags, vm_page_t *ma, struct iommu_map_entry **res) -{ - int error; - - error = iommu_gas_map(domain, common, size, offset, eflags, flags, - ma, res); - - return (error); -} - void iommu_unmap_msi(struct iommu_ctx *ctx) { @@ -917,17 +887,6 @@ iommu_translate_msi(struct iommu_domain *domain, uint64_t *addr) __func__, (uintmax_t)*addr, (uintmax_t)domain->msi_entry->end)); } -int -iommu_map_region(struct iommu_domain *domain, struct iommu_map_entry *entry, - u_int eflags, u_int flags, vm_page_t *ma) -{ - int error; - - error = iommu_gas_map_region(domain, entry, eflags, flags, ma); - - return (error); -} - SYSCTL_NODE(_hw, OID_AUTO, iommu, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, ""); #ifdef INVARIANTS