Re: [Intel-wired-lan] [PATCH iwl-next v4 9/9] idpf: generalize mailbox API

[Salin, Samuel]

> -Original Message-
> From: Intel-wired-lan  On Behalf Of
> Pavan Kumar Linga
> Sent: Thursday, May 8, 2025 2:50 PM
> To: intel-wired-...@lists.osuosl.org
> Cc: net...@vger.kernel.org; Olech, Milena ;
> Nadezhdin, Anton ; Linga, Pavan Kumar
> ; Chittim, Madhu
> 
> Subject: [Intel-wired-lan] [PATCH iwl-next v4 9/9] idpf: generalize mailbox 
> API
> 
> Add a control queue parameter to all mailbox APIs in order to make use of
> those APIs for non-default mailbox as well.
> 
> Signed-off-by: Anton Nadezhdin 
> Reviewed-by: Madhu Chittim 
> Signed-off-by: Pavan Kumar Linga 
> ---
> 2.43.0

Tested-by: Samuel Salin 

[Intel-wired-lan] [PATCH iwl-next v4 9/9] idpf: generalize mailbox API

[Pavan Kumar Linga]

Add a control queue parameter to all mailbox APIs in order to make use
of those APIs for non-default mailbox as well.

Signed-off-by: Anton Nadezhdin 
Reviewed-by: Madhu Chittim 
Signed-off-by: Pavan Kumar Linga 
---
 drivers/net/ethernet/intel/idpf/idpf_lib.c|  2 +-
 drivers/net/ethernet/intel/idpf/idpf_vf_dev.c |  3 +-
 .../net/ethernet/intel/idpf/idpf_virtchnl.c   | 33 ++-
 .../net/ethernet/intel/idpf/idpf_virtchnl.h   |  6 ++--
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/drivers/net/ethernet/intel/idpf/idpf_lib.c 
b/drivers/net/ethernet/intel/idpf/idpf_lib.c
index 7dabf5ddbf16..492b03d8f718 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_lib.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_lib.c
@@ -1202,7 +1202,7 @@ void idpf_mbx_task(struct work_struct *work)
queue_delayed_work(adapter->mbx_wq, &adapter->mbx_task,
   msecs_to_jiffies(300));
 
-   idpf_recv_mb_msg(adapter);
+   idpf_recv_mb_msg(adapter, adapter->hw.arq);
 }
 
 /**
diff --git a/drivers/net/ethernet/intel/idpf/idpf_vf_dev.c 
b/drivers/net/ethernet/intel/idpf/idpf_vf_dev.c
index 0bb07bcb974b..ac091280e828 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_vf_dev.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_vf_dev.c
@@ -146,7 +146,8 @@ static void idpf_vf_trigger_reset(struct idpf_adapter 
*adapter,
/* Do not send VIRTCHNL2_OP_RESET_VF message on driver unload */
if (trig_cause == IDPF_HR_FUNC_RESET &&
!test_bit(IDPF_REMOVE_IN_PROG, adapter->flags))
-   idpf_send_mb_msg(adapter, VIRTCHNL2_OP_RESET_VF, 0, NULL, 0);
+   idpf_send_mb_msg(adapter, adapter->hw.asq,
+VIRTCHNL2_OP_RESET_VF, 0, NULL, 0);
 }
 
 /**
diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c 
b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
index c2d4caa4408d..b7bec559f5ee 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
@@ -116,13 +116,15 @@ static void idpf_recv_event_msg(struct idpf_adapter 
*adapter,
 
 /**
  * idpf_mb_clean - Reclaim the send mailbox queue entries
- * @adapter: Driver specific private structure
+ * @adapter: driver specific private structure
+ * @asq: send control queue info
  *
  * Reclaim the send mailbox queue entries to be used to send further messages
  *
  * Returns 0 on success, negative on failure
  */
-static int idpf_mb_clean(struct idpf_adapter *adapter)
+static int idpf_mb_clean(struct idpf_adapter *adapter,
+struct idpf_ctlq_info *asq)
 {
u16 i, num_q_msg = IDPF_DFLT_MBX_Q_LEN;
struct idpf_ctlq_msg **q_msg;
@@ -133,7 +135,7 @@ static int idpf_mb_clean(struct idpf_adapter *adapter)
if (!q_msg)
return -ENOMEM;
 
-   err = idpf_ctlq_clean_sq(adapter->hw.asq, &num_q_msg, q_msg);
+   err = idpf_ctlq_clean_sq(asq, &num_q_msg, q_msg);
if (err)
goto err_kfree;
 
@@ -205,7 +207,8 @@ static void idpf_prepare_ptp_mb_msg(struct idpf_adapter 
*adapter, u32 op,
 
 /**
  * idpf_send_mb_msg - Send message over mailbox
- * @adapter: Driver specific private structure
+ * @adapter: driver specific private structure
+ * @asq: control queue to send message to
  * @op: virtchnl opcode
  * @msg_size: size of the payload
  * @msg: pointer to buffer holding the payload
@@ -215,8 +218,8 @@ static void idpf_prepare_ptp_mb_msg(struct idpf_adapter 
*adapter, u32 op,
  *
  * Returns 0 on success, negative on failure
  */
-int idpf_send_mb_msg(struct idpf_adapter *adapter, u32 op,
-u16 msg_size, u8 *msg, u16 cookie)
+int idpf_send_mb_msg(struct idpf_adapter *adapter, struct idpf_ctlq_info *asq,
+u32 op, u16 msg_size, u8 *msg, u16 cookie)
 {
struct idpf_ctlq_msg *ctlq_msg;
struct idpf_dma_mem *dma_mem;
@@ -230,7 +233,7 @@ int idpf_send_mb_msg(struct idpf_adapter *adapter, u32 op,
if (idpf_is_reset_detected(adapter))
return 0;
 
-   err = idpf_mb_clean(adapter);
+   err = idpf_mb_clean(adapter, asq);
if (err)
return err;
 
@@ -266,7 +269,7 @@ int idpf_send_mb_msg(struct idpf_adapter *adapter, u32 op,
ctlq_msg->ctx.indirect.payload = dma_mem;
ctlq_msg->ctx.sw_cookie.data = cookie;
 
-   err = idpf_ctlq_send(&adapter->hw, adapter->hw.asq, 1, ctlq_msg);
+   err = idpf_ctlq_send(&adapter->hw, asq, 1, ctlq_msg);
if (err)
goto send_error;
 
@@ -462,7 +465,7 @@ ssize_t idpf_vc_xn_exec(struct idpf_adapter *adapter,
cookie = FIELD_PREP(IDPF_VC_XN_SALT_M, xn->salt) |
 FIELD_PREP(IDPF_VC_XN_IDX_M, xn->idx);
 
-   retval = idpf_send_mb_msg(adapter, params->vc_op,
+   retval = idpf_send_mb_msg(adapter, adapter->hw.asq, params->vc_op,
  send_buf->iov_len, send_buf->iov_base,
  cookie);