From nobody Thu Sep 19 23:08:14 2024 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) (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 1B5061E863; Thu, 11 Apr 2024 03:37:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.244.123.138 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712806682; cv=none; b=nIcrE38cG0XZMUvWL5Zrk1I28RepmKG64yfUB08Zp+qL0Tenht7QrQ7ZUPGbk8sORmADccpNGvJ+LW40Pj/+xzzlK64Swdk3VfIf3XIDULEYeUsZgQfGX/OWmk9nxNLyEX5xXsiyW8Au6LAQmY5C+D1xVYDoUR1JyleoGT4xFsE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712806682; c=relaxed/simple; bh=W2vEuN0Ei8x0/EdhFQfiyxL+NFDgxyRT8X21TwtVGag=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MCfsgHIOsjqb46k/JqbvD3r2qLDp7aqVOCoYk8V8xppqyNyM5Ta5aXwaVrdLnNfLjE1MNAPJgWWxTVqyPgOftc3EqUsWSzxyYCjjJeQjfZ4Ut5zIk2iDwhyOKwkOFJUP8sMJx4L2y0UqCsJyWArwPmmxmn6/gBYNYIIvAdjPvgw= 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=qmcu2PT5; arc=none smtp.client-ip=60.244.123.138 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="qmcu2PT5" X-UUID: e2073562f7b411eeb8927bc1f75efef4-20240411 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=4N+27Nm7lzpsbnRVD5dNKXK3d/Iz5vY7gg+UaT2lqDo=; b=qmcu2PT5UCF5P3veoGWxfCElLw+uufE5ePW2fEEK+DIiqghu9/XOq6R0XdJPiy5teuicSRM1v+vSSshFqYsoqPYObe7MTrg5TFId2XBs8VxgwxPzDXNB+J27+AHzY1mHLoxXayUkDkOMCgSlcvF6r8AFf04EGrhUaleBC6kYKtg=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:71c7f81c-d57b-4640-8712-32e0a4c84884,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:6f543d0,CLOUDID:58760a86-8d4f-477b-89d2-1e3bdbef96d1,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL: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 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: e2073562f7b411eeb8927bc1f75efef4-20240411 Received: from mtkmbs14n2.mediatek.inc [(172.21.101.76)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 923527615; Thu, 11 Apr 2024 11:37:55 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) 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.1118.26; Thu, 11 Apr 2024 11:37:53 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Thu, 11 Apr 2024 11:37:53 +0800 From: olivia.wen To: Bjorn Andersson , Mathieu Poirier , Rob Herring CC: Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Tinghan Shen , , , , , , , , , , Subject: [PATCH 1/2] dt-bindings: remoteproc: mediatek: Support MT8188 dual-core SCP Date: Thu, 11 Apr 2024 11:37:49 +0800 Message-ID: <20240411033750.6476-2-olivia.wen@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240411033750.6476-1-olivia.wen@mediatek.com> References: <20240411033750.6476-1-olivia.wen@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Under different applications, the MT8188 SCP can be used as single-core or dual-core. Signed-off-by: olivia.wen Reviewed-by: AngeloGioacchino Del Regno --- Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml b/Do= cumentation/devicetree/bindings/remoteproc/mtk,scp.yaml index 507f98f..7e7b567 100644 --- a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml +++ b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml @@ -22,7 +22,7 @@ properties: - mediatek,mt8192-scp - mediatek,mt8195-scp - mediatek,mt8195-scp-dual - + - mediatek,mt8188-scp-dual reg: description: Should contain the address ranges for memory regions SRAM, CFG, and, @@ -195,6 +195,7 @@ allOf: compatible: enum: - mediatek,mt8195-scp-dual + - mediatek,mt8188-scp-dual then: properties: reg: --=20 2.6.4 From nobody Thu Sep 19 23:08:14 2024 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 1E56360B9D; Thu, 11 Apr 2024 03:37:59 +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=1712806682; cv=none; b=Sh17xbLoNy/a7cbOtSl+qEUUk7rqiGIM8jFskCGoNPkv0yV4kSZRco9h9O0FgRbw+F+Q2XYw6kk3UIE02SuZSTLmp3IKfVR7lnF84wTxn/g4YU89hbVdgD4jWmVWCeiz/tTwe3yd+2XNp3LTm1yD4IM1svqHEo3rP3RU8Wpnmvo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712806682; c=relaxed/simple; bh=W30wZEwAdnb897V8ut868bNRKVxFQqSs7Dr1Kc84Fd8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jDhbzg6e54bdxtszam9v6tUnk66yyIT/TqUAGsbAQK+5dgLlreAcJtgE014cqtl4zUa2eLAH5VLd8mGrP7v/V9YAneDEbLJGeDoRvnjvgs2ZJhLzKMeZaoBFSchKZwKVGQSbHikcj0WeEmTZjm3+e8cOz6AAEvaZDG8wNyU/4Xo= 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=QKBn912v; 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="QKBn912v" X-UUID: e21ba588f7b411ee935d6952f98a51a9-20240411 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=UvMG50Z3NH/sSS5y+Dr9wRb2N8963RLCoZFyqfPOd9k=; b=QKBn912vvyp1NWRim6rtNs9/aDQCIjrqkkwu2O/9qyRatyTLWEfxtPILqNCSBLKEW0zHW1rg2xgE2BlAKIC/PFw2Dxd16IgyKHXTTwSTg//E8djnOovhEJAEVFrRXcTKxd09KDYWpMGeWQsG4o/SLrFkTB2AStgPVookk3BYUAs=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:83e27213-294c-4307-bc53-da12d537252d,IP:0,U RL:0,TC:0,Content:-5,EDM:-25,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:-30 X-CID-META: VersionHash:6f543d0,CLOUDID:54760a86-8d4f-477b-89d2-1e3bdbef96d1,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:1,IP:nil,UR L:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,S PR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: e21ba588f7b411ee935d6952f98a51a9-20240411 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 932935860; Thu, 11 Apr 2024 11:37:55 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) by MTKMBS09N1.mediatek.inc (172.21.101.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 10 Apr 2024 20:37:54 -0700 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Thu, 11 Apr 2024 11:37:54 +0800 From: olivia.wen To: Bjorn Andersson , Mathieu Poirier , Rob Herring CC: Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Tinghan Shen , , , , , , , , , , Subject: [PATCH 2/2] remoteproc: mediatek: Support MT8188 SCP core 1 Date: Thu, 11 Apr 2024 11:37:50 +0800 Message-ID: <20240411033750.6476-3-olivia.wen@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240411033750.6476-1-olivia.wen@mediatek.com> References: <20240411033750.6476-1-olivia.wen@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To Support MT8188 SCP core 1 for ISP driver. The SCP on different chips will require different code sizes and IPI buffer sizes based on varying requirements. Signed-off-by: olivia.wen --- drivers/remoteproc/mtk_common.h | 5 +-- drivers/remoteproc/mtk_scp.c | 62 +++++++++++++++++++++++++++++++---= ---- drivers/remoteproc/mtk_scp_ipi.c | 9 ++++-- include/linux/remoteproc/mtk_scp.h | 1 + 4 files changed, 62 insertions(+), 15 deletions(-) diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_commo= n.h index 6d7736a..8f37f65 100644 --- a/drivers/remoteproc/mtk_common.h +++ b/drivers/remoteproc/mtk_common.h @@ -78,7 +78,6 @@ #define MT8195_L2TCM_OFFSET 0x850d0 =20 #define SCP_FW_VER_LEN 32 -#define SCP_SHARE_BUFFER_SIZE 288 =20 struct scp_run { u32 signaled; @@ -110,6 +109,8 @@ struct mtk_scp_of_data { u32 host_to_scp_int_bit; =20 size_t ipi_buf_offset; + u32 ipi_buffer_size; + u32 max_code_size; }; =20 struct mtk_scp_of_cluster { @@ -162,7 +163,7 @@ struct mtk_scp { struct mtk_share_obj { u32 id; u32 len; - u8 share_buf[SCP_SHARE_BUFFER_SIZE]; + u8 *share_buf; }; =20 void scp_memcpy_aligned(void __iomem *dst, const void *src, unsigned int l= en); diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c index 6751829..270718d 100644 --- a/drivers/remoteproc/mtk_scp.c +++ b/drivers/remoteproc/mtk_scp.c @@ -20,7 +20,6 @@ #include "mtk_common.h" #include "remoteproc_internal.h" =20 -#define MAX_CODE_SIZE 0x500000 #define SECTION_NAME_IPI_BUFFER ".ipi_buffer" =20 /** @@ -94,14 +93,14 @@ static void scp_ipi_handler(struct mtk_scp *scp) { struct mtk_share_obj __iomem *rcv_obj =3D scp->recv_buf; struct scp_ipi_desc *ipi_desc =3D scp->ipi_desc; - u8 tmp_data[SCP_SHARE_BUFFER_SIZE]; + u8 *tmp_data; scp_ipi_handler_t handler; u32 id =3D readl(&rcv_obj->id); u32 len =3D readl(&rcv_obj->len); =20 - if (len > SCP_SHARE_BUFFER_SIZE) { + if (len > scp->data->ipi_buffer_size) { dev_err(scp->dev, "ipi message too long (len %d, max %d)", len, - SCP_SHARE_BUFFER_SIZE); + scp->data->ipi_buffer_size); return; } if (id >=3D SCP_IPI_MAX) { @@ -109,6 +108,10 @@ static void scp_ipi_handler(struct mtk_scp *scp) return; } =20 + tmp_data =3D kzalloc(len, GFP_KERNEL); + if (!tmp_data) + return; + scp_ipi_lock(scp, id); handler =3D ipi_desc[id].handler; if (!handler) { @@ -123,6 +126,7 @@ static void scp_ipi_handler(struct mtk_scp *scp) =20 scp->ipi_id_ack[id] =3D true; wake_up(&scp->ack_wq); + kfree(tmp_data); } =20 static int scp_elf_read_ipi_buf_addr(struct mtk_scp *scp, @@ -133,6 +137,7 @@ static int scp_ipi_init(struct mtk_scp *scp, const stru= ct firmware *fw) { int ret; size_t buf_sz, offset; + size_t share_buf_offset; =20 /* read the ipi buf addr from FW itself first */ ret =3D scp_elf_read_ipi_buf_addr(scp, fw, &offset); @@ -154,10 +159,12 @@ static int scp_ipi_init(struct mtk_scp *scp, const st= ruct firmware *fw) =20 scp->recv_buf =3D (struct mtk_share_obj __iomem *) (scp->sram_base + offset); + share_buf_offset =3D sizeof(scp->recv_buf->id) + + sizeof(scp->recv_buf->len) + scp->data->ipi_buffer_size; scp->send_buf =3D (struct mtk_share_obj __iomem *) - (scp->sram_base + offset + sizeof(*scp->recv_buf)); - memset_io(scp->recv_buf, 0, sizeof(*scp->recv_buf)); - memset_io(scp->send_buf, 0, sizeof(*scp->send_buf)); + (scp->sram_base + offset + share_buf_offset); + memset_io(scp->recv_buf, 0, share_buf_offset); + memset_io(scp->send_buf, 0, share_buf_offset); =20 return 0; } @@ -891,7 +898,7 @@ static int scp_map_memory_region(struct mtk_scp *scp) } =20 /* Reserved SCP code size */ - scp->dram_size =3D MAX_CODE_SIZE; + scp->dram_size =3D scp->data->max_code_size; scp->cpu_addr =3D dma_alloc_coherent(scp->dev, scp->dram_size, &scp->dma_addr, GFP_KERNEL); if (!scp->cpu_addr) @@ -1247,6 +1254,8 @@ static const struct mtk_scp_of_data mt8183_of_data = =3D { .host_to_scp_reg =3D MT8183_HOST_TO_SCP, .host_to_scp_int_bit =3D MT8183_HOST_IPC_INT_BIT, .ipi_buf_offset =3D 0x7bdb0, + .max_code_size =3D 0x500000, + .ipi_buffer_size =3D 288, }; =20 static const struct mtk_scp_of_data mt8186_of_data =3D { @@ -1260,18 +1269,22 @@ static const struct mtk_scp_of_data mt8186_of_data = =3D { .host_to_scp_reg =3D MT8183_HOST_TO_SCP, .host_to_scp_int_bit =3D MT8183_HOST_IPC_INT_BIT, .ipi_buf_offset =3D 0x3bdb0, + .max_code_size =3D 0x500000, + .ipi_buffer_size =3D 288, }; =20 static const struct mtk_scp_of_data mt8188_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_before_load =3D mt8195_scp_before_load, + .scp_irq_handler =3D mt8195_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_stop =3D mt8195_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, + .max_code_size =3D 0x500000, + .ipi_buffer_size =3D 600, }; =20 static const struct mtk_scp_of_data mt8192_of_data =3D { @@ -1284,6 +1297,8 @@ static const struct mtk_scp_of_data mt8192_of_data = =3D { .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, + .max_code_size =3D 0x500000, + .ipi_buffer_size =3D 288, }; =20 static const struct mtk_scp_of_data mt8195_of_data =3D { @@ -1296,6 +1311,8 @@ static const struct mtk_scp_of_data mt8195_of_data = =3D { .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, + .max_code_size =3D 0x500000, + .ipi_buffer_size =3D 288, }; =20 static const struct mtk_scp_of_data mt8195_of_data_c1 =3D { @@ -1308,6 +1325,22 @@ static const struct mtk_scp_of_data mt8195_of_data_c= 1 =3D { .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 MT8195_CORE1_HOST_IPC_INT_BIT, + .max_code_size =3D 0x500000, + .ipi_buffer_size =3D 288, +}; + +static const struct mtk_scp_of_data mt8188_of_data_c1 =3D { + .scp_clk_get =3D mt8195_scp_clk_get, + .scp_before_load =3D mt8195_scp_c1_before_load, + .scp_irq_handler =3D mt8195_scp_c1_irq_handler, + .scp_reset_assert =3D mt8195_scp_c1_reset_assert, + .scp_reset_deassert =3D mt8195_scp_c1_reset_deassert, + .scp_stop =3D mt8195_scp_c1_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 MT8195_CORE1_HOST_IPC_INT_BIT, + .max_code_size =3D 0xA00000, + .ipi_buffer_size =3D 600, }; =20 static const struct mtk_scp_of_data *mt8195_of_data_cores[] =3D { @@ -1316,6 +1349,12 @@ static const struct mtk_scp_of_data *mt8195_of_data_= cores[] =3D { NULL }; =20 +static const struct mtk_scp_of_data *mt8188_of_data_cores[] =3D { + &mt8188_of_data, + &mt8188_of_data_c1, + NULL +}; + static const struct of_device_id mtk_scp_of_match[] =3D { { .compatible =3D "mediatek,mt8183-scp", .data =3D &mt8183_of_data }, { .compatible =3D "mediatek,mt8186-scp", .data =3D &mt8186_of_data }, @@ -1323,6 +1362,7 @@ static const struct of_device_id mtk_scp_of_match[] = =3D { { .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 }, + { .compatible =3D "mediatek,mt8188-scp-dual", .data =3D &mt8188_of_data_c= ores }, {}, }; MODULE_DEVICE_TABLE(of, mtk_scp_of_match); diff --git a/drivers/remoteproc/mtk_scp_ipi.c b/drivers/remoteproc/mtk_scp_= ipi.c index cd0b601..4ef5491 100644 --- a/drivers/remoteproc/mtk_scp_ipi.c +++ b/drivers/remoteproc/mtk_scp_ipi.c @@ -162,10 +162,12 @@ int scp_ipi_send(struct mtk_scp *scp, u32 id, void *b= uf, unsigned int len, struct mtk_share_obj __iomem *send_obj =3D scp->send_buf; u32 val; int ret; + size_t share_buf_offset; + void __iomem *share_buf_io_address; =20 if (WARN_ON(id <=3D SCP_IPI_INIT) || WARN_ON(id >=3D SCP_IPI_MAX) || WARN_ON(id =3D=3D SCP_IPI_NS_SERVICE) || - WARN_ON(len > sizeof(send_obj->share_buf)) || WARN_ON(!buf)) + WARN_ON(len > scp->data->ipi_buffer_size) || WARN_ON(!buf)) return -EINVAL; =20 ret =3D clk_prepare_enable(scp->clk); @@ -184,7 +186,10 @@ int scp_ipi_send(struct mtk_scp *scp, u32 id, void *bu= f, unsigned int len, goto unlock_mutex; } =20 - scp_memcpy_aligned(send_obj->share_buf, buf, len); + share_buf_offset =3D offsetof(struct mtk_share_obj, share_buf); + share_buf_io_address =3D (void __iomem *)((uintptr_t)scp->send_buf + shar= e_buf_offset); + + scp_memcpy_aligned(share_buf_io_address, buf, len); =20 writel(len, &send_obj->len); writel(id, &send_obj->id); diff --git a/include/linux/remoteproc/mtk_scp.h b/include/linux/remoteproc/= mtk_scp.h index 7c2b7cc9..344ff41 100644 --- a/include/linux/remoteproc/mtk_scp.h +++ b/include/linux/remoteproc/mtk_scp.h @@ -43,6 +43,7 @@ enum scp_ipi_id { SCP_IPI_CROS_HOST_CMD, SCP_IPI_VDEC_LAT, SCP_IPI_VDEC_CORE, + SCP_IPI_IMGSYS_CMD, SCP_IPI_NS_SERVICE =3D 0xFF, SCP_IPI_MAX =3D 0x100, }; --=20 2.6.4