Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755324AbcCQQ1Z (ORCPT ); Thu, 17 Mar 2016 12:27:25 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:33843 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031201AbcCQQ1T (ORCPT ); Thu, 17 Mar 2016 12:27:19 -0400 From: Magnus Damm To: iommu@lists.linux-foundation.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, joro@8bytes.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, horms+renesas@verge.net.au, Magnus Damm Date: Fri, 18 Mar 2016 01:30:42 +0900 Message-Id: <20160317163042.24104.62082.sendpatchset@little-apple> In-Reply-To: <20160317162909.24104.31682.sendpatchset@little-apple> References: <20160317162909.24104.31682.sendpatchset@little-apple> Subject: [PATCH 10/10] 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: 1572 Lines: 51 From: Magnus Damm Tie in r8a7795 features and update the IOMMU_OF_DECLARE compat string to hook up the updated compat string. TODO: - Go over init order once more - Consider counting number of IPMMU devices from ->xlate() - Experiment with delaying call to bus_set_iommu() - Poke around with IPMMU-MP1 and the associated dma-controller - 64-bit bus mastering and coherency may need per-device enablement Signed-off-by: Magnus Damm --- drivers/iommu/ipmmu-vmsa.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) --- 0027/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2016-03-18 00:34:36.510513000 +0900 @@ -1009,11 +1009,21 @@ 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, + .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 */ }, }; @@ -1176,6 +1186,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");