From patchwork Thu Mar 17 16:30:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 8613111 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1B71FC0553 for ; Thu, 17 Mar 2016 16:27:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 70B762026C for ; Thu, 17 Mar 2016 16:27:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B2EFB2026F for ; Thu, 17 Mar 2016 16:27:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753142AbcCQQ1X (ORCPT ); Thu, 17 Mar 2016 12:27:23 -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 Received: by mail-pf0-f173.google.com with SMTP id x3so127083834pfb.1; Thu, 17 Mar 2016 09:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=uuBQQTAzkx+IuC8nImltGBFslLGrjNMjXn73HB1r/uM=; b=V4tkZ/zsADXxNoB+3aYT+jwfKUw6Z77lL7CGmw68TcbC7Z4zTMvwlz4N4orJ+dcYLF 0agMhyVyhEHMFmZyj4c/DM6P79TFj9IeDz+pKfgVxfK6oWQg0MjFkkRwr6sh3rR3vfO6 2DQfhexOLjpySYW29ZvA6chtOE39xpk3zE301iRp4AFs2anNJSDhmJTWpFV2JqV6g+/D yo5bRlZWvkfAMWeJrBM1mcc6wbgniGcCOZe0qcrBPQ2GqbLt3g4BKxAbmRhs2tClRqfs JV6Hu9APnhccEiSj9ZpG4WV0DyB2iNPBxcf8ZLVZqsR4d7jYP2CaXqzW6oLGEpimfEOE xn5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:date:message-id:in-reply-to :references:subject; bh=uuBQQTAzkx+IuC8nImltGBFslLGrjNMjXn73HB1r/uM=; b=arSr9pCNSOoL8Pv13ffw9cKEYTIGskTvrpBMFKiycdp1B0x/ovNRsh6DgZxm1repvi VodXOHJ9VBdU6t+97B0uHMyRIDzdJI6s+Cz6rmxVV2n+HScFdjH/hxUQ4M/eeJOlVkBb 59XOeNWj6A1N+ZLVZgcAVO9/UZZYMxAOFlLneTjm5UKP9BMPJ3T0tAnrcr4ml/ta3moT suSZ8EOhhxzVw1ypqqp41OPacIh6DKKfQTLo66IQZXMsl0TybNaw6pmOC1qzSgXWW6Ki laHtB0e3ya8McTC7cpZfKsLI7BbaQGdgB9fmnA28i1w4c+DFGlge2a4DpAkRP1A/fHag psXA== X-Gm-Message-State: AD7BkJL2xhBwr2t9pOAZLYNm9106iNhiW66R+JjawSfVo+ML2H0EMgx6WVoZ5UpiRenkbw== X-Received: by 10.98.87.23 with SMTP id l23mr16247543pfb.101.1458232039172; Thu, 17 Mar 2016 09:27:19 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id yj1sm14530529pac.16.2016.03.17.09.27.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Mar 2016 09:27:18 -0700 (PDT) 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-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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");