From patchwork Sun Mar 12 05:38:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9619233 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E685960522 for ; Sun, 12 Mar 2017 05:44:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D907E285A4 for ; Sun, 12 Mar 2017 05:44:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD854285A5; Sun, 12 Mar 2017 05:44:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 666BA285A5 for ; Sun, 12 Mar 2017 05:44:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932541AbdCLFoi (ORCPT ); Sun, 12 Mar 2017 00:44:38 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35705 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933178AbdCLFob (ORCPT ); Sun, 12 Mar 2017 00:44:31 -0500 Received: by mail-pg0-f67.google.com with SMTP id g2so10228148pge.2; Sat, 11 Mar 2017 21:44:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=dIhdTtYQ8ibGltm4ahpbIu2lKphgN2agqM7mEqmFlUs=; b=uhLX42ZEyNfH+MBC8sgP4yFieISiWY5arNcNdHJm+IqG4COd5cI1TtA7+zdv7bHR/V +c9tqaSOs7j2u/WdunZZaWWOkNZrN4+FhCSPnJxtMMO3VHohJPj9fIeFJVLpzwTA7pH3 BK8wyFooLXXYWY4Y8GgICjzBAY3EUpT/q8k3d06DQHSwgy+xLf89Fy/J9pM8/UaQ2kaS 4I/73+qkE0lvLvDNCjoxepr4JOTmCYUfygMhuC5vKC9TBmTSur1if5aFdRWCm2bVJbAI MGoksZkpn/f21QNjtHQVTzHuc0ewAYh5G/mlr6QjkKXORUeoFHBQUlvGS3F0jKhGUIR1 FImw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:date:message-id:in-reply-to :references:subject; bh=dIhdTtYQ8ibGltm4ahpbIu2lKphgN2agqM7mEqmFlUs=; b=ITrxCiUNDs+sT9s4XqtxqY8sogwIYG2QPbzo9hvahLU0qKNKkcmPzz9mqfh0TQNr7D e8S9n9v2mqwTHcPWaQ86ljcXRL5p2adTBcT8Kv658r5RjjXFqpWRzrrTG+0s0hstPddD OsIibOjOPq7XiqdmxYH2bp5r+BhmR7gjYZOM21apgFXG2vtZYQdf39jFzO/7r18G1sX2 Z3A7/v/+ooxIfAZNyAUFqXXlDg5YlcaCIrnb5ljMZO9riCpPbpWgaBJOTzC869iPnFlt nFwOkZDCU1LlIgImCWG1guYvP4aRqf7b0DSIcQVHxYMyc/NZ5gBdSSa7k2bgYeLoXAe4 3HXA== X-Gm-Message-State: AMke39lnTB4fgE+CLPo/uavt4pGhebAllTr4FbIwY8EKb9C0SuYpRWnBi757N0Mfi8lqqw== X-Received: by 10.84.178.195 with SMTP id z61mr38257777plb.139.1489297469726; Sat, 11 Mar 2017 21:44:29 -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 s87sm26800999pfa.29.2017.03.11.21.44.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Mar 2017 21:44:27 -0800 (PST) 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: Sun, 12 Mar 2017 14:38:51 +0900 Message-Id: <148929713106.20744.12985371298983384075.sendpatchset@little-apple> In-Reply-To: <148929710090.20744.10912918031085568693.sendpatchset@little-apple> References: <148929710090.20744.10912918031085568693.sendpatchset@little-apple> Subject: [PATCH v3 3/3] iommu/ipmmu-vmsa: Hook up r8a7796 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-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Support the r8a7796 IPMMU by sharing feature flags between r8a7795 and r8a7796. Also update IOMMU_OF_DECLARE to hook up the updated compat string. Signed-off-by: Magnus Damm Reviewed-by: Geert Uytterhoeven --- Changes since V2: - Updated to include white list suppport Changes since V1: - None drivers/iommu/ipmmu-vmsa.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) --- 0024/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-03-12 14:14:32.550607110 +0900 @@ -1058,8 +1058,9 @@ static bool ipmmu_slave_whitelist(struct return false; } -static const struct soc_device_attribute soc_r8a7795[] = { +static const struct soc_device_attribute soc_rcar_gen3[] = { { .soc_id = "r8a7795", }, + { .soc_id = "r8a7796", }, { /* sentinel */ } }; @@ -1082,7 +1083,7 @@ static int ipmmu_of_xlate_dma(struct dev } /* For R-Car Gen3 use a white list to opt-in slave devices */ - if (soc_device_match(soc_r8a7795) && !ipmmu_slave_whitelist(dev)) + if (soc_device_match(soc_rcar_gen3) && !ipmmu_slave_whitelist(dev)) return -ENODEV; return ipmmu_init_platform_device(dev); @@ -1127,7 +1128,7 @@ static const struct ipmmu_features ipmmu .twobit_imttbcr_sl0 = false, }; -static const struct ipmmu_features ipmmu_features_r8a7795 = { +static const struct ipmmu_features ipmmu_features_rcar_gen3 = { .use_ns_alias_offset = false, .has_cache_leaf_nodes = true, .has_eight_ctx = true, @@ -1141,7 +1142,10 @@ static const struct of_device_id ipmmu_o .data = &ipmmu_features_default, }, { .compatible = "renesas,ipmmu-r8a7795", - .data = &ipmmu_features_r8a7795, + .data = &ipmmu_features_rcar_gen3, + }, { + .compatible = "renesas,ipmmu-r8a7796", + .data = &ipmmu_features_rcar_gen3, }, { /* Terminator */ }, @@ -1333,6 +1337,8 @@ IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "r ipmmu_vmsa_iommu_of_setup); IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795", ipmmu_vmsa_iommu_of_setup); +IOMMU_OF_DECLARE(ipmmu_r8a7796_iommu_of, "renesas,ipmmu-r8a7796", + ipmmu_vmsa_iommu_of_setup); #endif MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");