vxge: add support for ethtool firmware flashing
Subsystems (2)
PATCH 5/12 vxge: add support for ethtool firmware flashing
Add the ability in the vxge driver to flash firmware via ethtool.
Updated to include comments from Ben Hutchings.
Signed-off-by Jon Mason <[email protected]>
Signed-off-by Ram Vepa <[email protected]>
--- drivers/net/vxge/vxge-config.c | 183 +++++++++++++++++++++++++++++++++++++- drivers/net/vxge/vxge-config.h | 71 ++++++++++++++- drivers/net/vxge/vxge-ethtool.c | 20 ++++ drivers/net/vxge/vxge-main.c | 190 +++++++++++++++++++++++++++++++++++---- drivers/net/vxge/vxge-main.h | 2 + drivers/net/vxge/vxge-reg.h | 29 ++++++- drivers/net/vxge/vxge-version.h | 27 ++++++ 7 files changed, 500 insertions(+), 22 deletions(-)
drivers/net/vxge/vxge-config.c +182 -1
@@ -155,7 +155,6 @@ __vxge_hw_vpath_reset_check(struct __vxge_hw_virtualpath *vpath);static enum vxge_hw_status __vxge_hw_vpath_sw_reset (struct __vxge_hw_device *devh,u32 vp_id); -static enum vxge_hw_status __vxge_hw_vpath_mac_configure (struct __vxge_hw_device *devh,u32 vp_id);
@@ -322,6 +321,188 @@ out:return status; } +enum vxge_hw_status +vxge_hw_upgrade_read_version (struct __vxge_hw_device *hldev,u32 *major, +u32 *minor,u32 *build) +{ +u64 data0 =0 , data1 =0 , steer_ctrl =0 ; +struct __vxge_hw_virtualpath *vpath; +enum vxge_hw_status status; + + vpath = &hldev->virtual_paths[hldev->first_vp_id]; + + status =vxge_hw_vpath_fw_api (vpath, +VXGE_HW_FW_UPGRADE_ACTION , +VXGE_HW_FW_UPGRADE_MEMO , +VXGE_HW_FW_UPGRADE_OFFSET_READ , + &data0, &data1, &steer_ctrl); +if (status !=VXGE_HW_OK ) +return status; + + *major =VXGE_HW_RTS_ACCESS_STEER_DATA0_GET_FW_VER_MAJOR (data0); + *minor =VXGE_HW_RTS_ACCESS_STEER_DATA0_GET_FW_VER_MINOR (data0); + *build =VXGE_HW_RTS_ACCESS_STEER_DATA0_GET_FW_VER_BUILD (data0); + +return status; +} + +enum vxge_hw_status vxge_hw_flash_fw (struct __vxge_hw_device *hldev) +{ +u64 data0 =0 , data1 =0 , steer_ctrl =0 ; +struct __vxge_hw_virtualpath *vpath; +enum vxge_hw_status status; +u32 ret; + + vpath = &hldev->virtual_paths[hldev->first_vp_id]; + + status =vxge_hw_vpath_fw_api (vpath, +VXGE_HW_FW_UPGRADE_ACTION , +VXGE_HW_FW_UPGRADE_MEMO , +VXGE_HW_FW_UPGRADE_OFFSET_COMMIT , + &data0, &data1, &steer_ctrl); +if (status !=VXGE_HW_OK ) { +vxge_debug_init (VXGE_ERR ,"%s: FW upgrade failed" , __func__); + goto exit; + } + + ret =VXGE_HW_RTS_ACCESS_STEER_CTRL_GET_ACTION (steer_ctrl) &0x7F ; +if (ret !=1 ) { +vxge_debug_init (VXGE_ERR ,"%s: FW commit failed with error %d" , + __func__, ret); + status =VXGE_HW_FAIL ; + } + +exit: +return status; +} + +enum vxge_hw_status +vxge_update_fw_image (struct __vxge_hw_device *hldev,const u8 *fwdata,int size) +{ +u64 data0 =0 , data1 =0 , steer_ctrl =0 ; +struct __vxge_hw_virtualpath *vpath; +enum vxge_hw_status status; +int ret_code, sec_code; + + vpath = &hldev->virtual_paths[hldev->first_vp_id]; + +/* send upgrade start command */ + status =vxge_hw_vpath_fw_api (vpath, +VXGE_HW_FW_UPGRADE_ACTION , +VXGE_HW_FW_UPGRADE_MEMO , +VXGE_HW_FW_UPGRADE_OFFSET_START , + &data0, &data1, &steer_ctrl); +if (status !=VXGE_HW_OK ) { +vxge_debug_init (VXGE_ERR ," %s: Upgrade start cmd failed" , + __func__); +return status; + } + +/* Transfer fw image to adapter 16 bytes at a time */ +for (; size >0 ; size -=VXGE_HW_FW_UPGRADE_BLK_SIZE ) { + steer_ctrl =0 ; + +/* The next 128bits of fwdata to be loaded onto the adapter */ + data0 = *((u64 *)fwdata); + data1 = *((u64 *)fwdata +1 ); + + status =vxge_hw_vpath_fw_api (vpath, +VXGE_HW_FW_UPGRADE_ACTION , +VXGE_HW_FW_UPGRADE_MEMO , +VXGE_HW_FW_UPGRADE_OFFSET_SEND , + &data0, &data1, &steer_ctrl); +if (status !=VXGE_HW_OK ) { +vxge_debug_init (VXGE_ERR ,"%s: Upgrade send failed" , + __func__); + goto out; + } + + ret_code =VXGE_HW_UPGRADE_GET_RET_ERR_CODE (data0); +switch (ret_code) { +case VXGE_HW_FW_UPGRADE_OK : +/* All OK, send next 16 bytes. */ +break ; +case VXGE_FW_UPGRADE_BYTES2SKIP : +/* skip bytes in the stream */ + fwdata += (data0 >>8 ) &0xFFFFFFFF ; +break ; +case VXGE_HW_FW_UPGRADE_DONE : + goto out; +case VXGE_HW_FW_UPGRADE_ERR : + sec_code =VXGE_HW_UPGRADE_GET_SEC_ERR_CODE (data0); +switch (sec_code) { +case VXGE_HW_FW_UPGRADE_ERR_CORRUPT_DATA_1 : +case VXGE_HW_FW_UPGRADE_ERR_CORRUPT_DATA_7 : +printk (KERN_ERR +"corrupted data from .ncf file\n" ); +break ; +case VXGE_HW_FW_UPGRADE_ERR_INV_NCF_FILE_3 : +case VXGE_HW_FW_UPGRADE_ERR_INV_NCF_FILE_4 : +case VXGE_HW_FW_UPGRADE_ERR_INV_NCF_FILE_5 : +case VXGE_HW_FW_UPGRADE_ERR_INV_NCF_FILE_6 : +case VXGE_HW_FW_UPGRADE_ERR_INV_NCF_FILE_8 : +printk (KERN_ERR "invalid .ncf file\n" ); +break ; +case VXGE_HW_FW_UPGRADE_ERR_BUFFER_OVERFLOW : +printk (KERN_ERR "buffer overflow\n" ); +break ; +case VXGE_HW_FW_UPGRADE_ERR_FAILED_TO_FLASH : +printk (KERN_ERR "failed to flash the image\n" ); +break ; +case VXGE_HW_FW_UPGRADE_ERR_GENERIC_ERROR_UNKNOWN : +printk (KERN_ERR +"generic error. Unknown error type\n" ); +break ; +default : +printk (KERN_ERR "Unknown error of type %d\n" , + sec_code); +break ; + } + status =VXGE_HW_FAIL ; + goto out; +default : +printk (KERN_ERR "Unknown FW error: %d\n" , ret_code); + status =VXGE_HW_FAIL ; + goto out; + } +/* point to next 16 bytes */ + fwdata +=VXGE_HW_FW_UPGRADE_BLK_SIZE ; + } +out: +return status; +} + +enum vxge_hw_status +vxge_hw_vpath_eprom_img_ver_get (struct __vxge_hw_device *hldev, +struct eprom_image *img) +{ +u64 data0 =0 , data1 =0 , steer_ctrl =0 ; +struct __vxge_hw_virtualpath *vpath; +enum vxge_hw_status status; +int i; + + vpath = &hldev->virtual_paths[hldev->first_vp_id]; + +for (i =0 ; i <VXGE_HW_MAX_ROM_IMAGES ; i++) { + data0 =VXGE_HW_RTS_ACCESS_STEER_ROM_IMAGE_INDEX (i); + data1 = steer_ctrl =0 ; + + status =vxge_hw_vpath_fw_api (vpath, +VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO , +VXGE_HW_FW_API_GET_EPROM_REV , +0 , &data0, &data1, &steer_ctrl); +if (status !=VXGE_HW_OK ) +break ; + + img[i].is_valid =VXGE_HW_GET_EPROM_IMAGE_VALID (data0); + img[i].index =VXGE_HW_GET_EPROM_IMAGE_INDEX (data0); + img[i].type =VXGE_HW_GET_EPROM_IMAGE_TYPE (data0); + img[i].version =VXGE_HW_GET_EPROM_IMAGE_REV (data0); + } + +return status; +} +/* * __vxge_hw_channel_allocate - Allocate memory for channel * This function allocates required memory for the channel and various arrays
drivers/net/vxge/vxge-config.h +68 -3
100 lines not on this page · raw message
drivers/net/vxge/vxge-ethtool.c +20 -0
@@ -1153,6 +1153,25 @@ static int vxge_set_flags(struct net_device *dev, u32 data)return 0 ; } +static int vxge_fw_flash (struct net_device *dev,struct ethtool_flash *parms) +{ +struct vxgedev *vdev = (struct vxgedev *)netdev_priv (dev); + +if (vdev->max_vpath_supported !=VXGE_HW_MAX_VIRTUAL_PATHS ) { +printk (KERN_INFO "Single Function Mode is required to flash the" +" firmware\n" ); +return -EINVAL ; + } + +if (netif_running (dev)) { +printk (KERN_INFO "Interface %s must be down to flash the " +"firmware\n" , dev->name); +return -EBUSY ; + } + +return vxge_fw_upgrade (vdev, parms->data,1 ); +} +static const struct ethtool_ops vxge_ethtool_ops = { .get_settings = vxge_ethtool_gset, .set_settings = vxge_ethtool_sset,
@@ -1175,6 +1194,7 @@ static const struct ethtool_ops vxge_ethtool_ops = { .get_sset_count = vxge_ethtool_get_sset_count, .get_ethtool_stats = vxge_get_ethtool_stats, .set_flags = vxge_set_flags, + .flash_device = vxge_fw_flash, };void vxge_initialize_ethtool_ops (struct net_device *ndev)
drivers/net/vxge/vxge-main.c +174 -16
249 lines not on this page · raw message
drivers/net/vxge/vxge-main.h +2 -0
@@ -397,6 +397,8 @@ struct vxge_tx_priv {extern void vxge_initialize_ethtool_ops (struct net_device *ndev);enum vxge_hw_status vxge_reset_all_vpaths (struct vxgedev *vdev); +int vxge_fw_upgrade (struct vxgedev *vdev,char *fw_name,int override); +/** * #define VXGE_DEBUG_INIT: debug for initialization functions * #define VXGE_DEBUG_TX : debug transmit related functions
drivers/net/vxge/vxge-reg.h +27 -2
@@ -49,6 +49,30 @@#define VXGE_HW_TITAN_VPMGMT_REG_SPACES 17#define VXGE_HW_TITAN_VPATH_REG_SPACES 17 +#define VXGE_HW_FW_API_GET_EPROM_REV 31 + +#define VXGE_EPROM_IMG_MAJOR (val) (u32) vxge_bVALn(val, 48, 4) +#define VXGE_EPROM_IMG_MINOR (val) (u32) vxge_bVALn(val, 52, 4) +#define VXGE_EPROM_IMG_FIX (val) (u32) vxge_bVALn(val, 56, 4) +#define VXGE_EPROM_IMG_BUILD (val) (u32) vxge_bVALn(val, 60, 4) + +#define VXGE_HW_GET_EPROM_IMAGE_INDEX (val) vxge_bVALn(val, 16, 8) +#define VXGE_HW_GET_EPROM_IMAGE_VALID (val) vxge_bVALn(val, 31, 1) +#define VXGE_HW_GET_EPROM_IMAGE_TYPE (val) vxge_bVALn(val, 40, 8) +#define VXGE_HW_GET_EPROM_IMAGE_REV (val) vxge_bVALn(val, 48, 16) +#define VXGE_HW_RTS_ACCESS_STEER_ROM_IMAGE_INDEX (val) vxge_vBIT(val, 16, 8) + +#define VXGE_HW_FW_UPGRADE_MEMO 13 +#define VXGE_HW_FW_UPGRADE_ACTION 16 +#define VXGE_HW_FW_UPGRADE_OFFSET_START 2 +#define VXGE_HW_FW_UPGRADE_OFFSET_SEND 3 +#define VXGE_HW_FW_UPGRADE_OFFSET_COMMIT 4 +#define VXGE_HW_FW_UPGRADE_OFFSET_READ 5 + +#define VXGE_HW_FW_UPGRADE_BLK_SIZE 16 +#define VXGE_HW_UPGRADE_GET_RET_ERR_CODE (val) (val & 0xff) +#define VXGE_HW_UPGRADE_GET_SEC_ERR_CODE (val) ((val >> 8) & 0xff) +#define VXGE_HW_ASIC_MODE_RESERVED 0#define VXGE_HW_ASIC_MODE_NO_IOV 1#define VXGE_HW_ASIC_MODE_SR_IOV 2
@@ -165,13 +189,13 @@#define VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_ETYPE 2#define VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_PN 3#define VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_RTH_GEN_CFG 5 -#define VXGE_HW_RTS_ACS_STEER_CTRL_DATA_STRUCT_SEL_RTH_SOLO_IT 6 +#define VXGE_HW_RTS_ACS_STEER_CTRL_DATA_STRUCT_SEL_RTH_SOLO_IT 6#define VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_RTH_JHASH_CFG 7#define VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_RTH_MASK 8#define VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_RTH_KEY 9#define VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_QOS 10#define VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_DS 11 -#define VXGE_HW_RTS_ACS_STEER_CTRL_DATA_STRUCT_SEL_RTH_MULTI_IT 12 +#define VXGE_HW_RTS_ACS_STEER_CTRL_DATA_STRUCT_SEL_RTH_MULTI_IT 12#define VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO 13#define VXGE_HW_RTS_ACCESS_STEER_DATA0_GET_DA_MAC_ADDR (bits) \
@@ -437,6 +461,7 @@#define VXGE_HW_RTS_ACCESS_STEER_DATA1_GET_FLASH_VER_BUILD (bits) \ vxge_bVALn(bits, 48, 16)#define VXGE_HW_RTS_ACCESS_STEER_DATA1_FLASH_VER_BUILD vxge_vBIT(val, 48, 16) +#define VXGE_HW_RTS_ACCESS_STEER_CTRL_GET_ACTION (bits) vxge_bVALn(bits, 0, 8)#define VXGE_HW_SRPCIM_TO_VPATH_ALARM_REG_GET_PPIF_SRPCIM_TO_VPATH_ALARM (bits)\ vxge_bVALn(bits, 0, 18)
drivers/net/vxge/vxge-version.h +27 -0
@@ -19,4 +19,31 @@#define VXGE_VERSION_FIX "9"#define VXGE_VERSION_BUILD "20840"#define VXGE_VERSION_FOR "k" + +#define VXGE_FW_VER (maj, min, bld) (((maj) << 16) + ((min) << 8) + (bld)) + +#define VXGE_DEAD_FW_VER_MAJOR 1 +#define VXGE_DEAD_FW_VER_MINOR 4 +#define VXGE_DEAD_FW_VER_BUILD 4 + +#define VXGE_FW_DEAD_VER VXGE_FW_VER(VXGE_DEAD_FW_VER_MAJOR, \ + VXGE_DEAD_FW_VER_MINOR, \ + VXGE_DEAD_FW_VER_BUILD) + +#define VXGE_EPROM_FW_VER_MAJOR 1 +#define VXGE_EPROM_FW_VER_MINOR 6 +#define VXGE_EPROM_FW_VER_BUILD 1 + +#define VXGE_EPROM_FW_VER VXGE_FW_VER(VXGE_EPROM_FW_VER_MAJOR, \ + VXGE_EPROM_FW_VER_MINOR, \ + VXGE_EPROM_FW_VER_BUILD) + +#define VXGE_CERT_FW_VER_MAJOR 1 +#define VXGE_CERT_FW_VER_MINOR 8 +#define VXGE_CERT_FW_VER_BUILD 1 + +#define VXGE_CERT_FW_VER VXGE_FW_VER(VXGE_CERT_FW_VER_MAJOR, \ + VXGE_CERT_FW_VER_MINOR, \ + VXGE_CERT_FW_VER_BUILD) +#endif
Signature · 1 line
1.7.0.4