On Wed, Oct 07, 2015 at 09:21:40AM +0530, Hariprasad Shenai wrote:
> t4_check_fw_version() can return several error codes (-EINVAL, -EBUSY,
> -EAGAIN). The present code sets the adapter state to UNINIT only if its
> an EFAULT. In all the error cases set the adapter to uninitialized state.
>
> In t4_check_fw_version() if call to t4_read_flash() fails, repeat the
> operation a few times before returning failure.
>
> Signed-off-by: Hariprasad Shenai <haripra...@chelsio.com>
> ---
> drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +-
> drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 6 +++++-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> index 9f1f5b2..c29227e 100644
> --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> @@ -3698,7 +3698,7 @@ static int adap_init0(struct adapter *adap)
> t4_get_tp_version(adap, &adap->params.tp_vers);
> ret = t4_check_fw_version(adap);
> /* If firmware is too old (not supported by driver) force an update. */
> - if (ret == -EFAULT)
> + if (ret)
> state = DEV_STATE_UNINIT;
> if ((adap->flags & MASTER_PF) && state != DEV_STATE_INIT) {
> struct fw_info *fw_info;
> diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> index dc6ce31..874b599 100644
> --- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> @@ -2981,11 +2981,15 @@ int t4_get_exprom_version(struct adapter *adap, u32
> *vers)
> */
> int t4_check_fw_version(struct adapter *adap)
> {
> - int ret, major, minor, micro;
> + int i, ret, major, minor, micro;
> int exp_major, exp_minor, exp_micro;
> unsigned int chip_version = CHELSIO_CHIP_VERSION(adap->params.chip);
>
> ret = t4_get_fw_version(adap, &adap->params.fw_vers);
> + /* Try multiple times before returning error */
> + for (i = 0; ret && i < 3; i++)
> + ret = t4_get_fw_version(adap, &adap->params.fw_vers);
> +
Shouldn't you only retry if you get an error that indicates the error is
transient (i.e. EBUSY or EAGAIN)?
Neil
> if (ret)
> return ret;
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
