From nobody Fri Apr 3 03:00:57 2026 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 C2DFB2DC79F; Wed, 25 Mar 2026 04:02:48 +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=1774411370; cv=none; b=RUxVxr/PtrHxC9V1rpnOCYLQndTBwvp7AKytai8UNI+3oVv7JAMDGmQDz6ySBhbEy14/IRahhtRkR5r+O6gKt+iKf3FNMJil0nIf/Dxoz6sFyV271SgP4iis6fVtVm9IJ49UY1AYl358Y/7FyZ4/ViF+AgUSgPq1H3YKllJ2Uzc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774411370; c=relaxed/simple; bh=KshY7oIuLcU8PstZSt3y0udynA8ZxHePyfHCigjvATQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rhqtxmApqYR6Q6agPjSOeM7dRFOT3GeCPXTsTqlk3GmGX4gGifTenZYXxd2XskuwB32GCPeKZOCt1zV9+XLnUmOQHxDFJuDb+AeDslKizdZqATSkDnftT3TFvdhTaTO6ZMUvwWUU7deu/KHBUZYsK5szGNlHlI5p7hHmd1nFPxU= 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=KYLPQK3+; 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="KYLPQK3+" X-UUID: 789f84d027ff11f1a39cd589f645bc18-20260325 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=Jt6qClMpSxG69acldOGZvCU50hx3UA7l99LsgXHFcPc=; b=KYLPQK3+p3RuuDYI4LT+vpeLoaNia2VmeX2y/2RNGI1lwzIkAM+v08LdtwJfUD1xsMgv1haADwxkaPboyW0cPps85SEZy+xyaFs3OwRE6QvjuNAGtTSFfzTR/doJWkAafTRQx1npDo78iJCpeElNg5VQLIOaWr6DnkUD839Idag=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:209a124e-e25d-4e5e-b887-6c43f91bc1b5,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:e7bac3a,CLOUDID:fa451ad5-060f-4ecc-9ee0-121eeeb4a682,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102|836|888|898,TC:-5,Content: 0|15|50,EDM:-3,IP:nil,URL:0,File:130,RT:0,Bulk:nil,QS:nil,BEC:-1,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: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 789f84d027ff11f1a39cd589f645bc18-20260325 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 1094163050; Wed, 25 Mar 2026 12:02:41 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by MTKMBS14N1.mediatek.inc (172.21.101.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.29; Wed, 25 Mar 2026 12:02:40 +0800 Received: from mtksitap99.mediatek.inc (10.233.130.16) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.2562.29 via Frontend Transport; Wed, 25 Mar 2026 12:02:40 +0800 From: Jason-JH Lin To: Jassi Brar , Chun-Kuang Hu , AngeloGioacchino Del Regno , Nicolas Dufresne , Mauro Carvalho Chehab CC: Matthias Brugger , Jason-JH Lin , Nancy Lin , Singo Chang , Paul-PL Chen , Moudy Ho , Xiandong Wang , Sirius Wang , Fei Shao , Chen-yu Tsai , , , , , , Subject: [PATCH v2 1/2] soc: mediatek: mtk-cmdq: Remove shift_pa parameter from cmdq_pkt_jump() Date: Wed, 25 Mar 2026 12:02:09 +0800 Message-ID: <20260325040239.2112517-2-jason-jh.lin@mediatek.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260325040239.2112517-1-jason-jh.lin@mediatek.com> References: <20260325040239.2112517-1-jason-jh.lin@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 X-MTK: N Content-Type: text/plain; charset="utf-8" Since shift_pa will be stored in the cmdq_mbox_priv structure within cmdq_pkt, all shift_pa parameters in CMDQ helper APIs can be removed. Remove the shift_pa parameters from cmdq_pkt_jump(), cmdq_pkt_jump_abs(), and cmdq_pkt_jump_rel(). Signed-off-by: Jason-JH Lin Reviewed-by: AngeloGioacchino Del Regno --- drivers/soc/mediatek/mtk-cmdq-helper.c | 6 +++--- include/linux/soc/mediatek/mtk-cmdq.h | 20 ++++++++------------ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/= mtk-cmdq-helper.c index f8ee6c9ade89..9cec6a096d8b 100644 --- a/drivers/soc/mediatek/mtk-cmdq-helper.c +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c @@ -562,7 +562,7 @@ int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, = u32 value) } EXPORT_SYMBOL(cmdq_pkt_assign); =20 -int cmdq_pkt_jump_abs(struct cmdq_pkt *pkt, dma_addr_t addr, u8 shift_pa) +int cmdq_pkt_jump_abs(struct cmdq_pkt *pkt, dma_addr_t addr) { struct cmdq_instruction inst =3D { .op =3D CMDQ_CODE_JUMP, @@ -573,11 +573,11 @@ int cmdq_pkt_jump_abs(struct cmdq_pkt *pkt, dma_addr_= t addr, u8 shift_pa) } EXPORT_SYMBOL(cmdq_pkt_jump_abs); =20 -int cmdq_pkt_jump_rel(struct cmdq_pkt *pkt, s32 offset, u8 shift_pa) +int cmdq_pkt_jump_rel(struct cmdq_pkt *pkt, s32 offset) { struct cmdq_instruction inst =3D { .op =3D CMDQ_CODE_JUMP, - .value =3D (u32)offset >> shift_pa + .value =3D (u32)offset >> pkt->priv.shift_pa }; return cmdq_pkt_append_command(pkt, inst); } diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/medi= atek/mtk-cmdq.h index 03bb85462566..3d0de1a9cac1 100644 --- a/include/linux/soc/mediatek/mtk-cmdq.h +++ b/include/linux/soc/mediatek/mtk-cmdq.h @@ -418,17 +418,15 @@ int cmdq_pkt_poll_addr(struct cmdq_pkt *pkt, dma_addr= _t addr, u32 value, u32 mas * contains more instruction. * @pkt: the CMDQ packet * @addr: absolute physical address of target instruction buffer - * @shift_pa: shift bits of physical address in CMDQ instruction. This val= ue - * is got by cmdq_get_shift_pa(). * * Return: 0 for success; else the error code is returned */ -int cmdq_pkt_jump_abs(struct cmdq_pkt *pkt, dma_addr_t addr, u8 shift_pa); +int cmdq_pkt_jump_abs(struct cmdq_pkt *pkt, dma_addr_t addr); =20 /* This wrapper has to be removed after all users migrated to jump_abs */ -static inline int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr, u8 = shift_pa) +static inline int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr) { - return cmdq_pkt_jump_abs(pkt, addr, shift_pa); + return cmdq_pkt_jump_abs(pkt, addr); } =20 /** @@ -438,12 +436,10 @@ static inline int cmdq_pkt_jump(struct cmdq_pkt *pkt,= dma_addr_t addr, u8 shift_ * target address should contains more instruction. * @pkt: the CMDQ packet * @offset: relative offset of target instruction buffer from current PC. - * @shift_pa: shift bits of physical address in CMDQ instruction. This val= ue - * is got by cmdq_get_shift_pa(). * * Return: 0 for success; else the error code is returned */ -int cmdq_pkt_jump_rel(struct cmdq_pkt *pkt, s32 offset, u8 shift_pa); +int cmdq_pkt_jump_rel(struct cmdq_pkt *pkt, s32 offset); =20 /** * cmdq_pkt_jump_rel_temp() - Temporary wrapper for new CMDQ helper API @@ -460,7 +456,7 @@ int cmdq_pkt_jump_rel(struct cmdq_pkt *pkt, s32 offset,= u8 shift_pa); */ static inline int cmdq_pkt_jump_rel_temp(struct cmdq_pkt *pkt, s32 offset,= u8 shift_pa) { - return cmdq_pkt_jump_rel(pkt, offset, shift_pa); + return cmdq_pkt_jump_rel(pkt, offset); } =20 /** @@ -602,17 +598,17 @@ static inline int cmdq_pkt_poll_addr(struct cmdq_pkt = *pkt, dma_addr_t addr, u32 return -EINVAL; } =20 -static inline int cmdq_pkt_jump_abs(struct cmdq_pkt *pkt, dma_addr_t addr,= u8 shift_pa) +static inline int cmdq_pkt_jump_abs(struct cmdq_pkt *pkt, dma_addr_t addr) { return -EINVAL; } =20 -static inline int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr, u8 = shift_pa) +static inline int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr) { return -EINVAL; } =20 -static inline int cmdq_pkt_jump_rel(struct cmdq_pkt *pkt, s32 offset, u8 s= hift_pa) +static inline int cmdq_pkt_jump_rel(struct cmdq_pkt *pkt, s32 offset) { return -EINVAL; } --=20 2.43.0 From nobody Fri Apr 3 03:00:57 2026 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 2514B2EBBA1; Wed, 25 Mar 2026 04:02:49 +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=1774411372; cv=none; b=RyamZ5T8jDDzwEtcwjZU4EQmVdu10GYrTkeLDHlNJ74AfvhGwQyS7rXA2FX8d8Wpg7HVk3r2X26+0xr9k3KZA/FeBPOSCZ0F2QQKZa9CGLBnlTZI74Sp65u0PYuATd5s+4Ywy0guxKkZIFYcqyd4BA9oty81FvkarSK9iHMA13g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774411372; c=relaxed/simple; bh=7nQye91W36X4TTWAPuie6sG3PydbDl7JU9Pt+Ppsulk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=egSdg+cdEtAZBFhrfm0ixsO0XXBlNvcrsefhZOMwcH2gahFFShnprF8xivkSV3O9jnD5iXteUqyRtAd6mK5PlbuGpod8Q1Nf4xxXxxfT0CPYkx2miIGUWfbI8KHXlkuBgCyxnfTwYXF0TUs5osj2iZrlsiCmlhOGWvh7v6uEbTk= 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=riQv/22H; 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="riQv/22H" X-UUID: 78a2544427ff11f1a39cd589f645bc18-20260325 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=CqQKgebwenzZY4Z6DoNffua+Zv/Kky7+EqV5Xd0Vr1g=; b=riQv/22HUluE7yRFeUflv0gYb09km0EA74AeJ52B8DSUmVupSbg76aq+YX+/yASOqLYeDFTmX90/7+RXeTXHOlhsroXPnjyTRuDVaAnY8gyV7KqJH/jrt7Pv2yCKlIy5y0meE1VTjP5Ed3oTSh34iHyRPJ9iSujEk+50hW0JryI=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:03e4417b-02a0-4b85-8519-c013ef0eb45e,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:e7bac3a,CLOUDID:acb32d94-f8ef-4ca8-bea0-143568f9ca1d,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102|836|888|898,TC:-5,Content: 0|15|50,EDM:-3,IP:nil,URL:0,File:130,RT:0,Bulk:nil,QS:nil,BEC:-1,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: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 78a2544427ff11f1a39cd589f645bc18-20260325 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 2086179839; Wed, 25 Mar 2026 12:02:41 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by MTKMBS14N1.mediatek.inc (172.21.101.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.29; Wed, 25 Mar 2026 12:02:40 +0800 Received: from mtksitap99.mediatek.inc (10.233.130.16) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.2562.29 via Frontend Transport; Wed, 25 Mar 2026 12:02:40 +0800 From: Jason-JH Lin To: Jassi Brar , Chun-Kuang Hu , AngeloGioacchino Del Regno , Nicolas Dufresne , Mauro Carvalho Chehab CC: Matthias Brugger , Jason-JH Lin , Nancy Lin , Singo Chang , Paul-PL Chen , Moudy Ho , Xiandong Wang , Sirius Wang , Fei Shao , Chen-yu Tsai , , , , , , Subject: [PATCH v2 2/2] media: platform: mtk-mdp3: Use cmdq_pkt_jump_rel() without shift_pa Date: Wed, 25 Mar 2026 12:02:10 +0800 Message-ID: <20260325040239.2112517-3-jason-jh.lin@mediatek.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260325040239.2112517-1-jason-jh.lin@mediatek.com> References: <20260325040239.2112517-1-jason-jh.lin@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 X-MTK: N Content-Type: text/plain; charset="utf-8" With the removal of the shift_pa parameter, cmdq_pkt_jump_rel_temp() can be replaced by the new cmdq_pkt_jump_rel() without shift_pa. Then, remove the cmdq_shift_pa variable in the mdp_dev structure for each mbox client. Signed-off-by: Jason-JH Lin Reviewed-by: AngeloGioacchino Del Regno --- drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 2 +- drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c | 2 -- drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c b/drivers= /media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c index 96a66aadf0cd..6afd0164213e 100644 --- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c +++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c @@ -628,7 +628,7 @@ static struct mdp_cmdq_cmd *mdp_cmdq_prepare(struct mdp= _dev *mdp, goto err_free_path; } cmdq_pkt_eoc(&cmd->pkt); - cmdq_pkt_jump_rel_temp(&cmd->pkt, CMDQ_INST_SIZE, mdp->cmdq_shift_pa[pp_i= dx]); + cmdq_pkt_jump_rel(&cmd->pkt, CMDQ_INST_SIZE); =20 for (i =3D 0; i < num_comp; i++) { s32 inner_id =3D MDP_COMP_NONE; diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c b/drivers= /media/platform/mediatek/mdp3/mtk-mdp3-core.c index 8f4da4cf55d2..22fadc6668b1 100644 --- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c +++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c @@ -309,8 +309,6 @@ static int mdp_probe(struct platform_device *pdev) ret =3D PTR_ERR(mdp->cmdq_clt[i]); goto err_mbox_destroy; } - - mdp->cmdq_shift_pa[i] =3D cmdq_get_shift_pa(mdp->cmdq_clt[i]->chan); } =20 init_waitqueue_head(&mdp->callback_wq); diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h b/drivers= /media/platform/mediatek/mdp3/mtk-mdp3-core.h index 05cade1d098e..430251f63754 100644 --- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h +++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h @@ -126,7 +126,6 @@ struct mdp_dev { u32 id_count; struct ida mdp_ida; struct cmdq_client *cmdq_clt[MDP_PP_MAX]; - u8 cmdq_shift_pa[MDP_PP_MAX]; wait_queue_head_t callback_wq; =20 struct v4l2_device v4l2_dev; --=20 2.43.0