From patchwork Tue Dec 15 13:06:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 7854561 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C9C659F349 for ; Tue, 15 Dec 2015 13:05:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2810201F5 for ; Tue, 15 Dec 2015 13:05:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC9DE201C7 for ; Tue, 15 Dec 2015 13:05:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933635AbbLONFF (ORCPT ); Tue, 15 Dec 2015 08:05:05 -0500 Received: from mail-pf0-f171.google.com ([209.85.192.171]:33645 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933364AbbLONFB (ORCPT ); Tue, 15 Dec 2015 08:05:01 -0500 Received: by mail-pf0-f171.google.com with SMTP id n128so4664285pfn.0; Tue, 15 Dec 2015 05:05:01 -0800 (PST) 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=xO2Gdm1y7oMgi+a9crTPNg2aWuZcGHwk4HyLSaAxc7I=; b=qDmx2M2n218aNBfkY+gjjzeCxOA5ew/LD7xmJY0ZkXX47TnVPZPH86nNx9yLEdsy6m uxoKIq/AXpWVThUBArHr4WAetGD7GaWcZxUHCGyB8VK6jRrCZvCTHzIjhIIqIvWLksmy fmfL186KhF4ZFL1N6VRsO2KWDK9f1oa7N+SVvW8E0xEepgu0mIP2NstlaIK0JnJeAEPq LFv4nCmcehzpdeS0Xpi4VfBN/VQn62IQMN3f0Pt/8jDJISgNE14mPJIYpEKRWc4x9Ck8 XCkBB6PEN7fSmUF7iOlvl4NuzAKmWaqrQDBo38lzvtsiYn93O1o2QS6L9ajbWeUCaZBw xDng== X-Received: by 10.98.8.20 with SMTP id c20mr44029447pfd.65.1450184701476; Tue, 15 Dec 2015 05:05:01 -0800 (PST) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id by2sm2339408pab.20.2015.12.15.05.04.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Dec 2015 05:05:00 -0800 (PST) From: Magnus Damm To: iommu@lists.linux-foundation.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, linux-sh@vger.kernel.org, joro@8bytes.org, linux-kernel@vger.kernel.org, horms+renesas@verge.net.au, Magnus Damm Date: Tue, 15 Dec 2015 22:06:40 +0900 Message-Id: <20151215130640.13535.41176.sendpatchset@little-apple> In-Reply-To: <20151215130508.13535.26186.sendpatchset@little-apple> References: <20151215130508.13535.26186.sendpatchset@little-apple> Subject: [PATCH/RFC 10/10] iommu/ipmmu-vmsa: Hook up r8a7795 DT matching code Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@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, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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: - Describe IPMMU topology via DT - Document DT binding and topology - Figure out how to avoid multiple IOMMU_OF_DECLARE() Signed-off-by: Magnus Damm --- drivers/iommu/ipmmu-vmsa.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0025/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2015-12-15 15:47:44.550513000 +0900 @@ -999,11 +999,22 @@ static const struct ipmmu_features ipmmu .use_of_iommu = 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, + .use_of_iommu = 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 */ }, }; @@ -1163,7 +1174,7 @@ static int __init ipmmu_vmsa_iommu_of_se return 0; } -IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa", +IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-r8a7795", ipmmu_vmsa_iommu_of_setup); MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");