Unverified Commit 7218be3b authored by Chun-Kuang Hu's avatar Chun-Kuang Hu Committed by AngeloGioacchino Del Regno
Browse files

soc: mediatek: cmdq: Rename cmdq_pkt_jump() to cmdq_pkt_jump_abs() 



In order to distinguish absolute jump and relative jump,
cmdq_pkt_jump() append absolute jump command, so rename it to
cmdq_pkt_jump_abs().

Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20240222154120.16959-4-chunkuang.hu@kernel.org


[Angelo: Added temporary wrapper to avoid build breakage]
Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
parent ade17653

drivers/soc/mediatek/mtk-cmdq-helper.c

+2 −2
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value) 
}

EXPORT_SYMBOL(cmdq_pkt_assign);



int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr, u8 shift_pa)

int cmdq_pkt_jump_abs(struct cmdq_pkt *pkt, dma_addr_t addr, u8 shift_pa)

{

	struct cmdq_instruction inst = {};
@@ -402,7 +402,7 @@ int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr, u8 shift_pa) 
	inst.value = addr >> shift_pa;

	return cmdq_pkt_append_command(pkt, inst);

}

EXPORT_SYMBOL(cmdq_pkt_jump);

EXPORT_SYMBOL(cmdq_pkt_jump_abs);



int cmdq_pkt_finalize(struct cmdq_pkt *pkt)

{

include/linux/soc/mediatek/mtk-cmdq.h

+17 −5
Original line number Diff line number Diff line
@@ -248,17 +248,24 @@ int cmdq_pkt_poll_mask(struct cmdq_pkt *pkt, u8 subsys, 
int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value);



/**

 * cmdq_pkt_jump() - Append jump command to the CMDQ packet, ask GCE

 *		     to execute an instruction that change current thread PC to

 *		     a physical address which should contains more instruction.

 * cmdq_pkt_jump_abs() - Append jump command to the CMDQ packet, ask GCE

 *			 to execute an instruction that change current thread

 *			 PC to a absolute physical address which should

 *			 contains more instruction.

 * @pkt:        the CMDQ packet

 * @addr:       physical address of target instruction buffer

 * @addr:       absolute physical address of target instruction buffer

 * @shift_pa:	shift bits of physical address in CMDQ instruction. This value

 *		is got by cmdq_get_shift_pa().

 *

 * Return: 0 for success; else the error code is returned

 */

int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr, u8 shift_pa);

int cmdq_pkt_jump_abs(struct cmdq_pkt *pkt, dma_addr_t addr, u8 shift_pa);



/* 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)

{

	return cmdq_pkt_jump_abs(pkt, addr, shift_pa);

}



/**

 * cmdq_pkt_finalize() - Append EOC and jump command to pkt.
@@ -376,6 +383,11 @@ static inline int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value) 
	return -EINVAL;

}



static inline int cmdq_pkt_jump_abs(struct cmdq_pkt *pkt, dma_addr_t addr, u8 shift_pa)

{

	return -EINVAL;

}



static inline int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr, u8 shift_pa)

{

	return -EINVAL;