Message ID | 1574327552-11806-7-git-send-email-dennis-yc.hsieh@mediatek.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v1,01/12] dt-binding: gce: add gce header file for mt6779 | expand |
Hi, Dennis: On Thu, 2019-11-21 at 17:12 +0800, Dennis YC Hsieh wrote: > Add assign function in cmdq helper which assign constant value into > internal register by index. > > Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com> > --- > drivers/soc/mediatek/mtk-cmdq-helper.c | 24 +++++++++++++++++++++++- > include/linux/mailbox/mtk-cmdq-mailbox.h | 1 + > include/linux/soc/mediatek/mtk-cmdq.h | 14 ++++++++++++++ > 3 files changed, 38 insertions(+), 1 deletion(-) > > diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c > index 274f6f3..d419e99 100644 > --- a/drivers/soc/mediatek/mtk-cmdq-helper.c > +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c > @@ -14,6 +14,7 @@ > #define CMDQ_EOC_IRQ_EN BIT(0) > #define CMDQ_EOC_CMD ((u64)((CMDQ_CODE_EOC << CMDQ_OP_CODE_SHIFT)) \ > << 32 | CMDQ_EOC_IRQ_EN) > +#define CMDQ_REG_TYPE 1 > > struct cmdq_instruction { > union { > @@ -23,8 +24,17 @@ struct cmdq_instruction { > union { > u16 offset; > u16 event; > + u16 reg_dst; > + }; > + union { > + u8 subsys; > + struct { > + u8 sop:5; > + u8 arg_c_t:1; > + u8 arg_b_t:1; > + u8 arg_a_t:1; > + }; > }; > - u8 subsys; > u8 op; > }; > > @@ -279,6 +289,18 @@ int cmdq_pkt_poll_mask(struct cmdq_pkt *pkt, u8 subsys, > } > EXPORT_SYMBOL(cmdq_pkt_poll_mask); > > +int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value) > +{ > + struct cmdq_instruction inst = { {0} }; > + > + inst.op = CMDQ_CODE_LOGIC; > + inst.arg_a_t = CMDQ_REG_TYPE; It looks like that arg_a_t could have a meaningful name. Regards, CK > + inst.reg_dst = reg_idx; > + inst.value = value; > + return cmdq_pkt_append_command(pkt, inst); > +} > +EXPORT_SYMBOL(cmdq_pkt_assign); > + > static int cmdq_pkt_finalize(struct cmdq_pkt *pkt) > { > struct cmdq_client *cl = pkt->cl; > diff --git a/include/linux/mailbox/mtk-cmdq-mailbox.h b/include/linux/mailbox/mtk-cmdq-mailbox.h > index dfe5b2e..121c3bb 100644 > --- a/include/linux/mailbox/mtk-cmdq-mailbox.h > +++ b/include/linux/mailbox/mtk-cmdq-mailbox.h > @@ -59,6 +59,7 @@ enum cmdq_code { > CMDQ_CODE_JUMP = 0x10, > CMDQ_CODE_WFE = 0x20, > CMDQ_CODE_EOC = 0x40, > + CMDQ_CODE_LOGIC = 0xa0, > }; > > enum cmdq_cb_status { > diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h > index a74c1d5..8334021 100644 > --- a/include/linux/soc/mediatek/mtk-cmdq.h > +++ b/include/linux/soc/mediatek/mtk-cmdq.h > @@ -152,6 +152,20 @@ int cmdq_pkt_poll(struct cmdq_pkt *pkt, u8 subsys, > */ > int cmdq_pkt_poll_mask(struct cmdq_pkt *pkt, u8 subsys, > u16 offset, u32 value, u32 mask); > + > +/** > + * cmdq_pkt_assign() - Append logic assign command to the CMDQ packet, ask GCE > + * to execute an instruction that set a constant value into > + * internal register and use as value, mask or address in > + * read/write instruction. > + * @pkt: the CMDQ packet > + * @reg_idx: the CMDQ internal register ID > + * @value: the specified value > + * > + * Return: 0 for success; else the error code is returned > + */ > +int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value); > + > /** > * cmdq_pkt_flush_async() - trigger CMDQ to asynchronously execute the CMDQ > * packet and call back at the end of done packet
Hi CK, On Mon, 2019-11-25 at 13:35 +0800, CK Hu wrote: > Hi, Dennis: > > On Thu, 2019-11-21 at 17:12 +0800, Dennis YC Hsieh wrote: > > Add assign function in cmdq helper which assign constant value into > > internal register by index. > > > > Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com> > > --- > > drivers/soc/mediatek/mtk-cmdq-helper.c | 24 +++++++++++++++++++++++- > > include/linux/mailbox/mtk-cmdq-mailbox.h | 1 + > > include/linux/soc/mediatek/mtk-cmdq.h | 14 ++++++++++++++ > > 3 files changed, 38 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c > > index 274f6f3..d419e99 100644 > > --- a/drivers/soc/mediatek/mtk-cmdq-helper.c > > +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c > > @@ -14,6 +14,7 @@ > > #define CMDQ_EOC_IRQ_EN BIT(0) > > #define CMDQ_EOC_CMD ((u64)((CMDQ_CODE_EOC << CMDQ_OP_CODE_SHIFT)) \ > > << 32 | CMDQ_EOC_IRQ_EN) > > +#define CMDQ_REG_TYPE 1 > > > > struct cmdq_instruction { > > union { > > @@ -23,8 +24,17 @@ struct cmdq_instruction { > > union { > > u16 offset; > > u16 event; > > + u16 reg_dst; > > + }; > > + union { > > + u8 subsys; > > + struct { > > + u8 sop:5; > > + u8 arg_c_t:1; > > + u8 arg_b_t:1; > > + u8 arg_a_t:1; > > + }; > > }; > > - u8 subsys; > > u8 op; > > }; > > > > @@ -279,6 +289,18 @@ int cmdq_pkt_poll_mask(struct cmdq_pkt *pkt, u8 subsys, > > } > > EXPORT_SYMBOL(cmdq_pkt_poll_mask); > > > > +int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value) > > +{ > > + struct cmdq_instruction inst = { {0} }; > > + > > + inst.op = CMDQ_CODE_LOGIC; > > + inst.arg_a_t = CMDQ_REG_TYPE; > > It looks like that arg_a_t could have a meaningful name. > > Regards, > CK > Ok, I'll rename it. Thanks for your comment. Regards, Dennis > > + inst.reg_dst = reg_idx; > > + inst.value = value; > > + return cmdq_pkt_append_command(pkt, inst); > > +} > > +EXPORT_SYMBOL(cmdq_pkt_assign); > > + > > static int cmdq_pkt_finalize(struct cmdq_pkt *pkt) > > { > > struct cmdq_client *cl = pkt->cl; > > diff --git a/include/linux/mailbox/mtk-cmdq-mailbox.h b/include/linux/mailbox/mtk-cmdq-mailbox.h > > index dfe5b2e..121c3bb 100644 > > --- a/include/linux/mailbox/mtk-cmdq-mailbox.h > > +++ b/include/linux/mailbox/mtk-cmdq-mailbox.h > > @@ -59,6 +59,7 @@ enum cmdq_code { > > CMDQ_CODE_JUMP = 0x10, > > CMDQ_CODE_WFE = 0x20, > > CMDQ_CODE_EOC = 0x40, > > + CMDQ_CODE_LOGIC = 0xa0, > > }; > > > > enum cmdq_cb_status { > > diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h > > index a74c1d5..8334021 100644 > > --- a/include/linux/soc/mediatek/mtk-cmdq.h > > +++ b/include/linux/soc/mediatek/mtk-cmdq.h > > @@ -152,6 +152,20 @@ int cmdq_pkt_poll(struct cmdq_pkt *pkt, u8 subsys, > > */ > > int cmdq_pkt_poll_mask(struct cmdq_pkt *pkt, u8 subsys, > > u16 offset, u32 value, u32 mask); > > + > > +/** > > + * cmdq_pkt_assign() - Append logic assign command to the CMDQ packet, ask GCE > > + * to execute an instruction that set a constant value into > > + * internal register and use as value, mask or address in > > + * read/write instruction. > > + * @pkt: the CMDQ packet > > + * @reg_idx: the CMDQ internal register ID > > + * @value: the specified value > > + * > > + * Return: 0 for success; else the error code is returned > > + */ > > +int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value); > > + > > /** > > * cmdq_pkt_flush_async() - trigger CMDQ to asynchronously execute the CMDQ > > * packet and call back at the end of done packet > >
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c index 274f6f3..d419e99 100644 --- a/drivers/soc/mediatek/mtk-cmdq-helper.c +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c @@ -14,6 +14,7 @@ #define CMDQ_EOC_IRQ_EN BIT(0) #define CMDQ_EOC_CMD ((u64)((CMDQ_CODE_EOC << CMDQ_OP_CODE_SHIFT)) \ << 32 | CMDQ_EOC_IRQ_EN) +#define CMDQ_REG_TYPE 1 struct cmdq_instruction { union { @@ -23,8 +24,17 @@ struct cmdq_instruction { union { u16 offset; u16 event; + u16 reg_dst; + }; + union { + u8 subsys; + struct { + u8 sop:5; + u8 arg_c_t:1; + u8 arg_b_t:1; + u8 arg_a_t:1; + }; }; - u8 subsys; u8 op; }; @@ -279,6 +289,18 @@ int cmdq_pkt_poll_mask(struct cmdq_pkt *pkt, u8 subsys, } EXPORT_SYMBOL(cmdq_pkt_poll_mask); +int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value) +{ + struct cmdq_instruction inst = { {0} }; + + inst.op = CMDQ_CODE_LOGIC; + inst.arg_a_t = CMDQ_REG_TYPE; + inst.reg_dst = reg_idx; + inst.value = value; + return cmdq_pkt_append_command(pkt, inst); +} +EXPORT_SYMBOL(cmdq_pkt_assign); + static int cmdq_pkt_finalize(struct cmdq_pkt *pkt) { struct cmdq_client *cl = pkt->cl; diff --git a/include/linux/mailbox/mtk-cmdq-mailbox.h b/include/linux/mailbox/mtk-cmdq-mailbox.h index dfe5b2e..121c3bb 100644 --- a/include/linux/mailbox/mtk-cmdq-mailbox.h +++ b/include/linux/mailbox/mtk-cmdq-mailbox.h @@ -59,6 +59,7 @@ enum cmdq_code { CMDQ_CODE_JUMP = 0x10, CMDQ_CODE_WFE = 0x20, CMDQ_CODE_EOC = 0x40, + CMDQ_CODE_LOGIC = 0xa0, }; enum cmdq_cb_status { diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h index a74c1d5..8334021 100644 --- a/include/linux/soc/mediatek/mtk-cmdq.h +++ b/include/linux/soc/mediatek/mtk-cmdq.h @@ -152,6 +152,20 @@ int cmdq_pkt_poll(struct cmdq_pkt *pkt, u8 subsys, */ int cmdq_pkt_poll_mask(struct cmdq_pkt *pkt, u8 subsys, u16 offset, u32 value, u32 mask); + +/** + * cmdq_pkt_assign() - Append logic assign command to the CMDQ packet, ask GCE + * to execute an instruction that set a constant value into + * internal register and use as value, mask or address in + * read/write instruction. + * @pkt: the CMDQ packet + * @reg_idx: the CMDQ internal register ID + * @value: the specified value + * + * Return: 0 for success; else the error code is returned + */ +int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value); + /** * cmdq_pkt_flush_async() - trigger CMDQ to asynchronously execute the CMDQ * packet and call back at the end of done packet
Add assign function in cmdq helper which assign constant value into internal register by index. Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com> --- drivers/soc/mediatek/mtk-cmdq-helper.c | 24 +++++++++++++++++++++++- include/linux/mailbox/mtk-cmdq-mailbox.h | 1 + include/linux/soc/mediatek/mtk-cmdq.h | 14 ++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-)