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

soc: mediatek: cmdq: Add parameter shift_pa to cmdq_pkt_jump() 



In original design, cmdq_pkt_jump() call cmdq_get_shift_pa() every
time to get shift_pa. But the shift_pa is constant value for each
SoC, so client driver just need to call cmdq_get_shift_pa() once
and pass shift_pa to cmdq_pkt_jump() to prevent frequent function
call.

Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://lore.kernel.org/r/20240222154120.16959-3-chunkuang.hu@kernel.org


Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
parent ed4d5ab1

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

+2 −3
Original line number Diff line number Diff line
@@ -393,14 +393,13 @@ 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)

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

{

	struct cmdq_instruction inst = {};



	inst.op = CMDQ_CODE_JUMP;

	inst.offset = CMDQ_JUMP_ABSOLUTE;

	inst.value = addr >>

		cmdq_get_shift_pa(((struct cmdq_client *)pkt->cl)->chan);

	inst.value = addr >> shift_pa;

	return cmdq_pkt_append_command(pkt, inst);

}

EXPORT_SYMBOL(cmdq_pkt_jump);

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

+4 −2
Original line number Diff line number Diff line
@@ -253,10 +253,12 @@ int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value); 
 *		     a physical address which should contains more instruction.

 * @pkt:        the CMDQ packet

 * @addr:       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);

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



/**

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

}



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

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

{

	return -EINVAL;

}