From patchwork Fri Jul 16 08:34:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shameerali Kolothum Thodi X-Patchwork-Id: 478374 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp1146845jao; Fri, 16 Jul 2021 01:36:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYF4bAqdBdNxQzgXBbRsPkyp4BRLlCQAO6B9Y+xkguONfSE3KNynORkZ/U4skXyOgvkQM/ X-Received: by 2002:a17:906:f8d7:: with SMTP id lh23mr10698205ejb.485.1626424566572; Fri, 16 Jul 2021 01:36:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626424566; cv=none; d=google.com; s=arc-20160816; b=pjpSRWvxps5CA55V7nTTHfeTUmW8pOyccqZFr/yKlb9EVXjkkDO+nt6MTzqGnFHozQ 8/yfV4AD0x9cuJ5Mm7Aa4LZz7cIUOXaFE8ytaHiXJTTnKsNo3HDV0cgwZzJU1cOgeyFi r2i1eUCRuyOXTcTHx+QXoDAQ8M9otr12BLKZqEUAP4/nobpKn3mM5NwkumbmkrVhU8re 3w/MorKFssxYmsjiwiapsUX4P7ode7dVwY1NcURwkxJU1kvwvTJYOa7OusGyWkygRQfa PZJMsG499Td7vdGsQVjU6oVb59ak5XkyBZeulvq9IMgV4I2mI70J0626YlZe09a5N1Sw gsyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=a/O879fzSLfFh5eAZx7NFXunZe21Lim+UM6IJCf/EgU=; b=svTAww9tCIIqorUfNYGZWd43iSxYYUHbEGxzCpqrRv09EjsY6zlYmJpkzj/zGei54r Yr2gbuQ8tULKyFRj5BKgKCxD6W9PSohZoUKgjdtjDoPzfywsROyaUz7a3QXdB5e+n3kA LKygH1Jyo92U/MJ4QhvkCSiN5lnQMkxgdA7NuUyKjG+Bod2VNif7/4UP6A6J+Ev0croT wvaY3x+Zi1hUTm3Hz4S6KnYTuXzJ9sXcBG9RNaYd/UXGxwoIMc2sBEIitJ99CKLf2cXL Ck1VXxyqwcqCEaNSZ5VvXezRADHpq7caC/W/Z1Aou+0TOXRf6ck1epmWYE7vMH0HLzPh DHww== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dd21si2610993edb.514.2021.07.16.01.36.06; Fri, 16 Jul 2021 01:36:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237055AbhGPIi7 (ORCPT + 4 others); Fri, 16 Jul 2021 04:38:59 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3426 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232016AbhGPIi7 (ORCPT ); Fri, 16 Jul 2021 04:38:59 -0400 Received: from fraeml704-chm.china.huawei.com (unknown [172.18.147.206]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4GR46T1Xzgz6H7NP; Fri, 16 Jul 2021 16:24:49 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml704-chm.china.huawei.com (10.206.15.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Fri, 16 Jul 2021 10:36:03 +0200 Received: from A2006125610.china.huawei.com (10.47.80.222) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 16 Jul 2021 09:35:56 +0100 From: Shameer Kolothum To: , , CC: , , , , , , , , , , Subject: [PATCH v6 9/9] iommu/dma: Reserve any RMR regions associated with a dev Date: Fri, 16 Jul 2021 09:34:42 +0100 Message-ID: <20210716083442.1708-10-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20210716083442.1708-1-shameerali.kolothum.thodi@huawei.com> References: <20210716083442.1708-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.47.80.222] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Get ACPI IORT RMR regions associated with a dev reserved so that there is a unity mapping for them in SMMU. Signed-off-by: Shameer Kolothum --- drivers/iommu/dma-iommu.c | 56 +++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 1b6e27475279..c1ae0c3d4b33 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -207,22 +207,68 @@ void iommu_dma_put_rmrs(struct fwnode_handle *iommu_fwnode, } EXPORT_SYMBOL(iommu_dma_put_rmrs); +static bool iommu_dma_dev_has_rmr(struct iommu_fwspec *fwspec, + struct iommu_resv_region *e) +{ + int i; + + for (i = 0; i < fwspec->num_ids; i++) { + if (e->fw_data.rmr.sid == fwspec->ids[i]) + return true; + } + + return false; +} + +static void iommu_dma_get_rmr_resv_regions(struct device *dev, + struct list_head *list) +{ + struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); + struct list_head rmr_list; + struct iommu_resv_region *rmr, *tmp; + + INIT_LIST_HEAD(&rmr_list); + if (iommu_dma_get_rmrs(fwspec->iommu_fwnode, &rmr_list)) + return; + + if (dev_is_pci(dev)) { + struct pci_dev *pdev = to_pci_dev(dev); + struct pci_host_bridge *host = pci_find_host_bridge(pdev->bus); + + if (!host->preserve_config) + return; + } + + list_for_each_entry_safe(rmr, tmp, &rmr_list, list) { + if (!iommu_dma_dev_has_rmr(fwspec, rmr)) + continue; + + /* Remove from iommu RMR list and add to dev resv_regions */ + list_del_init(&rmr->list); + list_add_tail(&rmr->list, list); + } + + iommu_dma_put_rmrs(fwspec->iommu_fwnode, &rmr_list); +} + /** * iommu_dma_get_resv_regions - Reserved region driver helper * @dev: Device from iommu_get_resv_regions() * @list: Reserved region list from iommu_get_resv_regions() * * IOMMU drivers can use this to implement their .get_resv_regions callback - * for general non-IOMMU-specific reservations. Currently, this covers GICv3 - * ITS region reservation on ACPI based ARM platforms that may require HW MSI - * reservation. + * for general non-IOMMU-specific reservations. Currently this covers, + * -GICv3 ITS region reservation on ACPI based ARM platforms that may + * require HW MSI reservation. + * -Any ACPI IORT RMR memory range reservations (IORT spec rev E.b) */ void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list) { - if (!is_of_node(dev_iommu_fwspec_get(dev)->iommu_fwnode)) + if (!is_of_node(dev_iommu_fwspec_get(dev)->iommu_fwnode)) { iort_iommu_msi_get_resv_regions(dev, list); - + iommu_dma_get_rmr_resv_regions(dev, list); + } } EXPORT_SYMBOL(iommu_dma_get_resv_regions);