From: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
To: Rob Herring <robh+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Jassi Brar <jassisinghbrar@gmail.com>
Cc: <linux-kernel@vger.kernel.org>,
<linux-mediatek@lists.infradead.org>,
<devicetree@vger.kernel.org>, <wsd_upstream@mediatek.com>,
Bibby Hsieh <bibby.hsieh@mediatek.com>,
CK Hu <ck.hu@mediatek.com>,
Houlong Wei <houlong.wei@mediatek.com>,
<linux-arm-kernel@lists.infradead.org>,
<srv_heupstream@mediatek.com>,
Ming-Fan Chen <ming-fan.chen@mediatek.com>,
Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
Subject: [PATCH v3 07/13] soc: mediatek: cmdq: add write_s function
Date: Fri, 28 Feb 2020 21:44:15 +0800 [thread overview]
Message-ID: <1582897461-15105-9-git-send-email-dennis-yc.hsieh@mediatek.com> (raw)
In-Reply-To: <1582897461-15105-1-git-send-email-dennis-yc.hsieh@mediatek.com>
add write_s function in cmdq helper functions which
writes value contains in internal register to address
with large dma access support.
Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
---
drivers/soc/mediatek/mtk-cmdq-helper.c | 34 +++++++++++++++++++++++-
include/linux/mailbox/mtk-cmdq-mailbox.h | 2 ++
include/linux/soc/mediatek/mtk-cmdq.h | 20 ++++++++++++++
3 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
index 8342a5c94bc7..68b42c935fe6 100644
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -18,6 +18,10 @@ struct cmdq_instruction {
union {
u32 value;
u32 mask;
+ struct {
+ u16 arg_c;
+ u16 src_reg;
+ };
};
union {
u16 offset;
@@ -29,7 +33,7 @@ struct cmdq_instruction {
struct {
u8 sop:5;
u8 arg_c_t:1;
- u8 arg_b_t:1;
+ u8 src_t:1;
u8 dst_t:1;
};
};
@@ -222,6 +226,34 @@ int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys,
}
EXPORT_SYMBOL(cmdq_pkt_write_mask);
+int cmdq_pkt_write_s(struct cmdq_pkt *pkt, u16 high_addr_reg_idx,
+ u16 addr_low, u16 src_reg_idx, u32 mask)
+{
+ struct cmdq_instruction inst = { {0} };
+ int err;
+
+ if (mask != U32_MAX) {
+ inst.op = CMDQ_CODE_MASK;
+ inst.mask = ~mask;
+ err = cmdq_pkt_append_command(pkt, inst);
+ if (err < 0)
+ return err;
+
+ inst.mask = 0;
+ inst.op = CMDQ_CODE_WRITE_S_MASK;
+ } else {
+ inst.op = CMDQ_CODE_WRITE_S;
+ }
+
+ inst.src_t = CMDQ_REG_TYPE;
+ inst.sop = high_addr_reg_idx;
+ inst.offset = addr_low;
+ inst.src_reg = src_reg_idx;
+
+ return cmdq_pkt_append_command(pkt, inst);
+}
+EXPORT_SYMBOL(cmdq_pkt_write_s);
+
int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event)
{
struct cmdq_instruction inst = { {0} };
diff --git a/include/linux/mailbox/mtk-cmdq-mailbox.h b/include/linux/mailbox/mtk-cmdq-mailbox.h
index 121c3bb6d3de..8ef87e1bd03b 100644
--- a/include/linux/mailbox/mtk-cmdq-mailbox.h
+++ b/include/linux/mailbox/mtk-cmdq-mailbox.h
@@ -59,6 +59,8 @@ enum cmdq_code {
CMDQ_CODE_JUMP = 0x10,
CMDQ_CODE_WFE = 0x20,
CMDQ_CODE_EOC = 0x40,
+ CMDQ_CODE_WRITE_S = 0x90,
+ CMDQ_CODE_WRITE_S_MASK = 0x91,
CMDQ_CODE_LOGIC = 0xa0,
};
diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h
index 83340211e1d3..c72d826d8934 100644
--- a/include/linux/soc/mediatek/mtk-cmdq.h
+++ b/include/linux/soc/mediatek/mtk-cmdq.h
@@ -12,6 +12,8 @@
#include <linux/timer.h>
#define CMDQ_NO_TIMEOUT 0xffffffffu
+#define CMDQ_ADDR_HIGH(addr) ((u32)(((addr) >> 16) & GENMASK(31, 0)))
+#define CMDQ_ADDR_LOW(addr) ((u16)(addr) | BIT(1))
struct cmdq_pkt;
@@ -102,6 +104,24 @@ int cmdq_pkt_write(struct cmdq_pkt *pkt, u8 subsys, u16 offset, u32 value);
int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys,
u16 offset, u32 value, u32 mask);
+/**
+ * cmdq_pkt_write_s() - append write_s command to the CMDQ packet
+ * @pkt: the CMDQ packet
+ * @high_addr_reg_idx: internal regisger ID which contains high address of pa
+ * @addr_low: low address of pa
+ * @src_reg_idx: the CMDQ internal register ID which cache source value
+ * @mask: the specified target address mask, use U32_MAX if no need
+ *
+ * Return: 0 for success; else the error code is returned
+ *
+ * Support write value to physical address without subsys. Use CMDQ_ADDR_HIGH()
+ * to get high addrees and call cmdq_pkt_assign() to assign value into internal
+ * reg. Also use CMDQ_ADDR_LOW() to get low address for addr_low parameterwhen
+ * call to this function.
+ */
+int cmdq_pkt_write_s(struct cmdq_pkt *pkt, u16 high_addr_reg_idx,
+ u16 addr_low, u16 src_reg_idx, u32 mask);
+
/**
* cmdq_pkt_wfe() - append wait for event command to the CMDQ packet
* @pkt: the CMDQ packet
--
2.18.0
next prev parent reply other threads:[~2020-02-28 13:46 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-28 13:44 [PATCH v3 00/13] support gce on mt6779 platform Dennis YC Hsieh
2020-02-28 13:44 ` Dennis YC Hsieh
2020-02-28 13:44 ` [PATCH v3 01/13] dt-binding: gce: add gce header file for mt6779 Dennis YC Hsieh
2020-02-28 15:26 ` CK Hu
2020-03-02 20:15 ` Rob Herring
2020-02-28 13:44 ` [PATCH v3 02/13] mailbox: cmdq: variablize address shift in platform Dennis YC Hsieh
2020-02-28 15:22 ` CK Hu
2020-02-29 13:36 ` Dennis-YC Hsieh
2020-02-28 13:44 ` [PATCH v3 03/13] mailbox: cmdq: support mt6779 gce platform definition Dennis YC Hsieh
2020-02-28 13:44 ` [PATCH v3 04/13] mailbox: mediatek: cmdq: clear task in channel before shutdown Dennis YC Hsieh
2020-02-28 15:57 ` CK Hu
2020-02-29 13:40 ` Dennis-YC Hsieh
2020-02-28 13:44 ` [PATCH v3 05/13] soc: mediatek: cmdq: return send msg error code Dennis YC Hsieh
2020-02-28 15:39 ` CK Hu
2020-02-29 13:41 ` Dennis-YC Hsieh
2020-02-28 13:44 ` [PATCH v3 06/13] soc: mediatek: cmdq: add assign function Dennis YC Hsieh
2020-02-28 14:44 ` CK Hu
2020-02-28 13:44 ` Dennis YC Hsieh [this message]
2020-02-28 14:49 ` [PATCH v3 07/13] soc: mediatek: cmdq: add write_s function CK Hu
2020-02-28 13:44 ` [PATCH v3 08/13] soc: mediatek: cmdq: add read_s function Dennis YC Hsieh
2020-02-28 14:50 ` CK Hu
2020-02-28 13:44 ` [PATCH v3 09/13] soc: mediatek: cmdq: add write_s value function Dennis YC Hsieh
2020-02-28 14:55 ` CK Hu
2020-02-28 13:44 ` [PATCH v3 10/13] soc: mediatek: cmdq: export finalize function Dennis YC Hsieh
2020-02-28 13:44 ` [PATCH v3 11/13] soc: mediatek: cmdq: add jump function Dennis YC Hsieh
2020-02-28 14:59 ` CK Hu
2020-02-29 13:42 ` Dennis-YC Hsieh
2020-02-28 13:44 ` [PATCH v3 12/13] soc: mediatek: cmdq: add clear option in cmdq_pkt_wfe api Dennis YC Hsieh
2020-02-28 14:32 ` CK Hu
2020-02-29 14:37 ` Dennis-YC Hsieh
2020-02-28 13:44 ` [PATCH v3 13/13] soc: mediatek: cmdq: add set event function Dennis YC Hsieh
2020-02-28 15:05 ` CK Hu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1582897461-15105-9-git-send-email-dennis-yc.hsieh@mediatek.com \
--to=dennis-yc.hsieh@mediatek.com \
--cc=bibby.hsieh@mediatek.com \
--cc=ck.hu@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=houlong.wei@mediatek.com \
--cc=jassisinghbrar@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=ming-fan.chen@mediatek.com \
--cc=robh+dt@kernel.org \
--cc=srv_heupstream@mediatek.com \
--cc=wsd_upstream@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).