This patch is to use firmware version macros from t4fw_version.h and also enables 40g T5 adapter.
Unified · Split
| @@ -1372,7 +1372,8 @@ csio_config_device_caps(struct csio_hw *hw) · 1371 unmodified lines | ||
| 1372 | 1372 | } |
| 1373 | 1373 | |
| 1374 | 1374 | /* Validate device capabilities */ |
| 1375 | − if (csio_hw_validate_caps(hw, mbp)) | |
| 1375 | + rv = csio_hw_validate_caps(hw, mbp); | |
| 1376 | + if (rv != 0) | |
| 1376 | 1377 | goto out; |
| 1377 | 1378 | |
| 1378 | 1379 | /* Don't config device capabilities if already configured */ |
| @@ -1776,7 +1777,8 @@ csio_hw_use_fwconfig(struct csio_hw *hw, int reset, u32 *fw_cfg_param) · 397 unmodified lines | ||
| 1776 | 1777 | } |
| 1777 | 1778 | |
| 1778 | 1779 | /* Validate device capabilities */ |
| 1779 | − if (csio_hw_validate_caps(hw, mbp)) | |
| 1780 | + rv = csio_hw_validate_caps(hw, mbp); | |
| 1781 | + if (rv != 0) | |
| 1780 | 1782 | goto bye; |
| 1781 | 1783 | /* |
| 1782 | 1784 | * Note that we're operating with parameters |
| @@ -45,11 +45,6 @@ · 44 unmodified lines | ||
| 45 | 45 | #define FW_FNAME_T5 "cxgb4/t5fw.bin" |
| 46 | 46 | #define FW_CFG_NAME_T5 "cxgb4/t5-config.txt" |
| 47 | 47 | |
| 48 | −#define T5FW_VERSION_MAJOR 0x01 | |
| 49 | −#define T5FW_VERSION_MINOR 0x0B | |
| 50 | −#define T5FW_VERSION_MICRO 0x1B | |
| 51 | −#define T5FW_VERSION_BUILD 0x00 | |
| 52 | − | |
| 53 | 48 | #define CHELSIO_CHIP_CODE(version, revision) (((version) << 4) | (revision)) |
| 54 | 49 | #define CHELSIO_CHIP_FPGA 0x100 |
| 55 | 50 | #define CHELSIO_CHIP_VERSION(code) (((code) >> 12) & 0xf) |
| @@ -74,6 +69,7 @@ static inline int csio_is_t5(uint16_t chip) · 18 unmodified lines | ||
| 74 | 69 | { PCI_VENDOR_ID_CHELSIO, (devid), PCI_ANY_ID, PCI_ANY_ID, 0, 0, (idx) } |
| 75 | 70 | |
| 76 | 71 | #include "t4fw_api.h" |
| 72 | +#include "t4fw_version.h" | |
| 77 | 73 | |
| 78 | 74 | #define FW_VERSION(chip) ( \ |
| 79 | 75 | FW_HDR_FW_VER_MAJOR_G(chip##FW_VERSION_MAJOR) | \ |
| @@ -327,7 +327,8 @@ csio_mb_caps_config(struct csio_hw *hw, struct csio_mb *mbp, uint32_t tmo, · 326 unmodified lines | ||
| 327 | 327 | } |
| 328 | 328 | |
| 329 | 329 | #define CSIO_ADVERT_MASK (FW_PORT_CAP_SPEED_100M | FW_PORT_CAP_SPEED_1G |\ |
| 330 | − FW_PORT_CAP_SPEED_10G | FW_PORT_CAP_ANEG) | |
| 330 | + FW_PORT_CAP_SPEED_10G | FW_PORT_CAP_SPEED_40G |\ | |
| 331 | + FW_PORT_CAP_ANEG) | |
| 331 | 332 | |
| 332 | 333 | /* |
| 333 | 334 | * csio_mb_port- FW PORT command helper |