* support gce on mt6779 platform
@ 2019-11-21 9:12 Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 01/12] dt-binding: gce: add gce header file for mt6779 Dennis YC Hsieh
` (11 more replies)
0 siblings, 12 replies; 23+ messages in thread
From: Dennis YC Hsieh @ 2019-11-21 9:12 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger, Jassi Brar
Cc: linux-kernel, linux-mediatek, devicetree, wsd_upstream,
Bibby Hsieh, CK Hu, Houlong Wei, linux-arm-kernel
Support gce function on mt6779 platform.
dt-binding: gce: add gce header file for mt6779
mailbox: cmdq: variablize address shift in platform
mailbox: cmdq: support mt6779 gce platform
arm64: dts: add gce node for mt6779
Refine driver to support stop hardware with safe callback.
mailbox: mediatek: cmdq: clear task in channel
Inorder to support mt6779 client requirement, add new helper functions to
enable more hardware capability.
soc: mediatek: cmdq: add assign function
soc: mediatek: cmdq: add write_s function
soc: mediatek: cmdq: add read_s function
soc: mediatek: cmdq: add mem move function
soc: mediatek: cmdq: add loop function
soc: mediatek: cmdq: add wait no clear event
soc: mediatek: cmdq: add set event function
Dennis YC Hsieh (12):
dt-binding: gce: add gce header file for mt6779
mailbox: cmdq: variablize address shift in platform
mailbox: cmdq: support mt6779 gce platform definition
mailbox: mediatek: cmdq: clear task in channel before shutdown
arm64: dts: add gce node for mt6779
soc: mediatek: cmdq: add assign function
soc: mediatek: cmdq: add write_s function
soc: mediatek: cmdq: add read_s function
soc: mediatek: cmdq: add mem move function
soc: mediatek: cmdq: add loop function
soc: mediatek: cmdq: add wait no clear event function
soc: mediatek: cmdq: add set event function
.../devicetree/bindings/mailbox/mtk-gce.txt | 8 +-
arch/arm64/boot/dts/mediatek/mt6779.dtsi | 10 +
drivers/mailbox/mtk-cmdq-mailbox.c | 85 ++++++-
drivers/soc/mediatek/mtk-cmdq-helper.c | 182 +++++++++++++-
include/dt-bindings/gce/mt6779-gce.h | 222 ++++++++++++++++++
include/linux/mailbox/mtk-cmdq-mailbox.h | 7 +
include/linux/soc/mediatek/mtk-cmdq.h | 77 ++++++
7 files changed, 573 insertions(+), 18 deletions(-)
create mode 100644 include/dt-bindings/gce/mt6779-gce.h
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH v1 01/12] dt-binding: gce: add gce header file for mt6779
2019-11-21 9:12 support gce on mt6779 platform Dennis YC Hsieh
@ 2019-11-21 9:12 ` Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 02/12] mailbox: cmdq: variablize address shift in platform Dennis YC Hsieh
` (10 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Dennis YC Hsieh @ 2019-11-21 9:12 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger, Jassi Brar
Cc: linux-kernel, linux-mediatek, devicetree, wsd_upstream,
Bibby Hsieh, CK Hu, Houlong Wei, linux-arm-kernel,
Dennis YC Hsieh
Add documentation for the mt6779 gce.
Add gce header file defined the gce hardware event,
subsys number and constant for mt6779.
Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
---
.../devicetree/bindings/mailbox/mtk-gce.txt | 8 +-
include/dt-bindings/gce/mt6779-gce.h | 222 ++++++++++++++++++++
2 files changed, 227 insertions(+), 3 deletions(-)
create mode 100644 include/dt-bindings/gce/mt6779-gce.h
diff --git a/Documentation/devicetree/bindings/mailbox/mtk-gce.txt b/Documentation/devicetree/bindings/mailbox/mtk-gce.txt
index 7b13787..82c0a83 100644
--- a/Documentation/devicetree/bindings/mailbox/mtk-gce.txt
+++ b/Documentation/devicetree/bindings/mailbox/mtk-gce.txt
@@ -9,7 +9,8 @@ CMDQ driver uses mailbox framework for communication. Please refer to
mailbox.txt for generic information about mailbox device-tree bindings.
Required properties:
-- compatible: can be "mediatek,mt8173-gce" or "mediatek,mt8183-gce"
+- compatible: can be "mediatek,mt8173-gce", "mediatek,mt8183-gce" or
+ "mediatek,mt6779-gce".
- reg: Address range of the GCE unit
- interrupts: The interrupt signal from the GCE block
- clock: Clocks according to the common clock binding
@@ -36,8 +37,9 @@ Optional properties for a client device:
start_offset: the start offset of register address that GCE can access.
size: the total size of register address that GCE can access.
-Some vaules of properties are defined in 'dt-bindings/gce/mt8173-gce.h'
-or 'dt-binding/gce/mt8183-gce.h'. Such as sub-system ids, thread priority, event ids.
+Some vaules of properties are defined in 'dt-bindings/gce/mt8173-gce.h',
+'dt-binding/gce/mt8183-gce.h' or 'dt-bindings/gce/mt6779-gce.h'. Such as
+sub-system ids, thread priority, event ids.
Example:
diff --git a/include/dt-bindings/gce/mt6779-gce.h b/include/dt-bindings/gce/mt6779-gce.h
new file mode 100644
index 0000000..0610131
--- /dev/null
+++ b/include/dt-bindings/gce/mt6779-gce.h
@@ -0,0 +1,222 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2019 MediaTek Inc.
+ * Author: Dennis-YC Hsieh <dennis-yc.hsieh@mediatek.com>
+ */
+
+#ifndef _DT_BINDINGS_GCE_MT6779_H
+#define _DT_BINDINGS_GCE_MT6779_H
+
+#define CMDQ_NO_TIMEOUT 0xffffffff
+
+/* GCE HW thread priority */
+#define CMDQ_THR_PRIO_LOWEST 0
+#define CMDQ_THR_PRIO_1 1
+#define CMDQ_THR_PRIO_2 2
+#define CMDQ_THR_PRIO_3 3
+#define CMDQ_THR_PRIO_4 4
+#define CMDQ_THR_PRIO_5 5
+#define CMDQ_THR_PRIO_6 6
+#define CMDQ_THR_PRIO_HIGHEST 7
+
+/* GCE subsys table */
+#define SUBSYS_1300XXXX 0
+#define SUBSYS_1400XXXX 1
+#define SUBSYS_1401XXXX 2
+#define SUBSYS_1402XXXX 3
+#define SUBSYS_1502XXXX 4
+#define SUBSYS_1880XXXX 5
+#define SUBSYS_1881XXXX 6
+#define SUBSYS_1882XXXX 7
+#define SUBSYS_1883XXXX 8
+#define SUBSYS_1884XXXX 9
+#define SUBSYS_1000XXXX 10
+#define SUBSYS_1001XXXX 11
+#define SUBSYS_1002XXXX 12
+#define SUBSYS_1003XXXX 13
+#define SUBSYS_1004XXXX 14
+#define SUBSYS_1005XXXX 15
+#define SUBSYS_1020XXXX 16
+#define SUBSYS_1028XXXX 17
+#define SUBSYS_1700XXXX 18
+#define SUBSYS_1701XXXX 19
+#define SUBSYS_1702XXXX 20
+#define SUBSYS_1703XXXX 21
+#define SUBSYS_1800XXXX 22
+#define SUBSYS_1801XXXX 23
+#define SUBSYS_1802XXXX 24
+#define SUBSYS_1804XXXX 25
+#define SUBSYS_1805XXXX 26
+#define SUBSYS_1808XXXX 27
+#define SUBSYS_180aXXXX 28
+#define SUBSYS_180bXXXX 29
+#define CMDQ_SUBSYS_OFF 32
+
+/* GCE hardware events */
+#define CMDQ_EVENT_DISP_RDMA0_SOF 0
+#define CMDQ_EVENT_DISP_RDMA1_SOF 1
+#define CMDQ_EVENT_MDP_RDMA0_SOF 2
+#define CMDQ_EVENT_MDP_RDMA1_SOF 3
+#define CMDQ_EVENT_MDP_RSZ0_SOF 4
+#define CMDQ_EVENT_MDP_RSZ1_SOF 5
+#define CMDQ_EVENT_MDP_TDSHP_SOF 6
+#define CMDQ_EVENT_MDP_WROT0_SOF 7
+#define CMDQ_EVENT_MDP_WROT1_SOF 8
+#define CMDQ_EVENT_DISP_OVL0_SOF 9
+#define CMDQ_EVENT_DISP_2L_OVL0_SOF 10
+#define CMDQ_EVENT_DISP_2L_OVL1_SOF 11
+#define CMDQ_EVENT_DISP_WDMA0_SOF 12
+#define CMDQ_EVENT_DISP_COLOR0_SOF 13
+#define CMDQ_EVENT_DISP_CCORR0_SOF 14
+#define CMDQ_EVENT_DISP_AAL0_SOF 15
+#define CMDQ_EVENT_DISP_GAMMA0_SOF 16
+#define CMDQ_EVENT_DISP_DITHER0_SOF 17
+#define CMDQ_EVENT_DISP_PWM0_SOF 18
+#define CMDQ_EVENT_DISP_DSI0_SOF 19
+#define CMDQ_EVENT_DISP_DPI0_SOF 20
+#define CMDQ_EVENT_DISP_POSTMASK0_SOF 21
+#define CMDQ_EVENT_DISP_RSZ0_SOF 22
+#define CMDQ_EVENT_MDP_AAL_SOF 23
+#define CMDQ_EVENT_MDP_CCORR_SOF 24
+#define CMDQ_EVENT_DISP_DBI0_SOF 25
+#define CMDQ_EVENT_ISP_RELAY_SOF 26
+#define CMDQ_EVENT_IPU_RELAY_SOF 27
+#define CMDQ_EVENT_DISP_RDMA0_EOF 28
+#define CMDQ_EVENT_DISP_RDMA1_EOF 29
+#define CMDQ_EVENT_MDP_RDMA0_EOF 30
+#define CMDQ_EVENT_MDP_RDMA1_EOF 31
+#define CMDQ_EVENT_MDP_RSZ0_EOF 32
+#define CMDQ_EVENT_MDP_RSZ1_EOF 33
+#define CMDQ_EVENT_MDP_TDSHP_EOF 34
+#define CMDQ_EVENT_MDP_WROT0_W_EOF 35
+#define CMDQ_EVENT_MDP_WROT1_W_EOF 36
+#define CMDQ_EVENT_DISP_OVL0_EOF 37
+#define CMDQ_EVENT_DISP_2L_OVL0_EOF 38
+#define CMDQ_EVENT_DISP_2L_OVL1_EOF 39
+#define CMDQ_EVENT_DISP_WDMA0_EOF 40
+#define CMDQ_EVENT_DISP_COLOR0_EOF 41
+#define CMDQ_EVENT_DISP_CCORR0_EOF 42
+#define CMDQ_EVENT_DISP_AAL0_EOF 43
+#define CMDQ_EVENT_DISP_GAMMA0_EOF 44
+#define CMDQ_EVENT_DISP_DITHER0_EOF 45
+#define CMDQ_EVENT_DISP_DSI0_EOF 46
+#define CMDQ_EVENT_DISP_DPI0_EOF 47
+#define CMDQ_EVENT_DISP_RSZ0_EOF 49
+#define CMDQ_EVENT_MDP_AAL_FRAME_DONE 50
+#define CMDQ_EVENT_MDP_CCORR_FRAME_DONE 51
+#define CMDQ_EVENT_DISP_POSTMASK0_FRAME_DONE 52
+#define CMDQ_EVENT_MUTEX0_STREAM_EOF 130
+#define CMDQ_EVENT_MUTEX1_STREAM_EOF 131
+#define CMDQ_EVENT_MUTEX2_STREAM_EOF 132
+#define CMDQ_EVENT_MUTEX3_STREAM_EOF 133
+#define CMDQ_EVENT_MUTEX4_STREAM_EOF 134
+#define CMDQ_EVENT_MUTEX5_STREAM_EOF 135
+#define CMDQ_EVENT_MUTEX6_STREAM_EOF 136
+#define CMDQ_EVENT_MUTEX7_STREAM_EOF 137
+#define CMDQ_EVENT_MUTEX8_STREAM_EOF 138
+#define CMDQ_EVENT_MUTEX9_STREAM_EOF 139
+#define CMDQ_EVENT_MUTEX10_STREAM_EOF 140
+#define CMDQ_EVENT_MUTEX11_STREAM_EOF 141
+#define CMDQ_EVENT_DISP_RDMA0_UNDERRUN 142
+#define CMDQ_EVENT_DISP_RDMA1_UNDERRUN 143
+#define CMDQ_EVENT_DISP_RDMA2_UNDERRUN 144
+#define CMDQ_EVENT_DISP_RDMA3_UNDERRUN 145
+#define CMDQ_EVENT_DSI0_TE 146
+#define CMDQ_EVENT_DSI0_IRQ_EVENT 147
+#define CMDQ_EVENT_DSI0_DONE_EVENT 148
+#define CMDQ_EVENT_DISP_POSTMASK0_RST_DONE 150
+#define CMDQ_EVENT_DISP_WDMA0_RST_DONE 151
+#define CMDQ_EVENT_MDP_WROT0_RST_DONE 153
+#define CMDQ_EVENT_MDP_RDMA0_RST_DONE 154
+#define CMDQ_EVENT_DISP_OVL0_RST_DONE 155
+#define CMDQ_EVENT_DISP_OVL0_2L_RST_DONE 156
+#define CMDQ_EVENT_DISP_OVL1_2L_RST_DONE 157
+#define CMDQ_EVENT_DIP_CQ_THREAD0_EOF 257
+#define CMDQ_EVENT_DIP_CQ_THREAD1_EOF 258
+#define CMDQ_EVENT_DIP_CQ_THREAD2_EOF 259
+#define CMDQ_EVENT_DIP_CQ_THREAD3_EOF 260
+#define CMDQ_EVENT_DIP_CQ_THREAD4_EOF 261
+#define CMDQ_EVENT_DIP_CQ_THREAD5_EOF 262
+#define CMDQ_EVENT_DIP_CQ_THREAD6_EOF 263
+#define CMDQ_EVENT_DIP_CQ_THREAD7_EOF 264
+#define CMDQ_EVENT_DIP_CQ_THREAD8_EOF 265
+#define CMDQ_EVENT_DIP_CQ_THREAD9_EOF 266
+#define CMDQ_EVENT_DIP_CQ_THREAD10_EOF 267
+#define CMDQ_EVENT_DIP_CQ_THREAD11_EOF 268
+#define CMDQ_EVENT_DIP_CQ_THREAD12_EOF 269
+#define CMDQ_EVENT_DIP_CQ_THREAD13_EOF 270
+#define CMDQ_EVENT_DIP_CQ_THREAD14_EOF 271
+#define CMDQ_EVENT_DIP_CQ_THREAD15_EOF 272
+#define CMDQ_EVENT_DIP_CQ_THREAD16_EOF 273
+#define CMDQ_EVENT_DIP_CQ_THREAD17_EOF 274
+#define CMDQ_EVENT_DIP_CQ_THREAD18_EOF 275
+#define CMDQ_EVENT_DIP_DMA_ERR_EVENT 276
+#define CMDQ_EVENT_AMD_FRAME_DONE 277
+#define CMDQ_EVENT_MFB_DONE 278
+#define CMDQ_EVENT_WPE_A_EOF 279
+#define CMDQ_EVENT_VENC_EOF 289
+#define CMDQ_EVENT_VENC_CMDQ_PAUSE_DONE 290
+#define CMDQ_EVENT_JPEG_ENC_EOF 291
+#define CMDQ_EVENT_VENC_MB_DONE 292
+#define CMDQ_EVENT_VENC_128BYTE_CNT_DONE 293
+#define CMDQ_EVENT_ISP_FRAME_DONE_A 321
+#define CMDQ_EVENT_ISP_FRAME_DONE_B 322
+#define CMDQ_EVENT_ISP_FRAME_DONE_C 323
+#define CMDQ_EVENT_ISP_CAMSV_0_PASS1_DONE 324
+#define CMDQ_EVENT_ISP_CAMSV_0_2_PASS1_DONE 325
+#define CMDQ_EVENT_ISP_CAMSV_1_PASS1_DONE 326
+#define CMDQ_EVENT_ISP_CAMSV_2_PASS1_DONE 327
+#define CMDQ_EVENT_ISP_CAMSV_3_PASS1_DONE 328
+#define CMDQ_EVENT_ISP_TSF_DONE 329
+#define CMDQ_EVENT_SENINF_0_FIFO_FULL 330
+#define CMDQ_EVENT_SENINF_1_FIFO_FULL 331
+#define CMDQ_EVENT_SENINF_2_FIFO_FULL 332
+#define CMDQ_EVENT_SENINF_3_FIFO_FULL 333
+#define CMDQ_EVENT_SENINF_4_FIFO_FULL 334
+#define CMDQ_EVENT_SENINF_5_FIFO_FULL 335
+#define CMDQ_EVENT_SENINF_6_FIFO_FULL 336
+#define CMDQ_EVENT_SENINF_7_FIFO_FULL 337
+#define CMDQ_EVENT_TG_OVRUN_A_INT_DLY 338
+#define CMDQ_EVENT_TG_OVRUN_B_INT_DLY 339
+#define CMDQ_EVENT_TG_OVRUN_C_INT 340
+#define CMDQ_EVENT_TG_GRABERR_A_INT_DLY 341
+#define CMDQ_EVENT_TG_GRABERR_B_INT_DLY 342
+#define CMDQ_EVENT_TG_GRABERR_C_INT 343
+#define CMDQ_EVENT_CQ_VR_SNAP_A_INT_DLY 344
+#define CMDQ_EVENT_CQ_VR_SNAP_B_INT_DLY 345
+#define CMDQ_EVENT_CQ_VR_SNAP_C_INT 346
+#define CMDQ_EVENT_DMA_R1_ERROR_A_INT_DLY 347
+#define CMDQ_EVENT_DMA_R1_ERROR_B_INT_DLY 348
+#define CMDQ_EVENT_DMA_R1_ERROR_C_INT 349
+#define CMDQ_EVENT_APU_GCE_CORE0_EVENT_0 353
+#define CMDQ_EVENT_APU_GCE_CORE0_EVENT_1 354
+#define CMDQ_EVENT_APU_GCE_CORE0_EVENT_2 355
+#define CMDQ_EVENT_APU_GCE_CORE0_EVENT_3 356
+#define CMDQ_EVENT_APU_GCE_CORE1_EVENT_0 385
+#define CMDQ_EVENT_APU_GCE_CORE1_EVENT_1 386
+#define CMDQ_EVENT_APU_GCE_CORE1_EVENT_2 387
+#define CMDQ_EVENT_APU_GCE_CORE1_EVENT_3 388
+#define CMDQ_EVENT_VDEC_EVENT_0 416
+#define CMDQ_EVENT_VDEC_EVENT_1 417
+#define CMDQ_EVENT_VDEC_EVENT_2 418
+#define CMDQ_EVENT_VDEC_EVENT_3 419
+#define CMDQ_EVENT_VDEC_EVENT_4 420
+#define CMDQ_EVENT_VDEC_EVENT_5 421
+#define CMDQ_EVENT_VDEC_EVENT_6 422
+#define CMDQ_EVENT_VDEC_EVENT_7 423
+#define CMDQ_EVENT_VDEC_EVENT_8 424
+#define CMDQ_EVENT_VDEC_EVENT_9 425
+#define CMDQ_EVENT_VDEC_EVENT_10 426
+#define CMDQ_EVENT_VDEC_EVENT_11 427
+#define CMDQ_EVENT_VDEC_EVENT_12 428
+#define CMDQ_EVENT_VDEC_EVENT_13 429
+#define CMDQ_EVENT_VDEC_EVENT_14 430
+#define CMDQ_EVENT_VDEC_EVENT_15 431
+#define CMDQ_EVENT_FDVT_DONE 449
+#define CMDQ_EVENT_FE_DONE 450
+#define CMDQ_EVENT_RSC_EOF 451
+#define CMDQ_EVENT_DVS_DONE_ASYNC_SHOT 452
+#define CMDQ_EVENT_DVP_DONE_ASYNC_SHOT 453
+#define CMDQ_EVENT_DSI0_TE_INFRA 898
+
+#endif
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v1 02/12] mailbox: cmdq: variablize address shift in platform
2019-11-21 9:12 support gce on mt6779 platform Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 01/12] dt-binding: gce: add gce header file for mt6779 Dennis YC Hsieh
@ 2019-11-21 9:12 ` Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 03/12] mailbox: cmdq: support mt6779 gce platform definition Dennis YC Hsieh
` (9 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Dennis YC Hsieh @ 2019-11-21 9:12 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger, Jassi Brar
Cc: linux-kernel, linux-mediatek, devicetree, wsd_upstream,
Bibby Hsieh, CK Hu, Houlong Wei, linux-arm-kernel,
Dennis YC Hsieh
Some gce hardware shift pc and end address in register to support
large dram addressing.
Implement gce address shift when write or read pc and end register.
And add shift bit in platform definition.
Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
---
drivers/mailbox/mtk-cmdq-mailbox.c | 57 +++++++++++++++++++++++-------
drivers/soc/mediatek/mtk-cmdq-helper.c | 3 +-
include/linux/mailbox/mtk-cmdq-mailbox.h | 2 ++
3 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
index 9a6ce9f..d553656 100644
--- a/drivers/mailbox/mtk-cmdq-mailbox.c
+++ b/drivers/mailbox/mtk-cmdq-mailbox.c
@@ -76,8 +76,21 @@ struct cmdq {
struct cmdq_thread *thread;
struct clk *clock;
bool suspended;
+ u8 shift_pa;
};
+struct gce_plat {
+ u32 thread_nr;
+ u8 shift;
+};
+
+u8 cmdq_mbox_shift(struct mbox_chan *chan)
+{
+ struct cmdq *cmdq = container_of(chan->mbox, struct cmdq, mbox);
+
+ return cmdq->shift_pa;
+}
+
static int cmdq_thread_suspend(struct cmdq *cmdq, struct cmdq_thread *thread)
{
u32 status;
@@ -176,6 +189,7 @@ static void cmdq_task_remove_wfe(struct cmdq_task *task)
{
struct device *dev = task->cmdq->mbox.dev;
u64 *base = task->pkt->va_base;
+ struct cmdq *cmdq = task->cmdq;
int i;
dma_sync_single_for_cpu(dev, task->pa_base, task->pkt->cmd_buf_size,
@@ -183,7 +197,7 @@ static void cmdq_task_remove_wfe(struct cmdq_task *task)
for (i = 0; i < CMDQ_NUM_CMD(task->pkt); i++)
if (cmdq_command_is_wfe(base[i]))
base[i] = (u64)CMDQ_JUMP_BY_OFFSET << 32 |
- CMDQ_JUMP_PASS;
+ CMDQ_JUMP_PASS >> cmdq->shift_pa;
dma_sync_single_for_device(dev, task->pa_base, task->pkt->cmd_buf_size,
DMA_TO_DEVICE);
}
@@ -221,13 +235,15 @@ static void cmdq_task_handle_error(struct cmdq_task *task)
{
struct cmdq_thread *thread = task->thread;
struct cmdq_task *next_task;
+ struct cmdq *cmdq = task->cmdq;
dev_err(task->cmdq->mbox.dev, "task 0x%p error\n", task);
WARN_ON(cmdq_thread_suspend(task->cmdq, thread) < 0);
next_task = list_first_entry_or_null(&thread->task_busy_list,
struct cmdq_task, list_entry);
if (next_task)
- writel(next_task->pa_base, thread->base + CMDQ_THR_CURR_ADDR);
+ writel(next_task->pa_base >> cmdq->shift_pa,
+ thread->base + CMDQ_THR_CURR_ADDR);
cmdq_thread_resume(thread);
}
@@ -257,7 +273,7 @@ static void cmdq_thread_irq_handler(struct cmdq *cmdq,
else
return;
- curr_pa = readl(thread->base + CMDQ_THR_CURR_ADDR);
+ curr_pa = readl(thread->base + CMDQ_THR_CURR_ADDR) << cmdq->shift_pa;
list_for_each_entry_safe(task, tmp, &thread->task_busy_list,
list_entry) {
@@ -373,16 +389,20 @@ static int cmdq_mbox_send_data(struct mbox_chan *chan, void *data)
WARN_ON(clk_enable(cmdq->clock) < 0);
WARN_ON(cmdq_thread_reset(cmdq, thread) < 0);
- writel(task->pa_base, thread->base + CMDQ_THR_CURR_ADDR);
- writel(task->pa_base + pkt->cmd_buf_size,
+ writel(task->pa_base >> cmdq->shift_pa,
+ thread->base + CMDQ_THR_CURR_ADDR);
+ writel((task->pa_base + pkt->cmd_buf_size) >> cmdq->shift_pa,
thread->base + CMDQ_THR_END_ADDR);
+
writel(thread->priority, thread->base + CMDQ_THR_PRIORITY);
writel(CMDQ_THR_IRQ_EN, thread->base + CMDQ_THR_IRQ_ENABLE);
writel(CMDQ_THR_ENABLED, thread->base + CMDQ_THR_ENABLE_TASK);
} else {
WARN_ON(cmdq_thread_suspend(cmdq, thread) < 0);
- curr_pa = readl(thread->base + CMDQ_THR_CURR_ADDR);
- end_pa = readl(thread->base + CMDQ_THR_END_ADDR);
+ curr_pa = readl(thread->base + CMDQ_THR_CURR_ADDR) <<
+ cmdq->shift_pa;
+ end_pa = readl(thread->base + CMDQ_THR_END_ADDR) <<
+ cmdq->shift_pa;
/*
* Atomic execution should remove the following wfe, i.e. only
@@ -395,7 +415,7 @@ static int cmdq_mbox_send_data(struct mbox_chan *chan, void *data)
cmdq_thread_wait_end(thread, end_pa);
WARN_ON(cmdq_thread_suspend(cmdq, thread) < 0);
/* set to this task directly */
- writel(task->pa_base,
+ writel(task->pa_base >> cmdq->shift_pa,
thread->base + CMDQ_THR_CURR_ADDR);
} else {
cmdq_task_insert_into_thread(task);
@@ -407,14 +427,14 @@ static int cmdq_mbox_send_data(struct mbox_chan *chan, void *data)
if (curr_pa == end_pa - CMDQ_INST_SIZE ||
curr_pa == end_pa) {
/* set to this task directly */
- writel(task->pa_base,
+ writel(task->pa_base >> cmdq->shift_pa,
thread->base + CMDQ_THR_CURR_ADDR);
} else {
cmdq_task_insert_into_thread(task);
smp_mb(); /* modify jump before enable thread */
}
}
- writel(task->pa_base + pkt->cmd_buf_size,
+ writel((task->pa_base + pkt->cmd_buf_size) >> cmdq->shift_pa,
thread->base + CMDQ_THR_END_ADDR);
cmdq_thread_resume(thread);
}
@@ -461,6 +481,7 @@ static int cmdq_probe(struct platform_device *pdev)
struct resource *res;
struct cmdq *cmdq;
int err, i;
+ struct gce_plat *plat_data;
cmdq = devm_kzalloc(dev, sizeof(*cmdq), GFP_KERNEL);
if (!cmdq)
@@ -479,7 +500,14 @@ static int cmdq_probe(struct platform_device *pdev)
return -EINVAL;
}
- cmdq->thread_nr = (u32)(unsigned long)of_device_get_match_data(dev);
+ plat_data = (struct gce_plat *)of_device_get_match_data(dev);
+ if (!plat_data) {
+ dev_err(dev, "failed to get match data\n");
+ return -EINVAL;
+ }
+
+ cmdq->thread_nr = plat_data->thread_nr;
+ cmdq->shift_pa = plat_data->shift;
cmdq->irq_mask = GENMASK(cmdq->thread_nr - 1, 0);
err = devm_request_irq(dev, cmdq->irq, cmdq_irq_handler, IRQF_SHARED,
"mtk_cmdq", cmdq);
@@ -542,9 +570,12 @@ static int cmdq_probe(struct platform_device *pdev)
.resume = cmdq_resume,
};
+static const struct gce_plat gce_plat_v2 = {.thread_nr = 16, .shift = 0};
+static const struct gce_plat gce_plat_v3 = {.thread_nr = 24, .shift = 0};
+
static const struct of_device_id cmdq_of_ids[] = {
- {.compatible = "mediatek,mt8173-gce", .data = (void *)16},
- {.compatible = "mediatek,mt8183-gce", .data = (void *)24},
+ {.compatible = "mediatek,mt8173-gce", .data = (void *)&gce_plat_v2},
+ {.compatible = "mediatek,mt8183-gce", .data = (void *)&gce_plat_v3},
{}
};
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
index 9add0fd..274f6f3 100644
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -281,6 +281,7 @@ int cmdq_pkt_poll_mask(struct cmdq_pkt *pkt, u8 subsys,
static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
{
+ struct cmdq_client *cl = pkt->cl;
struct cmdq_instruction inst = { {0} };
int err;
@@ -293,7 +294,7 @@ static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
/* JUMP to end */
inst.op = CMDQ_CODE_JUMP;
- inst.value = CMDQ_JUMP_PASS;
+ inst.value = CMDQ_JUMP_PASS >> cmdq_mbox_shift(cl->chan);
err = cmdq_pkt_append_command(pkt, inst);
return err;
diff --git a/include/linux/mailbox/mtk-cmdq-mailbox.h b/include/linux/mailbox/mtk-cmdq-mailbox.h
index a4dc45f..dfe5b2e 100644
--- a/include/linux/mailbox/mtk-cmdq-mailbox.h
+++ b/include/linux/mailbox/mtk-cmdq-mailbox.h
@@ -88,4 +88,6 @@ struct cmdq_pkt {
void *cl;
};
+u8 cmdq_mbox_shift(struct mbox_chan *chan);
+
#endif /* __MTK_CMDQ_MAILBOX_H__ */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v1 03/12] mailbox: cmdq: support mt6779 gce platform definition
2019-11-21 9:12 support gce on mt6779 platform Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 01/12] dt-binding: gce: add gce header file for mt6779 Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 02/12] mailbox: cmdq: variablize address shift in platform Dennis YC Hsieh
@ 2019-11-21 9:12 ` Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 04/12] mailbox: mediatek: cmdq: clear task in channel before shutdown Dennis YC Hsieh
` (8 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Dennis YC Hsieh @ 2019-11-21 9:12 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger, Jassi Brar
Cc: linux-kernel, linux-mediatek, devicetree, wsd_upstream,
Bibby Hsieh, CK Hu, Houlong Wei, linux-arm-kernel,
Dennis YC Hsieh
Add gce v4 hardware support with different thread number and shift.
Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
---
drivers/mailbox/mtk-cmdq-mailbox.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
index d553656..fd519b6 100644
--- a/drivers/mailbox/mtk-cmdq-mailbox.c
+++ b/drivers/mailbox/mtk-cmdq-mailbox.c
@@ -572,10 +572,12 @@ static int cmdq_probe(struct platform_device *pdev)
static const struct gce_plat gce_plat_v2 = {.thread_nr = 16, .shift = 0};
static const struct gce_plat gce_plat_v3 = {.thread_nr = 24, .shift = 0};
+static const struct gce_plat gce_plat_v4 = {.thread_nr = 24, .shift = 3};
static const struct of_device_id cmdq_of_ids[] = {
{.compatible = "mediatek,mt8173-gce", .data = (void *)&gce_plat_v2},
{.compatible = "mediatek,mt8183-gce", .data = (void *)&gce_plat_v3},
+ {.compatible = "mediatek,mt6779-gce", .data = (void *)&gce_plat_v4},
{}
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v1 04/12] mailbox: mediatek: cmdq: clear task in channel before shutdown
2019-11-21 9:12 support gce on mt6779 platform Dennis YC Hsieh
` (2 preceding siblings ...)
2019-11-21 9:12 ` [PATCH v1 03/12] mailbox: cmdq: support mt6779 gce platform definition Dennis YC Hsieh
@ 2019-11-21 9:12 ` Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 05/12] arm64: dts: add gce node for mt6779 Dennis YC Hsieh
` (7 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Dennis YC Hsieh @ 2019-11-21 9:12 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger, Jassi Brar
Cc: linux-kernel, linux-mediatek, devicetree, wsd_upstream,
Bibby Hsieh, CK Hu, Houlong Wei, linux-arm-kernel,
Dennis YC Hsieh
Do success callback in channel when shutdown. For those task not finish,
callback with error code thus client has chance to cleanup or reset.
Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
---
drivers/mailbox/mtk-cmdq-mailbox.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
index fd519b6..c12a768 100644
--- a/drivers/mailbox/mtk-cmdq-mailbox.c
+++ b/drivers/mailbox/mtk-cmdq-mailbox.c
@@ -450,6 +450,32 @@ static int cmdq_mbox_startup(struct mbox_chan *chan)
static void cmdq_mbox_shutdown(struct mbox_chan *chan)
{
+ struct cmdq_thread *thread = (struct cmdq_thread *)chan->con_priv;
+ struct cmdq *cmdq = dev_get_drvdata(chan->mbox->dev);
+ struct cmdq_task *task, *tmp;
+ unsigned long flags;
+
+ spin_lock_irqsave(&thread->chan->lock, flags);
+ if (list_empty(&thread->task_busy_list))
+ goto done;
+
+ WARN_ON(cmdq_thread_suspend(cmdq, thread) < 0);
+
+ /* make sure executed tasks have success callback */
+ cmdq_thread_irq_handler(cmdq, thread);
+ if (list_empty(&thread->task_busy_list))
+ goto done;
+
+ list_for_each_entry_safe(task, tmp, &thread->task_busy_list,
+ list_entry) {
+ cmdq_task_exec_done(task, -ECONNABORTED);
+ kfree(task);
+ }
+
+ cmdq_thread_disable(cmdq, thread);
+ clk_disable(cmdq->clock);
+done:
+ spin_unlock_irqrestore(&thread->chan->lock, flags);
}
static const struct mbox_chan_ops cmdq_mbox_chan_ops = {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v1 05/12] arm64: dts: add gce node for mt6779
2019-11-21 9:12 support gce on mt6779 platform Dennis YC Hsieh
` (3 preceding siblings ...)
2019-11-21 9:12 ` [PATCH v1 04/12] mailbox: mediatek: cmdq: clear task in channel before shutdown Dennis YC Hsieh
@ 2019-11-21 9:12 ` Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 06/12] soc: mediatek: cmdq: add assign function Dennis YC Hsieh
` (6 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Dennis YC Hsieh @ 2019-11-21 9:12 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger, Jassi Brar
Cc: linux-kernel, linux-mediatek, devicetree, wsd_upstream,
Bibby Hsieh, CK Hu, Houlong Wei, linux-arm-kernel,
Dennis YC Hsieh
add gce device node for mt6779
Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
---
arch/arm64/boot/dts/mediatek/mt6779.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm64/boot/dts/mediatek/mt6779.dtsi b/arch/arm64/boot/dts/mediatek/mt6779.dtsi
index daa25b7..10d5938 100644
--- a/arch/arm64/boot/dts/mediatek/mt6779.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt6779.dtsi
@@ -8,6 +8,7 @@
#include <dt-bindings/clock/mt6779-clk.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/gce/mt6779-gce.h>
/ {
compatible = "mediatek,mt6779";
@@ -159,6 +160,15 @@
#clock-cells = <1>;
};
+ gce: mailbox@10228000 {
+ compatible = "mediatek,mt6779-gce";
+ reg = <0 0x10228000 0 0x4000>;
+ interrupts = <GIC_SPI 185 IRQ_TYPE_LEVEL_LOW>;
+ #mbox-cells = <3>;
+ clocks = <&infracfg_ao CLK_INFRA_GCE>;
+ clock-names = "gce";
+ };
+
uart0: serial@11002000 {
compatible = "mediatek,mt6779-uart",
"mediatek,mt6577-uart";
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v1 06/12] soc: mediatek: cmdq: add assign function
2019-11-21 9:12 support gce on mt6779 platform Dennis YC Hsieh
` (4 preceding siblings ...)
2019-11-21 9:12 ` [PATCH v1 05/12] arm64: dts: add gce node for mt6779 Dennis YC Hsieh
@ 2019-11-21 9:12 ` Dennis YC Hsieh
2019-11-25 5:35 ` CK Hu
2019-11-21 9:12 ` [PATCH v1 07/12] soc: mediatek: cmdq: add write_s function Dennis YC Hsieh
` (5 subsequent siblings)
11 siblings, 1 reply; 23+ messages in thread
From: Dennis YC Hsieh @ 2019-11-21 9:12 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger, Jassi Brar
Cc: linux-kernel, linux-mediatek, devicetree, wsd_upstream,
Bibby Hsieh, CK Hu, Houlong Wei, linux-arm-kernel,
Dennis YC Hsieh
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;
+ 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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v1 07/12] soc: mediatek: cmdq: add write_s function
2019-11-21 9:12 support gce on mt6779 platform Dennis YC Hsieh
` (5 preceding siblings ...)
2019-11-21 9:12 ` [PATCH v1 06/12] soc: mediatek: cmdq: add assign function Dennis YC Hsieh
@ 2019-11-21 9:12 ` Dennis YC Hsieh
2019-11-22 8:56 ` CK Hu
2019-11-21 9:12 ` [PATCH v1 08/12] soc: mediatek: cmdq: add read_s function Dennis YC Hsieh
` (4 subsequent siblings)
11 siblings, 1 reply; 23+ messages in thread
From: Dennis YC Hsieh @ 2019-11-21 9:12 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger, Jassi Brar
Cc: linux-kernel, linux-mediatek, devicetree, wsd_upstream,
Bibby Hsieh, CK Hu, Houlong Wei, linux-arm-kernel,
Dennis YC Hsieh
add write_s function in cmdq helper functions which
support large dma access.
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 | 13 ++++++++++++
3 files changed, 49 insertions(+)
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
index d419e99..1b074a9 100644
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -15,6 +15,9 @@
#define CMDQ_EOC_CMD ((u64)((CMDQ_CODE_EOC << CMDQ_OP_CODE_SHIFT)) \
<< 32 | CMDQ_EOC_IRQ_EN)
#define CMDQ_REG_TYPE 1
+#define CMDQ_ADDR_HIGH(addr) ((u32)(((addr) >> 16) & GENMASK(31, 0)))
+#define CMDQ_ADDR_LOW_BIT BIT(1)
+#define CMDQ_ADDR_LOW(addr) ((u16)(addr) | CMDQ_ADDR_LOW_BIT)
struct cmdq_instruction {
union {
@@ -224,6 +227,37 @@ 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, dma_addr_t addr,
+ u32 value, u32 mask)
+{
+ struct cmdq_instruction inst = { {0} };
+ int err;
+ const u16 dst_reg_idx = CMDQ_SPR_TEMP;
+
+ err = cmdq_pkt_assign(pkt, dst_reg_idx, CMDQ_ADDR_HIGH(addr));
+ if (err < 0)
+ return 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.op = CMDQ_CODE_WRITE_S_MASK;
+ } else {
+ inst.op = CMDQ_CODE_WRITE_S;
+ }
+
+ inst.sop = dst_reg_idx;
+ inst.offset = CMDQ_ADDR_LOW(addr);
+ inst.value = value;
+
+ 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 121c3bb..8ef87e1 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 8334021..8dbd046 100644
--- a/include/linux/soc/mediatek/mtk-cmdq.h
+++ b/include/linux/soc/mediatek/mtk-cmdq.h
@@ -12,6 +12,7 @@
#include <linux/timer.h>
#define CMDQ_NO_TIMEOUT 0xffffffffu
+#define CMDQ_SPR_TEMP 0
struct cmdq_pkt;
@@ -103,6 +104,18 @@ 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 with mask to the CMDQ packet
+ * @pkt: the CMDQ packet
+ * @addr: the physical address of register or dma
+ * @value: the specified target value
+ * @mask: the specified target mask
+ *
+ * Return: 0 for success; else the error code is returned
+ */
+int cmdq_pkt_write_s(struct cmdq_pkt *pkt, dma_addr_t addr,
+ u32 value, u32 mask);
+
+/**
* cmdq_pkt_wfe() - append wait for event command to the CMDQ packet
* @pkt: the CMDQ packet
* @event: the desired event type to "wait and CLEAR"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v1 08/12] soc: mediatek: cmdq: add read_s function
2019-11-21 9:12 support gce on mt6779 platform Dennis YC Hsieh
` (6 preceding siblings ...)
2019-11-21 9:12 ` [PATCH v1 07/12] soc: mediatek: cmdq: add write_s function Dennis YC Hsieh
@ 2019-11-21 9:12 ` Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 09/12] soc: mediatek: cmdq: add mem move function Dennis YC Hsieh
` (3 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Dennis YC Hsieh @ 2019-11-21 9:12 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger, Jassi Brar
Cc: linux-kernel, linux-mediatek, devicetree, wsd_upstream,
Bibby Hsieh, CK Hu, Houlong Wei, linux-arm-kernel,
Dennis YC Hsieh
Add read_s function in cmdq helper functions which support read value from
register or dma physical address into gce internal register.
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 | 10 ++++++++++
3 files changed, 35 insertions(+)
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
index 1b074a9..4c90fed 100644
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -23,6 +23,10 @@ struct cmdq_instruction {
union {
u32 value;
u32 mask;
+ struct {
+ u16 arg_c;
+ u16 arg_b;
+ };
};
union {
u16 offset;
@@ -227,6 +231,26 @@ int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys,
}
EXPORT_SYMBOL(cmdq_pkt_write_mask);
+int cmdq_pkt_read_s(struct cmdq_pkt *pkt, phys_addr_t addr, u16 reg_idx)
+{
+ struct cmdq_instruction inst = { {0} };
+ int err;
+ const u16 src_reg_idx = CMDQ_SPR_TEMP;
+
+ err = cmdq_pkt_assign(pkt, src_reg_idx, CMDQ_ADDR_HIGH(addr));
+ if (err < 0)
+ return err;
+
+ inst.op = CMDQ_CODE_READ_S;
+ inst.arg_a_t = CMDQ_REG_TYPE;
+ inst.sop = src_reg_idx;
+ inst.reg_dst = reg_idx;
+ inst.arg_b = CMDQ_ADDR_LOW(addr);
+
+ return cmdq_pkt_append_command(pkt, inst);
+}
+EXPORT_SYMBOL(cmdq_pkt_read_s);
+
int cmdq_pkt_write_s(struct cmdq_pkt *pkt, dma_addr_t addr,
u32 value, u32 mask)
{
diff --git a/include/linux/mailbox/mtk-cmdq-mailbox.h b/include/linux/mailbox/mtk-cmdq-mailbox.h
index 8ef87e1..3f6bc0d 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_READ_S = 0x80,
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 8dbd046..fb48d3c 100644
--- a/include/linux/soc/mediatek/mtk-cmdq.h
+++ b/include/linux/soc/mediatek/mtk-cmdq.h
@@ -104,6 +104,16 @@ int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys,
u16 offset, u32 value, u32 mask);
/**
+ * cmdq_pkt_read_s() - append read_s command to the CMDQ packet
+ * @pkt: the CMDQ packet
+ * @addr: the physical address of register or dma to read
+ * @reg_idx: the CMDQ internal register ID to cache read data
+ *
+ * Return: 0 for success; else the error code is returned
+ */
+int cmdq_pkt_read_s(struct cmdq_pkt *pkt, phys_addr_t addr, u16 reg_idx);
+
+/**
* cmdq_pkt_write_s() - append write_s command with mask to the CMDQ packet
* @pkt: the CMDQ packet
* @addr: the physical address of register or dma
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v1 09/12] soc: mediatek: cmdq: add mem move function
2019-11-21 9:12 support gce on mt6779 platform Dennis YC Hsieh
` (7 preceding siblings ...)
2019-11-21 9:12 ` [PATCH v1 08/12] soc: mediatek: cmdq: add read_s function Dennis YC Hsieh
@ 2019-11-21 9:12 ` Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 10/12] soc: mediatek: cmdq: add loop function Dennis YC Hsieh
` (2 subsequent siblings)
11 siblings, 0 replies; 23+ messages in thread
From: Dennis YC Hsieh @ 2019-11-21 9:12 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger, Jassi Brar
Cc: linux-kernel, linux-mediatek, devicetree, wsd_upstream,
Bibby Hsieh, CK Hu, Houlong Wei, linux-arm-kernel,
Dennis YC Hsieh
Add memory move function in cmdq helper functions which helps copy value
between physical address.
Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
---
drivers/soc/mediatek/mtk-cmdq-helper.c | 26 ++++++++++++++++++++++++++
include/linux/soc/mediatek/mtk-cmdq.h | 13 +++++++++++++
2 files changed, 39 insertions(+)
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
index 4c90fed..4235cf8 100644
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -282,6 +282,32 @@ int cmdq_pkt_write_s(struct cmdq_pkt *pkt, dma_addr_t addr,
}
EXPORT_SYMBOL(cmdq_pkt_write_s);
+int cmdq_pkt_mem_move(struct cmdq_pkt *pkt, phys_addr_t src_addr,
+ phys_addr_t dst_addr)
+{
+ struct cmdq_instruction inst = { {0} };
+ const u16 dst_reg_idx = CMDQ_SPR_TEMP;
+ const u16 swap_reg_idx = CMDQ_SPR1;
+ int err;
+
+ err = cmdq_pkt_read_s(pkt, src_addr, swap_reg_idx);
+ if (err < 0)
+ return err;
+
+ err = cmdq_pkt_assign(pkt, dst_reg_idx, CMDQ_ADDR_HIGH(dst_addr));
+ if (err < 0)
+ return err;
+
+ inst.op = CMDQ_CODE_WRITE_S;
+ inst.arg_b_t = CMDQ_REG_TYPE;
+ inst.sop = dst_reg_idx;
+ inst.offset = CMDQ_ADDR_LOW(dst_addr);
+ inst.arg_b = swap_reg_idx;
+
+ return cmdq_pkt_append_command(pkt, inst);
+}
+EXPORT_SYMBOL(cmdq_pkt_mem_move);
+
int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event)
{
struct cmdq_instruction inst = { {0} };
diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h
index fb48d3c..b3474f2 100644
--- a/include/linux/soc/mediatek/mtk-cmdq.h
+++ b/include/linux/soc/mediatek/mtk-cmdq.h
@@ -13,6 +13,7 @@
#define CMDQ_NO_TIMEOUT 0xffffffffu
#define CMDQ_SPR_TEMP 0
+#define CMDQ_SPR1 1
struct cmdq_pkt;
@@ -126,6 +127,18 @@ int cmdq_pkt_write_s(struct cmdq_pkt *pkt, dma_addr_t addr,
u32 value, u32 mask);
/**
+ * cmdq_pkt_mem_move() - append read and write commands to copy data from
+ * source address to destination address.
+ * @pkt: the CMDQ packet
+ * @src_addr: the source physical address
+ * @dst_addr: the destination physical address
+ *
+ * Return: 0 for success; else the error code is returned
+ */
+int cmdq_pkt_mem_move(struct cmdq_pkt *pkt, phys_addr_t src_addr,
+ phys_addr_t dst_addr);
+
+/**
* cmdq_pkt_wfe() - append wait for event command to the CMDQ packet
* @pkt: the CMDQ packet
* @event: the desired event type to "wait and CLEAR"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v1 10/12] soc: mediatek: cmdq: add loop function
2019-11-21 9:12 support gce on mt6779 platform Dennis YC Hsieh
` (8 preceding siblings ...)
2019-11-21 9:12 ` [PATCH v1 09/12] soc: mediatek: cmdq: add mem move function Dennis YC Hsieh
@ 2019-11-21 9:12 ` Dennis YC Hsieh
2019-11-22 9:46 ` CK Hu
2019-11-21 9:12 ` [PATCH v1 11/12] soc: mediatek: cmdq: add wait no clear event function Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 12/12] soc: mediatek: cmdq: add set " Dennis YC Hsieh
11 siblings, 1 reply; 23+ messages in thread
From: Dennis YC Hsieh @ 2019-11-21 9:12 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger, Jassi Brar
Cc: linux-kernel, linux-mediatek, devicetree, wsd_upstream,
Bibby Hsieh, CK Hu, Houlong Wei, linux-arm-kernel,
Dennis YC Hsieh
Add finalize loop function in cmdq helper functions which loop whole pkt
in gce hardware thread without cpu operation.
Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
---
drivers/soc/mediatek/mtk-cmdq-helper.c | 41 ++++++++++++++++++++++++++++++++
include/linux/soc/mediatek/mtk-cmdq.h | 8 +++++++
2 files changed, 49 insertions(+)
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
index 4235cf8..3b10241 100644
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -385,12 +385,27 @@ int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value)
}
EXPORT_SYMBOL(cmdq_pkt_assign);
+static bool cmdq_pkt_finalized(struct cmdq_pkt *pkt)
+{
+ struct cmdq_instruction *inst;
+
+ if (pkt->cmd_buf_size < 2 * CMDQ_INST_SIZE)
+ return false;
+
+ inst = pkt->va_base + pkt->cmd_buf_size - 2 * CMDQ_INST_SIZE;
+ return inst->op == CMDQ_CODE_EOC;
+}
+
static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
{
struct cmdq_client *cl = pkt->cl;
struct cmdq_instruction inst = { {0} };
int err;
+ /* do not finalize twice */
+ if (cmdq_pkt_finalized(pkt))
+ return 0;
+
/* insert EOC and generate IRQ for each command iteration */
inst.op = CMDQ_CODE_EOC;
inst.value = CMDQ_EOC_IRQ_EN;
@@ -406,6 +421,32 @@ static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
return err;
}
+int cmdq_pkt_finalize_loop(struct cmdq_pkt *pkt)
+{
+ struct cmdq_client *cl = pkt->cl;
+ struct cmdq_instruction inst = { {0} };
+ int err;
+
+ /* do not finalize twice */
+ if (cmdq_pkt_finalized(pkt))
+ return 0;
+
+ /* insert EOC and generate IRQ for each command iteration */
+ inst.op = CMDQ_CODE_EOC;
+ err = cmdq_pkt_append_command(pkt, inst);
+ if (err < 0)
+ return err;
+
+ /* JUMP abaolute to begin */
+ inst.op = CMDQ_CODE_JUMP;
+ inst.offset = 1;
+ inst.value = pkt->pa_base >> cmdq_mbox_shift(cl->chan);
+ err = cmdq_pkt_append_command(pkt, inst);
+
+ return err;
+}
+EXPORT_SYMBOL(cmdq_pkt_finalize_loop);
+
static void cmdq_pkt_flush_async_cb(struct cmdq_cb_data data)
{
struct cmdq_pkt *pkt = (struct cmdq_pkt *)data.data;
diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h
index b3474f2..77e8944 100644
--- a/include/linux/soc/mediatek/mtk-cmdq.h
+++ b/include/linux/soc/mediatek/mtk-cmdq.h
@@ -203,6 +203,14 @@ 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_finalize_loop() - Append EOC and jump command to loop pkt.
+ * @pkt: the CMDQ packet
+ *
+ * Return: 0 for success; else the error code is returned
+ */
+int cmdq_pkt_finalize_loop(struct cmdq_pkt *pkt);
+
+/**
* cmdq_pkt_flush_async() - trigger CMDQ to asynchronously execute the CMDQ
* packet and call back at the end of done packet
* @pkt: the CMDQ packet
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v1 11/12] soc: mediatek: cmdq: add wait no clear event function
2019-11-21 9:12 support gce on mt6779 platform Dennis YC Hsieh
` (9 preceding siblings ...)
2019-11-21 9:12 ` [PATCH v1 10/12] soc: mediatek: cmdq: add loop function Dennis YC Hsieh
@ 2019-11-21 9:12 ` Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 12/12] soc: mediatek: cmdq: add set " Dennis YC Hsieh
11 siblings, 0 replies; 23+ messages in thread
From: Dennis YC Hsieh @ 2019-11-21 9:12 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger, Jassi Brar
Cc: linux-kernel, linux-mediatek, devicetree, wsd_upstream,
Bibby Hsieh, CK Hu, Houlong Wei, linux-arm-kernel,
Dennis YC Hsieh
Add wait no clear event function in cmdq helper functions to wait specific
event without clear to 0 after receive it.
Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
---
drivers/soc/mediatek/mtk-cmdq-helper.c | 15 +++++++++++++++
include/linux/soc/mediatek/mtk-cmdq.h | 10 ++++++++++
2 files changed, 25 insertions(+)
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
index 3b10241..7f1e332 100644
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -323,6 +323,21 @@ int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event)
}
EXPORT_SYMBOL(cmdq_pkt_wfe);
+int cmdq_pkt_wait_no_clear(struct cmdq_pkt *pkt, u16 event)
+{
+ struct cmdq_instruction inst = { {0} };
+
+ if (event >= CMDQ_MAX_EVENT)
+ return -EINVAL;
+
+ inst.op = CMDQ_CODE_WFE;
+ inst.value = CMDQ_WFE_WAIT | CMDQ_WFE_WAIT_VALUE;
+ inst.event = event;
+
+ return cmdq_pkt_append_command(pkt, inst);
+}
+EXPORT_SYMBOL(cmdq_pkt_wait_no_clear);
+
int cmdq_pkt_clear_event(struct cmdq_pkt *pkt, u16 event)
{
struct cmdq_instruction inst = { {0} };
diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h
index 77e8944..5211827 100644
--- a/include/linux/soc/mediatek/mtk-cmdq.h
+++ b/include/linux/soc/mediatek/mtk-cmdq.h
@@ -148,6 +148,16 @@ int cmdq_pkt_mem_move(struct cmdq_pkt *pkt, phys_addr_t src_addr,
int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event);
/**
+ * cmdq_pkt_wait_no_clear() - Append wait for event command to the CMDQ packet,
+ * without update event to 0 after receive it.
+ * @pkt: the CMDQ packet
+ * @event: the desired event type to wait
+ *
+ * Return: 0 for success; else the error code is returned
+ */
+int cmdq_pkt_wait_no_clear(struct cmdq_pkt *pkt, u16 event);
+
+/**
* cmdq_pkt_clear_event() - append clear event command to the CMDQ packet
* @pkt: the CMDQ packet
* @event: the desired event to be cleared
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v1 12/12] soc: mediatek: cmdq: add set event function
2019-11-21 9:12 support gce on mt6779 platform Dennis YC Hsieh
` (10 preceding siblings ...)
2019-11-21 9:12 ` [PATCH v1 11/12] soc: mediatek: cmdq: add wait no clear event function Dennis YC Hsieh
@ 2019-11-21 9:12 ` Dennis YC Hsieh
11 siblings, 0 replies; 23+ messages in thread
From: Dennis YC Hsieh @ 2019-11-21 9:12 UTC (permalink / raw)
To: Rob Herring, Matthias Brugger, Jassi Brar
Cc: linux-kernel, linux-mediatek, devicetree, wsd_upstream,
Bibby Hsieh, CK Hu, Houlong Wei, linux-arm-kernel,
Dennis YC Hsieh
Add set event function in cmdq helper functions to set specific event.
Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
---
drivers/soc/mediatek/mtk-cmdq-helper.c | 15 +++++++++++++++
include/linux/mailbox/mtk-cmdq-mailbox.h | 1 +
include/linux/soc/mediatek/mtk-cmdq.h | 9 +++++++++
3 files changed, 25 insertions(+)
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
index 7f1e332..dd29968 100644
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -353,6 +353,21 @@ int cmdq_pkt_clear_event(struct cmdq_pkt *pkt, u16 event)
}
EXPORT_SYMBOL(cmdq_pkt_clear_event);
+int cmdq_pkt_set_event(struct cmdq_pkt *pkt, u16 event)
+{
+ struct cmdq_instruction inst = { {0} };
+
+ if (event >= CMDQ_MAX_EVENT)
+ return -EINVAL;
+
+ inst.op = CMDQ_CODE_WFE;
+ inst.value = CMDQ_WFE_UPDATE | CMDQ_WFE_UPDATE_VALUE;
+ inst.event = event;
+
+ return cmdq_pkt_append_command(pkt, inst);
+}
+EXPORT_SYMBOL(cmdq_pkt_set_event);
+
int cmdq_pkt_poll(struct cmdq_pkt *pkt, u8 subsys,
u16 offset, u32 value)
{
diff --git a/include/linux/mailbox/mtk-cmdq-mailbox.h b/include/linux/mailbox/mtk-cmdq-mailbox.h
index 3f6bc0d..dbedda6 100644
--- a/include/linux/mailbox/mtk-cmdq-mailbox.h
+++ b/include/linux/mailbox/mtk-cmdq-mailbox.h
@@ -17,6 +17,7 @@
#define CMDQ_JUMP_PASS CMDQ_INST_SIZE
#define CMDQ_WFE_UPDATE BIT(31)
+#define CMDQ_WFE_UPDATE_VALUE BIT(16)
#define CMDQ_WFE_WAIT BIT(15)
#define CMDQ_WFE_WAIT_VALUE 0x1
diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h
index 5211827..84dbf0e 100644
--- a/include/linux/soc/mediatek/mtk-cmdq.h
+++ b/include/linux/soc/mediatek/mtk-cmdq.h
@@ -167,6 +167,15 @@ int cmdq_pkt_mem_move(struct cmdq_pkt *pkt, phys_addr_t src_addr,
int cmdq_pkt_clear_event(struct cmdq_pkt *pkt, u16 event);
/**
+ * cmdq_pkt_set_event() - append set event command to the CMDQ packet
+ * @pkt: the CMDQ packet
+ * @event: the desired event to be set
+ *
+ * Return: 0 for success; else the error code is returned
+ */
+int cmdq_pkt_set_event(struct cmdq_pkt *pkt, u16 event);
+
+/**
* cmdq_pkt_poll() - Append polling command to the CMDQ packet, ask GCE to
* execute an instruction that wait for a specified
* hardware register to check for the value w/o mask.
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH v1 07/12] soc: mediatek: cmdq: add write_s function
2019-11-21 9:12 ` [PATCH v1 07/12] soc: mediatek: cmdq: add write_s function Dennis YC Hsieh
@ 2019-11-22 8:56 ` CK Hu
2019-11-22 10:11 ` Dennis-YC Hsieh
0 siblings, 1 reply; 23+ messages in thread
From: CK Hu @ 2019-11-22 8:56 UTC (permalink / raw)
To: Dennis YC Hsieh
Cc: Rob Herring, Matthias Brugger, Jassi Brar, linux-kernel,
linux-mediatek, devicetree, wsd_upstream, Bibby Hsieh,
Houlong Wei, linux-arm-kernel
Hi, Dennis:
On Thu, 2019-11-21 at 17:12 +0800, Dennis YC Hsieh wrote:
> add write_s function in cmdq helper functions which
> support large dma access.
>
> 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 | 13 ++++++++++++
> 3 files changed, 49 insertions(+)
>
> diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
> index d419e99..1b074a9 100644
> --- a/drivers/soc/mediatek/mtk-cmdq-helper.c
> +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
> @@ -15,6 +15,9 @@
> #define CMDQ_EOC_CMD ((u64)((CMDQ_CODE_EOC << CMDQ_OP_CODE_SHIFT)) \
> << 32 | CMDQ_EOC_IRQ_EN)
> #define CMDQ_REG_TYPE 1
> +#define CMDQ_ADDR_HIGH(addr) ((u32)(((addr) >> 16) & GENMASK(31, 0)))
> +#define CMDQ_ADDR_LOW_BIT BIT(1)
> +#define CMDQ_ADDR_LOW(addr) ((u16)(addr) | CMDQ_ADDR_LOW_BIT)
>
> struct cmdq_instruction {
> union {
> @@ -224,6 +227,37 @@ 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, dma_addr_t addr,
> + u32 value, u32 mask)
> +{
> + struct cmdq_instruction inst = { {0} };
> + int err;
> + const u16 dst_reg_idx = CMDQ_SPR_TEMP;
> +
> + err = cmdq_pkt_assign(pkt, dst_reg_idx, CMDQ_ADDR_HIGH(addr));
> + if (err < 0)
> + return 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.op = CMDQ_CODE_WRITE_S_MASK;
> + } else {
> + inst.op = CMDQ_CODE_WRITE_S;
> + }
> +
> + inst.sop = dst_reg_idx;
> + inst.offset = CMDQ_ADDR_LOW(addr);
> + inst.value = value;
> +
> + 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 121c3bb..8ef87e1 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 8334021..8dbd046 100644
> --- a/include/linux/soc/mediatek/mtk-cmdq.h
> +++ b/include/linux/soc/mediatek/mtk-cmdq.h
> @@ -12,6 +12,7 @@
> #include <linux/timer.h>
>
> #define CMDQ_NO_TIMEOUT 0xffffffffu
> +#define CMDQ_SPR_TEMP 0
>
> struct cmdq_pkt;
>
> @@ -103,6 +104,18 @@ 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 with mask to the CMDQ packet
> + * @pkt: the CMDQ packet
> + * @addr: the physical address of register or dma
> + * @value: the specified target value
> + * @mask: the specified target mask
> + *
> + * Return: 0 for success; else the error code is returned
> + */
> +int cmdq_pkt_write_s(struct cmdq_pkt *pkt, dma_addr_t addr,
> + u32 value, u32 mask);
You have an API cmdq_pkt_read_s() which read data into gce internal
register, so I expect that cmdq_pkt_write_s() is an API which write data
from gce internal register, the expected prototype is
int cmdq_pkt_write_s(struct cmdq_pkt *pkt, phys_addr_t addr, u16
reg_idx);
Your version would confuse the user because you hide the internal
register parameter. If you want to provide this service, I would like
you to change the function name so that user would not be confused and
easily to understand what you want to do in this function.
Another choice is: cmdq_pkt_write_s() is implemented in my definition,
and user could call cmdq_pkt_assign() and cmdq_pkt_write_s() to achieve
this function.
Regards,
CK
> +
> +/**
> * cmdq_pkt_wfe() - append wait for event command to the CMDQ packet
> * @pkt: the CMDQ packet
> * @event: the desired event type to "wait and CLEAR"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v1 10/12] soc: mediatek: cmdq: add loop function
2019-11-21 9:12 ` [PATCH v1 10/12] soc: mediatek: cmdq: add loop function Dennis YC Hsieh
@ 2019-11-22 9:46 ` CK Hu
2019-11-22 10:29 ` Dennis-YC Hsieh
0 siblings, 1 reply; 23+ messages in thread
From: CK Hu @ 2019-11-22 9:46 UTC (permalink / raw)
To: Dennis YC Hsieh
Cc: Rob Herring, Matthias Brugger, Jassi Brar, linux-kernel,
linux-mediatek, devicetree, wsd_upstream, Bibby Hsieh,
Houlong Wei, linux-arm-kernel
Hi, Dennis:
On Thu, 2019-11-21 at 17:12 +0800, Dennis YC Hsieh wrote:
> Add finalize loop function in cmdq helper functions which loop whole pkt
> in gce hardware thread without cpu operation.
>
> Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
> ---
> drivers/soc/mediatek/mtk-cmdq-helper.c | 41 ++++++++++++++++++++++++++++++++
> include/linux/soc/mediatek/mtk-cmdq.h | 8 +++++++
> 2 files changed, 49 insertions(+)
>
> diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
> index 4235cf8..3b10241 100644
> --- a/drivers/soc/mediatek/mtk-cmdq-helper.c
> +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
> @@ -385,12 +385,27 @@ int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value)
> }
> EXPORT_SYMBOL(cmdq_pkt_assign);
>
> +static bool cmdq_pkt_finalized(struct cmdq_pkt *pkt)
> +{
> + struct cmdq_instruction *inst;
> +
> + if (pkt->cmd_buf_size < 2 * CMDQ_INST_SIZE)
> + return false;
> +
> + inst = pkt->va_base + pkt->cmd_buf_size - 2 * CMDQ_INST_SIZE;
> + return inst->op == CMDQ_CODE_EOC;
> +}
> +
> static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
> {
> struct cmdq_client *cl = pkt->cl;
> struct cmdq_instruction inst = { {0} };
> int err;
>
> + /* do not finalize twice */
> + if (cmdq_pkt_finalized(pkt))
> + return 0;
> +
> /* insert EOC and generate IRQ for each command iteration */
> inst.op = CMDQ_CODE_EOC;
> inst.value = CMDQ_EOC_IRQ_EN;
> @@ -406,6 +421,32 @@ static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
> return err;
> }
>
> +int cmdq_pkt_finalize_loop(struct cmdq_pkt *pkt)
> +{
> + struct cmdq_client *cl = pkt->cl;
> + struct cmdq_instruction inst = { {0} };
> + int err;
> +
> + /* do not finalize twice */
> + if (cmdq_pkt_finalized(pkt))
> + return 0;
Why not just export cmdq_pkt_finalize() for user and do not call
cmdq_pkt_finalize() in cmdq_pkt_flush_async(), so you don't need to
check this.
I would be more like to export API such as cmdq_pkt_eoc(),
cmdq_pkt_jump(), this would provide more flexibility for user to
assemble the command it want.
Regards,
CK
> +
> + /* insert EOC and generate IRQ for each command iteration */
> + inst.op = CMDQ_CODE_EOC;
> + err = cmdq_pkt_append_command(pkt, inst);
> + if (err < 0)
> + return err;
> +
> + /* JUMP abaolute to begin */
> + inst.op = CMDQ_CODE_JUMP;
> + inst.offset = 1;
> + inst.value = pkt->pa_base >> cmdq_mbox_shift(cl->chan);
> + err = cmdq_pkt_append_command(pkt, inst);
> +
> + return err;
> +}
> +EXPORT_SYMBOL(cmdq_pkt_finalize_loop);
> +
> static void cmdq_pkt_flush_async_cb(struct cmdq_cb_data data)
> {
> struct cmdq_pkt *pkt = (struct cmdq_pkt *)data.data;
> diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h
> index b3474f2..77e8944 100644
> --- a/include/linux/soc/mediatek/mtk-cmdq.h
> +++ b/include/linux/soc/mediatek/mtk-cmdq.h
> @@ -203,6 +203,14 @@ 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_finalize_loop() - Append EOC and jump command to loop pkt.
> + * @pkt: the CMDQ packet
> + *
> + * Return: 0 for success; else the error code is returned
> + */
> +int cmdq_pkt_finalize_loop(struct cmdq_pkt *pkt);
> +
> +/**
> * cmdq_pkt_flush_async() - trigger CMDQ to asynchronously execute the CMDQ
> * packet and call back at the end of done packet
> * @pkt: the CMDQ packet
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v1 07/12] soc: mediatek: cmdq: add write_s function
2019-11-22 8:56 ` CK Hu
@ 2019-11-22 10:11 ` Dennis-YC Hsieh
2019-11-25 2:08 ` CK Hu
0 siblings, 1 reply; 23+ messages in thread
From: Dennis-YC Hsieh @ 2019-11-22 10:11 UTC (permalink / raw)
To: CK Hu
Cc: Rob Herring, Matthias Brugger, Jassi Brar, linux-kernel,
linux-mediatek, devicetree, wsd_upstream, Bibby Hsieh,
Houlong Wei, linux-arm-kernel
Hi CK,
On Fri, 2019-11-22 at 16:56 +0800, CK Hu wrote:
> Hi, Dennis:
>
> On Thu, 2019-11-21 at 17:12 +0800, Dennis YC Hsieh wrote:
> > add write_s function in cmdq helper functions which
> > support large dma access.
> >
> > 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 | 13 ++++++++++++
> > 3 files changed, 49 insertions(+)
> >
> > diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > index d419e99..1b074a9 100644
> > --- a/drivers/soc/mediatek/mtk-cmdq-helper.c
> > +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > @@ -15,6 +15,9 @@
> > #define CMDQ_EOC_CMD ((u64)((CMDQ_CODE_EOC << CMDQ_OP_CODE_SHIFT)) \
> > << 32 | CMDQ_EOC_IRQ_EN)
> > #define CMDQ_REG_TYPE 1
> > +#define CMDQ_ADDR_HIGH(addr) ((u32)(((addr) >> 16) & GENMASK(31, 0)))
> > +#define CMDQ_ADDR_LOW_BIT BIT(1)
> > +#define CMDQ_ADDR_LOW(addr) ((u16)(addr) | CMDQ_ADDR_LOW_BIT)
> >
> > struct cmdq_instruction {
> > union {
> > @@ -224,6 +227,37 @@ 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, dma_addr_t addr,
> > + u32 value, u32 mask)
> > +{
> > + struct cmdq_instruction inst = { {0} };
> > + int err;
> > + const u16 dst_reg_idx = CMDQ_SPR_TEMP;
> > +
> > + err = cmdq_pkt_assign(pkt, dst_reg_idx, CMDQ_ADDR_HIGH(addr));
> > + if (err < 0)
> > + return 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.op = CMDQ_CODE_WRITE_S_MASK;
> > + } else {
> > + inst.op = CMDQ_CODE_WRITE_S;
> > + }
> > +
> > + inst.sop = dst_reg_idx;
> > + inst.offset = CMDQ_ADDR_LOW(addr);
> > + inst.value = value;
> > +
> > + 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 121c3bb..8ef87e1 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 8334021..8dbd046 100644
> > --- a/include/linux/soc/mediatek/mtk-cmdq.h
> > +++ b/include/linux/soc/mediatek/mtk-cmdq.h
> > @@ -12,6 +12,7 @@
> > #include <linux/timer.h>
> >
> > #define CMDQ_NO_TIMEOUT 0xffffffffu
> > +#define CMDQ_SPR_TEMP 0
> >
> > struct cmdq_pkt;
> >
> > @@ -103,6 +104,18 @@ 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 with mask to the CMDQ packet
> > + * @pkt: the CMDQ packet
> > + * @addr: the physical address of register or dma
> > + * @value: the specified target value
> > + * @mask: the specified target mask
> > + *
> > + * Return: 0 for success; else the error code is returned
> > + */
> > +int cmdq_pkt_write_s(struct cmdq_pkt *pkt, dma_addr_t addr,
> > + u32 value, u32 mask);
>
> You have an API cmdq_pkt_read_s() which read data into gce internal
> register, so I expect that cmdq_pkt_write_s() is an API which write data
> from gce internal register, the expected prototype is
>
> int cmdq_pkt_write_s(struct cmdq_pkt *pkt, phys_addr_t addr, u16
> reg_idx);
>
> Your version would confuse the user because you hide the internal
> register parameter. If you want to provide this service, I would like
> you to change the function name so that user would not be confused and
> easily to understand what you want to do in this function.
>
> Another choice is: cmdq_pkt_write_s() is implemented in my definition,
> and user could call cmdq_pkt_assign() and cmdq_pkt_write_s() to achieve
> this function.
>
> Regards,
> CK
>
Thanks for your comment.
Ok, we have to provide write constant value service to client, so I will
change the function name to cmdq_pkt_write_s_value() in this patch.
And since it is better to provide consistent API so I will design
another function with interface as your suggestion:
int cmdq_pkt_write_s(struct cmdq_pkt *pkt, phys_addr_t addr, u16
reg_idx);
In another patch I provide cmdq_pkt_mem_move(). I will move part of
implementation to cmdq_pkt_write_s(), so that cmdq_pkt_mem_move() can be
combination of cmdq_pkt_read_s() and cmdq_pkt_write_s().
How do you think?
Regards,
Dennis
> > +
> > +/**
> > * cmdq_pkt_wfe() - append wait for event command to the CMDQ packet
> > * @pkt: the CMDQ packet
> > * @event: the desired event type to "wait and CLEAR"
>
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v1 10/12] soc: mediatek: cmdq: add loop function
2019-11-22 9:46 ` CK Hu
@ 2019-11-22 10:29 ` Dennis-YC Hsieh
2019-11-25 1:35 ` CK Hu
0 siblings, 1 reply; 23+ messages in thread
From: Dennis-YC Hsieh @ 2019-11-22 10:29 UTC (permalink / raw)
To: CK Hu
Cc: Rob Herring, Matthias Brugger, Jassi Brar, linux-kernel,
linux-mediatek, devicetree, wsd_upstream, Bibby Hsieh,
Houlong Wei, linux-arm-kernel
Hi CK,
On Fri, 2019-11-22 at 17:46 +0800, CK Hu wrote:
> Hi, Dennis:
>
> On Thu, 2019-11-21 at 17:12 +0800, Dennis YC Hsieh wrote:
> > Add finalize loop function in cmdq helper functions which loop whole pkt
> > in gce hardware thread without cpu operation.
> >
> > Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
> > ---
> > drivers/soc/mediatek/mtk-cmdq-helper.c | 41 ++++++++++++++++++++++++++++++++
> > include/linux/soc/mediatek/mtk-cmdq.h | 8 +++++++
> > 2 files changed, 49 insertions(+)
> >
> > diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > index 4235cf8..3b10241 100644
> > --- a/drivers/soc/mediatek/mtk-cmdq-helper.c
> > +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > @@ -385,12 +385,27 @@ int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value)
> > }
> > EXPORT_SYMBOL(cmdq_pkt_assign);
> >
> > +static bool cmdq_pkt_finalized(struct cmdq_pkt *pkt)
> > +{
> > + struct cmdq_instruction *inst;
> > +
> > + if (pkt->cmd_buf_size < 2 * CMDQ_INST_SIZE)
> > + return false;
> > +
> > + inst = pkt->va_base + pkt->cmd_buf_size - 2 * CMDQ_INST_SIZE;
> > + return inst->op == CMDQ_CODE_EOC;
> > +}
> > +
> > static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
> > {
> > struct cmdq_client *cl = pkt->cl;
> > struct cmdq_instruction inst = { {0} };
> > int err;
> >
> > + /* do not finalize twice */
> > + if (cmdq_pkt_finalized(pkt))
> > + return 0;
> > +
> > /* insert EOC and generate IRQ for each command iteration */
> > inst.op = CMDQ_CODE_EOC;
> > inst.value = CMDQ_EOC_IRQ_EN;
> > @@ -406,6 +421,32 @@ static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
> > return err;
> > }
> >
> > +int cmdq_pkt_finalize_loop(struct cmdq_pkt *pkt)
> > +{
> > + struct cmdq_client *cl = pkt->cl;
> > + struct cmdq_instruction inst = { {0} };
> > + int err;
> > +
> > + /* do not finalize twice */
> > + if (cmdq_pkt_finalized(pkt))
> > + return 0;
>
> Why not just export cmdq_pkt_finalize() for user and do not call
> cmdq_pkt_finalize() in cmdq_pkt_flush_async(), so you don't need to
> check this.
>
> I would be more like to export API such as cmdq_pkt_eoc(),
> cmdq_pkt_jump(), this would provide more flexibility for user to
> assemble the command it want.
>
> Regards,
> CK
Thanks for your comment.
Should we backward compatible with existing clients? Remove finalize in
flush will cause existing client flush without IRQ.
Regards,
Dennis
>
> > +
> > + /* insert EOC and generate IRQ for each command iteration */
> > + inst.op = CMDQ_CODE_EOC;
> > + err = cmdq_pkt_append_command(pkt, inst);
> > + if (err < 0)
> > + return err;
> > +
> > + /* JUMP abaolute to begin */
> > + inst.op = CMDQ_CODE_JUMP;
> > + inst.offset = 1;
> > + inst.value = pkt->pa_base >> cmdq_mbox_shift(cl->chan);
> > + err = cmdq_pkt_append_command(pkt, inst);
> > +
> > + return err;
> > +}
> > +EXPORT_SYMBOL(cmdq_pkt_finalize_loop);
> > +
> > static void cmdq_pkt_flush_async_cb(struct cmdq_cb_data data)
> > {
> > struct cmdq_pkt *pkt = (struct cmdq_pkt *)data.data;
> > diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h
> > index b3474f2..77e8944 100644
> > --- a/include/linux/soc/mediatek/mtk-cmdq.h
> > +++ b/include/linux/soc/mediatek/mtk-cmdq.h
> > @@ -203,6 +203,14 @@ 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_finalize_loop() - Append EOC and jump command to loop pkt.
> > + * @pkt: the CMDQ packet
> > + *
> > + * Return: 0 for success; else the error code is returned
> > + */
> > +int cmdq_pkt_finalize_loop(struct cmdq_pkt *pkt);
> > +
> > +/**
> > * cmdq_pkt_flush_async() - trigger CMDQ to asynchronously execute the CMDQ
> > * packet and call back at the end of done packet
> > * @pkt: the CMDQ packet
>
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v1 10/12] soc: mediatek: cmdq: add loop function
2019-11-22 10:29 ` Dennis-YC Hsieh
@ 2019-11-25 1:35 ` CK Hu
2019-11-25 7:36 ` Dennis-YC Hsieh
0 siblings, 1 reply; 23+ messages in thread
From: CK Hu @ 2019-11-25 1:35 UTC (permalink / raw)
To: Dennis-YC Hsieh
Cc: Rob Herring, Matthias Brugger, Jassi Brar, linux-kernel,
linux-mediatek, devicetree, wsd_upstream, Bibby Hsieh,
Houlong Wei, linux-arm-kernel
Hi, Dennis:
On Fri, 2019-11-22 at 18:29 +0800, Dennis-YC Hsieh wrote:
> Hi CK,
>
> On Fri, 2019-11-22 at 17:46 +0800, CK Hu wrote:
> > Hi, Dennis:
> >
> > On Thu, 2019-11-21 at 17:12 +0800, Dennis YC Hsieh wrote:
> > > Add finalize loop function in cmdq helper functions which loop whole pkt
> > > in gce hardware thread without cpu operation.
> > >
> > > Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
> > > ---
> > > drivers/soc/mediatek/mtk-cmdq-helper.c | 41 ++++++++++++++++++++++++++++++++
> > > include/linux/soc/mediatek/mtk-cmdq.h | 8 +++++++
> > > 2 files changed, 49 insertions(+)
> > >
> > > diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > > index 4235cf8..3b10241 100644
> > > --- a/drivers/soc/mediatek/mtk-cmdq-helper.c
> > > +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > > @@ -385,12 +385,27 @@ int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value)
> > > }
> > > EXPORT_SYMBOL(cmdq_pkt_assign);
> > >
> > > +static bool cmdq_pkt_finalized(struct cmdq_pkt *pkt)
> > > +{
> > > + struct cmdq_instruction *inst;
> > > +
> > > + if (pkt->cmd_buf_size < 2 * CMDQ_INST_SIZE)
> > > + return false;
> > > +
> > > + inst = pkt->va_base + pkt->cmd_buf_size - 2 * CMDQ_INST_SIZE;
> > > + return inst->op == CMDQ_CODE_EOC;
> > > +}
> > > +
> > > static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
> > > {
> > > struct cmdq_client *cl = pkt->cl;
> > > struct cmdq_instruction inst = { {0} };
> > > int err;
> > >
> > > + /* do not finalize twice */
> > > + if (cmdq_pkt_finalized(pkt))
> > > + return 0;
> > > +
> > > /* insert EOC and generate IRQ for each command iteration */
> > > inst.op = CMDQ_CODE_EOC;
> > > inst.value = CMDQ_EOC_IRQ_EN;
> > > @@ -406,6 +421,32 @@ static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
> > > return err;
> > > }
> > >
> > > +int cmdq_pkt_finalize_loop(struct cmdq_pkt *pkt)
> > > +{
> > > + struct cmdq_client *cl = pkt->cl;
> > > + struct cmdq_instruction inst = { {0} };
> > > + int err;
> > > +
> > > + /* do not finalize twice */
> > > + if (cmdq_pkt_finalized(pkt))
> > > + return 0;
> >
> > Why not just export cmdq_pkt_finalize() for user and do not call
> > cmdq_pkt_finalize() in cmdq_pkt_flush_async(), so you don't need to
> > check this.
> >
> > I would be more like to export API such as cmdq_pkt_eoc(),
> > cmdq_pkt_jump(), this would provide more flexibility for user to
> > assemble the command it want.
> >
> > Regards,
> > CK
>
> Thanks for your comment.
>
> Should we backward compatible with existing clients? Remove finalize in
> flush will cause existing client flush without IRQ.
The latest kernel (v5.4-rc8) still has no clients which use cmdq landed
on upstream, and we don't need to consider backward compatible. [1] is
the example that iommu would replace the proprietary interface with
standard interface, so it would modify all clients which use the
proprietary interface. So what you should do is to modify client as
well.
[1]
https://patchwork.kernel.org/project/linux-mediatek/list/?series=168801
Regards,
CK
>
>
> Regards,
> Dennis
>
> >
> > > +
> > > + /* insert EOC and generate IRQ for each command iteration */
> > > + inst.op = CMDQ_CODE_EOC;
> > > + err = cmdq_pkt_append_command(pkt, inst);
> > > + if (err < 0)
> > > + return err;
> > > +
> > > + /* JUMP abaolute to begin */
> > > + inst.op = CMDQ_CODE_JUMP;
> > > + inst.offset = 1;
> > > + inst.value = pkt->pa_base >> cmdq_mbox_shift(cl->chan);
> > > + err = cmdq_pkt_append_command(pkt, inst);
> > > +
> > > + return err;
> > > +}
> > > +EXPORT_SYMBOL(cmdq_pkt_finalize_loop);
> > > +
> > > static void cmdq_pkt_flush_async_cb(struct cmdq_cb_data data)
> > > {
> > > struct cmdq_pkt *pkt = (struct cmdq_pkt *)data.data;
> > > diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h
> > > index b3474f2..77e8944 100644
> > > --- a/include/linux/soc/mediatek/mtk-cmdq.h
> > > +++ b/include/linux/soc/mediatek/mtk-cmdq.h
> > > @@ -203,6 +203,14 @@ 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_finalize_loop() - Append EOC and jump command to loop pkt.
> > > + * @pkt: the CMDQ packet
> > > + *
> > > + * Return: 0 for success; else the error code is returned
> > > + */
> > > +int cmdq_pkt_finalize_loop(struct cmdq_pkt *pkt);
> > > +
> > > +/**
> > > * cmdq_pkt_flush_async() - trigger CMDQ to asynchronously execute the CMDQ
> > > * packet and call back at the end of done packet
> > > * @pkt: the CMDQ packet
> >
> >
>
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v1 07/12] soc: mediatek: cmdq: add write_s function
2019-11-22 10:11 ` Dennis-YC Hsieh
@ 2019-11-25 2:08 ` CK Hu
2019-11-25 7:39 ` Dennis-YC Hsieh
0 siblings, 1 reply; 23+ messages in thread
From: CK Hu @ 2019-11-25 2:08 UTC (permalink / raw)
To: Dennis-YC Hsieh
Cc: Rob Herring, Matthias Brugger, Jassi Brar, linux-kernel,
linux-mediatek, devicetree, wsd_upstream, Bibby Hsieh,
Houlong Wei, linux-arm-kernel
Hi, Dennis:
On Fri, 2019-11-22 at 18:11 +0800, Dennis-YC Hsieh wrote:
> Hi CK,
>
> On Fri, 2019-11-22 at 16:56 +0800, CK Hu wrote:
> > Hi, Dennis:
> >
> > On Thu, 2019-11-21 at 17:12 +0800, Dennis YC Hsieh wrote:
> > > add write_s function in cmdq helper functions which
> > > support large dma access.
> > >
> > > 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 | 13 ++++++++++++
> > > 3 files changed, 49 insertions(+)
> > >
> > > diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > > index d419e99..1b074a9 100644
> > > --- a/drivers/soc/mediatek/mtk-cmdq-helper.c
> > > +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > > @@ -15,6 +15,9 @@
> > > #define CMDQ_EOC_CMD ((u64)((CMDQ_CODE_EOC << CMDQ_OP_CODE_SHIFT)) \
> > > << 32 | CMDQ_EOC_IRQ_EN)
> > > #define CMDQ_REG_TYPE 1
> > > +#define CMDQ_ADDR_HIGH(addr) ((u32)(((addr) >> 16) & GENMASK(31, 0)))
> > > +#define CMDQ_ADDR_LOW_BIT BIT(1)
> > > +#define CMDQ_ADDR_LOW(addr) ((u16)(addr) | CMDQ_ADDR_LOW_BIT)
> > >
> > > struct cmdq_instruction {
> > > union {
> > > @@ -224,6 +227,37 @@ 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, dma_addr_t addr,
> > > + u32 value, u32 mask)
> > > +{
> > > + struct cmdq_instruction inst = { {0} };
> > > + int err;
> > > + const u16 dst_reg_idx = CMDQ_SPR_TEMP;
> > > +
> > > + err = cmdq_pkt_assign(pkt, dst_reg_idx, CMDQ_ADDR_HIGH(addr));
> > > + if (err < 0)
> > > + return 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.op = CMDQ_CODE_WRITE_S_MASK;
> > > + } else {
> > > + inst.op = CMDQ_CODE_WRITE_S;
> > > + }
> > > +
> > > + inst.sop = dst_reg_idx;
> > > + inst.offset = CMDQ_ADDR_LOW(addr);
> > > + inst.value = value;
> > > +
> > > + 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 121c3bb..8ef87e1 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 8334021..8dbd046 100644
> > > --- a/include/linux/soc/mediatek/mtk-cmdq.h
> > > +++ b/include/linux/soc/mediatek/mtk-cmdq.h
> > > @@ -12,6 +12,7 @@
> > > #include <linux/timer.h>
> > >
> > > #define CMDQ_NO_TIMEOUT 0xffffffffu
> > > +#define CMDQ_SPR_TEMP 0
> > >
> > > struct cmdq_pkt;
> > >
> > > @@ -103,6 +104,18 @@ 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 with mask to the CMDQ packet
> > > + * @pkt: the CMDQ packet
> > > + * @addr: the physical address of register or dma
> > > + * @value: the specified target value
> > > + * @mask: the specified target mask
> > > + *
> > > + * Return: 0 for success; else the error code is returned
> > > + */
> > > +int cmdq_pkt_write_s(struct cmdq_pkt *pkt, dma_addr_t addr,
> > > + u32 value, u32 mask);
> >
> > You have an API cmdq_pkt_read_s() which read data into gce internal
> > register, so I expect that cmdq_pkt_write_s() is an API which write data
> > from gce internal register, the expected prototype is
> >
> > int cmdq_pkt_write_s(struct cmdq_pkt *pkt, phys_addr_t addr, u16
> > reg_idx);
> >
> > Your version would confuse the user because you hide the internal
> > register parameter. If you want to provide this service, I would like
> > you to change the function name so that user would not be confused and
> > easily to understand what you want to do in this function.
> >
> > Another choice is: cmdq_pkt_write_s() is implemented in my definition,
> > and user could call cmdq_pkt_assign() and cmdq_pkt_write_s() to achieve
> > this function.
> >
> > Regards,
> > CK
> >
>
> Thanks for your comment.
>
> Ok, we have to provide write constant value service to client, so I will
> change the function name to cmdq_pkt_write_s_value() in this patch.
>
> And since it is better to provide consistent API so I will design
> another function with interface as your suggestion:
> int cmdq_pkt_write_s(struct cmdq_pkt *pkt, phys_addr_t addr, u16
> reg_idx);
>
> In another patch I provide cmdq_pkt_mem_move(). I will move part of
> implementation to cmdq_pkt_write_s(), so that cmdq_pkt_mem_move() can be
> combination of cmdq_pkt_read_s() and cmdq_pkt_write_s().
>
> How do you think?
So cmdq_pkt_read_s()/cmdq_pkt_write_s() are the basic function and
cmdq_pkt_write_s_value()/cmdq_pkt_mem_move() are combination function. I
would like to keep the basic function and drop the combination function
at first. I think what we place in helper is used by two or more
clients. It's strong believed that basic function could be used by two
or more client, but it's doubt that combination would be. If only one
client use this combination, just place the combination in that client.
If later second client use this combination, we then move the common
code in helper and both client call the helper function. If you could
prove that this combination is used by two or more clients now, just
show me.
Regards,
CK
>
>
> Regards,
> Dennis
>
> > > +
> > > +/**
> > > * cmdq_pkt_wfe() - append wait for event command to the CMDQ packet
> > > * @pkt: the CMDQ packet
> > > * @event: the desired event type to "wait and CLEAR"
> >
> >
>
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v1 06/12] soc: mediatek: cmdq: add assign function
2019-11-21 9:12 ` [PATCH v1 06/12] soc: mediatek: cmdq: add assign function Dennis YC Hsieh
@ 2019-11-25 5:35 ` CK Hu
2019-11-25 7:41 ` Dennis-YC Hsieh
0 siblings, 1 reply; 23+ messages in thread
From: CK Hu @ 2019-11-25 5:35 UTC (permalink / raw)
To: Dennis YC Hsieh
Cc: Rob Herring, Matthias Brugger, Jassi Brar, linux-kernel,
linux-mediatek, devicetree, wsd_upstream, Bibby Hsieh,
Houlong Wei, linux-arm-kernel
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
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v1 10/12] soc: mediatek: cmdq: add loop function
2019-11-25 1:35 ` CK Hu
@ 2019-11-25 7:36 ` Dennis-YC Hsieh
0 siblings, 0 replies; 23+ messages in thread
From: Dennis-YC Hsieh @ 2019-11-25 7:36 UTC (permalink / raw)
To: CK Hu
Cc: Rob Herring, Matthias Brugger, Jassi Brar, linux-kernel,
linux-mediatek, devicetree, wsd_upstream, Bibby Hsieh,
Houlong Wei, linux-arm-kernel
Hi CK,
On Mon, 2019-11-25 at 09:35 +0800, CK Hu wrote:
> Hi, Dennis:
>
> On Fri, 2019-11-22 at 18:29 +0800, Dennis-YC Hsieh wrote:
> > Hi CK,
> >
> > On Fri, 2019-11-22 at 17:46 +0800, CK Hu wrote:
> > > Hi, Dennis:
> > >
> > > On Thu, 2019-11-21 at 17:12 +0800, Dennis YC Hsieh wrote:
> > > > Add finalize loop function in cmdq helper functions which loop whole pkt
> > > > in gce hardware thread without cpu operation.
> > > >
> > > > Signed-off-by: Dennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
> > > > ---
> > > > drivers/soc/mediatek/mtk-cmdq-helper.c | 41 ++++++++++++++++++++++++++++++++
> > > > include/linux/soc/mediatek/mtk-cmdq.h | 8 +++++++
> > > > 2 files changed, 49 insertions(+)
> > > >
> > > > diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > > > index 4235cf8..3b10241 100644
> > > > --- a/drivers/soc/mediatek/mtk-cmdq-helper.c
> > > > +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > > > @@ -385,12 +385,27 @@ int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value)
> > > > }
> > > > EXPORT_SYMBOL(cmdq_pkt_assign);
> > > >
> > > > +static bool cmdq_pkt_finalized(struct cmdq_pkt *pkt)
> > > > +{
> > > > + struct cmdq_instruction *inst;
> > > > +
> > > > + if (pkt->cmd_buf_size < 2 * CMDQ_INST_SIZE)
> > > > + return false;
> > > > +
> > > > + inst = pkt->va_base + pkt->cmd_buf_size - 2 * CMDQ_INST_SIZE;
> > > > + return inst->op == CMDQ_CODE_EOC;
> > > > +}
> > > > +
> > > > static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
> > > > {
> > > > struct cmdq_client *cl = pkt->cl;
> > > > struct cmdq_instruction inst = { {0} };
> > > > int err;
> > > >
> > > > + /* do not finalize twice */
> > > > + if (cmdq_pkt_finalized(pkt))
> > > > + return 0;
> > > > +
> > > > /* insert EOC and generate IRQ for each command iteration */
> > > > inst.op = CMDQ_CODE_EOC;
> > > > inst.value = CMDQ_EOC_IRQ_EN;
> > > > @@ -406,6 +421,32 @@ static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
> > > > return err;
> > > > }
> > > >
> > > > +int cmdq_pkt_finalize_loop(struct cmdq_pkt *pkt)
> > > > +{
> > > > + struct cmdq_client *cl = pkt->cl;
> > > > + struct cmdq_instruction inst = { {0} };
> > > > + int err;
> > > > +
> > > > + /* do not finalize twice */
> > > > + if (cmdq_pkt_finalized(pkt))
> > > > + return 0;
> > >
> > > Why not just export cmdq_pkt_finalize() for user and do not call
> > > cmdq_pkt_finalize() in cmdq_pkt_flush_async(), so you don't need to
> > > check this.
> > >
> > > I would be more like to export API such as cmdq_pkt_eoc(),
> > > cmdq_pkt_jump(), this would provide more flexibility for user to
> > > assemble the command it want.
> > >
> > > Regards,
> > > CK
> >
> > Thanks for your comment.
> >
> > Should we backward compatible with existing clients? Remove finalize in
> > flush will cause existing client flush without IRQ.
>
> The latest kernel (v5.4-rc8) still has no clients which use cmdq landed
> on upstream, and we don't need to consider backward compatible. [1] is
> the example that iommu would replace the proprietary interface with
> standard interface, so it would modify all clients which use the
> proprietary interface. So what you should do is to modify client as
> well.
>
> [1]
> https://patchwork.kernel.org/project/linux-mediatek/list/?series=168801
>
> Regards,
> CK
Ok, I'll remove all check code.
Thanks for your comment.
Regards,
Dennis
> >
> >
> > Regards,
> > Dennis
> >
> > >
> > > > +
> > > > + /* insert EOC and generate IRQ for each command iteration */
> > > > + inst.op = CMDQ_CODE_EOC;
> > > > + err = cmdq_pkt_append_command(pkt, inst);
> > > > + if (err < 0)
> > > > + return err;
> > > > +
> > > > + /* JUMP abaolute to begin */
> > > > + inst.op = CMDQ_CODE_JUMP;
> > > > + inst.offset = 1;
> > > > + inst.value = pkt->pa_base >> cmdq_mbox_shift(cl->chan);
> > > > + err = cmdq_pkt_append_command(pkt, inst);
> > > > +
> > > > + return err;
> > > > +}
> > > > +EXPORT_SYMBOL(cmdq_pkt_finalize_loop);
> > > > +
> > > > static void cmdq_pkt_flush_async_cb(struct cmdq_cb_data data)
> > > > {
> > > > struct cmdq_pkt *pkt = (struct cmdq_pkt *)data.data;
> > > > diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h
> > > > index b3474f2..77e8944 100644
> > > > --- a/include/linux/soc/mediatek/mtk-cmdq.h
> > > > +++ b/include/linux/soc/mediatek/mtk-cmdq.h
> > > > @@ -203,6 +203,14 @@ 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_finalize_loop() - Append EOC and jump command to loop pkt.
> > > > + * @pkt: the CMDQ packet
> > > > + *
> > > > + * Return: 0 for success; else the error code is returned
> > > > + */
> > > > +int cmdq_pkt_finalize_loop(struct cmdq_pkt *pkt);
> > > > +
> > > > +/**
> > > > * cmdq_pkt_flush_async() - trigger CMDQ to asynchronously execute the CMDQ
> > > > * packet and call back at the end of done packet
> > > > * @pkt: the CMDQ packet
> > >
> > >
> >
> >
>
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v1 07/12] soc: mediatek: cmdq: add write_s function
2019-11-25 2:08 ` CK Hu
@ 2019-11-25 7:39 ` Dennis-YC Hsieh
0 siblings, 0 replies; 23+ messages in thread
From: Dennis-YC Hsieh @ 2019-11-25 7:39 UTC (permalink / raw)
To: CK Hu
Cc: Rob Herring, Matthias Brugger, Jassi Brar, linux-kernel,
linux-mediatek, devicetree, wsd_upstream, Bibby Hsieh,
Houlong Wei, linux-arm-kernel
Hi CK,
On Mon, 2019-11-25 at 10:08 +0800, CK Hu wrote:
> Hi, Dennis:
>
> On Fri, 2019-11-22 at 18:11 +0800, Dennis-YC Hsieh wrote:
> > Hi CK,
> >
> > On Fri, 2019-11-22 at 16:56 +0800, CK Hu wrote:
> > > Hi, Dennis:
> > >
> > > On Thu, 2019-11-21 at 17:12 +0800, Dennis YC Hsieh wrote:
> > > > add write_s function in cmdq helper functions which
> > > > support large dma access.
> > > >
> > > > 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 | 13 ++++++++++++
> > > > 3 files changed, 49 insertions(+)
> > > >
> > > > diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > > > index d419e99..1b074a9 100644
> > > > --- a/drivers/soc/mediatek/mtk-cmdq-helper.c
> > > > +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
> > > > @@ -15,6 +15,9 @@
> > > > #define CMDQ_EOC_CMD ((u64)((CMDQ_CODE_EOC << CMDQ_OP_CODE_SHIFT)) \
> > > > << 32 | CMDQ_EOC_IRQ_EN)
> > > > #define CMDQ_REG_TYPE 1
> > > > +#define CMDQ_ADDR_HIGH(addr) ((u32)(((addr) >> 16) & GENMASK(31, 0)))
> > > > +#define CMDQ_ADDR_LOW_BIT BIT(1)
> > > > +#define CMDQ_ADDR_LOW(addr) ((u16)(addr) | CMDQ_ADDR_LOW_BIT)
> > > >
> > > > struct cmdq_instruction {
> > > > union {
> > > > @@ -224,6 +227,37 @@ 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, dma_addr_t addr,
> > > > + u32 value, u32 mask)
> > > > +{
> > > > + struct cmdq_instruction inst = { {0} };
> > > > + int err;
> > > > + const u16 dst_reg_idx = CMDQ_SPR_TEMP;
> > > > +
> > > > + err = cmdq_pkt_assign(pkt, dst_reg_idx, CMDQ_ADDR_HIGH(addr));
> > > > + if (err < 0)
> > > > + return 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.op = CMDQ_CODE_WRITE_S_MASK;
> > > > + } else {
> > > > + inst.op = CMDQ_CODE_WRITE_S;
> > > > + }
> > > > +
> > > > + inst.sop = dst_reg_idx;
> > > > + inst.offset = CMDQ_ADDR_LOW(addr);
> > > > + inst.value = value;
> > > > +
> > > > + 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 121c3bb..8ef87e1 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 8334021..8dbd046 100644
> > > > --- a/include/linux/soc/mediatek/mtk-cmdq.h
> > > > +++ b/include/linux/soc/mediatek/mtk-cmdq.h
> > > > @@ -12,6 +12,7 @@
> > > > #include <linux/timer.h>
> > > >
> > > > #define CMDQ_NO_TIMEOUT 0xffffffffu
> > > > +#define CMDQ_SPR_TEMP 0
> > > >
> > > > struct cmdq_pkt;
> > > >
> > > > @@ -103,6 +104,18 @@ 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 with mask to the CMDQ packet
> > > > + * @pkt: the CMDQ packet
> > > > + * @addr: the physical address of register or dma
> > > > + * @value: the specified target value
> > > > + * @mask: the specified target mask
> > > > + *
> > > > + * Return: 0 for success; else the error code is returned
> > > > + */
> > > > +int cmdq_pkt_write_s(struct cmdq_pkt *pkt, dma_addr_t addr,
> > > > + u32 value, u32 mask);
> > >
> > > You have an API cmdq_pkt_read_s() which read data into gce internal
> > > register, so I expect that cmdq_pkt_write_s() is an API which write data
> > > from gce internal register, the expected prototype is
> > >
> > > int cmdq_pkt_write_s(struct cmdq_pkt *pkt, phys_addr_t addr, u16
> > > reg_idx);
> > >
> > > Your version would confuse the user because you hide the internal
> > > register parameter. If you want to provide this service, I would like
> > > you to change the function name so that user would not be confused and
> > > easily to understand what you want to do in this function.
> > >
> > > Another choice is: cmdq_pkt_write_s() is implemented in my definition,
> > > and user could call cmdq_pkt_assign() and cmdq_pkt_write_s() to achieve
> > > this function.
> > >
> > > Regards,
> > > CK
> > >
> >
> > Thanks for your comment.
> >
> > Ok, we have to provide write constant value service to client, so I will
> > change the function name to cmdq_pkt_write_s_value() in this patch.
> >
> > And since it is better to provide consistent API so I will design
> > another function with interface as your suggestion:
> > int cmdq_pkt_write_s(struct cmdq_pkt *pkt, phys_addr_t addr, u16
> > reg_idx);
> >
> > In another patch I provide cmdq_pkt_mem_move(). I will move part of
> > implementation to cmdq_pkt_write_s(), so that cmdq_pkt_mem_move() can be
> > combination of cmdq_pkt_read_s() and cmdq_pkt_write_s().
> >
> > How do you think?
>
> So cmdq_pkt_read_s()/cmdq_pkt_write_s() are the basic function and
> cmdq_pkt_write_s_value()/cmdq_pkt_mem_move() are combination function. I
> would like to keep the basic function and drop the combination function
> at first. I think what we place in helper is used by two or more
> clients. It's strong believed that basic function could be used by two
> or more client, but it's doubt that combination would be. If only one
> client use this combination, just place the combination in that client.
> If later second client use this combination, we then move the common
> code in helper and both client call the helper function. If you could
> prove that this combination is used by two or more clients now, just
> show me.
>
> Regards,
> CK
>
Ok, I'll remove combination function in next version.
Thanks for you comment.
Regards,
Dennis
> >
> >
> > Regards,
> > Dennis
> >
> > > > +
> > > > +/**
> > > > * cmdq_pkt_wfe() - append wait for event command to the CMDQ packet
> > > > * @pkt: the CMDQ packet
> > > > * @event: the desired event type to "wait and CLEAR"
> > >
> > >
> >
> >
>
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v1 06/12] soc: mediatek: cmdq: add assign function
2019-11-25 5:35 ` CK Hu
@ 2019-11-25 7:41 ` Dennis-YC Hsieh
0 siblings, 0 replies; 23+ messages in thread
From: Dennis-YC Hsieh @ 2019-11-25 7:41 UTC (permalink / raw)
To: CK Hu
Cc: Rob Herring, Matthias Brugger, Jassi Brar, linux-kernel,
linux-mediatek, devicetree, wsd_upstream, Bibby Hsieh,
Houlong Wei, linux-arm-kernel
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
>
>
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2019-11-25 7:41 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-21 9:12 support gce on mt6779 platform Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 01/12] dt-binding: gce: add gce header file for mt6779 Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 02/12] mailbox: cmdq: variablize address shift in platform Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 03/12] mailbox: cmdq: support mt6779 gce platform definition Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 04/12] mailbox: mediatek: cmdq: clear task in channel before shutdown Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 05/12] arm64: dts: add gce node for mt6779 Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 06/12] soc: mediatek: cmdq: add assign function Dennis YC Hsieh
2019-11-25 5:35 ` CK Hu
2019-11-25 7:41 ` Dennis-YC Hsieh
2019-11-21 9:12 ` [PATCH v1 07/12] soc: mediatek: cmdq: add write_s function Dennis YC Hsieh
2019-11-22 8:56 ` CK Hu
2019-11-22 10:11 ` Dennis-YC Hsieh
2019-11-25 2:08 ` CK Hu
2019-11-25 7:39 ` Dennis-YC Hsieh
2019-11-21 9:12 ` [PATCH v1 08/12] soc: mediatek: cmdq: add read_s function Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 09/12] soc: mediatek: cmdq: add mem move function Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 10/12] soc: mediatek: cmdq: add loop function Dennis YC Hsieh
2019-11-22 9:46 ` CK Hu
2019-11-22 10:29 ` Dennis-YC Hsieh
2019-11-25 1:35 ` CK Hu
2019-11-25 7:36 ` Dennis-YC Hsieh
2019-11-21 9:12 ` [PATCH v1 11/12] soc: mediatek: cmdq: add wait no clear event function Dennis YC Hsieh
2019-11-21 9:12 ` [PATCH v1 12/12] soc: mediatek: cmdq: add set " Dennis YC Hsieh
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).