| Message ID | 20240301111126.22035-3-jason-jh.lin@mediatek.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Add CMDQ API for upcoming ISP feature | expand |
Il 01/03/24 12:11, Jason-JH.Lin ha scritto: > Add cmdq_pkt_mem_move() function to support CMDQ user making > an instruction for moving a value from a source address to a > destination address. > > Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com> > Change-Id: I0128db6a3412303fc6da61f8a57a0c08e0c0067e Drop Change-id please > --- > drivers/soc/mediatek/mtk-cmdq-helper.c | 26 ++++++++++++++++++++++++++ > include/linux/soc/mediatek/mtk-cmdq.h | 10 ++++++++++ > 2 files changed, 36 insertions(+) > > diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c > index b0cd071c4719..3a1e47ad8a41 100644 > --- a/drivers/soc/mediatek/mtk-cmdq-helper.c > +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c > @@ -299,6 +299,32 @@ int cmdq_pkt_write_s_mask_value(struct cmdq_pkt *pkt, u8 high_addr_reg_idx, > } > EXPORT_SYMBOL(cmdq_pkt_write_s_mask_value); > > +s32 cmdq_pkt_mem_move(struct cmdq_pkt *pkt, dma_addr_t src_addr, dma_addr_t dst_addr) > +{ > + s32 err; > + const u16 tmp_reg_idx = CMDQ_THR_SPR_IDX0; > + const u16 swap_reg_idx = CMDQ_THR_SPR_IDX1; s32 err at the end please > + > + /* read the value of src_addr into swap_reg_idx */ > + err = cmdq_pkt_assign(pkt, tmp_reg_idx, CMDQ_ADDR_HIGH(src_addr)); > + if (err < 0) > + return err; > + err = cmdq_pkt_read_s(pkt, tmp_reg_idx, CMDQ_ADDR_LOW(src_addr), swap_reg_idx); > + if (err < 0) > + return err; > + > + /* write the value of swap_reg_idx into dst_addr */ > + err = cmdq_pkt_assign(pkt, tmp_reg_idx, CMDQ_ADDR_HIGH(dst_addr)); > + if (err < 0) > + return err; > + err = cmdq_pkt_write_s(pkt, tmp_reg_idx, CMDQ_ADDR_LOW(dst_addr), swap_reg_idx); > + if (err < 0) > + return err; > + > + return err; In the documentation, you say "0 for success", so... return 0; here :-) > +} > +EXPORT_SYMBOL(cmdq_pkt_mem_move); > + > int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event, bool clear) > { > struct cmdq_instruction inst = { {0} }; > diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h > index 1dae80185f9f..b6dbe2d8f16a 100644 > --- a/include/linux/soc/mediatek/mtk-cmdq.h > +++ b/include/linux/soc/mediatek/mtk-cmdq.h > @@ -182,6 +182,16 @@ int cmdq_pkt_write_s_value(struct cmdq_pkt *pkt, u8 high_addr_reg_idx, > int cmdq_pkt_write_s_mask_value(struct cmdq_pkt *pkt, u8 high_addr_reg_idx, > u16 addr_low, u32 value, u32 mask); > > +/** > + * cmdq_pkt_mem_move() - append memory move command to the CMDQ packet > + * @pkt: the CMDQ packet > + * @src_addr: source address > + * @dma_addr_t: destination address > + * * @dst_addr: destination address * * Appends a CMDQ command to copy the value found in `src_addr` to `dst_addr` * * Return .... > + * Return: 0 for success; else the error code is returned > + */ > +int cmdq_pkt_mem_move(struct cmdq_pkt *pkt, dma_addr_t src_addr, dma_addr_t dst_addr); > + > /** > * cmdq_pkt_wfe() - append wait for event command to the CMDQ packet > * @pkt: the CMDQ packet
Hi Angelo, Thanks for the reviews. On Mon, 2024-03-04 at 11:05 +0100, AngeloGioacchino Del Regno wrote: > Il 01/03/24 12:11, Jason-JH.Lin ha scritto: > > Add cmdq_pkt_mem_move() function to support CMDQ user making > > an instruction for moving a value from a source address to a > > destination address. > > > > Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com> > > Change-Id: I0128db6a3412303fc6da61f8a57a0c08e0c0067e > > Drop Change-id please > OK, I'll drop this. > > --- > > drivers/soc/mediatek/mtk-cmdq-helper.c | 26 > > ++++++++++++++++++++++++++ > > include/linux/soc/mediatek/mtk-cmdq.h | 10 ++++++++++ > > 2 files changed, 36 insertions(+) > > > > diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c > > b/drivers/soc/mediatek/mtk-cmdq-helper.c > > index b0cd071c4719..3a1e47ad8a41 100644 > > --- a/drivers/soc/mediatek/mtk-cmdq-helper.c > > +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c > > @@ -299,6 +299,32 @@ int cmdq_pkt_write_s_mask_value(struct > > cmdq_pkt *pkt, u8 high_addr_reg_idx, > > } > > EXPORT_SYMBOL(cmdq_pkt_write_s_mask_value); > > > > +s32 cmdq_pkt_mem_move(struct cmdq_pkt *pkt, dma_addr_t src_addr, > > dma_addr_t dst_addr) > > +{ > > + s32 err; > > + const u16 tmp_reg_idx = CMDQ_THR_SPR_IDX0; > > + const u16 swap_reg_idx = CMDQ_THR_SPR_IDX1; > > s32 err at the end please OK, I'll move it here and I'll change 's32' to 'int' to align with other functions. > > + > > + /* read the value of src_addr into swap_reg_idx */ > > + err = cmdq_pkt_assign(pkt, tmp_reg_idx, > > CMDQ_ADDR_HIGH(src_addr)); > > + if (err < 0) > > + return err; > > + err = cmdq_pkt_read_s(pkt, tmp_reg_idx, > > CMDQ_ADDR_LOW(src_addr), swap_reg_idx); > > + if (err < 0) > > + return err; > > + > > + /* write the value of swap_reg_idx into dst_addr */ > > + err = cmdq_pkt_assign(pkt, tmp_reg_idx, > > CMDQ_ADDR_HIGH(dst_addr)); > > + if (err < 0) > > + return err; > > + err = cmdq_pkt_write_s(pkt, tmp_reg_idx, > > CMDQ_ADDR_LOW(dst_addr), swap_reg_idx); > > + if (err < 0) > > + return err; > > + > > + return err; > > In the documentation, you say "0 for success", so... > > return 0; here :-) OK, I'll change it. > > > +} > > +EXPORT_SYMBOL(cmdq_pkt_mem_move); > > + > > int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event, bool clear) > > { > > struct cmdq_instruction inst = { {0} }; > > diff --git a/include/linux/soc/mediatek/mtk-cmdq.h > > b/include/linux/soc/mediatek/mtk-cmdq.h > > index 1dae80185f9f..b6dbe2d8f16a 100644 > > --- a/include/linux/soc/mediatek/mtk-cmdq.h > > +++ b/include/linux/soc/mediatek/mtk-cmdq.h > > @@ -182,6 +182,16 @@ int cmdq_pkt_write_s_value(struct cmdq_pkt > > *pkt, u8 high_addr_reg_idx, > > int cmdq_pkt_write_s_mask_value(struct cmdq_pkt *pkt, u8 > > high_addr_reg_idx, > > u16 addr_low, u32 value, u32 mask); > > > > +/** > > + * cmdq_pkt_mem_move() - append memory move command to the CMDQ > > packet > > + * @pkt: the CMDQ packet > > + * @src_addr: source address > > + * @dma_addr_t: destination address > > + * > > * @dst_addr: destination address > * I'll fix that typo. Thanks! > * Appends a CMDQ command to copy the value found in `src_addr` to > `dst_addr` > * > * Return .... > and also change the doc format like this. Regards, Jason-JH.Lin > > + * Return: 0 for success; else the error code is returned > > + */ > > +int cmdq_pkt_mem_move(struct cmdq_pkt *pkt, dma_addr_t src_addr, > > dma_addr_t dst_addr); > > + > > /** > > * cmdq_pkt_wfe() - append wait for event command to the CMDQ > > packet > > * @pkt: the CMDQ packet > >
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c index b0cd071c4719..3a1e47ad8a41 100644 --- a/drivers/soc/mediatek/mtk-cmdq-helper.c +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c @@ -299,6 +299,32 @@ int cmdq_pkt_write_s_mask_value(struct cmdq_pkt *pkt, u8 high_addr_reg_idx, } EXPORT_SYMBOL(cmdq_pkt_write_s_mask_value); +s32 cmdq_pkt_mem_move(struct cmdq_pkt *pkt, dma_addr_t src_addr, dma_addr_t dst_addr) +{ + s32 err; + const u16 tmp_reg_idx = CMDQ_THR_SPR_IDX0; + const u16 swap_reg_idx = CMDQ_THR_SPR_IDX1; + + /* read the value of src_addr into swap_reg_idx */ + err = cmdq_pkt_assign(pkt, tmp_reg_idx, CMDQ_ADDR_HIGH(src_addr)); + if (err < 0) + return err; + err = cmdq_pkt_read_s(pkt, tmp_reg_idx, CMDQ_ADDR_LOW(src_addr), swap_reg_idx); + if (err < 0) + return err; + + /* write the value of swap_reg_idx into dst_addr */ + err = cmdq_pkt_assign(pkt, tmp_reg_idx, CMDQ_ADDR_HIGH(dst_addr)); + if (err < 0) + return err; + err = cmdq_pkt_write_s(pkt, tmp_reg_idx, CMDQ_ADDR_LOW(dst_addr), swap_reg_idx); + if (err < 0) + return err; + + return err; +} +EXPORT_SYMBOL(cmdq_pkt_mem_move); + int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event, bool clear) { struct cmdq_instruction inst = { {0} }; diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h index 1dae80185f9f..b6dbe2d8f16a 100644 --- a/include/linux/soc/mediatek/mtk-cmdq.h +++ b/include/linux/soc/mediatek/mtk-cmdq.h @@ -182,6 +182,16 @@ int cmdq_pkt_write_s_value(struct cmdq_pkt *pkt, u8 high_addr_reg_idx, int cmdq_pkt_write_s_mask_value(struct cmdq_pkt *pkt, u8 high_addr_reg_idx, u16 addr_low, u32 value, u32 mask); +/** + * cmdq_pkt_mem_move() - append memory move command to the CMDQ packet + * @pkt: the CMDQ packet + * @src_addr: source address + * @dma_addr_t: destination address + * + * Return: 0 for success; else the error code is returned + */ +int cmdq_pkt_mem_move(struct cmdq_pkt *pkt, dma_addr_t src_addr, dma_addr_t dst_addr); + /** * cmdq_pkt_wfe() - append wait for event command to the CMDQ packet * @pkt: the CMDQ packet
Add cmdq_pkt_mem_move() function to support CMDQ user making an instruction for moving a value from a source address to a destination address. Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com> Change-Id: I0128db6a3412303fc6da61f8a57a0c08e0c0067e --- drivers/soc/mediatek/mtk-cmdq-helper.c | 26 ++++++++++++++++++++++++++ include/linux/soc/mediatek/mtk-cmdq.h | 10 ++++++++++ 2 files changed, 36 insertions(+)