ice: remove unnecessary control queue cmd_buf arrays

The driver allocates a cmd_buf array in addition to the desc_buf array.
This array stores an ice_sq_cd command details structure for each entry in
the control queue ring.

The contents of the structure are copied from the value passed in via
ice_sq_send_cmd, and include only a pointer to storage for the write back
descriptor contents.

Originally this array was intended to support asynchronous completion
including features such as a callback function. This support was never
implemented. All that exists today is needless copying and resetting of a
cmd_buf array that is otherwise functionally unused.

Since we do not plan to implement asynchronous completions, drop this
unnecessary memory and logic. This saves memory for each control queue, and
avoids the pointless copying and memset.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.c b/drivers/net/ethernet/intel/ice/ice_controlq.c
index f38fd25a914a7bacbbeb970a98e70ef79a0be529..b5774035e6f9399c2c122fd1960afc8d8b115498 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_controlq.c
+++ b/drivers/net/ethernet/intel/ice/ice_controlq.c
@@ -99,17 +99,6 @@ ice_alloc_ctrlq_sq_ring(struct ice_hw *hw, struct ice_ctl_q_info *cq)
                return -ENOMEM;
        cq->sq.desc_buf.size = size;
 
-       cq->sq.cmd_buf = devm_kcalloc(ice_hw_to_dev(hw), cq->num_sq_entries,
-                                     sizeof(struct ice_sq_cd), GFP_KERNEL);
-       if (!cq->sq.cmd_buf) {
-               dmam_free_coherent(ice_hw_to_dev(hw), cq->sq.desc_buf.size,
-                                  cq->sq.desc_buf.va, cq->sq.desc_buf.pa);
-               cq->sq.desc_buf.va = NULL;
-               cq->sq.desc_buf.pa = 0;
-               cq->sq.desc_buf.size = 0;
-               return -ENOMEM;
-       }
-
        return 0;
 }
 
@@ -338,8 +327,6 @@ do {                                                                        \
                                        (qi)->ring.r.ring##_bi[i].size = 0;\
                }                                                       \
        }                                                               \
-       /* free the buffer info list */                                 \
-       devm_kfree(ice_hw_to_dev(hw), (qi)->ring.cmd_buf);              \
        /* free DMA head */                                             \
        devm_kfree(ice_hw_to_dev(hw), (qi)->ring.dma_head);             \
 } while (0)
@@ -865,21 +852,17 @@ static u16 ice_clean_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq)
 {
        struct ice_ctl_q_ring *sq = &cq->sq;
        u16 ntc = sq->next_to_clean;
-       struct ice_sq_cd *details;
        struct ice_aq_desc *desc;
 
        desc = ICE_CTL_Q_DESC(*sq, ntc);
-       details = ICE_CTL_Q_DETAILS(*sq, ntc);
 
        while (rd32(hw, cq->sq.head) != ntc) {
                ice_debug(hw, ICE_DBG_AQ_MSG, "ntc %d head %d.\n", ntc, rd32(hw, cq->sq.head));
                memset(desc, 0, sizeof(*desc));
-               memset(details, 0, sizeof(*details));
                ntc++;
                if (ntc == sq->count)
                        ntc = 0;
                desc = ICE_CTL_Q_DESC(*sq, ntc);
-               details = ICE_CTL_Q_DETAILS(*sq, ntc);
        }
 
        sq->next_to_clean = ntc;
@@ -1009,7 +992,6 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,
        struct ice_dma_mem *dma_buf = NULL;
        struct ice_aq_desc *desc_on_ring;
        bool cmd_completed = false;
-       struct ice_sq_cd *details;
        int status = 0;
        u16 retval = 0;
        u32 val = 0;
@@ -1053,12 +1035,6 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,
                goto sq_send_command_error;
        }
 
-       details = ICE_CTL_Q_DETAILS(cq->sq, cq->sq.next_to_use);
-       if (cd)
-               *details = *cd;
-       else
-               memset(details, 0, sizeof(*details));
-
        /* Call clean and check queue available function to reclaim the
         * descriptors that were processed by FW/MBX; the function returns the
         * number of desc available. The clean function called here could be
@@ -1140,9 +1116,8 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,
        ice_debug_cq(hw, cq, (void *)desc, buf, buf_size, true);
 
        /* save writeback AQ if requested */
-       if (details->wb_desc)
-               memcpy(details->wb_desc, desc_on_ring,
-                      sizeof(*details->wb_desc));
+       if (cd && cd->wb_desc)
+               memcpy(cd->wb_desc, desc_on_ring, sizeof(*cd->wb_desc));
 
        /* update the error if time out occurred */
        if (!cmd_completed) {

diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.h b/drivers/net/ethernet/intel/ice/ice_controlq.h
index e5b6691436f52c891c99fc50ce5fda087638a917..ca97b7365a1b89a45d153062df23ad242e8eb142 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_controlq.h
+++ b/drivers/net/ethernet/intel/ice/ice_controlq.h
@@ -50,7 +50,6 @@ enum ice_ctl_q {
 struct ice_ctl_q_ring {
        void *dma_head;                 /* Virtual address to DMA head */
        struct ice_dma_mem desc_buf;    /* descriptor ring memory */
-       void *cmd_buf;                  /* command buffer memory */
 
        union {
                struct ice_dma_mem *sq_bi;
@@ -80,8 +79,6 @@ struct ice_sq_cd {
        struct ice_aq_desc *wb_desc;
 };
 
-#define ICE_CTL_Q_DETAILS(R, i) (&(((struct ice_sq_cd *)((R).cmd_buf))[i]))
-
 /* rq event information */
 struct ice_rq_event_info {
        struct ice_aq_desc desc;