From nobody Sun Oct 5 22:02:13 2025 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 081FA1FBE9B; Tue, 29 Jul 2025 02:31:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753756306; cv=none; b=ZtGCaVn2an0xX11JvsPDlBnhQM1IhTqeXw2dSbfZrm0r+Pefk0Oov0qChd7/3htVpkyvsBPPa7u/AG6d0Pfy0yqxdD03adv6Gx8+lt12P8ZUYlXlcYtwSP+9AsZkkt01m+5QN0Nz6OSAlMQgni+EhGRoWWwjw50TK9Vmv9Bmk4k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753756306; c=relaxed/simple; bh=RljFFVYaK3RenDcoSpifixa+i9jotyiIirqFaDn0X3k=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AqlvO7EhOH2UaLW3zo/e2xSJ5U+ANVMJHNeDrWkvbSXq18HHsjDBJzfe0L6oEFHhhTPd81wYFMSpIsxfNfPopHK6PlFohFgB3EzKB1ugJ+3Gd1sNWyEqgXG0OEDq17re1bcC6VNDUKeQz3wvW0NLWtXPzpuyLKFlGZIrRYLNGlE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=pzUrVNUn; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="pzUrVNUn" X-UUID: 236959066c2411f0b33aeb1e7f16c2b6-20250729 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=Auj5DQbL/yH5GaBcL6/70Iry/pxPJPvG+3rfM1NOxsw=; b=pzUrVNUnBxGCFdBN9UUi8tfj+NdfmILJwiGIuxSbJqStAYJTD9dkltS+EDSSR+bLWRAMrUWW2zB8dd4wJBHs58u56+RWwtU9xcvSRIcB4UmsuxKApw/hs0RFKGeMxLFcdiF7vLudqUOULGEGJnlzQUHUWX42RFm+iH705oytlLs=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.2,REQID:00266cb0-56da-4094-8598-851d0c683506,IP:0,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION:r elease,TS:0 X-CID-META: VersionHash:9eb4ff7,CLOUDID:80ba450f-6968-429c-a74d-a1cce2b698bd,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102,TC:nil,Content:0|15|50,EDM :-3,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0 ,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 236959066c2411f0b33aeb1e7f16c2b6-20250729 Received: from mtkmbs14n1.mediatek.inc [(172.21.101.75)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1626149572; Tue, 29 Jul 2025 10:31:31 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs13n2.mediatek.inc (172.21.101.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.39; Tue, 29 Jul 2025 10:31:30 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.39 via Frontend Transport; Tue, 29 Jul 2025 10:31:30 +0800 From: Huayu Zong To: Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Tinghan Shen CC: , , , , , <--cc=Project_Global_Chrome_Upstream_Group@mediatek.com>, Huayu Zong Subject: [PATCH 1/3] dt-bindings: remoteproc: mediatek: Add binding for mt8189 scp Date: Tue, 29 Jul 2025 10:31:11 +0800 Message-ID: <20250729023125.9036-2-huayu.zong@mediatek.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250729023125.9036-1-huayu.zong@mediatek.com> References: <20250729023125.9036-1-huayu.zong@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add the compatible for mt8189 SCP to the binding. Signed-off-by: Huayu Zong Acked-by: Conor Dooley Reviewed-by: AngeloGioacchino Del Regno --- Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml b/Do= cumentation/devicetree/bindings/remoteproc/mtk,scp.yaml index adc6b3f36fde..88e240430f3f 100644 --- a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml +++ b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml @@ -20,6 +20,7 @@ properties: - mediatek,mt8186-scp - mediatek,mt8188-scp - mediatek,mt8188-scp-dual + - mediatek,mt8189-scp - mediatek,mt8192-scp - mediatek,mt8195-scp - mediatek,mt8195-scp-dual @@ -168,6 +169,7 @@ allOf: - mediatek,mt8183-scp - mediatek,mt8186-scp - mediatek,mt8188-scp + - mediatek,mt8189-scp then: properties: reg: --=20 2.45.2 From nobody Sun Oct 5 22:02:13 2025 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3E2A201004; Tue, 29 Jul 2025 02:31:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753756309; cv=none; b=XCzi73qcpgLHHFSPYI6CzPy1xO43pxE7XqAdAgFZPWYKBP38Ywf1XkQkrF6JBO+d1rvu99Nwe4WMzSVp2Y1x9gM24ymq8nOcIt2tQ+b4pEcWHPHwXXYccL/lnOQTkelNQR2MA6HgPM78erKqANpjoObbRnp2HswNQhVeLXu9vdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753756309; c=relaxed/simple; bh=tCSF7lWfdbojV4jhsSF7FTuRiIw6T1A9derIUFGlZnA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BDOxOcQtu+8HOvxS8T7gSvyAgK52NwHtG9vAgakCqbdqlsMiuGY/1xEvN8Gc4MqshENMW7xeQEz1G/7z8QgUrabkeSPp9EfwtVwffBDSA1+RkQ3I5X6ht5kC9VS969jIe4NzHSH1dsLrsmelNb0C3oBQDnvOEtkr9pyUDsSLxxE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=usPxFED4; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="usPxFED4" X-UUID: 248c69b86c2411f0b33aeb1e7f16c2b6-20250729 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=/gWFTVUtfqcSTh6Oq1Z1VkUVT+x79QYdNgJkeqMe0Us=; b=usPxFED4ZUKek8uECAdEtcSe++F2yKbuduj192ZlMPtziu5QIAQwFqRfdhXYfWtF08Y69CKBPo6SqTAhzZK2Oov6wymNKO+08FcKIs/49Nn/SN2N3CJ/Waaj6TRFJQG3/Nyu3tpyVzw02lz8SbioE6rbNC4/wFhC5+cmTTLaGNE=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.2,REQID:455fc5c9-a8f9-481e-bce4-9084c7305479,IP:0,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION:r elease,TS:0 X-CID-META: VersionHash:9eb4ff7,CLOUDID:958fe108-aadc-4681-92d7-012627504691,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102,TC:nil,Content:0|15|50,EDM :-3,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0 ,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 248c69b86c2411f0b33aeb1e7f16c2b6-20250729 Received: from mtkmbs14n1.mediatek.inc [(172.21.101.75)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 482597564; Tue, 29 Jul 2025 10:31:33 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs11n1.mediatek.inc (172.21.101.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.39; Tue, 29 Jul 2025 10:31:32 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.39 via Frontend Transport; Tue, 29 Jul 2025 10:31:31 +0800 From: Huayu Zong To: Bjorn Andersson , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Tinghan Shen CC: , , , , , <--cc=Project_Global_Chrome_Upstream_Group@mediatek.com>, Huayu Zong Subject: [PATCH 2/3] arm64: dts: mt8189: Add scp node Date: Tue, 29 Jul 2025 10:31:12 +0800 Message-ID: <20250729023125.9036-3-huayu.zong@mediatek.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250729023125.9036-1-huayu.zong@mediatek.com> References: <20250729023125.9036-1-huayu.zong@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add scp node for mt8189. Signed-off-by: Huayu Zong --- arch/arm64/boot/dts/mediatek/mt8189-evb.dts | 17 +++++++++++++++++ arch/arm64/boot/dts/mediatek/mt8189.dtsi | 11 +++++++++++ 2 files changed, 28 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8189-evb.dts b/arch/arm64/boot/= dts/mediatek/mt8189-evb.dts index e5d9ce1b8e61..39cd56b31ca0 100644 --- a/arch/arm64/boot/dts/mediatek/mt8189-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt8189-evb.dts @@ -13,8 +13,25 @@ / { chosen: chosen { stdout-path =3D "serial0:115200n8"; }; + + reserved_memory: reserved-memory { + #address-cells =3D <2>; + #size-cells =3D <2>; + ranges; + + scp_mem_reserved: scp@50000000 { + compatible =3D "shared-dma-pool"; + reg =3D <0 0x50000000 0 0x2900000>; + no-map; + }; + }; }; =20 &uart0 { status =3D "okay"; }; + +&scp { + status =3D "okay"; + memory-region =3D <&scp_mem_reserved>; +}; diff --git a/arch/arm64/boot/dts/mediatek/mt8189.dtsi b/arch/arm64/boot/dts= /mediatek/mt8189.dtsi index 2444c3e553ec..b70397b9ef6c 100644 --- a/arch/arm64/boot/dts/mediatek/mt8189.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8189.dtsi @@ -371,5 +371,16 @@ uart0: serial@11001000 { clock-names =3D "baud", "bus"; status =3D "disabled"; }; + + scp: scp@1c400000 { + compatible =3D "mediatek,mt8189-scp"; + reg =3D <0 0x1c400000 0 0x60000>, + <0 0x1cb20000 0 0xe0000>; + reg-names =3D "sram", "cfg"; + interrupts =3D ; + status =3D "disabled"; + clocks =3D <&vlp_cksys_clk CLK_VLP_CK_SCP_SEL>; + clock-names =3D "scp_sel"; + }; }; }; --=20 2.45.2 From nobody Sun Oct 5 22:02:13 2025 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8307A20D4F9; Tue, 29 Jul 2025 02:31:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753756309; cv=none; b=QCO8ONb2jgx3qIQywicORyfIGCUeamHLFGL9DwzwTfIg/qpVUXiRMcq5fxQ7NyQlU6bHzJAdKy4Li6ng+hGIjcJy42iG4p2zEplxpXMpvAYN30bEo1xNNJM5s+8LBFKQmqqXjHXdNfxxTugUU2zKP+nR7ZCXzszdSX2w9cq6X8Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753756309; c=relaxed/simple; bh=Fv+mqhtoohGsxrWk8MdR/p813cWLZElyVD4RRW2uZyk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JcBvqeFb8zhEzQbVMlJnxu+wLCXgyjZov5ZBVyNkedEVoXb8numuQnQ97jIWLJiDkhdIq5IJBap0Dxe8iziyxWHsgFEIIC/34YcFdVtf8/ysvAj/jPgjzJJVI2Dq14pJZ4I3k+Jo8P+h0WAdR3we5hEryEvVPKeX6p3rCJ23lso= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=HGkbQybO; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="HGkbQybO" X-UUID: 252415386c2411f0b33aeb1e7f16c2b6-20250729 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=bYebe6d6FF9a4Sv4DvMcxFHqACdPJ8d1sUQcdh4dprA=; b=HGkbQybOGOYQBWIuNXkYPFYAVg1vnabqsg9i4zZ3150X+6Hxz/5o1xczpGc5oWPI5YTLKDDsSdIzi3RmD4oBIgglrJx7QAUehYPxDk95j1Q6kydcm3QwIdGVIEW2wmsxuz1Ny5h6nxj3JjtQ6s9T7sVOxaRgicpBM2Fnxq1rwgo=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.2,REQID:c9a35b41-8a16-4a2d-af32-a6377096b96d,IP:0,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION:r elease,TS:0 X-CID-META: VersionHash:9eb4ff7,CLOUDID:d8555e9a-32fc-44a3-90ac-aa371853f23f,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102,TC:nil,Content:0|15|50,EDM :-3,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0 ,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 252415386c2411f0b33aeb1e7f16c2b6-20250729 Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 697706325; Tue, 29 Jul 2025 10:31:34 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.39; Tue, 29 Jul 2025 10:31:33 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.39 via Frontend Transport; Tue, 29 Jul 2025 10:31:32 +0800 From: Huayu Zong To: Bjorn Andersson , Mathieu Poirier , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley , "Matthias Brugger" , AngeloGioacchino Del Regno , Tinghan Shen CC: , , , , , <--cc=Project_Global_Chrome_Upstream_Group@mediatek.com>, Huayu Zong Subject: [PATCH 3/3] remoteproc: mediatek: Support MT8189 SCP Date: Tue, 29 Jul 2025 10:31:13 +0800 Message-ID: <20250729023125.9036-4-huayu.zong@mediatek.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250729023125.9036-1-huayu.zong@mediatek.com> References: <20250729023125.9036-1-huayu.zong@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add SCP support for mt8189. Signed-off-by: Huayu Zong --- drivers/remoteproc/mtk_common.h | 11 ++++++++++ drivers/remoteproc/mtk_scp.c | 37 ++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_commo= n.h index fd5c539ab2ac..fb2131e0ed07 100644 --- a/drivers/remoteproc/mtk_common.h +++ b/drivers/remoteproc/mtk_common.h @@ -35,6 +35,11 @@ #define MT8186_SCP_L1_SRAM_PD_P1 0x40B0 #define MT8186_SCP_L1_SRAM_PD_p2 0x40B4 =20 +#define MT8189_SCP2APMCU_IPC_CLR 0x30010 +#define MT8189_SCP2SPM_IPC_CLR 0x30018 +#define MT8189_SCP_SECURE_DOMAIN 0xA080 +#define MT8189_SCP_DOMAIN_VAL 0x3303003 + #define MT8192_L2TCM_SRAM_PD_0 0x10C0 #define MT8192_L2TCM_SRAM_PD_1 0x10C4 #define MT8192_L2TCM_SRAM_PD_2 0x10C8 @@ -112,6 +117,12 @@ struct mtk_scp_of_data { =20 u32 host_to_scp_reg; u32 host_to_scp_int_bit; + u32 scp_to_host_ipc_set_reg; + u32 scp_to_host_ipc_clr_reg; + u32 scp_to_spm_ipc_clr_reg; + + u32 scp_secure_domain_reg; + u32 scp_domain_value; =20 size_t ipi_buf_offset; const struct mtk_scp_sizes_data *scp_sizes; diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c index 8206a1766481..956793fc6901 100644 --- a/drivers/remoteproc/mtk_scp.c +++ b/drivers/remoteproc/mtk_scp.c @@ -225,7 +225,8 @@ static void mt8192_scp_irq_handler(struct mtk_scp *scp) { u32 scp_to_host; =20 - scp_to_host =3D readl(scp->cluster->reg_base + MT8192_SCP2APMCU_IPC_SET); + scp_to_host =3D readl(scp->cluster->reg_base + + scp->data->scp_to_host_ipc_set_reg); =20 if (scp_to_host & MT8192_SCP_IPC_INT_BIT) { scp_ipi_handler(scp); @@ -235,7 +236,7 @@ static void mt8192_scp_irq_handler(struct mtk_scp *scp) * MT8192_SCP2APMCU_IPC. */ writel(MT8192_SCP_IPC_INT_BIT, - scp->cluster->reg_base + MT8192_SCP2APMCU_IPC_CLR); + scp->cluster->reg_base + scp->data->scp_to_host_ipc_clr_reg); } else { scp_wdt_handler(scp, scp_to_host); writel(1, scp->cluster->reg_base + MT8192_CORE0_WDT_IRQ); @@ -559,8 +560,10 @@ static int mt8188_scp_c1_before_load(struct mtk_scp *s= cp) =20 static int mt8192_scp_before_load(struct mtk_scp *scp) { + u32 scp2spm_ipc_clr =3D scp->data->scp_to_spm_ipc_clr_reg; + /* clear SPM interrupt, SCP2SPM_IPC_CLR */ - writel(0xff, scp->cluster->reg_base + MT8192_SCP2SPM_IPC_CLR); + writel(0xff, scp->cluster->reg_base + scp2spm_ipc_clr); =20 writel(1, scp->cluster->reg_base + MT8192_CORE0_SW_RSTN_SET); =20 @@ -574,6 +577,11 @@ static int mt8192_scp_before_load(struct mtk_scp *scp) /* enable MPU for all memory regions */ writel(0xff, scp->cluster->reg_base + MT8192_CORE0_MEM_ATT_PREDEF); =20 + /* set the domain of master in SCP */ + if (scp->data->scp_secure_domain_reg) + writel(scp->data->scp_domain_value, + scp->cluster->reg_base + scp->data->scp_secure_domain_reg); + return 0; } =20 @@ -1464,6 +1472,24 @@ static const struct mtk_scp_of_data mt8188_of_data_c= 1 =3D { .scp_sizes =3D &mt8188_scp_c1_sizes, }; =20 +static const struct mtk_scp_of_data mt8189_of_data =3D { + .scp_clk_get =3D mt8195_scp_clk_get, + .scp_before_load =3D mt8192_scp_before_load, + .scp_irq_handler =3D mt8192_scp_irq_handler, + .scp_reset_assert =3D mt8192_scp_reset_assert, + .scp_reset_deassert =3D mt8192_scp_reset_deassert, + .scp_stop =3D mt8192_scp_stop, + .scp_da_to_va =3D mt8192_scp_da_to_va, + .host_to_scp_reg =3D MT8192_GIPC_IN_SET, + .host_to_scp_int_bit =3D MT8192_HOST_IPC_INT_BIT, + .scp_to_host_ipc_set_reg =3D MT8192_SCP2APMCU_IPC_SET, + .scp_to_host_ipc_clr_reg =3D MT8189_SCP2APMCU_IPC_CLR, + .scp_to_spm_ipc_clr_reg =3D MT8189_SCP2SPM_IPC_CLR, + .scp_secure_domain_reg =3D MT8189_SCP_SECURE_DOMAIN, + .scp_domain_value =3D MT8189_SCP_DOMAIN_VAL, + .scp_sizes =3D &default_scp_sizes, +}; + static const struct mtk_scp_of_data mt8192_of_data =3D { .scp_clk_get =3D mt8192_scp_clk_get, .scp_before_load =3D mt8192_scp_before_load, @@ -1475,6 +1501,10 @@ static const struct mtk_scp_of_data mt8192_of_data = =3D { .host_to_scp_reg =3D MT8192_GIPC_IN_SET, .host_to_scp_int_bit =3D MT8192_HOST_IPC_INT_BIT, .scp_sizes =3D &default_scp_sizes, + .scp_to_host_ipc_set_reg =3D MT8192_SCP2APMCU_IPC_SET, + .scp_to_host_ipc_clr_reg =3D MT8192_SCP2APMCU_IPC_CLR, + .scp_to_spm_ipc_clr_reg =3D MT8192_SCP2SPM_IPC_CLR, + .scp_sizes =3D &default_scp_sizes, }; =20 static const struct mtk_scp_of_data mt8195_of_data =3D { @@ -1520,6 +1550,7 @@ static const struct of_device_id mtk_scp_of_match[] = =3D { { .compatible =3D "mediatek,mt8186-scp", .data =3D &mt8186_of_data }, { .compatible =3D "mediatek,mt8188-scp", .data =3D &mt8188_of_data }, { .compatible =3D "mediatek,mt8188-scp-dual", .data =3D &mt8188_of_data_c= ores }, + { .compatible =3D "mediatek,mt8189-scp", .data =3D &mt8189_of_data }, { .compatible =3D "mediatek,mt8192-scp", .data =3D &mt8192_of_data }, { .compatible =3D "mediatek,mt8195-scp", .data =3D &mt8195_of_data }, { .compatible =3D "mediatek,mt8195-scp-dual", .data =3D &mt8195_of_data_c= ores }, --=20 2.45.2