From patchwork Mon Oct 17 18:22:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 3650 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1586992wrs; Mon, 17 Oct 2022 11:30:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6P2Umy3eJt6D1cvwEpqlsG0wXKuTfhYotydybKpZt0GoMIxRQ+upgTmB3qbVO0opbeCxxh X-Received: by 2002:a17:903:1109:b0:179:d220:1f55 with SMTP id n9-20020a170903110900b00179d2201f55mr13010671plh.42.1666031444123; Mon, 17 Oct 2022 11:30:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666031444; cv=none; d=google.com; s=arc-20160816; b=Ih9hBQVIMieyC18Z0JuW4aAZVPfQHlMXyEzur0gIUjDErAtpAO7bUbohWXpm9C4fEA rfBE/2GMVfYEjnQTbdlpIvU8A1zdOpTjxLFbSwNnYwO2Pmo419qJRpZbayuN2dlCJjkq tYtRKP1PWt6qPyIZqySMoxWzg+WZh7A/eGHV2kSqudYVKBc0XHFaA5+/qmGenHgDh6Eo v3zWKmKQPCPiyB1/fhTq1gltwugfO6poGNOSED1dqyHA4vrChUowoa+QbsihD+avIDDk FqVh5slrMTlPhmm68E7I0CTt+5K3Vpw548DrVt+Z+w6nGijBXYjE3/26ETP57QwC4a7w I4WA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Q6K0fLEBttx8lrk4TTwV2hs18H4QMB+rkLX1+fm4Wis=; b=RARKhLPYVM9HiKeCWhA6GldxsQu5U/1oa8qep9PqXhcedpUXKQD9PgwIsTaKp549U1 qNaXe6SOvRibZPsliyoiES9h1N/wZ8KyOGXB2U3JVFFa2EZisdXdkcHSuZJJYe5fd4jT Yd/NcWDM/gtn/IGlM/tWy4xCRdcDVEZOAL9BZHFhjCVjySJvyh6S48PjnbFUxNHzXXMi +FKp5VIdMB6npXdZmZZ74rwy2s5TkAAOcXpY0jod/tXnqxIPnl+AKgA2tXnqvfe9mTHP sOygZzKMKCs6nMy2nwllc1u0lMH5JVenrweQ7dB/1WuL0at4/5kbDKLKoDBtQXTeR2KL hGwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=nxqUGdiz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o3-20020a655203000000b004639c679346si12091137pgp.837.2022.10.17.11.30.29; Mon, 17 Oct 2022 11:30:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=nxqUGdiz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229871AbiJQSWq (ORCPT + 99 others); Mon, 17 Oct 2022 14:22:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229594AbiJQSWo (ORCPT ); Mon, 17 Oct 2022 14:22:44 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F272263852 for ; Mon, 17 Oct 2022 11:22:43 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id d24so11539430pls.4 for ; Mon, 17 Oct 2022 11:22:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Q6K0fLEBttx8lrk4TTwV2hs18H4QMB+rkLX1+fm4Wis=; b=nxqUGdizsCANm/EpHpz5hqb4AimuiKiL4vxSxSv4+4wYsCrg3ZX2r+R0nalfLws+lo hkpfcpbWLzwK3FjxPPyjYWRoo2eJlZVFqFfN1ttObKYlxV3X/0770D3G8e0NtmrnyM2h NRRQp2E9X5Q+TL0/EC7JOM6GGtX+WIi/eFLLU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Q6K0fLEBttx8lrk4TTwV2hs18H4QMB+rkLX1+fm4Wis=; b=oqhKW/a08V2DnU/RERZyyU+nTQspDIyWooEjjcv/zp2gGYEBfClMnpg1Bms8d3nq+m EpN4J9LAaXwukTd9HbVdd6R8p8RnGTKwtu4xt1VFmiZeNLecTj47uUsp0tz9XcApcUJE jaLY4dqROswxMl4n86pE+XDetPib8CnKPiZ1/gQyuPR9xqQRzfeAjKWKToeeVznA/RTY uPyxa6byc3LRb3svUfspAEe0BHqDdxSSo3hwkqoc5OasYp6Hd86mDIs10YSM6RcUwROQ PYKzrmWH6myCj0z4z6JELhYfMMP1BZyMM+UsIPExL9GZ5DicEvKmr8ADj2S8+0xfc3Oo LdsQ== X-Gm-Message-State: ACrzQf2pgRssImmzgPsPv2EMOHM/qicGu0kts1MsHn3MRT9/HAqkTeK3 aAzs0pPRVFC60hLhOWsk9RtObA== X-Received: by 2002:a17:903:2342:b0:181:bc30:b02f with SMTP id c2-20020a170903234200b00181bc30b02fmr12928368plh.30.1666030963439; Mon, 17 Oct 2022 11:22:43 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:9d:2:f043:fb90:4576:538b]) by smtp.gmail.com with ESMTPSA id n18-20020a170903111200b001782a0d3eeasm7014597plh.115.2022.10.17.11.22.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Oct 2022 11:22:42 -0700 (PDT) From: Stephen Boyd To: stable@vger.kernel.org Cc: Sibi Sankar , linux-kernel@vger.kernel.org, patches@lists.linux.dev, Evan Green , Bjorn Andersson , Alex Elder Subject: [PATCH] arm64: dts: qcom: sc7180-trogdor: Fixup modem memory region Date: Mon, 17 Oct 2022 11:22:41 -0700 Message-Id: <20221017182241.1086545-1-swboyd@chromium.org> X-Mailer: git-send-email 2.38.0.413.g74048e4d9e-goog MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746960587731032930?= X-GMAIL-MSGID: =?utf-8?q?1746960587731032930?= From: Sibi Sankar commit ef9a5d188d663753e73a3c8e8910ceab8e9305c4 upstream. The modem firmware memory requirements vary between 32M/140M on no-lte/lte skus respectively, so fixup the modem memory region to reflect the requirements. Reviewed-by: Evan Green Signed-off-by: Sibi Sankar Link: https://lore.kernel.org/r/1602786476-27833-1-git-send-email-sibis@codeaurora.org Signed-off-by: Bjorn Andersson Acked-by: Alex Elder Signed-off-by: Stephen Boyd --- This fixes boot of the modem on trogdor boards with the DTS from 5.10.y stable tree. Without this patch I run into memory assignment errors and then the modem fails to boot. arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 4 ++++ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) base-commit: 014862eecf03f58066a957027dde73cbecdf4395 diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi index 44956e3165a1..469aad4e5948 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi @@ -9,6 +9,10 @@ &ap_sar_sensor { label = "proximity-wifi-lte"; }; +&mpss_mem { + reg = <0x0 0x86000000 0x0 0x8c00000>; +}; + &remoteproc_mpss { firmware-name = "qcom/sc7180-trogdor/modem/mba.mbn", "qcom/sc7180-trogdor/modem/qdsp6sw.mbn"; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 5b2a616c6257..cb2c47f13a8a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -39,7 +39,7 @@ atf_mem: memory@80b00000 { }; mpss_mem: memory@86000000 { - reg = <0x0 0x86000000 0x0 0x8c00000>; + reg = <0x0 0x86000000 0x0 0x2000000>; no-map; };