Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752770AbdCHLKw (ORCPT ); Wed, 8 Mar 2017 06:10:52 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:35035 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750853AbdCHLKt (ORCPT ); Wed, 8 Mar 2017 06:10:49 -0500 From: Magnus Damm To: joro@8bytes.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, iommu@lists.linux-foundation.org, horms+renesas@verge.net.au, Magnus Damm , robin.murphy@arm.com, m.szyprowski@samsung.com Date: Wed, 08 Mar 2017 20:02:53 +0900 Message-Id: <148897097336.16106.17118406255063350893.sendpatchset@little-apple> In-Reply-To: <148897088333.16106.13237004440297956899.sendpatchset@little-apple> References: <148897088333.16106.13237004440297956899.sendpatchset@little-apple> Subject: [PATCH v3 09/09] iommu/ipmmu-vmsa: Hook up r8a7795 DT matching code Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3568 Lines: 121 From: Magnus Damm Tie in r8a7795 features and update the IOMMU_OF_DECLARE compat string to include the updated compat string. TODO: - Consider making use of iommu_fwspec_add_ids() for uTLB handling Needed to coexist with non-OF R-Car Gen2 somehow... - Break out stuff useful for R-Car Gen2 from this series Fix up the Gen2 IPMMU support code and/or Fold more stuff into the multi-arch series - Add support for sysfs and iommu_device_link()/unlink() Signed-off-by: Magnus Damm --- Changes since V2: - Check for lack of root device in ->xlate() This fixed a bug when IPMMU-MM is disabled in DT the system hangs on boot - Added code to ipmmu_init_platform_device() to handle multiple ->xlate() calls - Include empty white list by default - Updated TODO list Changes since V1: - Enable multi context feature - Update TODO list drivers/iommu/ipmmu-vmsa.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) --- 0018/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-03-08 19:11:53.600607110 +0900 @@ -23,6 +23,7 @@ #include #include #include +#include #if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA) #include @@ -770,6 +771,10 @@ static int ipmmu_init_platform_device(st int num_utlbs; int ret = -ENODEV; + /* Initialize once - xlate() will call multiple times */ + if (to_archdata(dev)) + return 0; + /* Find the master corresponding to the device. */ num_utlbs = of_count_phandle_with_args(dev->of_node, "iommus", @@ -1043,6 +1048,17 @@ static struct iommu_group *ipmmu_find_gr return group; } +static bool ipmmu_slave_whitelist(struct device *dev) +{ + /* By default, do not allow use of IPMMU */ + return false; +} + +static const struct soc_device_attribute soc_r8a7795[] = { + { .soc_id = "r8a7795", }, + { /* sentinel */ } +}; + static int ipmmu_of_xlate_dma(struct device *dev, struct of_phandle_args *spec) { @@ -1053,6 +1069,18 @@ static int ipmmu_of_xlate_dma(struct dev if (!of_device_is_available(spec->np)) return -ENODEV; + /* Failing in ->attach_device() results in a hang, so make + * sure the root device is installed before going there + */ + if (!__ipmmu_find_root()) { + dev_info(dev, "Unable to locate IPMMU root device\n"); + return -ENODEV; + } + + /* For R-Car Gen3 use a white list to opt-in slave devices */ + if (soc_device_match(soc_r8a7795) && !ipmmu_slave_whitelist(dev)) + return -ENODEV; + return ipmmu_init_platform_device(dev); } @@ -1095,11 +1123,22 @@ static const struct ipmmu_features ipmmu .twobit_imttbcr_sl0 = false, }; +static const struct ipmmu_features ipmmu_features_r8a7795 = { + .use_ns_alias_offset = false, + .has_cache_leaf_nodes = true, + .has_eight_ctx = true, + .setup_imbuscr = false, + .twobit_imttbcr_sl0 = true, +}; + static const struct of_device_id ipmmu_of_ids[] = { { .compatible = "renesas,ipmmu-vmsa", .data = &ipmmu_features_default, }, { + .compatible = "renesas,ipmmu-r8a7795", + .data = &ipmmu_features_r8a7795, + }, { /* Terminator */ }, }; @@ -1288,6 +1327,8 @@ static int __init ipmmu_vmsa_iommu_of_se IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa", ipmmu_vmsa_iommu_of_setup); +IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795", + ipmmu_vmsa_iommu_of_setup); #endif MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");