From patchwork Fri Jun 21 18:00:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 167404 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1049302ilk; Fri, 21 Jun 2019 11:01:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqwjp23FEecC/6GWtOxWQVg0NbnItLQBKRkV2kIlTpEge6HVIwboaHfw4ok9vIWReOLGRmDn X-Received: by 2002:a63:5660:: with SMTP id g32mr19303583pgm.78.1561140065306; Fri, 21 Jun 2019 11:01:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561140065; cv=none; d=google.com; s=arc-20160816; b=zWcFb7aMgsIc5+D3PytxQogmUTrr9RGv7AXBF/zrPCJUZMslf0Pep/9OgZQR5bOSJG GdNbUwjsn5bm1iIljxVqLV1n9rXLFkgLI7gpx2CdbYppzjguWNDRfVBYGhOzl3slVhZX vw2wC357VXwrh6bFoKCWzrYhCZrc9uVnZBzchXAzEG+TqzUqe3fJW/dxZ0Ct8MU9DqfM NfGNm6EVFNODg52lak9/Yg8Xx2zXr4Sj//yDUj4dtY+X2rNbjrXIvRCdOEyWUkeETXgT /z64Jg3gqsvPJNyZrKfoxWzoCDa330ukUs6Rr+06/0rDxN7KFlemoqfvI028fezAzjON f8Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=gmN+6EpvZxwlHEVbdGNCjhmKTNUl54+7mWpdXjRHo+8=; b=IBTzXsk/3j6KjkR4fwawgmWzqgzqCAcJBFC1VNndR5x64ybSrPj4TXGXjKkN1OLCAb HCc9+wqVpkpixs5NyFp6BNUngoDBrKAUt9o3aihH4Fe06hxUYQb7vB3JwIEDfLYXj2A+ y38ygCn3q0OMvWmaMIAATTrrDhELbDnMrdMBFi9fNyKsdxR0D9ZXaFPwZ6gVUWmYRYR7 qSegaB7+Erj96eqmjf7HiWEEdCKbmAxBA1dTDKbOFpm92mVEyi1WdxlvF88uP1JK6ZFI YIkb0NnynQHYGJ6/Ppjhq9KdYhi09DyNsiyInTkTroRe+vivsAW+NRRtzllCZFV8BZ2E PoPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ILnjeNcN; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g12si3278516pjs.35.2019.06.21.11.01.05; Fri, 21 Jun 2019 11:01:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ILnjeNcN; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726137AbfFUSBE (ORCPT + 8 others); Fri, 21 Jun 2019 14:01:04 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:43420 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726073AbfFUSBE (ORCPT ); Fri, 21 Jun 2019 14:01:04 -0400 Received: from grover.flets-west.jp (softbank126125154139.bbtec.net [126.125.154.139]) (authenticated) by conuserg-11.nifty.com with ESMTP id x5LI0Wvw030591; Sat, 22 Jun 2019 03:00:33 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x5LI0Wvw030591 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1561140033; bh=gmN+6EpvZxwlHEVbdGNCjhmKTNUl54+7mWpdXjRHo+8=; h=From:To:Cc:Subject:Date:From; b=ILnjeNcNJ6aEAgZBkHfURXwDC8QagWDgMY5McU02iJtGrDE5GHwtHJ6FoPOWDKvE+ 5pJjGMfunMT13NCOY5zYqVWWqmY4ggxJ26fU2dmvQlunWlFmITtLkAn1WxHnUgw4HF 06uih0+BhOrofH5n0/hHtVWHgsU7vILen0iH6CJQQmfh+DtKK52ALV4dSEXThCIn6H OGxic7pnepBkMI83oaPb/c6KCVFBiKIo0qNz7oROKuWlcrm102TQnOOl9C+5h6dJoi nph+72NKw5b7Q/Vh4RoUMQD/A/0sniSBvXulZfaT2N4FTrUnCI2CsM/kxFVhlsSHwH +cKCC5nwoDOXQ== X-Nifty-SrcIP: [126.125.154.139] From: Masahiro Yamada To: linux-arm-kernel@lists.infradead.org Cc: Masahiro Yamada , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Mark Rutland Subject: [PATCH] arm64: dts: uniphier: add reserved-memory for secure memory Date: Sat, 22 Jun 2019 03:00:26 +0900 Message-Id: <20190621180026.25071-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The memory regions specified by /memreserve/ are passed to early_init_dt_reserve_memory_arch() with nomap=false, so it is not suitable for reserving memory for Trusted Firmware-A etc. Use the more robust /reserved-memory node with the no-map property to prevent the kernel from mapping it. Signed-off-by: Masahiro Yamada --- arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 13 +++++++++++-- arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 13 +++++++++++-- arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 13 +++++++++++-- 3 files changed, 33 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi index e32f8aef40bf..8ec40a0b8b1e 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi @@ -8,8 +8,6 @@ #include #include -/memreserve/ 0x80000000 0x02000000; - / { compatible = "socionext,uniphier-ld11"; #address-cells = <2>; @@ -110,6 +108,17 @@ <1 10 4>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + secure-memory@81000000 { + reg = <0x0 0x81000000 0x0 0x01000000>; + no-map; + }; + }; + soc@0 { compatible = "simple-bus"; #address-cells = <1>; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi index 0e1b30656fea..b658f2b641e2 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi @@ -9,8 +9,6 @@ #include #include -/memreserve/ 0x80000000 0x02000000; - / { compatible = "socionext,uniphier-ld20"; #address-cells = <2>; @@ -215,6 +213,17 @@ }; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + secure-memory@81000000 { + reg = <0x0 0x81000000 0x0 0x01000000>; + no-map; + }; + }; + soc@0 { compatible = "simple-bus"; #address-cells = <1>; diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi index d3863157ddd9..d6f6cee4d549 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi @@ -8,8 +8,6 @@ #include #include -/memreserve/ 0x80000000 0x02000000; - / { compatible = "socionext,uniphier-pxs3"; #address-cells = <2>; @@ -138,6 +136,17 @@ <1 10 4>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + secure-memory@81000000 { + reg = <0x0 0x81000000 0x0 0x01000000>; + no-map; + }; + }; + soc@0 { compatible = "simple-bus"; #address-cells = <1>;