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=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 B8D7BC07E98 for ; Mon, 5 Jul 2021 09:12:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 79875613CB for ; Mon, 5 Jul 2021 09:12:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 79875613CB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jNKgJvAx2v86tZ6d/DOYBqPgz3pEPD9pVI3OkASaK58=; b=jFx4wFJAzGaAzx TTORj2v3zXLwmv2rih1rISRvB+Ef1Gk4El3bAwmaxjym47GvDzeKt/EjYJYioSdEyy1SG/E7QTamv 89ltb99obH5r5GE7nVmsjOJoYzbytzcC+/R05urGTupglS2vUrBUk4jXQF8rwl2feESH3VBzLUush YNUyy96ODYrSnff95gNH70nczHg7NoV0NhvnZT7+EVl6Hir2wWGp3vpsWdNbA8CMcxT/+1pbHbjbI PC0oMnLVuA4glR6659WLevp/FlPIbDADtVdhB3VxuG4T/WRbK3q3lm6EdZwiRxOJcrhKltb0/MFWR 7OyQCHsN2sSw5SAVZcxQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0Kcd-008NHZ-E4; Mon, 05 Jul 2021 09:10:35 +0000 Received: from szxga02-in.huawei.com ([45.249.212.188]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0KcY-008NH1-Eo for linux-arm-kernel@lists.infradead.org; Mon, 05 Jul 2021 09:10:32 +0000 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4GJKZC5CjKz783B; Mon, 5 Jul 2021 17:06:59 +0800 (CST) Received: from dggpemm500003.china.huawei.com (7.185.36.56) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 5 Jul 2021 17:10:06 +0800 Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by dggpemm500003.china.huawei.com (7.185.36.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 5 Jul 2021 17:10:04 +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, 5 Jul 2021 10:10:02 +0100 From: Shameerali Kolothum Thodi To: Jon Nettleton , Robin Murphy CC: "linux-arm-kernel@lists.infradead.org" , "linux-acpi@vger.kernel.org" , "iommu@lists.linux-foundation.org" , 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 Thread-Topic: [PATCH v5 3/8] ACPI/IORT: Add a helper to retrieve RMR memory regions Thread-Index: AQHXUIxzNCstxTr9F0iaZEElN6n+2KsTbWwAgAAl39CAF9T/AIAHNQ4AgAG6w9A= Date: Mon, 5 Jul 2021 09:10:02 +0000 Message-ID: References: <20210524110222.2212-1-shameerali.kolothum.thodi@huawei.com> <20210524110222.2212-4-shameerali.kolothum.thodi@huawei.com> <9e788789-c1c2-10f1-d99c-93cfa6ea3348@arm.com> <3206cd67962242a69fb83adac892e34c@huawei.com> In-Reply-To: Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.47.83.49] MIME-Version: 1.0 X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210705_021030_876205_AE407323 X-CRM114-Status: GOOD ( 40.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org > -----Original Message----- > From: Jon Nettleton [mailto:jon@solid-run.com] > Sent: 04 July 2021 08:39 > To: Shameerali Kolothum Thodi > Cc: Robin Murphy ; > linux-arm-kernel@lists.infradead.org; linux-acpi@vger.kernel.org; > iommu@lists.linux-foundation.org; 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 Tue, Jun 29, 2021 at 7:34 PM Jon Nettleton wrote: > > > > On Mon, Jun 14, 2021 at 2:49 PM Shameerali Kolothum Thodi > > wrote: > > > > > > > > > > > > > -----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; > > > > > > > > I have been looking at this a bit more and looking at the history of > > RMR_REMAP_PERMITTED. Based on the history I have found it seems to > me > > like this would be the better options for prot. > > > > @@ -840,7 +840,7 @@ int iort_iommu_get_rmrs(struct fwnode_handle > *iommu_fwnode, > > return -ENODEV; > > > > list_for_each_entry(e, &iort_rmr_list, list) { > > - int prot = IOMMU_READ | IOMMU_WRITE | > IOMMU_NOEXEC | IOMMU_MMIO; > > + int prot = IOMMU_READ | IOMMU_WRITE; > > struct iommu_resv_region *region; > > enum iommu_resv_type type; > > struct acpi_iort_rmr_desc *rmr_desc; @@ -849,10 > > +849,13 @@ int iort_iommu_get_rmrs(struct fwnode_handle > *iommu_fwnode, > > continue; > > > > rmr_desc = e->rmr_desc; > > - if (e->flags & IOMMU_RMR_REMAP_PERMITTED) > > + if (e->flags & IOMMU_RMR_REMAP_PERMITTED) { > > type = IOMMU_RESV_DIRECT_RELAXABLE; > > - else > > + prot |= IOMMU_CACHE; > > + } else { > > type = IOMMU_RESV_DIRECT; > > + prot |= IOMMU_MMIO; > > + } > > > > region = > iommu_alloc_resv_region(rmr_desc->base_address, > > rmr_desc->length, > > > > any input on this? My reasoning is that IOMMU_RESV_DIRECT is > > specifically referenced for things like MSI doorbell and in all the > > examples needs IOMMU_MMIO, while REMAP_PERMITTED seems to be used > for > > allocated system memory that is then used for device specific reserved > > regions which commits say would be like a GPU or USB device. I am Ok to make those changes but not sure we can make the above assumptions based on the way it is currently used. Hi Robin, Any thoughts? Thanks, Shameer > > > > -Jon > > > > > > 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__ */ > > > > > > > Ping. Any comments on this? > > -Jon _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel