ice: do not clutter debug logs with unused data

Currently, debug logs are unnecessarily cluttered with the contents of
command data buffers even if the receiver of that command (i.e. FW or MBX)
are not told to read the buffer.  Change to only log command data buffers
when the RD flag (indicates receiver needs to read the buffer) is set.
Continue to log response data buffer when the returned datalen is non-zero.

Also, rename a local variable to reflect what is in the hardware
specification and how it is used elsewhere in the code, use local variables
instead of duplicating endian conversions unnecessarily and remove an
unnecessary assignment.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
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_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
index 66f02988d549641f7662e55c6e9c9f68d42bc127..0be1a98d7cc1b59fd5dc74d43ae7dce478b5454c 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
@@ -2632,12 +2632,16 @@ struct ice_aq_desc {
 /* FW defined boundary for a large buffer, 4k >= Large buffer > 512 bytes */
 #define ICE_AQ_LG_BUF  512
 
+#define ICE_AQ_FLAG_DD_S       0
+#define ICE_AQ_FLAG_CMP_S      1
 #define ICE_AQ_FLAG_ERR_S      2
 #define ICE_AQ_FLAG_LB_S       9
 #define ICE_AQ_FLAG_RD_S       10
 #define ICE_AQ_FLAG_BUF_S      12
 #define ICE_AQ_FLAG_SI_S       13
 
+#define ICE_AQ_FLAG_DD         BIT(ICE_AQ_FLAG_DD_S)  /* 0x1    */
+#define ICE_AQ_FLAG_CMP                BIT(ICE_AQ_FLAG_CMP_S) /* 0x2    */
 #define ICE_AQ_FLAG_ERR                BIT(ICE_AQ_FLAG_ERR_S) /* 0x4    */
 #define ICE_AQ_FLAG_LB         BIT(ICE_AQ_FLAG_LB_S)  /* 0x200  */
 #define ICE_AQ_FLAG_RD         BIT(ICE_AQ_FLAG_RD_S)  /* 0x400  */

diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.c b/drivers/net/ethernet/intel/ice/ice_controlq.c
index b0b38825e300f15cdc88a4c984381ac99087da12..ddf07b77331364e5d70048cb8e52af22f96774dc 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_controlq.c
+++ b/drivers/net/ethernet/intel/ice/ice_controlq.c
@@ -924,7 +924,7 @@ static void ice_debug_cq(struct ice_hw *hw, struct ice_ctl_q_info *cq,
                         void *desc, void *buf, u16 buf_len, bool response)
 {
        struct ice_aq_desc *cq_desc = desc;
-       u16 len;
+       u16 datalen, flags;
 
        if (!IS_ENABLED(CONFIG_DYNAMIC_DEBUG) &&
            !((ICE_DBG_AQ_DESC | ICE_DBG_AQ_DESC_BUF) & hw->debug_mask))
@@ -933,13 +933,13 @@ static void ice_debug_cq(struct ice_hw *hw, struct ice_ctl_q_info *cq,
        if (!desc)
                return;
 
-       len = le16_to_cpu(cq_desc->datalen);
+       datalen = le16_to_cpu(cq_desc->datalen);
+       flags = le16_to_cpu(cq_desc->flags);
 
        ice_debug(hw, ICE_DBG_AQ_DESC, "%s %s: opcode 0x%04X, flags 0x%04X, datalen 0x%04X, retval 0x%04X\n",
                  ice_ctl_q_str(cq->qtype), response ? "Response" : "Command",
-                 le16_to_cpu(cq_desc->opcode),
-                 le16_to_cpu(cq_desc->flags),
-                 le16_to_cpu(cq_desc->datalen), le16_to_cpu(cq_desc->retval));
+                 le16_to_cpu(cq_desc->opcode), flags, datalen,
+                 le16_to_cpu(cq_desc->retval));
        ice_debug(hw, ICE_DBG_AQ_DESC, "\tcookie (h,l) 0x%08X 0x%08X\n",
                  le32_to_cpu(cq_desc->cookie_high),
                  le32_to_cpu(cq_desc->cookie_low));
@@ -949,12 +949,15 @@ static void ice_debug_cq(struct ice_hw *hw, struct ice_ctl_q_info *cq,
        ice_debug(hw, ICE_DBG_AQ_DESC, "\taddr (h,l)   0x%08X 0x%08X\n",
                  le32_to_cpu(cq_desc->params.generic.addr_high),
                  le32_to_cpu(cq_desc->params.generic.addr_low));
-       if (buf && cq_desc->datalen != 0) {
+       /* Dump buffer iff 1) one exists and 2) is either a response indicated
+        * by the DD and/or CMP flag set or a command with the RD flag set.
+        */
+       if (buf && cq_desc->datalen &&
+           (flags & (ICE_AQ_FLAG_DD | ICE_AQ_FLAG_CMP | ICE_AQ_FLAG_RD))) {
                ice_debug(hw, ICE_DBG_AQ_DESC_BUF, "Buffer:\n");
-               if (buf_len < len)
-                       len = buf_len;
 
-               ice_debug_array(hw, ICE_DBG_AQ_DESC_BUF, 16, 1, buf, len);
+               ice_debug_array(hw, ICE_DBG_AQ_DESC_BUF, 16, 1, buf,
+                               min_t(u16, buf_len, datalen));
        }
 }