From patchwork Wed Feb 6 05:13:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 157556 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6000876jaa; Tue, 5 Feb 2019 21:13:52 -0800 (PST) X-Google-Smtp-Source: AHgI3IZHSfLKo8bDmFz56J8UVfPlE9jJtrLvDvwc2fkoSsnGN08JbDu9mJ20zjNqyDvBDIklpCIc X-Received: by 2002:a17:902:8a91:: with SMTP id p17mr8919263plo.316.1549430032360; Tue, 05 Feb 2019 21:13:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549430032; cv=none; d=google.com; s=arc-20160816; b=wT5j5xLoZWAol2XkZs19cL2whqh2h23MxfYAzNwcNwsX/9jY9J9lbUuLLzSx0m3JYV A2861oCDvKzdyKiKqr0Izfd7emdPLFqR4oKyEU8+Zh99cruOdiJs/cEIO6qqXwkLKa3G tGhARdTI8aAdxbNxefcYiWU4WWMn34frquXp4BlKTIDPxi4koo43iqWonD2NgiF9rplu yOE3/iXCfjsYi7zFJ8rBIL7BXGuYZTFLKW6lJ7AjbOoLeQwq57r70msL2b+9A1ccvwuB u0oL6ysnzCm/+ywr9EoH4xOdcF6319eCVzKb3HxsvC+LW4Rg+suz52TeVk8IjuIj9KPD dfRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=6eBUJRtxTOfCi5YseNIZQjzHG28hQt9IsL5ROy/8BF4=; b=YYSEaWRwubX6fa2/1XLHK8M+h1XV2eoka94shgZymGyqzl6xd2AwT6wkKgUpcnZ4f2 D0yF8IBaBEjXRCJ/Q83wnFJpU7rYy44pJsA6JZpgm/iPrvSv3+3aM3o+LzQ+9DFxp7m2 NbjPlLAj4xcI0/zgP+tBtapnMFpC8Ijw5Jd/CI+WdWmcAvz6ZiUQUaWq5Gf4HUNJe5my vE+SWweM09x10qrFZlEcULJR/Dth6Gh/gDOI+tBdvOAZ1dHUdIUxtDs44UhQ9syCO0it cjPy3oyYt7RlXrUL961pc3A4M/CESXFfCOxaN++DS2Wse+/nDAd9GykveuwlbX4wq4Np 0VNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eXFiE3TJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w11si3972824pfk.210.2019.02.05.21.13.52; Tue, 05 Feb 2019 21:13:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@linaro.org header.s=google header.b=eXFiE3TJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727591AbfBFFNo (ORCPT + 31 others); Wed, 6 Feb 2019 00:13:44 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:34466 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727378AbfBFFNo (ORCPT ); Wed, 6 Feb 2019 00:13:44 -0500 Received: by mail-pf1-f194.google.com with SMTP id h3so2581827pfg.1 for ; Tue, 05 Feb 2019 21:13:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6eBUJRtxTOfCi5YseNIZQjzHG28hQt9IsL5ROy/8BF4=; b=eXFiE3TJp96F2GlZiaJR3MD+eVMpqVUSw/7P8nOrNfHdev5fVN5fZlP4fbi6H2OK69 8Qz9+8L4Qk0et7vriyydSqaumgqpqJkyK3Sno1PZ8Vp/bnCyOzXKnns5eKuNkV2lQC9P 7TQUjYCKTvcVRSkcjKucaRy3v7WWxdowXsJXzT8GFs/1vPwmN3GgtRQFK+JgCNVAWkrW SpcuHZ5UnZzWzQ2sdDwUdapIkJT2rUwWWrJuUGi9AEN8w4bq25w3ztpkfnyCdOYsT+rF wmnrEOQFoSMBUWmksFOWzrzypSneaBFF513yvYHB1i91Cflkeq9tD6bDADBU8DKSLRf0 lEdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6eBUJRtxTOfCi5YseNIZQjzHG28hQt9IsL5ROy/8BF4=; b=VM01QquxiNVGBvnVYvbocF+3QbdtbJE8kabkxnEOWvR1+wMuJ9VrWCjrSkkhUiWxky YBy0rjO/gVIwZqC7XTqV+s/Y7yq3wqdKNTbVoj8+qzjI7VFLpxuvNFOWcOkVN5YZ0SYJ Lrl9Vgp/0tjmphjRkEw3PKK2+uXasyJGps3J11KDyiHCBySv/ndmWIgEJQ8zQEljziZv DevTudKKzFAxqTrPNYoT2VNDVreKazmwoM+E7JjPoKDJHG0MEWimpSdlq3i06TRbBZdt s1WG/a6CVdQOa7GACIpT+0sCqR647IO79zEqXzSlOaA1bmElQALQ5Lup/TDSDokU8N8d 4RPA== X-Gm-Message-State: AHQUAuYHRgIldI6R/XxVm+MZVmzEL7Eij9Q1CBKQi2de+Mi5xLLsT8Iq X2jgMulbNRNwUVtqPfHHuIz+U1EUTW8= X-Received: by 2002:a62:47d9:: with SMTP id p86mr8517917pfi.95.1549430023090; Tue, 05 Feb 2019 21:13:43 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id y71sm10735012pfi.123.2019.02.05.21.13.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 21:13:42 -0800 (PST) From: Bjorn Andersson To: Andy Gross Cc: David Brown , Rob Herring , Mark Rutland , Arun Kumar Neelakantam , Sibi Sankar , Doug Anderson , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 1/8] arm64: dts: qcom: sdm845: Update reserved memory map Date: Tue, 5 Feb 2019 21:13:28 -0800 Message-Id: <20190206051335.23799-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190206051335.23799-1-bjorn.andersson@linaro.org> References: <20190206051335.23799-1-bjorn.andersson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update existing and add missing regions to the reserved memory map, as described in version 10. Reviewed-by: Sibi Sankar Signed-off-by: Bjorn Andersson --- Changes since v5: - Replaced a few 0x0 with 0 - Corrected size of tz_mem arch/arm64/boot/dts/qcom/sdm845.dtsi | 74 +++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 7 deletions(-) -- 2.18.0 diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index ade2f385507c..16a060063882 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -72,29 +72,69 @@ #size-cells = <2>; ranges; - memory@85fc0000 { + hyp_mem: memory@85700000 { + reg = <0 0x85700000 0 0x600000>; + no-map; + }; + + xbl_mem: memory@85e00000 { + reg = <0 0x85e00000 0 0x100000>; + no-map; + }; + + aop_mem: memory@85fc0000 { reg = <0 0x85fc0000 0 0x20000>; no-map; }; - memory@85fe0000 { + aop_cmd_db_mem: memory@85fe0000 { compatible = "qcom,cmd-db"; - reg = <0x0 0x85fe0000 0x0 0x20000>; + reg = <0x0 0x85fe0000 0 0x20000>; no-map; }; smem_mem: memory@86000000 { - reg = <0x0 0x86000000 0x0 0x200000>; + reg = <0x0 0x86000000 0 0x200000>; no-map; }; - memory@86200000 { + tz_mem: memory@86200000 { reg = <0 0x86200000 0 0x2d00000>; no-map; }; - wlan_msa_mem: memory@96700000 { - reg = <0 0x96700000 0 0x100000>; + qseecom_mem: memory@8ab00000 { + reg = <0 0x8ab00000 0 0x1400000>; + no-map; + }; + + camera_mem: memory@8bf00000 { + reg = <0 0x8bf00000 0 0x500000>; + no-map; + }; + + ipa_fw_mem: memory@8c400000 { + reg = <0 0x8c400000 0 0x10000>; + no-map; + }; + + ipa_gsi_mem: memory@8c410000 { + reg = <0 0x8c410000 0 0x5000>; + no-map; + }; + + gpu_mem: memory@8c415000 { + reg = <0 0x8c415000 0 0x2000>; + no-map; + }; + + adsp_mem: memory@8c500000 { + reg = <0 0x8c500000 0 0x1a00000>; + no-map; + }; + + wlan_msa_mem: memory@8df00000 { + reg = <0 0x8df00000 0 0x100000>; no-map; }; @@ -103,10 +143,30 @@ no-map; }; + venus_mem: memory@95800000 { + reg = <0 0x95800000 0 0x500000>; + no-map; + }; + + cdsp_mem: memory@95d00000 { + reg = <0 0x95d00000 0 0x800000>; + no-map; + }; + mba_region: memory@96500000 { reg = <0 0x96500000 0 0x200000>; no-map; }; + + slpi_mem: memory@96700000 { + reg = <0 0x96700000 0 0x1400000>; + no-map; + }; + + spss_mem: memory@97b00000 { + reg = <0 0x97b00000 0 0x100000>; + no-map; + }; }; cpus {