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 X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A51BC2B9F4 for ; Mon, 14 Jun 2021 12:49:35 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 183CE61159 for ; Mon, 14 Jun 2021 12:49:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 183CE61159 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id DD68C400B5; Mon, 14 Jun 2021 12:49:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tC0-sgxrh0g9; Mon, 14 Jun 2021 12:49:33 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id 897EF40163; Mon, 14 Jun 2021 12:49:33 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6EDC9C000E; Mon, 14 Jun 2021 12:49:33 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id A1F47C000B for ; Mon, 14 Jun 2021 12:49:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 83ED060630 for ; Mon, 14 Jun 2021 12:49:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OjKmlkyT8HBH for ; Mon, 14 Jun 2021 12:49:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by smtp3.osuosl.org (Postfix) with ESMTPS id 1262D605F8 for ; Mon, 14 Jun 2021 12:49:30 +0000 (UTC) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4G3WQ04LSBz6xWj; Mon, 14 Jun 2021 20:45:28 +0800 (CST) Received: from dggema723-chm.china.huawei.com (10.3.20.87) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.2; Mon, 14 Jun 2021 20:49:25 +0800 Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by dggema723-chm.china.huawei.com (10.3.20.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Mon, 14 Jun 2021 20:49:24 +0800 Received: from lhreml710-chm.china.huawei.com ([169.254.81.184]) by lhreml710-chm.china.huawei.com ([169.254.81.184]) with mapi id 15.01.2176.012; Mon, 14 Jun 2021 13:49:22 +0100 From: Shameerali Kolothum Thodi To: Robin Murphy , "linux-arm-kernel@lists.infradead.org" , "linux-acpi@vger.kernel.org" , "iommu@lists.linux-foundation.org" Subject: RE: [PATCH v5 3/8] ACPI/IORT: Add a helper to retrieve RMR memory regions Thread-Topic: [PATCH v5 3/8] ACPI/IORT: Add a helper to retrieve RMR memory regions Thread-Index: AQHXUIxzNCstxTr9F0iaZEElN6n+2KsTbWwAgAAl39A= Date: Mon, 14 Jun 2021 12:49:22 +0000 Message-ID: <3206cd67962242a69fb83adac892e34c@huawei.com> References: <20210524110222.2212-1-shameerali.kolothum.thodi@huawei.com> <20210524110222.2212-4-shameerali.kolothum.thodi@huawei.com> <9e788789-c1c2-10f1-d99c-93cfa6ea3348@arm.com> In-Reply-To: <9e788789-c1c2-10f1-d99c-93cfa6ea3348@arm.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.47.26.251] MIME-Version: 1.0 X-CFilter-Loop: Reflected Cc: "jon@solid-run.com" , Linuxarm , "steven.price@arm.com" , "Guohanjun \(Hanjun Guo\)" , yangyicong , "Sami.Mujawar@arm.com" , wanghuiqiang X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" > -----Original Message----- > From: Robin Murphy [mailto:robin.murphy@arm.com] > Sent: 14 June 2021 12:23 > To: Shameerali Kolothum Thodi ; > linux-arm-kernel@lists.infradead.org; linux-acpi@vger.kernel.org; > iommu@lists.linux-foundation.org > Cc: jon@solid-run.com; Linuxarm ; > steven.price@arm.com; Guohanjun (Hanjun Guo) ; > yangyicong ; Sami.Mujawar@arm.com; > wanghuiqiang > Subject: Re: [PATCH v5 3/8] ACPI/IORT: Add a helper to retrieve RMR memory > regions > > On 2021-05-24 12:02, Shameer Kolothum wrote: > > Add a helper function that retrieves RMR memory descriptors > > associated with a given IOMMU. This will be used by IOMMU > > drivers to setup necessary mappings. > > > > Now that we have this, invoke it from the generic helper > > interface. > > > > Signed-off-by: Shameer Kolothum > > > --- > > drivers/acpi/arm64/iort.c | 50 > +++++++++++++++++++++++++++++++++++++++ > > drivers/iommu/dma-iommu.c | 4 ++++ > > include/linux/acpi_iort.h | 7 ++++++ > > 3 files changed, 61 insertions(+) > > > > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > > index fea1ffaedf3b..01917caf58de 100644 > > --- a/drivers/acpi/arm64/iort.c > > +++ b/drivers/acpi/arm64/iort.c > > @@ -12,6 +12,7 @@ > > > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -837,6 +838,53 @@ static inline int iort_add_device_replay(struct > device *dev) > > return err; > > } > > > > +/** > > + * iort_iommu_get_rmrs - Helper to retrieve RMR info associated with > IOMMU > > + * @iommu: fwnode for the IOMMU > > + * @head: RMR list head to be populated > > + * > > + * Returns: 0 on success, <0 failure > > + */ > > +int iort_iommu_get_rmrs(struct fwnode_handle *iommu_fwnode, > > + struct list_head *head) > > +{ > > + struct iort_rmr_entry *e; > > + struct acpi_iort_node *iommu; > > + int rmrs = 0; > > + > > + iommu = iort_get_iort_node(iommu_fwnode); > > + if (!iommu || list_empty(&iort_rmr_list)) > > + return -ENODEV; > > + > > + list_for_each_entry(e, &iort_rmr_list, list) { > > + int prot = IOMMU_READ | IOMMU_WRITE | IOMMU_NOEXEC | > IOMMU_MMIO; > > + struct iommu_resv_region *region; > > + enum iommu_resv_type type; > > + struct acpi_iort_rmr_desc *rmr_desc; > > + > > + if (e->smmu != iommu) > > + continue; > > + > > + rmr_desc = e->rmr_desc; > > + if (e->flags & IOMMU_RMR_REMAP_PERMITTED) > > + type = IOMMU_RESV_DIRECT_RELAXABLE; > > + else > > + type = IOMMU_RESV_DIRECT; > > Wasn't the idea that we can do all this during the initial parsing, i.e. > we don't even have iort_rmr_entry, we store them as iommu_resv_regions > and simply kmemdup() or whatever at this point? Hmm... Not yet. I removed struct iommu_rmr() from v4. But yes, it looks like we can get rid of iort_rmr_entry as well. Will give it a go in next. Thanks, Shameer > Robin. > > > + > > + region = iommu_alloc_resv_region(rmr_desc->base_address, > > + rmr_desc->length, > > + prot, type); > > + if (region) { > > + region->fw_data.rmr.flags = e->flags; > > + region->fw_data.rmr.sid = e->sid; > > + list_add_tail(®ion->list, head); > > + rmrs++; > > + } > > + } > > + > > + return (rmrs == 0) ? -ENODEV : 0; > > +} > > + > > /** > > * iort_iommu_msi_get_resv_regions - Reserved region driver helper > > * @dev: Device from iommu_get_resv_regions() > > @@ -1108,6 +1156,8 @@ int iort_iommu_msi_get_resv_regions(struct > device *dev, struct list_head *head) > > const struct iommu_ops *iort_iommu_configure_id(struct device *dev, > > const u32 *input_id) > > { return NULL; } > > +int iort_iommu_get_rmrs(struct fwnode_handle *fwnode, struct list_head > *head) > > +{ return -ENODEV; } > > #endif > > > > static int nc_dma_get_range(struct device *dev, u64 *size) > > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > > index 229ec65d98be..f893d460cfa4 100644 > > --- a/drivers/iommu/dma-iommu.c > > +++ b/drivers/iommu/dma-iommu.c > > @@ -185,6 +185,9 @@ EXPORT_SYMBOL(iommu_put_dma_cookie); > > int iommu_dma_get_rmrs(struct fwnode_handle *iommu_fwnode, > > struct list_head *list) > > { > > + if (!is_of_node(iommu_fwnode)) > > + return iort_iommu_get_rmrs(iommu_fwnode, list); > > + > > return -EINVAL; > > } > > EXPORT_SYMBOL(iommu_dma_get_rmrs); > > @@ -200,6 +203,7 @@ EXPORT_SYMBOL(iommu_dma_get_rmrs); > > void iommu_dma_put_rmrs(struct fwnode_handle *iommu_fwnode, > > struct list_head *list) > > { > > + generic_iommu_put_resv_regions(iommu_fwnode->dev, list); > > } > > EXPORT_SYMBOL(iommu_dma_put_rmrs); > > > > diff --git a/include/linux/acpi_iort.h b/include/linux/acpi_iort.h > > index 1a12baa58e40..e8c45fa59531 100644 > > --- a/include/linux/acpi_iort.h > > +++ b/include/linux/acpi_iort.h > > @@ -39,6 +39,8 @@ const struct iommu_ops > *iort_iommu_configure_id(struct device *dev, > > const u32 *id_in); > > int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head > *head); > > phys_addr_t acpi_iort_dma_get_max_cpu_address(void); > > +int iort_iommu_get_rmrs(struct fwnode_handle *iommu_fwnode, > > + struct list_head *list); > > #else > > static inline void acpi_iort_init(void) { } > > static inline u32 iort_msi_map_id(struct device *dev, u32 id) > > @@ -59,6 +61,11 @@ int iort_iommu_msi_get_resv_regions(struct device > *dev, struct list_head *head) > > > > static inline phys_addr_t acpi_iort_dma_get_max_cpu_address(void) > > { return PHYS_ADDR_MAX; } > > + > > +static inline > > +int iort_iommu_get_rmrs(struct fwnode_handle *iommu_fwnode, > > + struct list_head *list) > > +{ return -ENODEV; } > > #endif > > > > #endif /* __ACPI_IORT_H__ */ > > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu