From patchwork Mon Dec 2 10:29:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 180578 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp5010155ile; Mon, 2 Dec 2019 02:29:25 -0800 (PST) X-Google-Smtp-Source: APXvYqw9ALiJmx8ZGj7jqPNWxPomoozFH4SEuH5Zeu8LSbE0YamYTogLK+xZJX0ORC+7kJzL5JuL X-Received: by 2002:a17:906:692:: with SMTP id u18mr23174952ejb.295.1575282565798; Mon, 02 Dec 2019 02:29:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575282565; cv=none; d=google.com; s=arc-20160816; b=NmINTa1Y0YXmV9kwma5L5C0rOTkx3F0/uJjeHd7uWCL1+fBF/4qJS8XH3brPcqkH7q PuoVjWGSSOiPGByoVwUzpIjbqS8wmpgAlq8mvFNjArgEqE5g6s0xhXJEo6sp/ki2xeS0 sy1PlLCasTBhtXGZkHcGNdJa51+RSIXC9asmHkElFC+xRz8xWzik0R6hiQW/glHSNIW9 maPpL4Bu7ITap3eYZ+9Za7FmcW1SLY5fQmhlK9qUJZWFDtH+G8TpshJWXVj1nwEU1vmV Mc3ZUJ53Xq9/v/JE5+vWKiDzOLnE5cKSQeYYdc9x8VzDsU3vloKMbj5GjuQfZTsBbBpk 4A8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=AS8DCYJJtvcNwN5um3nfXr6AdvFpDMDLb3Ox1ZQkkeA=; b=ihiQyFN49ULLJsqJEQPPkdUE4AUjfkF9+gvdggh47smvaeUE0v/udOnsPCspHaJFqR IDmWKnGDvpSwWnx3R9GT5Ca7jzBqPdn7rR2a+jJSvRT476Ol3i/bDfAxs0nX7ziBYaI/ iIt4IJdtXhkiqh/FsenzYVQrcXAQXrmhmf3PzDiqF7w/O5M3mEdQfdVWdX1Hy3bSl2lZ 2wJMy/A/aYl8XUzZksM/0gtWp9VToIEH731mtwT5pr5tX3tWtAhd/1o5a7qbvyNFRqk6 asWPBftQJA9TLDOEIly/liFKOVepuXaP8Rh7xSOnU0fUPH1bYnxODc5m5MAUdqWFHxu8 Qdsw== ARC-Authentication-Results: i=1; mx.google.com; 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 g2si3519668ejf.191.2019.12.02.02.29.25; Mon, 02 Dec 2019 02:29:25 -0800 (PST) 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; 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 S1727445AbfLBK3X (ORCPT + 8 others); Mon, 2 Dec 2019 05:29:23 -0500 Received: from mx2.suse.de ([195.135.220.15]:57480 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726557AbfLBK3V (ORCPT ); Mon, 2 Dec 2019 05:29:21 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 1A41AB259; Mon, 2 Dec 2019 10:29:19 +0000 (UTC) From: =?utf-8?q?Andreas_F=C3=A4rber?= To: linux-realtek-soc@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andreas_F=C3=A4rber?= , Rob Herring , Mark Rutland , devicetree@vger.kernel.org Subject: [PATCH v2 1/9] arm64: dts: realtek: rtd129x: Fix GIC CPU masks for RTD1293 Date: Mon, 2 Dec 2019 11:29:02 +0100 Message-Id: <20191202102910.26916-2-afaerber@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191202102910.26916-1-afaerber@suse.de> References: <20191202102910.26916-1-afaerber@suse.de> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Convert from GIC_CPU_MASK_RAW() to GIC_CPU_MASK_SIMPLE(). In case of RTD1293 adjust the arch timer and VGIC interrupts' CPU masks to its smaller number of CPUs. Fixes: cf976f660ee8 ("arm64: dts: realtek: Add RTD1293 and Synology DS418j") Signed-off-by: Andreas Färber --- v1 -> v2: Unchanged arch/arm64/boot/dts/realtek/rtd1293.dtsi | 12 ++++++++---- arch/arm64/boot/dts/realtek/rtd1295.dtsi | 8 ++++---- arch/arm64/boot/dts/realtek/rtd1296.dtsi | 8 ++++---- 3 files changed, 16 insertions(+), 12 deletions(-) -- 2.16.4 diff --git a/arch/arm64/boot/dts/realtek/rtd1293.dtsi b/arch/arm64/boot/dts/realtek/rtd1293.dtsi index bd4e22723f7b..2d92b56ac94d 100644 --- a/arch/arm64/boot/dts/realtek/rtd1293.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd1293.dtsi @@ -36,16 +36,20 @@ timer { compatible = "arm,armv8-timer"; interrupts = , + (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, ; + (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>; }; }; &arm_pmu { interrupt-affinity = <&cpu0>, <&cpu1>; }; + +&gic { + interrupts = ; +}; diff --git a/arch/arm64/boot/dts/realtek/rtd1295.dtsi b/arch/arm64/boot/dts/realtek/rtd1295.dtsi index 93f0e1d97721..34f6cc6f16fe 100644 --- a/arch/arm64/boot/dts/realtek/rtd1295.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd1295.dtsi @@ -61,13 +61,13 @@ timer { compatible = "arm,armv8-timer"; interrupts = , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, ; + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; }; }; diff --git a/arch/arm64/boot/dts/realtek/rtd1296.dtsi b/arch/arm64/boot/dts/realtek/rtd1296.dtsi index 0f9e59cac086..fb864a139c97 100644 --- a/arch/arm64/boot/dts/realtek/rtd1296.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd1296.dtsi @@ -50,13 +50,13 @@ timer { compatible = "arm,armv8-timer"; interrupts = , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, ; + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; }; }; From patchwork Mon Dec 2 10:29:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 180577 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp5010149ile; Mon, 2 Dec 2019 02:29:25 -0800 (PST) X-Google-Smtp-Source: APXvYqw6VSHIIVzwaaMItJN0+z0LAVhOr5MakdEm+SmC+f/CN51odxivGR6F8BLu1gRgU4H4Sdp5 X-Received: by 2002:a17:906:b30f:: with SMTP id n15mr22736908ejz.236.1575282565444; Mon, 02 Dec 2019 02:29:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575282565; cv=none; d=google.com; s=arc-20160816; b=NVoqW2lyPqko34aPvxClmOY51unEXGZ5vm3Y/HH79zrbaECqtw9nIl5nrRFbinVtel ktAW8jlt2kInUNogBR9NL/TkEzcMgJIY76nAo50/DbkREbmq86CwQhtifa83wYUs4WOF 6pAst0LuU1e9VJfgDGissV8chkHknE4Owifp4zNM1os5mYyTcReTHuS28JE/P8Hc+WYz A2lUqZhY6ixyQc3ob90EBZpGkd9ZIeFhop3L8TINvzUjMCuWEmw/sO+F7VsuBUzUqRrV u0RLqGgdh//0g/R+HCKGS7MmSyfsG3KFnblK847ULOw7wCLpOudibQyKAYGUXw4LjD5O EewQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=XIWbNE5sigNJ/IgRLudnuxJs0FmHkC+PqwkuMVk2uZ4=; b=EMw83yfQAD05/ew1qsyBysmIm0IASjeDIsecewnathuMltYg3dKZKU3uq0wZvZLaRS 2P73E2GNzuLjJ40mdno27lYlYuYOAoFB60VZxuxO2bkAyVKSEcvYDlgrBmAcURO1nQeP zPttk1DsIMhZVhE9P19Wz1vXq60frhI6xAuHpl64sTTi7AY8NXWHktjoLwkQ/rf3AidS 6vaCR1dNt2kdJyJTGxyW0JvcXhGVzZHzyY0TP8eO3MKq8iUO2KiGkMOJZYPUG+kqpMIU GDzfCQm3spzdWy3IsVcTKS23D5OdXL/ij0c1wdqfPZ0Qqvcw//7a9D4L7WHiwi4sz+V9 5y5g== ARC-Authentication-Results: i=1; mx.google.com; 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 g2si3519668ejf.191.2019.12.02.02.29.25; Mon, 02 Dec 2019 02:29:25 -0800 (PST) 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; 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 S1727415AbfLBK3V (ORCPT + 8 others); Mon, 2 Dec 2019 05:29:21 -0500 Received: from mx2.suse.de ([195.135.220.15]:57508 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726678AbfLBK3V (ORCPT ); Mon, 2 Dec 2019 05:29:21 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 925BEB297; Mon, 2 Dec 2019 10:29:19 +0000 (UTC) From: =?utf-8?q?Andreas_F=C3=A4rber?= To: linux-realtek-soc@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andreas_F=C3=A4rber?= , Rob Herring , Mark Rutland , Arnd Bergmann , devicetree@vger.kernel.org Subject: [PATCH v2 2/9] arm64: dts: realtek: rtd129x: Use reserved-memory for RPC regions Date: Mon, 2 Dec 2019 11:29:03 +0100 Message-Id: <20191202102910.26916-3-afaerber@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191202102910.26916-1-afaerber@suse.de> References: <20191202102910.26916-1-afaerber@suse.de> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Move /reserved-memory node from RTD1295 to RTD129x DT. Convert RPC /memreserve/s into /reserved-memory nodes. Fixes: 72a7786c0a0d ("ARM64: dts: Add Realtek RTD1295 and Zidoo X9S") Fixes: f8b3436dad5c ("arm64: dts: realtek: Factor out common RTD129x parts") Signed-off-by: Andreas Färber --- v1 -> v2: Unchanged * Added Fixes headers arch/arm64/boot/dts/realtek/rtd1295.dtsi | 13 +------------ arch/arm64/boot/dts/realtek/rtd129x.dtsi | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 15 deletions(-) -- 2.16.4 diff --git a/arch/arm64/boot/dts/realtek/rtd1295.dtsi b/arch/arm64/boot/dts/realtek/rtd1295.dtsi index 34f6cc6f16fe..1402abe80ea1 100644 --- a/arch/arm64/boot/dts/realtek/rtd1295.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd1295.dtsi @@ -2,7 +2,7 @@ /* * Realtek RTD1295 SoC * - * Copyright (c) 2016-2017 Andreas Färber + * Copyright (c) 2016-2019 Andreas Färber */ #include "rtd129x.dtsi" @@ -47,17 +47,6 @@ }; }; - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - tee@10100000 { - reg = <0x10100000 0xf00000>; - no-map; - }; - }; - timer { compatible = "arm,armv8-timer"; interrupts = #include @@ -19,6 +17,25 @@ #address-cells = <1>; #size-cells = <1>; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + rpc_comm: rpc@1f000 { + reg = <0x1f000 0x1000>; + }; + + rpc_ringbuf: rpc@1ffe000 { + reg = <0x1ffe000 0x4000>; + }; + + tee: tee@10100000 { + reg = <0x10100000 0xf00000>; + no-map; + }; + }; + arm_pmu: arm-pmu { compatible = "arm,cortex-a53-pmu"; interrupts = ; From patchwork Mon Dec 2 10:29:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 180580 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp5010180ile; Mon, 2 Dec 2019 02:29:26 -0800 (PST) X-Google-Smtp-Source: APXvYqzVzJk0RBYtDO/S2jZCAISztf16sSVLmRSxaZxFOE3K2R8cRUpXLgiXIV/plciYaPHdLgDF X-Received: by 2002:aa7:d8d4:: with SMTP id k20mr55826162eds.144.1575282566521; Mon, 02 Dec 2019 02:29:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575282566; cv=none; d=google.com; s=arc-20160816; b=wxhbVWVnbmIry7YwWdJmf7agznYkkER6md6aTJm7uIxEPmM/Lk6oZP7Hr7hCdvixE2 FsTopK1ZVjbHAOr1jw55oxRPWnANdbA6Rs6lVo7zyCpRaWtlogJfT2rc2jVVbYMvKrrS YG0OkSEMxd75kmTLReZ4yQ7b7BFONDb+wqhKwO/Uu71ytlyoI4I4DI9NpjJTKu3LUWhX A1k5l6yiUsJWe9CsfTbblSsGhjRbtFbGbb72E59/FVfXgXr+yn6gRas2dWaXSDqOTRgc 0g4nWwSnWq2U9RFKWKIB+/cjYb5dJAj9q0bnnjNe2k1xp6Sv9KjFSNX9rUKn4b51P1AA 8Thw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=oMM6MCfq3UUPNyhzpEmk/l4VjfJFWHU+eALLjUdsMbk=; b=B9N1MxF2eCe/u0TJacnh+jVMnnsPcRtzRE0+5mFoKSZaItAqBAmzrY4i1/KFZ30dpk yZ0rPtmgMJOricmY72p4uSOHra7DlD4J+Nc9N0V3ZjsVMf+TRA+wyIYP0gIMQBo7DmBi 4z8OzhQocMFPrMNoFi1NjL0Nf1OsMDPiatFVQCKGwML3Qf+VI+z7ukN8nzcJhP/YAC5W nmTgJ3D7iM+1/EjdmpnF5mS9Y4gTMm2o0JOdYIfoIKTo11SBxkCiysHP7ip4nRvl/Nb5 U9q15BJl5GtvuVqwmSCQhZ+B72Ahkn8IRQEUR0/AAQ4v8mu2qMtSexBedwUCJ+Fs8LGR XIRQ== ARC-Authentication-Results: i=1; mx.google.com; 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 g2si3519668ejf.191.2019.12.02.02.29.26; Mon, 02 Dec 2019 02:29:26 -0800 (PST) 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; 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 S1726557AbfLBK3Y (ORCPT + 8 others); Mon, 2 Dec 2019 05:29:24 -0500 Received: from mx2.suse.de ([195.135.220.15]:57536 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726330AbfLBK3X (ORCPT ); Mon, 2 Dec 2019 05:29:23 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id E3A61B29F; Mon, 2 Dec 2019 10:29:20 +0000 (UTC) From: =?utf-8?q?Andreas_F=C3=A4rber?= To: linux-realtek-soc@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andreas_F=C3=A4rber?= , James Tai , Rob Herring , Mark Rutland , Arnd Bergmann , devicetree@vger.kernel.org Subject: [PATCH v2 4/9] arm64: dts: realtek: rtd129x: Carve out boot ROM from memory Date: Mon, 2 Dec 2019 11:29:05 +0100 Message-Id: <20191202102910.26916-5-afaerber@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191202102910.26916-1-afaerber@suse.de> References: <20191202102910.26916-1-afaerber@suse.de> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Update DS418j, MeLE V9, PROBOX2 AVA, Zidoo X9S and DS418 /memory nodes to exclude 0..0x1efff from reg entry and update unit address to match. Add this region to /soc ranges and for now just update the /memreserve/s. Suggested-by: Rob Herring Fixes: 72a7786c0a0d ("ARM64: dts: Add Realtek RTD1295 and Zidoo X9S") Fixes: d938a964a966 ("arm64: dts: realtek: Add ProBox2 Ava") Fixes: a9ce6f854581 ("arm64: dts: realtek: Add MeLE V9") Fixes: cf976f660ee8 ("arm64: dts: realtek: Add RTD1293 and Synology DS418j") Fixes: 5133636e41a2 ("arm64: dts: realtek: Add RTD1296 and Synology DS418") Cc: James Tai Signed-off-by: Andreas Färber --- v2: New arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts | 6 +++--- arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts | 6 +++--- arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts | 6 +++--- arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 4 ++-- arch/arm64/boot/dts/realtek/rtd1296-ds418.dts | 4 ++-- arch/arm64/boot/dts/realtek/rtd129x.dtsi | 9 +++++---- 6 files changed, 18 insertions(+), 17 deletions(-) -- 2.16.4 diff --git a/arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts b/arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts index b2dd583146b4..b2e44c6c2d22 100644 --- a/arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts +++ b/arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* - * Copyright (c) 2017 Andreas Färber + * Copyright (c) 2017-2019 Andreas Färber */ /dts-v1/; @@ -11,9 +11,9 @@ compatible = "synology,ds418j", "realtek,rtd1293"; model = "Synology DiskStation DS418j"; - memory@0 { + memory@1f000 { device_type = "memory"; - reg = <0x0 0x40000000>; + reg = <0x1f000 0x3ffe1000>; /* boot ROM to 1 GiB */ }; aliases { diff --git a/arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts b/arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts index bd584e99fff9..cf4a57c012a8 100644 --- a/arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts +++ b/arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Andreas Färber + * Copyright (c) 2017-2019 Andreas Färber * * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ @@ -12,9 +12,9 @@ compatible = "mele,v9", "realtek,rtd1295"; model = "MeLE V9"; - memory@0 { + memory@1f000 { device_type = "memory"; - reg = <0x0 0x80000000>; + reg = <0x1f000 0x7ffe1000>; /* boot ROM to 2 GiB */ }; aliases { diff --git a/arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts b/arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts index 8e2b0e75298a..14161c3f304d 100644 --- a/arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts +++ b/arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Andreas Färber + * Copyright (c) 2017-2019 Andreas Färber * * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ @@ -12,9 +12,9 @@ compatible = "probox2,ava", "realtek,rtd1295"; model = "PROBOX2 AVA"; - memory@0 { + memory@1f000 { device_type = "memory"; - reg = <0x0 0x80000000>; + reg = <0x1f000 0x7ffe1000>; /* boot ROM to 2 GiB */ }; aliases { diff --git a/arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts b/arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts index e98e508b9514..4beb37bb9522 100644 --- a/arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts +++ b/arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts @@ -11,9 +11,9 @@ compatible = "zidoo,x9s", "realtek,rtd1295"; model = "Zidoo X9S"; - memory@0 { + memory@1f000 { device_type = "memory"; - reg = <0x0 0x80000000>; + reg = <0x1f000 0x7ffe1000>; /* boot ROM to 2 GiB */ }; aliases { diff --git a/arch/arm64/boot/dts/realtek/rtd1296-ds418.dts b/arch/arm64/boot/dts/realtek/rtd1296-ds418.dts index 5a051a52bf88..cc706d13da8b 100644 --- a/arch/arm64/boot/dts/realtek/rtd1296-ds418.dts +++ b/arch/arm64/boot/dts/realtek/rtd1296-ds418.dts @@ -11,9 +11,9 @@ compatible = "synology,ds418", "realtek,rtd1296"; model = "Synology DiskStation DS418"; - memory@0 { + memory@1f000 { device_type = "memory"; - reg = <0x0 0x80000000>; + reg = <0x1f000 0x7ffe1000>; /* boot ROM to 2 GiB */ }; aliases { diff --git a/arch/arm64/boot/dts/realtek/rtd129x.dtsi b/arch/arm64/boot/dts/realtek/rtd129x.dtsi index 5e755dda7abb..0de9e675be16 100644 --- a/arch/arm64/boot/dts/realtek/rtd129x.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd129x.dtsi @@ -5,8 +5,8 @@ * Copyright (c) 2016-2019 Andreas Färber */ -/memreserve/ 0x0000000000000000 0x0000000000030000; -/memreserve/ 0x0000000000030000 0x00000000000d0000; +/memreserve/ 0x0000000000000000 0x000000000001f000; +/memreserve/ 0x000000000001f000 0x00000000000e1000; /memreserve/ 0x0000000001b00000 0x00000000004be000; #include @@ -52,8 +52,9 @@ compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; - /* Exclude up to 2 GiB of RAM */ - ranges = <0x80000000 0x80000000 0x80000000>; + ranges = <0x00000000 0x00000000 0x0001f000>, /* boot ROM */ + /* Exclude up to 2 GiB of RAM */ + <0x80000000 0x80000000 0x80000000>; rbus: bus@98000000 { compatible = "simple-bus"; From patchwork Mon Dec 2 10:29:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 180579 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp5010166ile; Mon, 2 Dec 2019 02:29:26 -0800 (PST) X-Google-Smtp-Source: APXvYqyC8zax9/kQTaF/62LxhOHPRQ5usMveIsSdjvrw19jY2FbgR6oX1vJRobnWpkIKGqbGEmnx X-Received: by 2002:a50:ce56:: with SMTP id k22mr29046710edj.34.1575282566173; Mon, 02 Dec 2019 02:29:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575282566; cv=none; d=google.com; s=arc-20160816; b=yAaXQ21g6S2t+GO5jN0dxiNbFL26e4iFhdlZgRDqokx0q+vF5d74K2t0WDEyywySrZ k9QSSdx3ZPVhG8aTBancxgvIy9Ch5VWIkY26iy3YoM3OuKAVBkhEm8/gUhra1tgbI9uK UKoteDNLx80yJgiYBG4zsRM7j6S77rqV5wBePRvwa/dcmW8qjPeWZ+Bz7xVsGEnBwfzy 1KT3uIhJCHKpnnIQ1ktSwrVuhk92WXh+k+U4bsUxBc5T0xAT/G0TLrVg9iu1c3zAveq8 KQildALT4lFU+u7k1c+BGosyxdvLaX+Gr3BnaEbLxsDBk7klWm/LMA8/AlSWI05HwyLK 6M+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=9/1mqy2ZOH2KzUBzDd4hNeNQVXjsrJ7tE9lh3JTjgNs=; b=yfYnLTFpt3O6MEYREJzso95xdGMuuvS7rsW381IEW4z5W5cr3Z96RR+6ccfxD5SFEx pgIrI35DaxcBfskjxT5Hk4vvvEdTOn0p4WwRXcC+JCEEiGVM0optQCeKQxkZYrhxWzvA 5yzTKxUieryrcsRPy7ryTZo323X/3WthqPSviODo3SqG2W0cGCZq5WWD6ZC268TNTv6S 5HxI/zTR1MDSBXMrCE20EYIavFGYcNAGI3cKe8w7EPPpOFYbJgmB7Ik3LVl672n4li6h X3VneI/4yOy0Gdl4zky937uWdD5YwuO8S4S26AmX/LQDVA+rdK9xGLAdPb5Pu0b1vY7P RAPg== ARC-Authentication-Results: i=1; mx.google.com; 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 g2si3519668ejf.191.2019.12.02.02.29.25; Mon, 02 Dec 2019 02:29:26 -0800 (PST) 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; 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 S1727453AbfLBK3X (ORCPT + 8 others); Mon, 2 Dec 2019 05:29:23 -0500 Received: from mx2.suse.de ([195.135.220.15]:57564 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727430AbfLBK3X (ORCPT ); Mon, 2 Dec 2019 05:29:23 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 6E18EB2B3; Mon, 2 Dec 2019 10:29:21 +0000 (UTC) From: =?utf-8?q?Andreas_F=C3=A4rber?= To: linux-realtek-soc@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andreas_F=C3=A4rber?= , James Tai , Rob Herring , Mark Rutland , devicetree@vger.kernel.org Subject: [PATCH v2 5/9] arm64: dts: realtek: rtd16xx: Carve out boot ROM from memory Date: Mon, 2 Dec 2019 11:29:06 +0100 Message-Id: <20191202102910.26916-6-afaerber@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191202102910.26916-1-afaerber@suse.de> References: <20191202102910.26916-1-afaerber@suse.de> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Update Mjolnir /memory node to exclude 0..0x2dfff from reg entry. Add this region to /soc ranges instead. Suggested-by: Rob Herring Cc: James Tai Signed-off-by: Andreas Färber --- TODO: Add Fixes header once RTD1619 has a stable -rc1 based commit hash. To be followed up by patch unshadowing more RAM from /soc 0x98000000..0xffffffff, once we know the higher RAM windows. v2: New arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts | 5 +++-- arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) -- 2.16.4 diff --git a/arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts b/arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts index 44dd67e04335..90ed6681468f 100644 --- a/arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts +++ b/arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts @@ -1,6 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * Copyright (c) 2019 Realtek Semiconductor Corp. + * Copyright (c) 2019 Andreas Färber */ /dts-v1/; @@ -11,9 +12,9 @@ compatible = "realtek,mjolnir", "realtek,rtd1619"; model = "Realtek Mjolnir EVB"; - memory@0 { + memory@2e000 { device_type = "memory"; - reg = <0x0 0x80000000>; + reg = <0x2e000 0x7ffd2000>; /* boot ROM to 2 GiB */ }; chosen { diff --git a/arch/arm64/boot/dts/realtek/rtd16xx.dtsi b/arch/arm64/boot/dts/realtek/rtd16xx.dtsi index c7bbf2c7bb7c..69cc0d941c8d 100644 --- a/arch/arm64/boot/dts/realtek/rtd16xx.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd16xx.dtsi @@ -3,6 +3,7 @@ * Realtek RTD16xx SoC family * * Copyright (c) 2019 Realtek Semiconductor Corp. + * Copyright (c) 2019 Andreas Färber */ #include @@ -107,7 +108,8 @@ compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; - ranges = <0x98000000 0x98000000 0x68000000>; + ranges = <0x00000000 0x00000000 0x0002e000>, /* boot ROM */ + <0x98000000 0x98000000 0x68000000>; rbus: bus@98000000 { compatible = "simple-bus";