From nobody Mon Feb 9 18:43:34 2026 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 57078262FEF; Mon, 12 May 2025 09:23:05 +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=1747041789; cv=none; b=mDpHkgvhDT/7x57ifW0doVDRgYOEK0AHHSq5ARwtl4kCT40IFadbHEYA62Nuz2ePuv3XW0MRKY0x259oKl7Vpkjmpm6gCzysyvRGxfsH1LfdJCE2yXZf7pnFBEnCkQ//blUryVQINrMSdOlOjPjZXLL77+5q7KQFqGC2t7Xg5Lk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747041789; c=relaxed/simple; bh=Kt0qv1sLvb+q1sniH6Zgn5KvTt72TyIIdNa4MQ0zKSQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BJ5JtBWpMvaghM0WMspaUTyY5NI8PXGmiagBUAoFnPxSNtMf+kHF71MYOlbWgKKIYktjAWlk5jLdtLNbtaQopbVtPhwPxyTFP2+/IQyB//tW+4M8CksPmMmJsKj77Sycq/AOOo+MKF/r+bpwUJPXHTQGe4lsVy/e7WhYCGr0/9Y= 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=idpaq5jD; 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="idpaq5jD" X-UUID: b03d421a2f1211f0813e4fe1310efc19-20250512 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=k2kAnr/rDtN9bEn+nMeXwAS2lV4DpQj7+1ksUkX70CA=; b=idpaq5jD1U/KuDxXQquC1GUIctdbcXh4SjbGYFYHVZ0aHKT96qf9xWEujDiSx1Z16gw5iq3OSn3MPv4Uqx/7bXiX8OdpLs8iuozUwWYSc75Ymfnc1LtovBF3AKdOzbVs7+ZH/oa7r2PUF0LcuRbee8cZwCP+RnQf60q/c/xs/nk=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.2.1,REQID:b36cf684-a862-41cd-b91c-154bd6cc9f27,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:0ef645f,CLOUDID:98889cb7-5e6b-4d0f-a080-a5e9cb36bea6,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102,TC:nil,Content:0|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 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: b03d421a2f1211f0813e4fe1310efc19-20250512 Received: from mtkmbs13n1.mediatek.inc [(172.21.101.193)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1564097911; Mon, 12 May 2025 17:22:56 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by MTKMBS09N2.mediatek.inc (172.21.101.94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.39; Mon, 12 May 2025 17:22:53 +0800 Received: from mtksitap99.mediatek.inc (10.233.130.16) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.39 via Frontend Transport; Mon, 12 May 2025 17:22:53 +0800 From: Jason-JH Lin To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jassi Brar , Chun-Kuang Hu , AngeloGioacchino Del Regno , Mauro Carvalho Chehab CC: Matthias Brugger , Jason-JH Lin , Nancy Lin , Singo Chang , Paul-PL Chen , Moudy Ho , Xavier Chang , Xiandong Wang , Sirius Wang , Fei Shao , Chen-yu Tsai , , , , , , , Subject: [PATCH RESEND v5 07/20] soc: mediatek: mtk-cmdq: Remove shift_pa parameter from cmdq_pkt_jump() Date: Mon, 12 May 2025 17:19:29 +0800 Message-ID: <20250512092252.905629-8-jason-jh.lin@mediatek.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250512092252.905629-1-jason-jh.lin@mediatek.com> References: <20250512092252.905629-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(). Fixes: ade176534112 ("soc: mediatek: cmdq: Add parameter shift_pa to cmdq_p= kt_jump()") Signed-off-by: Jason-JH Lin --- drivers/soc/mediatek/mtk-cmdq-helper.c | 8 ++++---- include/linux/soc/mediatek/mtk-cmdq.h | 20 ++++++++------------ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/= mtk-cmdq-helper.c index 8feeaa320359..a40919555d4d 100644 --- a/drivers/soc/mediatek/mtk-cmdq-helper.c +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c @@ -494,22 +494,22 @@ 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, .offset =3D CMDQ_JUMP_ABSOLUTE, - .value =3D addr >> shift_pa + .value =3D addr >> pkt->priv.shift_pa }; return cmdq_pkt_append_command(pkt, inst); } 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 67fd0924747b..ee4ec64a7322 100644 --- a/include/linux/soc/mediatek/mtk-cmdq.h +++ b/include/linux/soc/mediatek/mtk-cmdq.h @@ -350,17 +350,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 /** @@ -370,17 +368,15 @@ 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 /* This wrapper has to be removed after all users migrated to jump_rel */ static int cmdq_pkt_jump_rel_temp(struct cmdq_pkt *pkt, s32 offset, u8 shi= ft_pa) { - return cmdq_pkt_jump_rel(pkt, addr, shift_pa); + return cmdq_pkt_jump_rel(pkt, addr); } =20 /** @@ -497,17 +493,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