From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 59AEAC004D4 for ; Sat, 21 Jan 2023 19:30:24 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A4503856C1; Sat, 21 Jan 2023 20:29:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=xs4all.nl Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=xs4all.nl header.i=@xs4all.nl header.b="qxDIPqeu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C45A38568E; Sat, 21 Jan 2023 20:28:45 +0100 (CET) Received: from ewsoutbound.kpnmail.nl (ewsoutbound.kpnmail.nl [195.121.94.168]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 45586856A4 for ; Sat, 21 Jan 2023 20:28:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=xs4all.nl Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mark.kettenis@xs4all.nl X-KPN-MessageId: cfe4dfd4-99c1-11ed-a1d8-005056aba152 Received: from smtp.kpnmail.nl (unknown [10.31.155.38]) by ewsoutbound.so.kpn.org (Halon) with ESMTPS id cfe4dfd4-99c1-11ed-a1d8-005056aba152; Sat, 21 Jan 2023 20:28:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=xs4all01; h=subject:to:from:message-id:date; bh=0EvUqc2A3uUSaHiwDuFn1BUlbf+GOWtqzBeThSdD9Dw=; b=qxDIPqeu+IM3kMeDYo6NYF9w4MTguzsxlqxFpLXKDF8Odq7tCgkDOQVYLyiIArOVR7YGgNYeJa7vY VEfZP4WyUgWChMCn5ETxyg8jnSyih5UDRtq1Mf5LlgapfMN8oyGFKHXRsIK31Pvz31cv5pSAnDsmtI zq+jQ79OEtQr29TlJRx2cdG2Dsdqe8ePVh8vwbLhqbJNlgkLHCTOuIByzBM/KJL1iIdArnagYATNgY 4TThC+MMXJNT79SLsMppztW5tklqOrR/3u0JNnRYWc4ZPchSLf4tOxozL6dkadjvNBZF+NXQMW5Fr0 0xr2EpFs8Cfs3WKV0UCW2/1hIsm4rbQ== X-KPN-MID: 33|zZLbv2VxT6FY3IhpiX7L1HSk2TSGS0Kcjcb2t4+YL6ITuW6s8UWPsS1MPRBe9S7 jo48ZbRg2gsAjfDGbrkO2m0AnZMsJ+vLa42xp7/bh9FY= X-KPN-VerifiedSender: Yes X-CMASSUN: 33|9xc0KD94g+nbLrtssDBBPKF36mIQEVvYq0NnW4oIiW5GcIUnVwMPnvF5VKk3Q0D 8VjcJZIaJ+uGwo4r+K05Swg== X-Originating-IP: 80.61.163.207 Received: from bloch.sibelius.xs4all.nl (80-61-163-207.fixed.kpn.net [80.61.163.207]) by smtp.xs4all.nl (Halon) with ESMTPSA id cf8ca71b-99c1-11ed-97f1-005056abf0db; Sat, 21 Jan 2023 20:28:41 +0100 (CET) Date: Sat, 21 Jan 2023 20:28:40 +0100 Message-Id: <87o7qroffb.fsf@bloch.sibelius.xs4all.nl> From: Mark Kettenis To: Simon Glass Cc: kettenis@openbsd.org, u-boot@lists.denx.de, bmeng.cn@gmail.com, marex@denx.de In-Reply-To: (message from Simon Glass on Wed, 18 Jan 2023 12:42:19 -0700) Subject: Re: [PATCH 1/7] iommu: Add DMA mapping operations References: <20230117220404.15477-1-kettenis@openbsd.org> <20230117220404.15477-2-kettenis@openbsd.org> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean > From: Simon Glass > Date: Wed, 18 Jan 2023 12:42:19 -0700 > > Hi Mark, > > On Tue, 17 Jan 2023 at 15:04, Mark Kettenis wrote: > > > > In order to support IOMMUs in non-bypass mode we need device ops > > to map and unmap DMA memory. The map operation enters a mapping > > for a region specified by CPU address and size into the translation > > table of the IOMMU and returns a DMA address suitable for > > programming the device to do DMA. The unmap operation removes > > this mapping from the translation table of the IOMMU. > > > > Signed-off-by: Mark Kettenis > > --- > > drivers/iommu/iommu-uclass.c | 28 ++++++++++++++++++++++++++++ > > include/dm/device.h | 3 +++ > > include/iommu.h | 24 ++++++++++++++++++++++++ > > 3 files changed, 55 insertions(+) > > > > diff --git a/drivers/iommu/iommu-uclass.c b/drivers/iommu/iommu-uclass.c > > index ed917b3c3e..f6b1457736 100644 > > --- a/drivers/iommu/iommu-uclass.c > > +++ b/drivers/iommu/iommu-uclass.c > > @@ -7,6 +7,9 @@ > > > > #include > > #include > > +#include > > +#include > > +#include > > > > #if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) > > int dev_iommu_enable(struct udevice *dev) > > @@ -33,12 +36,37 @@ int dev_iommu_enable(struct udevice *dev) > > __func__, ret); > > return ret; > > } > > + dev->iommu = dev_iommu; > > } > > > > return 0; > > } > > #endif > > > > +dma_addr_t dev_iommu_dma_map(struct udevice *dev, void *addr, size_t size) > > +{ > > + const struct iommu_ops *ops; > > + > > + if (dev->iommu) { > > + ops = device_get_ops(dev->iommu); > > + if (ops && ops->map) > > + return ops->map(dev->iommu, addr, size); > > + } > > + > > + return dev_phys_to_bus(dev, virt_to_phys(addr)); > > +} > > + > > +void dev_iommu_dma_unmap(struct udevice *dev, dma_addr_t addr, size_t size) > > +{ > > + const struct iommu_ops *ops; > > + > > + if (dev->iommu) { > > + ops = device_get_ops(dev->iommu); > > + if (ops && ops->unmap) > > + ops->unmap(dev->iommu, addr, size); > > + } > > +} > > + > > UCLASS_DRIVER(iommu) = { > > .id = UCLASS_IOMMU, > > .name = "iommu", > > diff --git a/include/dm/device.h b/include/dm/device.h > > index f3f953c9af..abe1927ecd 100644 > > --- a/include/dm/device.h > > +++ b/include/dm/device.h > > @@ -194,6 +194,9 @@ struct udevice { > > #if CONFIG_IS_ENABLED(DM_DMA) > > ulong dma_offset; > > #endif > > +#if CONFIG_IS_ENABLED(IOMMU) > > + struct udevice *iommu; > > +#endif > > }; > > > > static inline int dm_udevice_size(void) > > diff --git a/include/iommu.h b/include/iommu.h > > index 6c46adf449..cf9719c5e9 100644 > > --- a/include/iommu.h > > +++ b/include/iommu.h > > @@ -3,6 +3,27 @@ > > > > struct udevice; > > > > +struct iommu_ops { > > + /** > > + * map() - map DMA memory > > + * > > + * @dev: device for which to map DMA memory > > + * @addr: CPU address of the memory > > + * @size: size of the memory > > + * @return DMA address for the device > > + */ > > + dma_addr_t (*map)(struct udevice *dev, void *addr, size_t size); > > + > > + /** > > + * unmap() - unmap DMA memory > > + * > > + * @dev: device for which to unmap DMA memory > > + * @addr: DMA address of the memory > > + * @size: size of the memory > > + */ > > + void (*unmap)(struct udevice *dev, dma_addr_t addr, size_t size); > > +}; > > + > > #if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) && \ > > CONFIG_IS_ENABLED(IOMMU) > > int dev_iommu_enable(struct udevice *dev); > > @@ -13,4 +34,7 @@ static inline int dev_iommu_enable(struct udevice *dev) > > } > > #endif > > > > +dma_addr_t dev_iommu_dma_map(struct udevice *dev, void *addr, size_t size); > > +void dev_iommu_dma_unmap(struct udevice *dev, dma_addr_t addr, size_t size); > > + > > #endif > > Please add some tests for these operations to test/dm/iommc.c Sure; just sent v2 with some tests added.