From patchwork Wed Mar 15 11:19:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 664278 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB353C7618A for ; Wed, 15 Mar 2023 11:20:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231154AbjCOLUs (ORCPT ); Wed, 15 Mar 2023 07:20:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231374AbjCOLU0 (ORCPT ); Wed, 15 Mar 2023 07:20:26 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F89E62B75 for ; Wed, 15 Mar 2023 04:19:58 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id l1so16930106wry.12 for ; Wed, 15 Mar 2023 04:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678879193; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=EmJQmSLAdC0WtS3STT0wWc+AeCLwgpzodfCAhTdjfEQ=; b=kZoLoaKq4++Zg0XlEBc+O524i/T3zhsI0XJoOZIepOVnhA+Ce57DzTKsTQk24DJ6VS 6LiUXGpYk68nxAfOyjzRYGB4ihlWpyFr4LjQeTYfyIbkP2vHZQAGQ7sG4Kn4BYgy3a5q cfWIqxwScEMmmz+CXeqits+nNSMbwK5V/ajQ+eImxkhvDGMBX8uU25dnqooMQGt/c0S3 +QkhBygQcYpG1w4YDqNzXxJlMcH7+XWijb0cfTXRzYLV5zD46wqTZH7seW64IwHtyIgL POVRwVi922EZ+9mzAI5DSRv7+va1XVGy4LqnatrxuimnFdI2ekyfl2Hj2vofb7AnXbZl /G9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678879193; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=EmJQmSLAdC0WtS3STT0wWc+AeCLwgpzodfCAhTdjfEQ=; b=rshL3kMFqvANcpcEXT9lsaqoBQlnlaz83FlhwML44sBRcqsMYcRv1DXLHkBMaEoc8t FRnvzBuui7ZQibB3xM6uSYFqgOS60v/P95a5/m7l6/JAyP8asiEyVCTvEpcsynP3ceSs hgUbn/bcGhnqyYUAMJ82jO5SPLXl0ak722H2kl9xXeZohjlyZeMfo6V9OI9pg/azwEOu S9b8GZHrLBuSHejzBjRVYv7fDG6r+0eerYoE7sVvM69VSas1zWexjtTRfhxRKvTTQKpU u+Pb3wAJjdEyENbJsZ8AyUM4XPC/eInEBQkY5HE3ZCW2I0KegPBBjEw1A6vn88g3mc7f 8i3A== X-Gm-Message-State: AO0yUKV+8r+kfs/rb9+HBYlL5hTJvL9BSvmiFs6tP0n7qkmAzsE1khuH Rod+xlSyFUFdxEYVDIQ+L0gP0A== X-Google-Smtp-Source: AK7set/KeTl9OJvQqovTWcjALV01qYRi3aDVbanxxgY1tmvvlwN7HQJUghGt+tDyB9pfRe5G3K5iDQ== X-Received: by 2002:adf:f748:0:b0:2cf:efc0:bd95 with SMTP id z8-20020adff748000000b002cfefc0bd95mr1498346wrp.38.1678879193022; Wed, 15 Mar 2023 04:19:53 -0700 (PDT) Received: from lion.caleb.cas.dev (cpc76484-cwma10-2-0-cust274.7-3.cable.virginm.net. [82.31.201.19]) by smtp.gmail.com with ESMTPSA id d13-20020adffbcd000000b002c55521903bsm4250015wrs.51.2023.03.15.04.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 04:19:52 -0700 (PDT) From: Caleb Connolly To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Krzysztof Kozlowski , Rob Herring Cc: Caleb Connolly , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v2 1/2] arm64: dts: qcom: sdm845: add framebuffer reserved memory Date: Wed, 15 Mar 2023 11:19:45 +0000 Message-Id: <20230315111947.3807083-1-caleb.connolly@linaro.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The bootloader configures a framebuffer in memory to display splash screens or other information. This configuration is overriden when the display pipeline probes, but never unmapped from the SMMU. To prevent issues from the kernel trying to allocate in this region and to allow using the framebuffer for debugging, many devices already reserve this region. All devices follow MTP and use the same address for this region, Cheza is a likely exception though I'm not able to validate that. Some devices only reserve the size needed to store the actual framebuffer, this is incorrect as on all devices I've checked the full 0x2400000 bytes are mapped. This patch moves the framebuffer region to sdm845.dtsi and removes it from each individual device. This ensures that the correct size is always reserved and prevents having the add the region for each individual device. This patch specifically ensures that this region is now reserved on the OnePlus 6, where it wasn't before. Signed-off-by: Caleb Connolly --- Changes since v1: * Offer more context and justification for this change * Make sure Cheza doesn't inherit the node. --- arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 6 ------ arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts | 5 ----- arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 5 ----- arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 6 ------ .../arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 6 ------ arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +++++ arch/arm64/boot/dts/qcom/sdm850.dtsi | 2 ++ 7 files changed, 7 insertions(+), 28 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi index f942c5afea9b..6a1c674a015b 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi @@ -93,12 +93,6 @@ spss_mem: memory@99000000 { no-map; }; - /* Framebuffer region */ - memory@9d400000 { - reg = <0x0 0x9d400000 0x0 0x2400000>; - no-map; - }; - /* rmtfs lower guard */ memory@f0800000 { reg = <0 0xf0800000 0 0x1000>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts index d37a433130b9..7c2457948a32 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts @@ -55,11 +55,6 @@ vreg_s4a_1p8: pm8998-smps4 { }; reserved-memory { - memory@9d400000 { - reg = <0x0 0x9d400000 0x0 0x02400000>; - no-map; - }; - memory@a1300000 { compatible = "ramoops"; reg = <0x0 0xa1300000 0x0 0x100000>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts index b54e304abf71..4f6b1053c15b 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts @@ -60,11 +60,6 @@ key-vol-up { }; reserved-memory { - framebuffer_region@9d400000 { - reg = <0x0 0x9d400000 0x0 (1080 * 2160 * 4)>; - no-map; - }; - ramoops: ramoops@b0000000 { compatible = "ramoops"; reg = <0 0xb0000000 0 0x00400000>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi index 4984c7496c31..7e273cc0158d 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi @@ -79,12 +79,6 @@ vreg_s4a_1p8: pm8998-smps4 { }; reserved-memory { - /* SONY was cool and didn't diverge from MTP this time, yay! */ - cont_splash_mem: memory@9d400000 { - reg = <0x0 0x9d400000 0x0 0x2400000>; - no-map; - }; - ramoops@ffc00000 { compatible = "ramoops"; reg = <0x0 0xffc00000 0x0 0x100000>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index e0fda4d754fe..191c2664f721 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -98,12 +98,6 @@ spss_mem: memory@97f00000 { no-map; }; - /* Cont splash region set up by the bootloader */ - cont_splash_mem: framebuffer@9d400000 { - reg = <0 0x9d400000 0 0x2400000>; - no-map; - }; - rmtfs_mem: memory@f6301000 { compatible = "qcom,rmtfs-mem"; reg = <0 0xf6301000 0 0x200000>; diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 479859bd8ab3..ecec2ee46683 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -865,6 +865,11 @@ spss_mem: spss@97b00000 { no-map; }; + cont_splash_mem: framebuffer@9d400000 { + reg = <0 0x9d400000 0 0x2400000>; + no-map; + }; + mdata_mem: mpss-metadata { alloc-ranges = <0 0xa0000000 0 0x20000000>; size = <0 0x4000>; diff --git a/arch/arm64/boot/dts/qcom/sdm850.dtsi b/arch/arm64/boot/dts/qcom/sdm850.dtsi index da9f6fbe32f6..b787575c77a5 100644 --- a/arch/arm64/boot/dts/qcom/sdm850.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm850.dtsi @@ -7,6 +7,8 @@ #include "sdm845.dtsi" +/delete-node/ &cont_splash_mem; + &cpu4_opp_table { cpu4_opp33: opp-2841600000 { opp-hz = /bits/ 64 <2841600000>; From patchwork Wed Mar 15 11:19:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 663609 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97D8EC76195 for ; Wed, 15 Mar 2023 11:20:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231374AbjCOLUt (ORCPT ); Wed, 15 Mar 2023 07:20:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231527AbjCOLU3 (ORCPT ); Wed, 15 Mar 2023 07:20:29 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9402F12BC2 for ; Wed, 15 Mar 2023 04:20:01 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id y14so4284523wrq.4 for ; Wed, 15 Mar 2023 04:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678879194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V4lIKxT2fGoirRHmch8dzAkOMft+emleSnT/iIO7ryY=; b=qEBZGcIwIGAd2at6H9jZUl/tx9Z9iMV7iFxl8LkThoqL36dWKkoJTyjGu+eVHPxQNz khgUsvvGOHnquG+NoUZUmaSepqq40281Gka6xbC57tvYNXy5ly/LiFF/yJpobRo1ciEx VFCwva1sU4dbHkLGVozJYUMuWPmTlZ5OqGi8ix0UftnEnbxDJ5RRlL2GzvlLoetr7cgd xajJEdOo7TUEYmd3WI2J+w7yO7mhldFqyHqI2yQ7C8H7y0AX+Tsu7y/5zqd8p7wUfyfw f6tpNz1aCJvFffVEucPGr/kllav+4+YABMbHuV6PqZh/Rl6Rajs7ZxBFZjE2AgfZcZJ2 f/UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678879194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V4lIKxT2fGoirRHmch8dzAkOMft+emleSnT/iIO7ryY=; b=cz6EU2jeIiUEirW2CbWQPw1wR1/9v4YKt3qbXZ2W++Yp/v9/PClsBuBj+n+wv5zpp8 oHrbzDAXW1/WpxdvjBRjQ6a/FYxm1ZR8LSFOviPtAXHQFz5GwCSiRkq3Pt6gb86yGoAM gfjgujf1F1LVjT2sCLbjH/E+zhBVyXyK1TUb4F/C8+0qT4lxWph12e0TFBDJ1CE6oZAg NVQ8ISxg7tZJtCz8LlbMYyXtVp1XmnP/6nzXvBJ68MlqbOoC7Zgi9TFGJ+rWT59G1TtS 9yqXxHzVV7EJ+QEI0G2ANEQLe+w/bjbacc2AABOOC9AvnZ0DriM/j1cJlG/MtOqS2nTX AJag== X-Gm-Message-State: AO0yUKUvibDl2xF/MIGLZM7knOr25sLfeUfroK53RVthqpn5WFLxa6tv h5lU9mwli+afm32TSgKxIR8FRWGqdFq8jwEZ6+sPwA== X-Google-Smtp-Source: AK7set/Fc8+nzOWDf/h9rE6Qamjt7uImZWspknxs+LN1Fq/dt9PUbqVcXIy7K5f2TqSZE/rbZ0VQBA== X-Received: by 2002:adf:e707:0:b0:2ce:a162:784c with SMTP id c7-20020adfe707000000b002cea162784cmr1530128wrm.65.1678879194571; Wed, 15 Mar 2023 04:19:54 -0700 (PDT) Received: from lion.caleb.cas.dev (cpc76484-cwma10-2-0-cust274.7-3.cable.virginm.net. [82.31.201.19]) by smtp.gmail.com with ESMTPSA id d13-20020adffbcd000000b002c55521903bsm4250015wrs.51.2023.03.15.04.19.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 04:19:54 -0700 (PDT) From: Caleb Connolly To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Krzysztof Kozlowski , Rob Herring Cc: Caleb Connolly , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v2 2/2] arm64: dts: qcom: sdm850: commonise framebuffer memory Date: Wed, 15 Mar 2023 11:19:46 +0000 Message-Id: <20230315111947.3807083-2-caleb.connolly@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315111947.3807083-1-caleb.connolly@linaro.org> References: <20230315111947.3807083-1-caleb.connolly@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This region needs to be reserved as it's mapped by the bootloader and the kernel doesn't currently have a way of unmapping it. Both the Galaxy Book2 and C630 use the same address and size for the framebuffer reserved memory region. Move the definition to sdm850.dtsi. The c630 was missing this region, this patch ensures that it's reserved there too. Signed-off-by: Caleb Connolly --- arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 6 ------ arch/arm64/boot/dts/qcom/sdm850.dtsi | 9 +++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts index 9850140514ba..6e36ad2f2d3e 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts @@ -61,12 +61,6 @@ aliases { /* Reserved memory changes */ reserved-memory { - /* Bootloader display framebuffer region */ - cont_splash_mem: memory@80400000 { - reg = <0x0 0x80400000 0x0 0x960000>; - no-map; - }; - qseecom_mem: memory@8b500000 { reg = <0 0x8b500000 0 0xa00000>; no-map; diff --git a/arch/arm64/boot/dts/qcom/sdm850.dtsi b/arch/arm64/boot/dts/qcom/sdm850.dtsi index b787575c77a5..89eda97daa57 100644 --- a/arch/arm64/boot/dts/qcom/sdm850.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm850.dtsi @@ -9,6 +9,15 @@ /delete-node/ &cont_splash_mem; +/ { + reserved-memory { + cont_splash_mem: framebuffer@80400000 { + reg = <0x0 0x80400000 0x0 0x960000>; + no-map; + }; + }; +}; + &cpu4_opp_table { cpu4_opp33: opp-2841600000 { opp-hz = /bits/ 64 <2841600000>;