Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod From: Magnus Damm Newsgroups: linux.kernel Subject: [PATCH 10/10] iommu/ipmmu-vmsa: Hook up r8a7795 DT matching code Date: Thu, 17 Mar 2016 17:30:03 +0100 Message-ID: References: X-Original-To: iommu@lists.linux-foundation.org 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) Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 51 Organization: linux.* mail to news gateway X-Original-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 X-Original-Date: Fri, 18 Mar 2016 01:30:42 +0900 X-Original-Message-ID: <20160317163042.24104.62082.sendpatchset@little-apple> X-Original-References: <20160317162909.24104.31682.sendpatchset@little-apple> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1360004 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");