Skip to contentSkip to conversation

mailbox: mtk-cmdq: Remove proprietary cmdq_task_cb

PATCH In review Chun-Kuang Hu 3 participants 4 messages Jun 8, 2022 – Jun 13, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mailbox: mtk-cmdq: Remove proprietary cmdq_task_cb

rx_callback is a standard mailbox callback mechanism and could cover the function of proprietary cmdq_task_cb, so use the standard one instead of the proprietary one. Client driver has changed to use standard rx_callback, so remove proprietary cmdq_task_cb.

---
 drivers/mailbox/mtk-cmdq-mailbox.c       | 11 -----------
 include/linux/mailbox/mtk-cmdq-mailbox.h | 10 ----------
 2 files changed, 21 deletions(-)
drivers/mailbox/mtk-cmdq-mailbox.c +0 -11
index 2578e5aaa935..9465f9081515 100644
@@ -192,15 +192,10 @@ static bool cmdq_thread_is_in_wfe(struct cmdq_thread *thread)
 
 static void cmdq_task_exec_done(struct cmdq_task *task, int sta)
 {
-	struct cmdq_task_cb *cb = &task->pkt->async_cb;
 	struct cmdq_cb_data data;
 
 	data.sta = sta;
-	data.data = cb->data;
 	data.pkt = task->pkt;
-	if (cb->cb)
-		cb->cb(data);
-
 	mbox_chan_received_data(task->thread->chan, &data);
 
 	list_del(&task->list_entry);
@@ -448,7 +443,6 @@ static void cmdq_mbox_shutdown(struct mbox_chan *chan)
 static int cmdq_mbox_flush(struct mbox_chan *chan, unsigned long timeout)
 {
 	struct cmdq_thread *thread = (struct cmdq_thread *)chan->con_priv;
-	struct cmdq_task_cb *cb;
 	struct cmdq_cb_data data;
 	struct cmdq *cmdq = dev_get_drvdata(chan->mbox->dev);
 	struct cmdq_task *task, *tmp;
@@ -465,13 +459,8 @@ static int cmdq_mbox_flush(struct mbox_chan *chan, unsigned long timeout)
 
 	list_for_each_entry_safe(task, tmp, &thread->task_busy_list,
 				 list_entry) {
-		cb = &task->pkt->async_cb;
 		data.sta = -ECONNABORTED;
-		data.data = cb->data;
 		data.pkt = task->pkt;
-		if (cb->cb)
-			cb->cb(data);
-
 		mbox_chan_received_data(task->thread->chan, &data);
 		list_del(&task->list_entry);
 		kfree(task);
include/linux/mailbox/mtk-cmdq-mailbox.h +0 -10
index 44365aab043c..a8f0070c7aa9 100644
@@ -67,24 +67,14 @@ enum cmdq_code {
 
 struct cmdq_cb_data {
 	int			sta;
-	void			*data;
 	struct cmdq_pkt		*pkt;
 };
 
-typedef void (*cmdq_async_flush_cb)(struct cmdq_cb_data data);
-
-struct cmdq_task_cb {
-	cmdq_async_flush_cb	cb;
-	void			*data;
-};
-
 struct cmdq_pkt {
 	void			*va_base;
 	dma_addr_t		pa_base;
 	size_t			cmd_buf_size; /* command occupied size */
 	size_t			buf_size; /* real buffer size */
-	struct cmdq_task_cb	cb;
-	struct cmdq_task_cb	async_cb;
 	void			*cl;
 };
 
Signature · 7 lines
2.25.1


_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Tested-by on v1 1/1
#1 lore raw
Quoted 8 lines · Chun-Kuang Hu

rx_callback is a standard mailbox callback mechanism and could cover the
function of proprietary cmdq_task_cb, so use the standard one instead of
the proprietary one. Client driver has changed to use standard rx_callback, so remove proprietary cmdq_task_cb.

Depends on:

https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/

Quoted 79 lines
---
 drivers/mailbox/mtk-cmdq-mailbox.c       | 11 -----------
 include/linux/mailbox/mtk-cmdq-mailbox.h | 10 ----------
 2 files changed, 21 deletions(-)
drivers/mailbox/mtk-cmdq-mailbox.c +0 -5
index 2578e5aaa935..9465f9081515 100644
@@ -192,15 +192,10 @@ static bool cmdq_thread_is_in_wfe(struct
 cmdq_thread *thread)
 
 static void cmdq_task_exec_done(struct cmdq_task *task, int sta)
 {
-	struct cmdq_task_cb *cb = &task->pkt->async_cb;
 	struct cmdq_cb_data data;
 
 	data.sta = sta;
-	data.data = cb->data;
 	data.pkt = task->pkt;
-	if (cb->cb)
-		cb->cb(data);
-
 	mbox_chan_received_data(task->thread->chan, &data);
 
drivers/mailbox/mtk-cmdq-mailbox.c +0 -1
 	list_del(&task->list_entry);
@@ -448,7 +443,6 @@ static void cmdq_mbox_shutdown(struct mbox_chan
 *chan)
 static int cmdq_mbox_flush(struct mbox_chan *chan, unsigned long
 timeout)
 {
 	struct cmdq_thread *thread = (struct cmdq_thread *)chan-
 >con_priv;
-	struct cmdq_task_cb *cb;
drivers/mailbox/mtk-cmdq-mailbox.c +0 -5
 	struct cmdq_cb_data data;
 	struct cmdq *cmdq = dev_get_drvdata(chan->mbox->dev);
 	struct cmdq_task *task, *tmp;
@@ -465,13 +459,8 @@ static int cmdq_mbox_flush(struct mbox_chan
 *chan, unsigned long timeout)
 
 	list_for_each_entry_safe(task, tmp, &thread->task_busy_list,
 				 list_entry) {
-		cb = &task->pkt->async_cb;
 		data.sta = -ECONNABORTED;
-		data.data = cb->data;
 		data.pkt = task->pkt;
-		if (cb->cb)
-			cb->cb(data);
-
 		mbox_chan_received_data(task->thread->chan, &data);
 		list_del(&task->list_entry);
drivers/mailbox/mtk-cmdq-mailbox.c +0 -0
 		kfree(task);
include/linux/mailbox/mtk-cmdq-mailbox.h +0 -8
index 44365aab043c..a8f0070c7aa9 100644
@@ -67,24 +67,14 @@ enum cmdq_code {
 
 struct cmdq_cb_data {
 	int			sta;
-	void			*data;
 	struct cmdq_pkt		*pkt;
 };
 
-typedef void (*cmdq_async_flush_cb)(struct cmdq_cb_data data);
-
-struct cmdq_task_cb {
-	cmdq_async_flush_cb	cb;
-	void			*data;
-};
-
 struct cmdq_pkt {
 	void			*va_base;
 	dma_addr_t		pa_base;
 	size_t			cmd_buf_size; /* command occupied

size */

include/linux/mailbox/mtk-cmdq-mailbox.h enum cmdq_code { · line 79

Quoted 5 lines
include/linux/mailbox/mtk-cmdq-mailbox.h +0 -2
 	size_t			buf_size; /* real buffer size */
-	struct cmdq_task_cb	cb;
-	struct cmdq_task_cb	async_cb;
 	void			*cl;
 };

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

maintainer
#2 lore raw
Quoted 8 lines · moudy.ho
Quoted 7 lines · Chun-Kuang Hu

rx_callback is a standard mailbox callback mechanism and could cover the
function of proprietary cmdq_task_cb, so use the standard one instead of
the proprietary one. Client driver has changed to use standard rx_callback, so remove proprietary cmdq_task_cb.

Quoted 8 lines
Quoted 1 line

Depends on:

https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/

Thanks for helping by testing this, although:

Your message makes me think that you didn't test against v5.19-rc1 nor against v5.18 (!) based kernel but something older. Giving a Tested-by tag to an older kernel with lots of out-of-tree patches on top can be critical as the kernel evolves and changes pretty much over time. Upstream development should always be done against an upstream kernel, as otherwise bugs in the upstream kernel could stay unnoticed and show up as "regressions" later on, when you update your base kernel version.

Best regards,
Matthias

Quoted 76 lines
Quoted 76 lines
---
  drivers/mailbox/mtk-cmdq-mailbox.c       | 11 -----------
  include/linux/mailbox/mtk-cmdq-mailbox.h | 10 ----------
  2 files changed, 21 deletions(-)
drivers/mailbox/mtk-cmdq-mailbox.c +0 -5
index 2578e5aaa935..9465f9081515 100644
@@ -192,15 +192,10 @@ static bool cmdq_thread_is_in_wfe(struct
 cmdq_thread *thread)
 
  static void cmdq_task_exec_done(struct cmdq_task *task, int sta)
  {
-	struct cmdq_task_cb *cb = &task->pkt->async_cb;
  	struct cmdq_cb_data data;
 
  	data.sta = sta;
-	data.data = cb->data;
  	data.pkt = task->pkt;
-	if (cb->cb)
-		cb->cb(data);
-
  	mbox_chan_received_data(task->thread->chan, &data);
 
  	list_del(&task->list_entry);
drivers/mailbox/mtk-cmdq-mailbox.c +0 -1
@@ -448,7 +443,6 @@ static void cmdq_mbox_shutdown(struct mbox_chan
 *chan)
  static int cmdq_mbox_flush(struct mbox_chan *chan, unsigned long
 timeout)
  {
  	struct cmdq_thread *thread = (struct cmdq_thread *)chan-
 > con_priv;
-	struct cmdq_task_cb *cb;
  	struct cmdq_cb_data data;
  	struct cmdq *cmdq = dev_get_drvdata(chan->mbox->dev);
  	struct cmdq_task *task, *tmp;
drivers/mailbox/mtk-cmdq-mailbox.c +0 -5
@@ -465,13 +459,8 @@ static int cmdq_mbox_flush(struct mbox_chan
 *chan, unsigned long timeout)
 
  	list_for_each_entry_safe(task, tmp, &thread->task_busy_list,
  				 list_entry) {
-		cb = &task->pkt->async_cb;
  		data.sta = -ECONNABORTED;
-		data.data = cb->data;
  		data.pkt = task->pkt;
-		if (cb->cb)
-			cb->cb(data);
-
  		mbox_chan_received_data(task->thread->chan, &data);
  		list_del(&task->list_entry);
  		kfree(task);
include/linux/mailbox/mtk-cmdq-mailbox.h +0 -8
index 44365aab043c..a8f0070c7aa9 100644
@@ -67,24 +67,14 @@ enum cmdq_code {
 
  struct cmdq_cb_data {
  	int			sta;
-	void			*data;
  	struct cmdq_pkt		*pkt;
  };
 
-typedef void (*cmdq_async_flush_cb)(struct cmdq_cb_data data);
-
-struct cmdq_task_cb {
-	cmdq_async_flush_cb	cb;
-	void			*data;
-};
-
  struct cmdq_pkt {
  	void			*va_base;
  	dma_addr_t		pa_base;
Quoted 9 lines

include/linux/mailbox/mtk-cmdq-mailbox.h enum cmdq_code { · line 79

Quoted 8 lines
include/linux/mailbox/mtk-cmdq-mailbox.h +0 -0
  	size_t			cmd_buf_size; /* command occupied

size */
size_t buf_size; /* real buffer size */

include/linux/mailbox/mtk-cmdq-mailbox.h +0 -2
-	struct cmdq_task_cb	cb;
-	struct cmdq_task_cb	async_cb;
  	void			*cl;
  };

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

maintainer Reviewed-by on v1 1/1
#3 lore raw
In reply to Chun-Kuang Hu
Quoted 6 lines · Chun-Kuang Hu

rx_callback is a standard mailbox callback mechanism and could cover the function of proprietary cmdq_task_cb, so use the standard one instead of the proprietary one. Client driver has changed to use standard rx_callback, so remove proprietary cmdq_task_cb.

Quoted 66 lines
---
  drivers/mailbox/mtk-cmdq-mailbox.c       | 11 -----------
  include/linux/mailbox/mtk-cmdq-mailbox.h | 10 ----------
  2 files changed, 21 deletions(-)
drivers/mailbox/mtk-cmdq-mailbox.c +0 -11
index 2578e5aaa935..9465f9081515 100644
@@ -192,15 +192,10 @@ static bool cmdq_thread_is_in_wfe(struct cmdq_thread *thread)
 
  static void cmdq_task_exec_done(struct cmdq_task *task, int sta)
  {
-	struct cmdq_task_cb *cb = &task->pkt->async_cb;
  	struct cmdq_cb_data data;
 
  	data.sta = sta;
-	data.data = cb->data;
  	data.pkt = task->pkt;
-	if (cb->cb)
-		cb->cb(data);
-
  	mbox_chan_received_data(task->thread->chan, &data);
 
  	list_del(&task->list_entry);
@@ -448,7 +443,6 @@ static void cmdq_mbox_shutdown(struct mbox_chan *chan)
  static int cmdq_mbox_flush(struct mbox_chan *chan, unsigned long timeout)
  {
  	struct cmdq_thread *thread = (struct cmdq_thread *)chan->con_priv;
-	struct cmdq_task_cb *cb;
  	struct cmdq_cb_data data;
  	struct cmdq *cmdq = dev_get_drvdata(chan->mbox->dev);
  	struct cmdq_task *task, *tmp;
@@ -465,13 +459,8 @@ static int cmdq_mbox_flush(struct mbox_chan *chan, unsigned long timeout)
 
  	list_for_each_entry_safe(task, tmp, &thread->task_busy_list,
  				 list_entry) {
-		cb = &task->pkt->async_cb;
  		data.sta = -ECONNABORTED;
-		data.data = cb->data;
  		data.pkt = task->pkt;
-		if (cb->cb)
-			cb->cb(data);
-
  		mbox_chan_received_data(task->thread->chan, &data);
  		list_del(&task->list_entry);
  		kfree(task);
include/linux/mailbox/mtk-cmdq-mailbox.h +0 -8
index 44365aab043c..a8f0070c7aa9 100644
@@ -67,24 +67,14 @@ enum cmdq_code {
 
  struct cmdq_cb_data {
  	int			sta;
-	void			*data;
  	struct cmdq_pkt		*pkt;
  };
 
-typedef void (*cmdq_async_flush_cb)(struct cmdq_cb_data data);
-
-struct cmdq_task_cb {
-	cmdq_async_flush_cb	cb;
-	void			*data;
-};
-

include/linux/mailbox/mtk-cmdq-mailbox.h enum cmdq_code { · line 80

Quoted 10 lines
include/linux/mailbox/mtk-cmdq-mailbox.h +0 -2
  struct cmdq_pkt {
  	void			*va_base;
  	dma_addr_t		pa_base;
  	size_t			cmd_buf_size; /* command occupied size */
  	size_t			buf_size; /* real buffer size */
-	struct cmdq_task_cb	cb;
-	struct cmdq_task_cb	async_cb;
  	void			*cl;
  };
 

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek