From patchwork Mon Dec 12 10:18:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9470351 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 1619C60760 for ; Mon, 12 Dec 2016 10:18:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0731928486 for ; Mon, 12 Dec 2016 10:18:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF9EA2848B; Mon, 12 Dec 2016 10:18:38 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DFFB128486 for ; Mon, 12 Dec 2016 10:18:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cGNgk-0004Qy-FF; Mon, 12 Dec 2016 10:18:30 +0000 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cGNgg-0004Kl-Tg for linux-amlogic@lists.infradead.org; Mon, 12 Dec 2016 10:18:28 +0000 Received: by mail-wm0-x231.google.com with SMTP id g23so54106359wme.1 for ; Mon, 12 Dec 2016 02:18:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=d6Wl/KVBFgeX04fX50aZpvVSIHRXQO3V+cuq7/Fju88=; b=RAX8/QfFxCGuAEHN7qdS8g7welDSHNb1eDHoDT1kYziCKsUyM+fFEdeIMKLVQSYVwa 41mFZwnRqL5cRVGON8VkvrgMSQm+XTNdSwYg9Wunm95Ii/YW4DKz9zsBYY7owJmQobQE iJ2m8o7dh5S3vTzotp5BdPo6hXxjz2quFv0Gk902Y3rlVB1RYaqT6OeOfHtflWFLfAcZ XP6JvFg1ITdzxDkmHb4LbUmgTORryZIDxObBslcO1VKbXJyTnxRaV95GDCb+4+rwngBj bniatub2ZVy6eSqdWbrYi+N0u3IQaVTYJ7Xoi1T80KlJfwPQuI1gYLIihyX68MKV8uZP AhqA== 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:subject:date:message-id; bh=d6Wl/KVBFgeX04fX50aZpvVSIHRXQO3V+cuq7/Fju88=; b=k/Npm+qfy9sGg6EJWNJdoLSfqWoW1O41N+clY8TJa/ZKLJGgb9exnpk/CVNkRBcpuh T0Hu+u0+Va/4Sm3OwHts96F8Ypr6BoS15V+glb+shgAgLKP5pnyifLdPXaGdfGB5D8XZ vyUi2xmCpqj49sluqQZ3lGCwNZbeH2B+2LO/qIlXJD7g4H+Cydgefn3cORNXMStBPrfF JZzSq3ogMW3r8ouf7FsCCk+Lqz53G+AnXQ+9qT1Xseu1FsDuRygKr5VO8FKG8OQOwhws WgEYutNMLkRUjqsb6IgPu7lc/PFNJoWytdzmscR3l53F+inre3IggOcKhBWNBIJ/vuqM aQYQ== X-Gm-Message-State: AKaTC01te+IPq6X6knY5FmtnIm84gfqjzOEUrzueFQzHlFTHeO9h6Eo971FaPiPNdVmQQ/LL X-Received: by 10.28.210.195 with SMTP id j186mr8091780wmg.73.1481537884730; Mon, 12 Dec 2016 02:18:04 -0800 (PST) Received: from build.net (build.baylibre.com. [37.187.146.144]) by smtp.gmail.com with ESMTPSA id vr9sm56394400wjc.35.2016.12.12.02.18.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Dec 2016 02:18:04 -0800 (PST) From: Neil Armstrong To: heinrich.schuchardt@gmx.de, khilman@baylibre.com, carlo@caione.org Subject: [RFT PATCH] ARM64: dts: meson-gxbb: Add reserved memory zone and usable memory range Date: Mon, 12 Dec 2016 11:18:01 +0100 Message-Id: <20161212101801.28491-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.9.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161212_021827_217090_14F5C48A X-CRM114-Status: UNSURE ( 8.18 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The Amlogic Meson GXBB secure monitor uses part of the memory space, this patch adds these reserved zones and redefines the usable memory range for each boards. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 21 +++++++++++++++++++++ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 +- .../boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts | 2 +- .../boot/dts/amlogic/meson-gxbb-vega-s95-pro.dts | 2 +- .../boot/dts/amlogic/meson-gxbb-vega-s95-telos.dts | 2 +- .../boot/dts/amlogic/meson-gxl-nexbox-a95x.dts | 2 +- .../arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 2 +- 11 files changed, 31 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi index 7a078be..ac40b2d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi @@ -56,7 +56,7 @@ memory@0 { device_type = "memory"; - reg = <0x0 0x0 0x0 0x80000000>; + reg = <0x0 0x1000000 0x0 0x7f000000>; }; vddio_boot: regulator-vddio_boot { diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index fc033c0..e085588 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -55,6 +55,27 @@ #address-cells = <2>; #size-cells = <2>; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + secos: secos { + reg = <0x0 0x05300000 0x0 0x2000000>; + no-map; + }; + + pstore: pstore { + reg = <0x0 0x07300000 0x0 0x100000>; + no-map; + }; + + secmon: secmon { + reg = <0x0 0x10000000 0x0 0x200000>; + no-map; + }; + }; + cpus { #address-cells = <0x2>; #size-cells = <0x0>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts index 9696820..25b8832 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts @@ -62,7 +62,7 @@ memory@0 { device_type = "memory"; - reg = <0x0 0x0 0x0 0x40000000>; + reg = <0x0 0x1000000 0x0 0x3f000000>; }; leds { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts index 238fbea..839c66a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -61,7 +61,7 @@ memory@0 { device_type = "memory"; - reg = <0x0 0x0 0x0 0x80000000>; + reg = <0x0 0x1000000 0x0 0x7f000000>; }; usb_otg_pwr: regulator-usb-pwrs { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi index 203be28..9a39518 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi @@ -55,7 +55,7 @@ memory@0 { device_type = "memory"; - reg = <0x0 0x0 0x0 0x40000000>; + reg = <0x0 0x1000000 0x0 0x3f000000>; }; usb_pwr: regulator-usb-pwrs { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts index 62fb496..287a4c7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts @@ -50,6 +50,6 @@ memory@0 { device_type = "memory"; - reg = <0x0 0x0 0x0 0x80000000>; + reg = <0x0 0x1000000 0x0 0x7f000000>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dts index 9a9663a..8bdbbe2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dts @@ -50,6 +50,6 @@ memory@0 { device_type = "memory"; - reg = <0x0 0x0 0x0 0x40000000>; + reg = <0x0 0x1000000 0x0 0x3f000000>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dts index 2fe167b..2d85295 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dts @@ -50,6 +50,6 @@ memory@0 { device_type = "memory"; - reg = <0x0 0x0 0x0 0x80000000>; + reg = <0x0 0x1000000 0x0 0x7f000000>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts index e99101a..4ec2bbb 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts @@ -60,7 +60,7 @@ memory@0 { device_type = "memory"; - reg = <0x0 0x0 0x0 0x80000000>; + reg = <0x0 0x1000000 0x0 0x7f000000>; }; vddio_card: gpio-regulator { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts index 9639f01..b8b5b74 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts @@ -59,7 +59,7 @@ memory@0 { device_type = "memory"; - reg = <0x0 0x0 0x0 0x80000000>; + reg = <0x0 0x1000000 0x0 0x7f000000>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts index f859d75..1544747 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts @@ -62,7 +62,7 @@ memory@0 { device_type = "memory"; - reg = <0x0 0x0 0x0 0x80000000>; + reg = <0x0 0x1000000 0x0 0x7f000000>; }; vddio_boot: regulator-vddio-boot {