From patchwork Tue Mar 18 22:22:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 14021671 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 06095C282EC for ; Tue, 18 Mar 2025 22:28:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=2c9kMAX2R1CYPdxk/Jfa9Ec6abXOPEPUdT8mXIO6YFA=; b=wOkuvJQbo1TqaVAYn5mK/oI/zV zWh9S8Z441qE+ogQlGgLwZOQn34lw9nd5l0aXXZt5MauljjSbXi9/rv0YjeH9S4/U1nZqy4/QZ6Uo e0C1xu91S3EaJDJSpZI4NXv+fCti5gEQHSZzFn73xUq+ZS9qzL0lX7Uvoi+taz5nxWavwZj83msT7 MYWmOCKgd8s2tc0xPSiaxGQI/CL2RuSr++cnuHGypRrsrzApwgp4r7MKH0wzN5cQPlL/N4aHSaqYY ZbQz2CsO8lccFgHz1qpIXxLjtq0ZVchIkGB0d/mrjMPevUQpjdNYfkRF1XnqmoneO+MD8ne4XcEiF mDMPT/2g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tufPp-00000007Fqa-16Xc; Tue, 18 Mar 2025 22:28:05 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tufMU-00000007FAD-3tJS; Tue, 18 Mar 2025 22:24:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1742336677; bh=up+BGxd5yruq1/jjYQr7mm3mJ2LrG2vsIBarOQEem10=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=JM0MRf+YtlyHEYRk8ImzBThTeuBeYnzaebvRvz490385HzecGv5k1O9LtoooxGR2v hZcTFmYj0SfCFEkKlPM6jBfOlvpt34NAhPmeklMqkMD912aF22EzouQ+L5kT68q3mZ MCUSbKYpaFFk0vGgJCLACfBs2OF4vNjHVRAPtzESVKEcE9Te6vfYhVqIQ2pXohLJZ4 cFSWW0te4RVJclYPhddQjPGrPNaXBAjCEl7PYr4Udd82TeCnDDqM/Gt0zjrEOOOloR rrZEj8LcASGRF/Xo8KvKZjmBn1yNngaLhlCKqFVMLf0dLf1fi0WjMG5ggO4V+okdIr hOOxg0NQzeQAw== Received: from [192.168.1.63] (unknown [70.107.117.78]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id B6A7F17E0FCC; Tue, 18 Mar 2025 23:24:34 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Tue, 18 Mar 2025 18:22:15 -0400 Subject: [PATCH 1/4] dt-bindings: remoteproc: mediatek: Add missing minItems for 8192/8195 MIME-Version: 1.0 Message-Id: <20250318-scp-dual-core-mt8390-v1-1-8733e192cc73@collabora.com> References: <20250318-scp-dual-core-mt8390-v1-0-8733e192cc73@collabora.com> In-Reply-To: <20250318-scp-dual-core-mt8390-v1-0-8733e192cc73@collabora.com> To: Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Tinghan Shen , Olivia Wen Cc: kernel@collabora.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Krzysztof Kozlowski , =?utf-8?b?TsOtY29s?= =?utf-8?b?YXMgRi4gUi4gQS4gUHJhZG8=?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250318_152439_107719_76974B8E X-CRM114-Status: UNSURE ( 7.46 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Both MT8192 and MT8195 have an L1TCM memory, so it should be described in reg, and therefore reg's minItems should be 3, as is already implicit by reg-names. Override minItems to 3 for MT8192 and MT8195. Fixes: 6b55b1e2fd7f ("dt-bindings: remoteproc: mediatek: Support MT8195 dual-core SCP") Signed-off-by: Nícolas F. R. A. Prado --- Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml index adc6b3f36fde49eb3fa7ed3f08b0fa9e7f331162..ee33c233e44f3d51f0851b35697a24208c87f68a 100644 --- a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml +++ b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml @@ -185,6 +185,7 @@ allOf: then: properties: reg: + minItems: 3 maxItems: 3 reg-names: items: From patchwork Tue Mar 18 22:22:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 14021672 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7222FC35FF3 for ; Tue, 18 Mar 2025 22:29:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=W5HB7O2zhf9k5PDHGyjQDylrX/O//96forEKvCV37O0=; b=TJM5kByI853E5pjBNOxrHyVtE/ rPYj9Py1tRtEZz5xpCReL47JmwkqBfAyVcKAOdZVOwdXg59fDr8Ml5UEh9UNwKY9eXBax1AI3j3Wh AyZHWoru4TAod6YcQSHS7sqcW0TEyptVZEPJQfMbwNXh5wNExxaUvXM1jXnEtAMHP4Bisbp2JNN3G czw6MspGscBMpjMpCrngNKxutrVVlm1tP/6zsvljzb90WdTEJJLZA2u9qpPl9OuR+r7HcOt2tM9kS 0PcpgSUEJWKfBQ2LqKaaKKAEb3Ibvwd0F8lD430ptsrqH9hyB8Rn2rfD2/EXkKEml7e+KJGLGvVli /z/ylSFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tufRU-00000007G1d-1Aqt; Tue, 18 Mar 2025 22:29:48 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tufMY-00000007FAZ-45Xj; Tue, 18 Mar 2025 22:24:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1742336681; bh=ebGgU8hC64Kx1MeaVNKAzJY5DqxxZk54iPOshavrJOQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=H85OROV8YeghJXytIplf5CcPOR7ZCEqVXqfu6vLBY8AfJxPraTyWE5X1VnOcGRLf7 j45/TRpM1MxGTYrfZUOQwPUp+yzdrugLE/fRdcgHesoAleL8B91N9iY+BmhvpZgvis g/VkOlq7XpOCelkbpo/oFreA2TM/GkniSaA7Ei6WyosFrMBW5rB2owyQ9nBmOMdIdq kiwDi0N/AkmCCKgmM40xmcb+69WQFeHxMzWuJltOq/HRXF0mWy4QTx/nAJeZMiMFHs P6nAxzD+3RDQvH4qzoqzaSN+Z1vWaY1TmDVUrfNsuhEAWzNbOb+L21/0BHjeYWw1Ho mEIMworYuAP+w== Received: from [192.168.1.63] (unknown [70.107.117.78]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id E27C317E0FD1; Tue, 18 Mar 2025 23:24:37 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Tue, 18 Mar 2025 18:22:16 -0400 Subject: [PATCH 2/4] dt-bindings: remoteproc: mediatek: Remove l1tcm for dual-core MT8188 SCP MIME-Version: 1.0 Message-Id: <20250318-scp-dual-core-mt8390-v1-2-8733e192cc73@collabora.com> References: <20250318-scp-dual-core-mt8390-v1-0-8733e192cc73@collabora.com> In-Reply-To: <20250318-scp-dual-core-mt8390-v1-0-8733e192cc73@collabora.com> To: Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Tinghan Shen , Olivia Wen Cc: kernel@collabora.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Krzysztof Kozlowski , =?utf-8?b?TsOtY29s?= =?utf-8?b?YXMgRi4gUi4gQS4gUHJhZG8=?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250318_152443_182727_4918935F X-CRM114-Status: UNSURE ( 9.42 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The SCP present on MT8188 does not have an L1TCM memory region, but the binding incorrectly requires one for the dual-core description of the MT8188 SCP. Remove that requirement. Also update the minimum number of reg and reg-names to 1, since as this is a multi-core SCP with no L1TCM memory, only the CFG memory region is present in the parent node. Fixes: 91e0d560b9fd ("dt-bindings: remoteproc: mediatek: Support MT8188 dual-core SCP") Signed-off-by: Nícolas F. R. A. Prado Reviewed-by: Krzysztof Kozlowski --- .../devicetree/bindings/remoteproc/mtk,scp.yaml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml index ee33c233e44f3d51f0851b35697a24208c87f68a..04348cfcb0424dc78ff1ddd77665285a052925e9 100644 --- a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml +++ b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml @@ -28,11 +28,11 @@ properties: description: Should contain the address ranges for memory regions SRAM, CFG, and, on some platforms, L1TCM. - minItems: 2 + minItems: 1 maxItems: 3 reg-names: - minItems: 2 + minItems: 1 maxItems: 3 clocks: @@ -171,6 +171,7 @@ allOf: then: properties: reg: + minItems: 2 maxItems: 2 reg-names: items: @@ -196,16 +197,28 @@ allOf: properties: compatible: enum: - - mediatek,mt8188-scp-dual - mediatek,mt8195-scp-dual then: properties: reg: + minItems: 2 maxItems: 2 reg-names: items: - const: cfg - const: l1tcm + - if: + properties: + compatible: + enum: + - mediatek,mt8188-scp-dual + then: + properties: + reg: + maxItems: 1 + reg-names: + items: + - const: cfg additionalProperties: false From patchwork Tue Mar 18 22:22:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 14021673 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9317EC282EC for ; Tue, 18 Mar 2025 22:31:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bzinidswk0/weqzLwAiyI4S8kkx9Uwp/rDUb5IqXKOA=; b=qRrTcWpMkOGyw3MUJEA4amnBT7 5egaEGVHJF6mW7bCXDTO97RjfX83n5daDMDoK9b3yNYxpc9Sfoijk+CeOS6SQkliw2RXgyzqA53LC 0cKf6ScNRHeiwqNUpJAw9uhvGn5kNMRA4V4FvjUmTRCUsaY3CMWbBVDWqDrO3Pbs4RwsQrnwEr67V Rlgkr3zKakicHbPOfg5IH/+YlYIm6v4YcfECIRn4K4J2s/EUX7ayE97U6uLvbOVWk8AI0pTwwdrxL 1ta9d9DknfKFvq+QeQ8vpqeTPVTV2YJ4gyWi7jdkwr9XZn0rGmNxvp8TZyDimrbwPWdZ4lrr5OoSL OMHnphZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tufT8-00000007GB3-2Qfe; Tue, 18 Mar 2025 22:31:30 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tufMb-00000007FB3-2NKe; Tue, 18 Mar 2025 22:24:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1742336684; bh=zddfv7Unlpv7e7XjDPUtNK+iuLo3QIUPOxRhAKw0r+k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=T3mN/OX8hYgd1KewZ7noslsjjuGUgedtWb7ODGQDv6UlWn0o4DhrUihcJn/qoAdvK vKBXVSCpLarFOW7oRTj9iKF/SX4dIPjVdBt3xD+ao/DcThuVbA0bR/USZ2gbJqdZDe xa6TAJ9WSJjDLmXWlHz6bNpFgFRxb3Fzy/HFmrXdcC4e//r64CR2+B2M3NJG52oh8I YwUSaOR8HdFxKyPJkOhqJW7brPA5X/Va9L1yzvj+/DxtlDJLhji5fX204N2LuseZhJ xJwJT4j70KfPcdsyL19xpCTkqTWZPeJt45k9O0dx4e72QsVNC+OLAtHjiPQ0MtXXnl 1ox0e7XJnXIxQ== Received: from [192.168.1.63] (unknown [70.107.117.78]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 7B7A217E09F6; Tue, 18 Mar 2025 23:24:41 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Tue, 18 Mar 2025 18:22:17 -0400 Subject: [PATCH 3/4] arm64: dts: mediatek: mt8188: Describe SCP as a cluster with two cores MIME-Version: 1.0 Message-Id: <20250318-scp-dual-core-mt8390-v1-3-8733e192cc73@collabora.com> References: <20250318-scp-dual-core-mt8390-v1-0-8733e192cc73@collabora.com> In-Reply-To: <20250318-scp-dual-core-mt8390-v1-0-8733e192cc73@collabora.com> To: Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Tinghan Shen , Olivia Wen Cc: kernel@collabora.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Krzysztof Kozlowski , =?utf-8?b?TsOtY29s?= =?utf-8?b?YXMgRi4gUi4gQS4gUHJhZG8=?= , Jason Chen X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250318_152445_892621_C9DDD7A5 X-CRM114-Status: GOOD ( 10.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The SCP is currently described in the Devicetree as a single-core processor, but really it is a cluster with two cores. Describe the full cluster but enable only core0 on the current mt8188 platforms since that's the only one usable with the upstream firmware. Co-developed-by: Tinghan Shen Signed-off-by: Tinghan Shen Co-developed-by: Jason Chen Signed-off-by: Jason Chen Signed-off-by: Nícolas F. R. A. Prado --- arch/arm64/boot/dts/mediatek/mt8188-evb.dts | 6 +++- arch/arm64/boot/dts/mediatek/mt8188.dtsi | 36 ++++++++++++++++------ .../boot/dts/mediatek/mt8390-genio-common.dtsi | 6 +++- 3 files changed, 37 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8188-evb.dts b/arch/arm64/boot/dts/mediatek/mt8188-evb.dts index f89835ac36f36f86e2054ae0c332172be97b049a..f4c207d65b877e1eefaa26540446c3c06369ca21 100644 --- a/arch/arm64/boot/dts/mediatek/mt8188-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt8188-evb.dts @@ -331,7 +331,11 @@ &pmic { interrupts-extended = <&pio 222 IRQ_TYPE_LEVEL_HIGH>; }; -&scp { +&scp_cluster { + status = "okay"; +}; + +&scp_c0 { memory-region = <&scp_mem_reserved>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8188.dtsi b/arch/arm64/boot/dts/mediatek/mt8188.dtsi index 4437b1820f2685281c3a373bf626f72b53503e62..bea3cee9b8e8f0dc656edd85e63f4f6f6645607f 100644 --- a/arch/arm64/boot/dts/mediatek/mt8188.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8188.dtsi @@ -1382,12 +1382,30 @@ gce1: mailbox@10330000 { clocks = <&infracfg_ao CLK_INFRA_AO_GCE2>; }; - scp: scp@10500000 { - compatible = "mediatek,mt8188-scp"; - reg = <0 0x10500000 0 0x100000>, - <0 0x10720000 0 0xe0000>; - reg-names = "sram", "cfg"; - interrupts = ; + scp_cluster: scp@10720000 { + compatible = "mediatek,mt8188-scp-dual"; + reg = <0 0x10720000 0 0xe0000>; + reg-names = "cfg"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0x10500000 0x100000>; + status = "disabled"; + + scp_c0: scp@0 { + compatible = "mediatek,scp-core"; + reg = <0x0 0xd0000>; + reg-names = "sram"; + interrupts = ; + status = "disabled"; + }; + + scp_c1: scp@d0000 { + compatible = "mediatek,scp-core"; + reg = <0xd0000 0x2f000>; + reg-names = "sram"; + interrupts = ; + status = "disabled"; + }; }; afe: audio-controller@10b10000 { @@ -2249,7 +2267,7 @@ dma-controller@14001000 { mediatek,gce-client-reg = <&gce1 SUBSYS_1400XXXX 0x1000 0x1000>; mediatek,gce-events = , ; - mediatek,scp = <&scp>; + mediatek,scp = <&scp_c0>; }; display@14002000 { @@ -2704,7 +2722,7 @@ video_decoder: video-decoder@18000000 { iommus = <&vpp_iommu M4U_PORT_L23_HW_VDEC_UFO_ENC_EXT>; #address-cells = <2>; #size-cells = <2>; - mediatek,scp = <&scp>; + mediatek,scp = <&scp_c0>; video-codec@10000 { compatible = "mediatek,mtk-vcodec-lat"; @@ -2828,7 +2846,7 @@ video_encoder: video-encoder@1a020000 { <&vdo_iommu M4U_PORT_L19_VENC_SUB_W_LUMA>, <&vdo_iommu M4U_PORT_L19_VENC_SUB_R_LUMA>; power-domains = <&spm MT8188_POWER_DOMAIN_VENC>; - mediatek,scp = <&scp>; + mediatek,scp = <&scp_c0>; }; jpeg_encoder: jpeg-encoder@1a030000 { diff --git a/arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi b/arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi index 60139e6dffd8e0e326690d922f3360d829ed026b..65952bcf5d03e3b22984dd3e997e7107e74dac72 100644 --- a/arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi @@ -1055,7 +1055,11 @@ power-key { }; }; -&scp { +&scp_cluster { + status = "okay"; +}; + +&scp_c0 { memory-region = <&scp_mem>; status = "okay"; }; From patchwork Tue Mar 18 22:22:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 14021675 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 77A3BC35FF3 for ; Tue, 18 Mar 2025 22:33:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IL4ph+nMApQKiG0jjdYDwg3HmV59NomY3yqhCM575c4=; b=zfB2ZqCC2tBzkisB2Vj2NzDVNh r0KvsAM/OL9s5IQAKeRklmDqbuYAOlqg+U9y8cEWtcu8DL7q53FPisvK/RlvpyTjFgIxPXXE2a0F/ XWOW1xabfdVxBP1ZbulFL4cia9t9JSx6lA/YXFGLfA9lenfghm8HADm2eVafjuNXxV/CsWVxT9vl1 RqwmMdYfwnK27wPysu+7ckzOtrUUQgVYuIHzOgoQVE57x0ogHhVcX+1G+hU4lfYMTvRWeLxmobiWH 8yrjMLiVo6+160lGlGj14LTyr4hrBExyxJq5T+DbP18f17p853+bWuHogvrTSttb1mClTTRbhhI5X 5kbxzO0A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tufUo-00000007GML-2mfQ; Tue, 18 Mar 2025 22:33:14 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tufMe-00000007FBh-10Sh; Tue, 18 Mar 2025 22:24:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1742336686; bh=P1vtmk+9u5G+Zjiu2jlC44IrlzgRmSDtGJusM9LFedk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=aJatjFct7ueDLUvYjXrczWUQf/Kjw0f9PhAE4Er+3AZ7E6nfd+0SdMGwfK60GtHCD /Cr97lnTp3Vlv/K+l6dvmsNpajw5+uOYadyUQGeDy539Tbm6bFjB1czcXIq49wGWWn vJp7BspKP9GtRYJ1eQtaUwEv49Fyjk4Y2xAC9gy8IUvmYL5IPBknNfuz1aEbuyOlDS 3BXhJdLYDH9wIroXA2B2Ds8izBS6OI+wTMvDg/RPsmnsqgAdy9iA7PNHuvpyDdy2/l /KTyCRXm6LwIzBh4dE+qrGw5iHGr5Luy5lUVDG/cTX/jv5gUaKadzB6GcjSizELErK cUyNzfRZGC4/w== Received: from [192.168.1.63] (unknown [70.107.117.78]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 80A1017E0B25; Tue, 18 Mar 2025 23:24:44 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Tue, 18 Mar 2025 18:22:18 -0400 Subject: [PATCH 4/4] arm64: dts: mediatek: mt8390-genio-common: Add firmware-name for scp0 MIME-Version: 1.0 Message-Id: <20250318-scp-dual-core-mt8390-v1-4-8733e192cc73@collabora.com> References: <20250318-scp-dual-core-mt8390-v1-0-8733e192cc73@collabora.com> In-Reply-To: <20250318-scp-dual-core-mt8390-v1-0-8733e192cc73@collabora.com> To: Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Tinghan Shen , Olivia Wen Cc: kernel@collabora.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Krzysztof Kozlowski , =?utf-8?b?TsOtY29s?= =?utf-8?b?YXMgRi4gUi4gQS4gUHJhZG8=?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250318_152448_420415_A140D121 X-CRM114-Status: UNSURE ( 8.00 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add the firmware-name property for SCP core0 so the firmware can be loaded from its canonical location in the linux-firmware repository. Signed-off-by: Nícolas F. R. A. Prado Reviewed-by: AngeloGioacchino Del Regno --- arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi b/arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi index 65952bcf5d03e3b22984dd3e997e7107e74dac72..53951817df468ee27d20db1f1028c21a1832b880 100644 --- a/arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi @@ -1060,6 +1060,7 @@ &scp_cluster { }; &scp_c0 { + firmware-name = "mediatek/mt8188/scp.img"; memory-region = <&scp_mem>; status = "okay"; };