Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a69265e9 authored by Hariprasad Shenai's avatar Hariprasad Shenai Committed by David S. Miller
Browse files

cxgb4: Force uninitialized state if FW in adapter is unsupported 



Forcing uninitialized state allows us to upgrade and reinitialize
the adapter.

    FW_VERSION_T4 = 1.4.0.0
    FW_VERSION_T5 = 0.0.0.0
    FW_VERSION_T6 = 0.0.0.0
At this point driver supports above and greater than above version.

If FW in adapter < min FW_VERSION driver supports tries to upgrade the FW
If FW in adapter >= FW_VERSION driver supports then it follows normal path

Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b72ca67

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h

+1 −0
Original line number Diff line number Diff line
@@ -1289,6 +1289,7 @@ int t4_fwcache(struct adapter *adap, enum fw_params_param_dev_fwcache op); 
int t4_fw_upgrade(struct adapter *adap, unsigned int mbox,

		  const u8 *fw_data, unsigned int size, int force);

unsigned int t4_flash_cfg_addr(struct adapter *adapter);

int t4_check_fw_version(struct adapter *adap);

int t4_get_fw_version(struct adapter *adapter, u32 *vers);

int t4_get_tp_version(struct adapter *adapter, u32 *vers);

int t4_get_exprom_version(struct adapter *adapter, u32 *vers);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+4 −0
Original line number Diff line number Diff line
@@ -3668,6 +3668,10 @@ static int adap_init0(struct adapter *adap) 
	 */

	t4_get_fw_version(adap, &adap->params.fw_vers);

	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)

		state = DEV_STATE_UNINIT;

	if ((adap->flags & MASTER_PF) && state != DEV_STATE_INIT) {

		struct fw_info *fw_info;

		struct fw_hdr *card_fw;

drivers/net/ethernet/chelsio/cxgb4/t4_hw.c

+56 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "t4_regs.h"

#include "t4_values.h"

#include "t4fw_api.h"

#include "t4fw_version.h"



/**

 *	t4_wait_op_done_val - wait until an operation is completed
@@ -2166,6 +2167,61 @@ int t4_get_exprom_version(struct adapter *adap, u32 *vers) 
	return 0;

}



/**

 *	t4_check_fw_version - check if the FW is supported with this driver

 *	@adap: the adapter

 *

 *	Checks if an adapter's FW is compatible with the driver.  Returns 0

 *	if there's exact match, a negative error if the version could not be

 *	read or there's a major version mismatch

 */

int t4_check_fw_version(struct adapter *adap)

{

	int 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);

	if (ret)

		return ret;



	major = FW_HDR_FW_VER_MAJOR_G(adap->params.fw_vers);

	minor = FW_HDR_FW_VER_MINOR_G(adap->params.fw_vers);

	micro = FW_HDR_FW_VER_MICRO_G(adap->params.fw_vers);



	switch (chip_version) {

	case CHELSIO_T4:

		exp_major = T4FW_MIN_VERSION_MAJOR;

		exp_minor = T4FW_MIN_VERSION_MINOR;

		exp_micro = T4FW_MIN_VERSION_MICRO;

		break;

	case CHELSIO_T5:

		exp_major = T5FW_MIN_VERSION_MAJOR;

		exp_minor = T5FW_MIN_VERSION_MINOR;

		exp_micro = T5FW_MIN_VERSION_MICRO;

		break;

	case CHELSIO_T6:

		exp_major = T6FW_MIN_VERSION_MAJOR;

		exp_minor = T6FW_MIN_VERSION_MINOR;

		exp_micro = T6FW_MIN_VERSION_MICRO;

		break;

	default:

		dev_err(adap->pdev_dev, "Unsupported chip type, %x\n",

			adap->chip);

		return -EINVAL;

	}



	if (major < exp_major || (major == exp_major && minor < exp_minor) ||

	    (major == exp_major && minor == exp_minor && micro < exp_micro)) {

		dev_err(adap->pdev_dev,

			"Card has firmware version %u.%u.%u, minimum "

			"supported firmware is %u.%u.%u.\n", major, minor,

			micro, exp_major, exp_minor, exp_micro);

		return -EFAULT;

	}

	return 0;

}



/* Is the given firmware API compatible with the one the driver was compiled

 * with?

 */

drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h

+11 −0
Original line number Diff line number Diff line
@@ -40,14 +40,25 @@ 
#define T4FW_VERSION_MICRO 0x20

#define T4FW_VERSION_BUILD 0x00



#define T4FW_MIN_VERSION_MAJOR 0x01

#define T4FW_MIN_VERSION_MINOR 0x04

#define T4FW_MIN_VERSION_MICRO 0x00



#define T5FW_VERSION_MAJOR 0x01

#define T5FW_VERSION_MINOR 0x0D

#define T5FW_VERSION_MICRO 0x20

#define T5FW_VERSION_BUILD 0x00



#define T5FW_MIN_VERSION_MAJOR 0x00

#define T5FW_MIN_VERSION_MINOR 0x00

#define T5FW_MIN_VERSION_MICRO 0x00



#define T6FW_VERSION_MAJOR 0x01

#define T6FW_VERSION_MINOR 0x0D

#define T6FW_VERSION_MICRO 0x2D

#define T6FW_VERSION_BUILD 0x00



#define T6FW_MIN_VERSION_MAJOR 0x00

#define T6FW_MIN_VERSION_MINOR 0x00

#define T6FW_MIN_VERSION_MICRO 0x00

#endif