From patchwork Mon Jun 6 03:59:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9157189 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 1F78860467 for ; Mon, 6 Jun 2016 04:09:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1622527B13 for ; Mon, 6 Jun 2016 04:09:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B04F28210; Mon, 6 Jun 2016 04:09:44 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 7BB2127B13 for ; Mon, 6 Jun 2016 04:09:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751362AbcFFEJa (ORCPT ); Mon, 6 Jun 2016 00:09:30 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:33905 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751098AbcFFEJ2 (ORCPT ); Mon, 6 Jun 2016 00:09:28 -0400 Received: by mail-pf0-f193.google.com with SMTP id l188so169837pfl.1; Sun, 05 Jun 2016 21:09:28 -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=lhyQtKV9KhvyJJ1yLVtiNTxK9k7HSA3draP+7qV6Qjk=; b=0yNdcxMkZTLJ0/sRHAra3645vL/bu5bl4M2B4dj9ToBcQ0i0oEAFloiOqIydEVu6wN 9+8nG1xw/N+yBXSArCXvBV0wCy1+Mb6GLdCox5AciBa7lCZ4v1FbBW3/eW1PG1x0GgHy xYhJUt3cbxg9vxOZBoLaCqIVz+2d6iSehfqKlhzuIfHtvrjOYhzk7NSADjf7O5f89C5I R0oLoFgyTVMbUVzJIHA3eE096+8PwhMlBBYLRU4bGRqPGYeOlQdCtK9dvhiC5Csyrt3Y XJx4745tbBc9kZ6SEXLftkNsRsB6hPgTkgdr1kY/o/E8FtBhM8zKz8Wl6kKd+cDpGM7B Hfng== 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=lhyQtKV9KhvyJJ1yLVtiNTxK9k7HSA3draP+7qV6Qjk=; b=OzhB7Q0lWqqd+Ja4RqpacIpP/ni19Rl8juNM9COHX1qV9UkH7HgaehAmkvrSZtDEDY KEmrRmT8SxhiiDhIoGHXr5wp5vsY+IMjs2SrnTxKSTRFgEVqhnOdnnMGUVDwf4SACx3c D1NN6kVbNkse33aDH5yblXX2qBaslv6x43ITwG5YxP6HYFQHgxxyuOV7bMmFyWFDMORJ yuSYeRIerCiZYIG/iWov32UpYTJowbhqybAkioYbdvxUbQfRQN0UpmfmFsPRG2b3juRX 5l4wws9/AKBCGUxJB2T3zBVDoOIC5gDR6uTEFH3Zy9qga+cthx0ZABDjqffw6gQAuNFg tbVw== X-Gm-Message-State: ALyK8tKh12AOX8DINqmiCh51fwavmIBX0dQaOO9lexXFDeAxMSSR2+z6CfNhrcX4knRJ9Q== X-Received: by 10.98.63.213 with SMTP id z82mr3688211pfj.14.1465186167844; Sun, 05 Jun 2016 21:09:27 -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 fd8sm21021453pac.23.2016.06.05.21.09.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Jun 2016 21:09:27 -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: Mon, 06 Jun 2016 12:59:07 +0900 Message-Id: <20160606035907.31763.20748.sendpatchset@little-apple> In-Reply-To: <20160606035723.31763.66500.sendpatchset@little-apple> References: <20160606035723.31763.66500.sendpatchset@little-apple> Subject: [PATCH v2 11/11] 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-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() Signed-off-by: Magnus Damm --- Changes since V1: - Enable multi context feature - Update TODO list drivers/iommu/ipmmu-vmsa.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) --- 0027/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2016-06-06 11:13:33.220607110 +0900 @@ -1074,11 +1074,22 @@ 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, + .has_eight_ctx = 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 */ }, }; @@ -1255,6 +1266,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");