From patchwork Wed Aug 9 10:53:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 109712 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp706559qge; Wed, 9 Aug 2017 04:04:13 -0700 (PDT) X-Received: by 10.99.158.10 with SMTP id s10mr7405450pgd.113.1502276651964; Wed, 09 Aug 2017 04:04:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502276651; cv=none; d=google.com; s=arc-20160816; b=en/oBK19UHc2Uh6SPr34X5syiWcft7KXDhR5k0FC6zS2UjE24MlncTBf4dc2xeSubt 8d91K+/ut9nD2aGAeha4VKMLDOkYx6hJ2OcVYg1Dcr/2U8u5pTY1SxAzgB3gVds6vEGP QIZhwyNO3ZwJC8keucQf+FiOSRPXqtHgCj6+O7qGPxPkEniRdEYhiylViUUQjkH9PWvT 62yFX8xr6D45Da/rIxXP0h2YFSCdyjJ1VtSopnWV69pEAMn3th+/KdRPJ26Kh6ExL15O HCZQmd1HXxzYhUPwQ5LocV/X9K5H2Scl5EnZp/QwP6sOAw8bwGGplhL5GaoFMNI0dsAf sPNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=9ljagKbY6wqT1/yB90hF46hcKEo6OZwWFhilj1dYfl0=; b=yG1Kl4ctnn9CaGjnPYel4lbigNCkxIHpQZ8Ompr+MgauzF4tvzfgDAN7t5ZXsIaZ/t 99fO4SR3D0xpM2iBNhGAv1NbYSb6DLCux2tTMpN0LBzeNlttTYB3zkEUYxx2/GFt0MSE /WHWlA00okngbL8DKOZUzstyL/qObhHq/rNgx/50VeJtfMM8NAG+IH4Gs/A3kkdXMEAK Hd5IiXIMODSLqyofU1AOfIG0fwVvhpYNCX5zGbF+p12abJGqVgKhMuj59Y3lUwCbi/Kf +1FsS6XHBbW4/2yYC63Nz+shS2qP31R+3tVx7qknR72B9COsotbZ5FZTCsM9uBnx6tuw oCGQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x69si2401191pfj.283.2017.08.09.04.04.11; Wed, 09 Aug 2017 04:04:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751995AbdHILEK (ORCPT + 7 others); Wed, 9 Aug 2017 07:04:10 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:3483 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752098AbdHILEJ (ORCPT ); Wed, 9 Aug 2017 07:04:09 -0400 Received: from 172.30.72.59 (EHLO DGGEMS411-HUB.china.huawei.com) ([172.30.72.59]) by dggrg04-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id DEU08680; Wed, 09 Aug 2017 19:00:42 +0800 (CST) Received: from linux-ibm.site (10.175.102.37) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.301.0; Wed, 9 Aug 2017 19:00:34 +0800 From: Hanjun Guo To: Lorenzo Pieralisi CC: , , , Sinan Kaya , "Rafael J. Wysocki" , Marc Zyngier , Hanjun Guo Subject: [RFC PATCH 4/4] ACPI: IORT: Add SMMUv3 MSI support Date: Wed, 9 Aug 2017 18:53:37 +0800 Message-ID: <1502276017-63108-5-git-send-email-guohanjun@huawei.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1502276017-63108-1-git-send-email-guohanjun@huawei.com> References: <1502276017-63108-1-git-send-email-guohanjun@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.598AEB5B.0010, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 124749991c9fca4264660572aa01ccb9 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Hanjun Guo Since we have a mapping index for SMMUv3 MSI, we can directly use that index to get the map entry, then retrieve dev ID and ITS parent to add SMMUv3 MSI support. Signed-off-by: Hanjun Guo --- drivers/acpi/arm64/iort.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) -- 1.7.12.4 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Signed-off-by: Lorenzo Pieralisi diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 9439f02..ce03298 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -313,7 +313,8 @@ static int iort_id_map(struct acpi_iort_id_mapping *map, u8 type, u32 rid_in, /* Single mapping does not care for input id */ if (map->flags & ACPI_IORT_ID_SINGLE_MAPPING) { if (type == ACPI_IORT_NODE_NAMED_COMPONENT || - type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX) { + type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX || + type == ACPI_IORT_NODE_SMMU_V3) { *rid_out = map->output_base; return 0; } @@ -357,7 +358,8 @@ struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node, if (map->flags & ACPI_IORT_ID_SINGLE_MAPPING) { if (node->type == ACPI_IORT_NODE_NAMED_COMPONENT || - node->type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX) { + node->type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX || + node->type == ACPI_IORT_NODE_SMMU_V3) { *id_out = map->output_base; return parent; } @@ -549,9 +551,21 @@ int iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id) if (!node) return -ENODEV; - for (i = 0; i < node->mapping_count; i++) { - if (iort_node_map_platform_id(node, dev_id, IORT_MSI_TYPE, i)) + if (node->type == ACPI_IORT_NODE_SMMU_V3) { + u32 index; + + if (iort_get_smmu_v3_id_mapping_index(node, &index)) + return -ENODEV; + + if (iort_node_map_platform_id(node, dev_id, IORT_MSI_TYPE, + index)) return 0; + } else { + for (i = 0; i < node->mapping_count; i++) { + if (iort_node_map_platform_id(node, dev_id, + IORT_MSI_TYPE, i)) + return 0; + } } return -ENODEV; @@ -626,20 +640,30 @@ static struct irq_domain *iort_get_platform_device_domain(struct device *dev) struct acpi_iort_node *node, *msi_parent; struct fwnode_handle *iort_fwnode; struct acpi_iort_its_group *its; - int i; /* find its associated iort node */ - node = iort_scan_node(ACPI_IORT_NODE_NAMED_COMPONENT, - iort_match_node_callback, dev); + node = iort_find_dev_node(dev); if (!node) return NULL; /* then find its msi parent node */ - for (i = 0; i < node->mapping_count; i++) { + if (node->type == ACPI_IORT_NODE_SMMU_V3) { + u32 index; + + if (iort_get_smmu_v3_id_mapping_index(node, &index)) + return NULL; + msi_parent = iort_node_map_platform_id(node, NULL, + IORT_MSI_TYPE, index); + } else { + int i; + + for (i = 0; i < node->mapping_count; i++) { + msi_parent = iort_node_map_platform_id(node, NULL, IORT_MSI_TYPE, i); - if (msi_parent) - break; + if (msi_parent) + break; + } } if (!msi_parent) @@ -1233,6 +1257,8 @@ static int __init iort_add_smmu_platform_device(struct acpi_iort_node *node) /* Configure DMA for the page table walker */ acpi_dma_configure(&pdev->dev, attr); + acpi_configure_pmsi_domain(&pdev->dev); + ret = platform_device_add(pdev); if (ret) goto dma_deconfigure;