From patchwork Thu Oct 27 10:29:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9399681 X-Patchwork-Delegate: horms@verge.net.au 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 7B94260231 for ; Thu, 27 Oct 2016 14:59:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68C452A232 for ; Thu, 27 Oct 2016 14:59:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5DB682A316; Thu, 27 Oct 2016 14:59:53 +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 31AE12A314 for ; Thu, 27 Oct 2016 14:59:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938478AbcJ0O7b (ORCPT ); Thu, 27 Oct 2016 10:59:31 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:35674 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934700AbcJ0O7a (ORCPT ); Thu, 27 Oct 2016 10:59:30 -0400 Received: by mail-pf0-f194.google.com with SMTP id s8so2875041pfj.2 for ; Thu, 27 Oct 2016 07:59:30 -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=DzUjCXg+3n0X7gEtcDsQV5UzDlN4R1rWE8//ORFF5nQ=; b=G8hx0wHjz3I1rIMl93kyNGVZw4i/GiLyEAn+t4gTGZLbMx1fYhayt+9D3PRPd8nVo7 fiEltZhbSM0ij5IzDhWrDS8ey7T7K86o8abuYyh8YLz23ZZ4zBG4w2XDPVZo4v9KDeVF 9tXz4HYos3pkBajnYjrcGI+1ExarGhmc+pSMLaKBmjdmhQFdtnWQwdETP2L49HaYa6No Vf6HgDJY5Oory7aXnwUZvyv65OvJ3j/yf1NUvRnTUqJr+fr5tI5HXI3eYBRo2lT66xay mP3NZM3uatqh9zX8EoMrfnHIfydfcxmyUgFj91RtgcJY4yMqqoutj8m/0P9W/gMxgMKq oe3w== 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=DzUjCXg+3n0X7gEtcDsQV5UzDlN4R1rWE8//ORFF5nQ=; b=mVpBYmOppPSV/L2uaFAUrlUewLKwHVUWI+hTBVdg7SZ/Q0QGP6X0Xg4rt6fXyebsTb sUMOc9tbDDVY1kHuQKVsInjKQrXlxXl/gvogZmFTKAB9Gq/1CPsIJygCj7N3F3FQMJRg FD+WGPRtbm+TlvsDNg3PLgwxp5otB5FFfmJnqj2aD9RYINcb6I6PWPM0Ej23FJaqsCLI Om6+BUQjOaT4xMugGDqXUThYNs7ccVexAbG+XXCNBjxDBRTWLzACJtYKrI6e1kwlClAw X6oHqkG9hhC7qwDa15dP7APvTzqOyalkyK41iBn0GWbzMbnPrs0+bvWFMuKEpC6WOEZo lmKg== X-Gm-Message-State: ABUngvchti9zCUY3AvvqWM1/7OXPv8lNX8yaM8XfYig703F3+OnnsU0TqzIR2HWrWRul0w== X-Received: by 10.98.131.7 with SMTP id h7mr13101402pfe.86.1477564620741; Thu, 27 Oct 2016 03:37:00 -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 n7sm10671155pfn.62.2016.10.27.03.36.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Oct 2016 03:36:59 -0700 (PDT) From: Magnus Damm To: linux-renesas-soc@vger.kernel.org Cc: horms+renesas@verge.net.au, Magnus Damm , laurent.pinchart+renesas@ideasonboard.com, joro@8bytes.org, geert+renesas@glider.be Date: Thu, 27 Oct 2016 19:29:15 +0900 Message-Id: <20161027102915.26426.82003.sendpatchset@little-apple> In-Reply-To: <20161027102856.26426.48132.sendpatchset@little-apple> References: <20161027102856.26426.48132.sendpatchset@little-apple> Subject: [PATCH 02/04] arm64: dts: r8a7795: Hook up SYS-DMAC to IPMMU 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 Hook up r8a7795 DMAC nodes to IPMMU-MP1, IPMMU-DS0 and IPMMU-DS1. Signed-off-by: Magnus Damm --- This patch can be merged any time, but it is however not recommended to enable IPMMU-MP1, IPMMU-DS0 or IPMMU-DS1 until various dependencies have been resolved: 1) DMA-Engine slave devices need the following two patches merged: arm64: Wire up iommu_dma_{map, unmap}_resource() iommu/dma: Implement dma_{map,unmap}_resource() 2) The Audio DMAC and the sound drivers need the above two patches as well as driver updates to correctly make use of the DMA MAP API. arch/arm64/boot/dts/renesas/r8a7795.dtsi | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) --- 0002/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ work/arch/arm64/boot/dts/renesas/r8a7795.dtsi 2016-10-27 18:04:48.460607110 +0900 @@ -358,6 +358,14 @@ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; #dma-cells = <1>; dma-channels = <16>; + iommus = <&ipmmu_mp1 0>, <&ipmmu_mp1 1>, + <&ipmmu_mp1 2>, <&ipmmu_mp1 3>, + <&ipmmu_mp1 4>, <&ipmmu_mp1 5>, + <&ipmmu_mp1 6>, <&ipmmu_mp1 7>, + <&ipmmu_mp1 8>, <&ipmmu_mp1 9>, + <&ipmmu_mp1 10>, <&ipmmu_mp1 11>, + <&ipmmu_mp1 12>, <&ipmmu_mp1 13>, + <&ipmmu_mp1 14>, <&ipmmu_mp1 15>; }; audma1: dma-controller@ec720000 { @@ -391,6 +399,14 @@ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; #dma-cells = <1>; dma-channels = <16>; + iommus = <&ipmmu_mp1 16>, <&ipmmu_mp1 17>, + <&ipmmu_mp1 18>, <&ipmmu_mp1 19>, + <&ipmmu_mp1 20>, <&ipmmu_mp1 21>, + <&ipmmu_mp1 22>, <&ipmmu_mp1 23>, + <&ipmmu_mp1 24>, <&ipmmu_mp1 25>, + <&ipmmu_mp1 26>, <&ipmmu_mp1 27>, + <&ipmmu_mp1 28>, <&ipmmu_mp1 29>, + <&ipmmu_mp1 30>, <&ipmmu_mp1 31>; }; pfc: pfc@e6060000 { @@ -557,6 +573,14 @@ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; #dma-cells = <1>; dma-channels = <16>; + iommus = <&ipmmu_ds0 0>, <&ipmmu_ds0 1>, + <&ipmmu_ds0 2>, <&ipmmu_ds0 3>, + <&ipmmu_ds0 4>, <&ipmmu_ds0 5>, + <&ipmmu_ds0 6>, <&ipmmu_ds0 7>, + <&ipmmu_ds0 8>, <&ipmmu_ds0 9>, + <&ipmmu_ds0 10>, <&ipmmu_ds0 11>, + <&ipmmu_ds0 12>, <&ipmmu_ds0 13>, + <&ipmmu_ds0 14>, <&ipmmu_ds0 15>; }; dmac1: dma-controller@e7300000 { @@ -590,6 +614,14 @@ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; #dma-cells = <1>; dma-channels = <16>; + iommus = <&ipmmu_ds1 0>, <&ipmmu_ds1 1>, + <&ipmmu_ds1 2>, <&ipmmu_ds1 3>, + <&ipmmu_ds1 4>, <&ipmmu_ds1 5>, + <&ipmmu_ds1 6>, <&ipmmu_ds1 7>, + <&ipmmu_ds1 8>, <&ipmmu_ds1 9>, + <&ipmmu_ds1 10>, <&ipmmu_ds1 11>, + <&ipmmu_ds1 12>, <&ipmmu_ds1 13>, + <&ipmmu_ds1 14>, <&ipmmu_ds1 15>; }; dmac2: dma-controller@e7310000 { @@ -623,6 +655,14 @@ power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; #dma-cells = <1>; dma-channels = <16>; + iommus = <&ipmmu_ds1 16>, <&ipmmu_ds1 17>, + <&ipmmu_ds1 18>, <&ipmmu_ds1 19>, + <&ipmmu_ds1 20>, <&ipmmu_ds1 21>, + <&ipmmu_ds1 22>, <&ipmmu_ds1 23>, + <&ipmmu_ds1 24>, <&ipmmu_ds1 25>, + <&ipmmu_ds1 26>, <&ipmmu_ds1 27>, + <&ipmmu_ds1 28>, <&ipmmu_ds1 29>, + <&ipmmu_ds1 30>, <&ipmmu_ds1 31>; }; avb: ethernet@e6800000 {