Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2891643pxb; Tue, 24 Aug 2021 10:00:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEPvmb6o3m9reH8Ivr0+XhoxrYwGDIU/fHAXqhJL4NJnDjOcbZ2qjFkxGO1FaLKJV/WlJ8 X-Received: by 2002:a05:6402:160a:: with SMTP id f10mr24279978edv.355.1629824408343; Tue, 24 Aug 2021 10:00:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629824408; cv=none; d=google.com; s=arc-20160816; b=VcxGyPQOnycz6DsSnThqO1BbAfgs6hhKLitvMCjn0GfY7kUzxa+vCOhar3TsMrQ/ap 73UNdOowMdV0rWD97c9aWUE+URGmS0etWRvbWeh7L5NVSS/F5xvlMYwRg5ps+VLOdPU5 LgMWUuuJf3m1jJwhfDerOXf3z4jedmLdVnnn7zW/eMKFwmeZjKbCrn1kCXiPXU+ZGugn MMSyMhXu85NPZvoWu/sgErMrCueCtZiqFF91OYM/mL98VYDwaw0JnaIXn6cV+ofuM7wk xII1E6keTpCIMw1Bl64GUUlgY/stQQpHKqqdVjI5inS5si9J/ayEpPKltOARiSAIeAkW iy6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GXFai8GtEpsTn0fdPK0Itlv+nkseYdetQdqCX+WPqII=; b=RxZEjeGpbKxIiCwYvpHxuXwXrvTuwy/07l3tPz389YKSLveBccxQVtqHF7qcxLXqDn e/C2UEl6B5v3tqDkb44N5kKyQ/J0P1kdhm6HRD0Y88FgCsQ05tyjWFMT62u/y1wuSzgg 06HMlTsqctYWz7tZJwLGNmCB9zTiW8PELb+IPulvYzoT313SrYqf8gVd3cY1HDk5ePmN KQMSVLAN6yS41zRV7XVZrafxI2crPBinafrDWtRP36KU7XO8S+VVfzztB+V6yWCyNEtP BDsIe/lqERAws1hq9ryBwVi4fSopf2O+qv3kDO+FLyMQ9vwW+6Sj9Dhst2JqAaecM7Gf e21Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gklw8EW0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h8si18169727edb.476.2021.08.24.09.59.45; Tue, 24 Aug 2021 10:00:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gklw8EW0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234603AbhHXQ6Y (ORCPT + 99 others); Tue, 24 Aug 2021 12:58:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:39066 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232797AbhHXQ5V (ORCPT ); Tue, 24 Aug 2021 12:57:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A8BE0613E8; Tue, 24 Aug 2021 16:56:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824197; bh=ZOcgwKbm5nIdqPe3lzCOmutXRonodFE/uiWfF8pp+jM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gklw8EW0KN1RLzeYteVWNCl+S21PtLlZwSx7x4gDDMwccYglnpgx2I7V2cD7p08js uWxtKpNW5mg0YmOBL9+h8XT3HOzs2szb+7TWIjDrxQuhh/Oh6ZZTYboOzustbhwXTj SXcKVAA+kjenXEC8CCW28tLFnejGVHwOx/OdEliE78mzUpAMe6QQsygCZcnvOyVhmx bFVsa0PbRc6MHCMm6Q2/2cemSDdHFVFrra2PVy7c1/Nux9vzifKHXoWvJ/mUGsUSkT uW+Lg2+vKZ518gLJOwAOdrsW070Jr0OeNwX0ksZVMh+ZuJz38IyUpZDZk1xLdIYHuy +31GFcYzE6QIQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Petr Vorel , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.13 029/127] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem mapping Date: Tue, 24 Aug 2021 12:54:29 -0400 Message-Id: <20210824165607.709387-30-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824165607.709387-1-sashal@kernel.org> References: <20210824165607.709387-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.13.13-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.13.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.13.13-rc1 X-KernelTest-Deadline: 2021-08-26T16:55+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Petr Vorel [ Upstream commit 3cb6a271f4b04f11270111638c24fa5c0b846dec ] cont_splash_mem has different memory mapping than generic from msm8994.dtsi: [ 0.000000] cma: Found cont_splash_mem@0, memory base 0x0000000003400000, size 12 MiB, limit 0xffffffffffffffff [ 0.000000] cma: CMA: reserved 12 MiB at 0x0000000003400000 for cont_splash_mem This fixes boot. Fixes: 976d321f32dc ("arm64: dts: qcom: msm8992: Make the DT an overlay on top of 8994") Signed-off-by: Petr Vorel Link: https://lore.kernel.org/r/20210713185734.380-3-petr.vorel@gmail.com Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts index 5c6e17f11ee9..1ccca83292ac 100644 --- a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts +++ b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts @@ -10,6 +10,9 @@ #include "pm8994.dtsi" #include "pmi8994.dtsi" +/* cont_splash_mem has different memory mapping */ +/delete-node/ &cont_splash_mem; + / { model = "LG Nexus 5X"; compatible = "lg,bullhead", "qcom,msm8992"; @@ -42,6 +45,11 @@ ftrace-size = <0x10000>; pmsg-size = <0x20000>; }; + + cont_splash_mem: memory@3400000 { + reg = <0 0x03400000 0 0x1200000>; + no-map; + }; }; }; -- 2.30.2