[dpdk-dev] [PATCH v2 15/33] i40e/base: replacement of DEBUGOUT() with i40e_debug()
Acked-by: Jingjing Wu
> -Original Message-
> From: Zhang, Helin
> Sent: Thursday, April 30, 2015 11:03 PM
> To: dev at dpdk.org
> Cc: Cao, Min; Xu, Qian Q; Wu, Jingjing; Liu, Jijiang; Kenguva, Monica; Patel,
> Rashmin N; Murray, Steven J; Nelson, Shannon; Zhang, Helin
> Subject: [PATCH v2 15/33] i40e/base: replacement of DEBUGOUT() with
> i40e_debug()
>
> To support better debug information printing, all DEBUGOUT() are replaced
> by i40e_debug(). In addition, the NVM update state strings are added in
> debug information.
>
> Signed-off-by: Helin Zhang
> ---
> lib/librte_pmd_i40e/Makefile| 1 +
> lib/librte_pmd_i40e/i40e/i40e_nvm.c | 77
> -
> 2 files changed, 59 insertions(+), 19 deletions(-)
>
> diff --git a/lib/librte_pmd_i40e/Makefile b/lib/librte_pmd_i40e/Makefile
> index 75b5120..22f0716 100644
> --- a/lib/librte_pmd_i40e/Makefile
> +++ b/lib/librte_pmd_i40e/Makefile
> @@ -68,6 +68,7 @@ CFLAGS_BASE_DRIVER += -Wno-missing-field-
> initializers CFLAGS_BASE_DRIVER += -Wno-pointer-to-int-cast
> CFLAGS_BASE_DRIVER += -Wno-format-nonliteral CFLAGS_BASE_DRIVER +=
> -Wno-format-security
> +CFLAGS_BASE_DRIVER += -Wno-unused-variable
>
> ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1)
> CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable diff --git
> a/lib/librte_pmd_i40e/i40e/i40e_nvm.c
> b/lib/librte_pmd_i40e/i40e/i40e_nvm.c
> index 55d0bed..f1a1e88 100644
> --- a/lib/librte_pmd_i40e/i40e/i40e_nvm.c
> +++ b/lib/librte_pmd_i40e/i40e/i40e_nvm.c
> @@ -82,7 +82,7 @@ enum i40e_status_code i40e_init_nvm(struct i40e_hw
> *hw)
> } else { /* Blank programming mode */
> nvm->blank_nvm_mode = true;
> ret_code = I40E_ERR_NVM_BLANK_MODE;
> - DEBUGOUT("NVM init error: unsupported blank mode.\n");
> + i40e_debug(hw, I40E_DEBUG_NVM, "NVM init error:
> unsupported blank
> +mode.\n");
> }
>
> return ret_code;
> @@ -186,7 +186,7 @@ static enum i40e_status_code
> i40e_poll_sr_srctl_done_bit(struct i40e_hw *hw)
> i40e_usec_delay(5);
> }
> if (ret_code == I40E_ERR_TIMEOUT)
> - DEBUGOUT("Done bit in GLNVM_SRCTL not set");
> + i40e_debug(hw, I40E_DEBUG_NVM, "Done bit in
> GLNVM_SRCTL not set");
> return ret_code;
> }
>
> @@ -705,6 +705,22 @@ STATIC inline u8
> i40e_nvmupd_get_transaction(u32 val)
> return (u8)((val & I40E_NVM_TRANS_MASK) >>
> I40E_NVM_TRANS_SHIFT); }
>
> +STATIC const char *i40e_nvm_update_state_str[] = {
> + "I40E_NVMUPD_INVALID",
> + "I40E_NVMUPD_READ_CON",
> + "I40E_NVMUPD_READ_SNT",
> + "I40E_NVMUPD_READ_LCB",
> + "I40E_NVMUPD_READ_SA",
> + "I40E_NVMUPD_WRITE_ERA",
> + "I40E_NVMUPD_WRITE_CON",
> + "I40E_NVMUPD_WRITE_SNT",
> + "I40E_NVMUPD_WRITE_LCB",
> + "I40E_NVMUPD_WRITE_SA",
> + "I40E_NVMUPD_CSUM_CON",
> + "I40E_NVMUPD_CSUM_SA",
> + "I40E_NVMUPD_CSUM_LCB",
> +};
> +
> /**
> * i40e_nvmupd_command - Process an NVM update command
> * @hw: pointer to hardware structure
> @@ -740,6 +756,8 @@ enum i40e_status_code
> i40e_nvmupd_command(struct i40e_hw *hw,
>
> default:
> /* invalid state, should never happen */
> + i40e_debug(hw, I40E_DEBUG_NVM,
> +"NVMUPD: no such state %d\n", hw-
> >nvmupd_state);
> status = I40E_NOT_SUPPORTED;
> *perrno = -ESRCH;
> break;
> @@ -900,6 +918,9 @@ STATIC enum i40e_status_code
> i40e_nvmupd_state_reading(struct i40e_hw *hw,
> break;
>
> default:
> + i40e_debug(hw, I40E_DEBUG_NVM,
> +"NVMUPD: bad cmd %s in reading state.\n",
> +i40e_nvm_update_state_str[upd_cmd]);
> status = I40E_NOT_SUPPORTED;
> *perrno = -ESRCH;
> break;
> @@ -1035,8 +1056,9 @@ STATIC enum i40e_nvmupd_cmd
> i40e_nvmupd_validate_command(struct i40e_hw *hw,
> /* limits on data size */
> if ((cmd->data_size < 1) ||
> (cmd->data_size > I40E_NVMUPD_MAX_DATA)) {
> - DEBUGOUT1("i40e_nvmupd_validate_command
> data_size %d\n",
> - cmd->data_size);
> + i40e_debug(hw, I40E_DEBUG_NVM,
> +"i40e_nvmupd_validate_command
> data_size %d\n",
> +cmd->data_size);
> *perrno = -EFAULT;
> return I40E_NVMUPD_INVALID;
> }
> @@ -1088,12 +1110,16 @@ STATIC enum i40e_nvmupd_cmd
> i40e_nvmupd_validate_command(struct i40e_hw *hw,
> }
> break;
> }
> + i40e_debug(hw, I40E_DEBUG_NVM, "%s state %d
> nvm_release_on_hold %d\n",
> +i40e_nvm_update_state_str[upd_cmd],
> +hw->nvmupd_state,
> +hw->aq.nvm_release_on_done);
>
> if (upd_cmd == I40E_NVMUPD_INVALID) {
> *perrno = -EFAULT;
> - DEBUGOUT2(
> -
[dpdk-dev] [PATCH v2 15/33] i40e/base: replacement of DEBUGOUT() with i40e_debug()
To support better debug information printing, all DEBUGOUT() are
replaced by i40e_debug(). In addition, the NVM update state strings
are added in debug information.
Signed-off-by: Helin Zhang
---
lib/librte_pmd_i40e/Makefile| 1 +
lib/librte_pmd_i40e/i40e/i40e_nvm.c | 77 -
2 files changed, 59 insertions(+), 19 deletions(-)
diff --git a/lib/librte_pmd_i40e/Makefile b/lib/librte_pmd_i40e/Makefile
index 75b5120..22f0716 100644
--- a/lib/librte_pmd_i40e/Makefile
+++ b/lib/librte_pmd_i40e/Makefile
@@ -68,6 +68,7 @@ CFLAGS_BASE_DRIVER += -Wno-missing-field-initializers
CFLAGS_BASE_DRIVER += -Wno-pointer-to-int-cast
CFLAGS_BASE_DRIVER += -Wno-format-nonliteral
CFLAGS_BASE_DRIVER += -Wno-format-security
+CFLAGS_BASE_DRIVER += -Wno-unused-variable
ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1)
CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable
diff --git a/lib/librte_pmd_i40e/i40e/i40e_nvm.c
b/lib/librte_pmd_i40e/i40e/i40e_nvm.c
index 55d0bed..f1a1e88 100644
--- a/lib/librte_pmd_i40e/i40e/i40e_nvm.c
+++ b/lib/librte_pmd_i40e/i40e/i40e_nvm.c
@@ -82,7 +82,7 @@ enum i40e_status_code i40e_init_nvm(struct i40e_hw *hw)
} else { /* Blank programming mode */
nvm->blank_nvm_mode = true;
ret_code = I40E_ERR_NVM_BLANK_MODE;
- DEBUGOUT("NVM init error: unsupported blank mode.\n");
+ i40e_debug(hw, I40E_DEBUG_NVM, "NVM init error: unsupported
blank mode.\n");
}
return ret_code;
@@ -186,7 +186,7 @@ static enum i40e_status_code
i40e_poll_sr_srctl_done_bit(struct i40e_hw *hw)
i40e_usec_delay(5);
}
if (ret_code == I40E_ERR_TIMEOUT)
- DEBUGOUT("Done bit in GLNVM_SRCTL not set");
+ i40e_debug(hw, I40E_DEBUG_NVM, "Done bit in GLNVM_SRCTL not
set");
return ret_code;
}
@@ -705,6 +705,22 @@ STATIC inline u8 i40e_nvmupd_get_transaction(u32 val)
return (u8)((val & I40E_NVM_TRANS_MASK) >> I40E_NVM_TRANS_SHIFT);
}
+STATIC const char *i40e_nvm_update_state_str[] = {
+ "I40E_NVMUPD_INVALID",
+ "I40E_NVMUPD_READ_CON",
+ "I40E_NVMUPD_READ_SNT",
+ "I40E_NVMUPD_READ_LCB",
+ "I40E_NVMUPD_READ_SA",
+ "I40E_NVMUPD_WRITE_ERA",
+ "I40E_NVMUPD_WRITE_CON",
+ "I40E_NVMUPD_WRITE_SNT",
+ "I40E_NVMUPD_WRITE_LCB",
+ "I40E_NVMUPD_WRITE_SA",
+ "I40E_NVMUPD_CSUM_CON",
+ "I40E_NVMUPD_CSUM_SA",
+ "I40E_NVMUPD_CSUM_LCB",
+};
+
/**
* i40e_nvmupd_command - Process an NVM update command
* @hw: pointer to hardware structure
@@ -740,6 +756,8 @@ enum i40e_status_code i40e_nvmupd_command(struct i40e_hw
*hw,
default:
/* invalid state, should never happen */
+ i40e_debug(hw, I40E_DEBUG_NVM,
+ "NVMUPD: no such state %d\n", hw->nvmupd_state);
status = I40E_NOT_SUPPORTED;
*perrno = -ESRCH;
break;
@@ -900,6 +918,9 @@ STATIC enum i40e_status_code
i40e_nvmupd_state_reading(struct i40e_hw *hw,
break;
default:
+ i40e_debug(hw, I40E_DEBUG_NVM,
+ "NVMUPD: bad cmd %s in reading state.\n",
+ i40e_nvm_update_state_str[upd_cmd]);
status = I40E_NOT_SUPPORTED;
*perrno = -ESRCH;
break;
@@ -1035,8 +1056,9 @@ STATIC enum i40e_nvmupd_cmd
i40e_nvmupd_validate_command(struct i40e_hw *hw,
/* limits on data size */
if ((cmd->data_size < 1) ||
(cmd->data_size > I40E_NVMUPD_MAX_DATA)) {
- DEBUGOUT1("i40e_nvmupd_validate_command data_size %d\n",
- cmd->data_size);
+ i40e_debug(hw, I40E_DEBUG_NVM,
+ "i40e_nvmupd_validate_command data_size %d\n",
+ cmd->data_size);
*perrno = -EFAULT;
return I40E_NVMUPD_INVALID;
}
@@ -1088,12 +1110,16 @@ STATIC enum i40e_nvmupd_cmd
i40e_nvmupd_validate_command(struct i40e_hw *hw,
}
break;
}
+ i40e_debug(hw, I40E_DEBUG_NVM, "%s state %d nvm_release_on_hold %d\n",
+ i40e_nvm_update_state_str[upd_cmd],
+ hw->nvmupd_state,
+ hw->aq.nvm_release_on_done);
if (upd_cmd == I40E_NVMUPD_INVALID) {
*perrno = -EFAULT;
- DEBUGOUT2(
- "i40e_nvmupd_validate_command returns %d perrno: %d\n",
- upd_cmd, *perrno);
+ i40e_debug(hw, I40E_DEBUG_NVM,
+ "i40e_nvmupd_validate_command returns %d perrno
%d\n",
+ upd_cmd, *perrno);
}
return upd_cmd;
}
@@ -1118,14 +1144,18 @@ STATIC enum i40e_status_code
i40e_nvmupd_nvm_read(struct i40e_hw *hw,
transaction = i40e_nvmupd_get_transaction(cmd->config);
