@@ -19,6 +19,7 @@
#include "nfpcore/nfp_nsp.h"
#include "nfpcore/nfp6000_pcie.h"
#include "nfpcore/nfp_resource.h"
+#include "nfpcore/nfp_elf.h"
#include "nfp_cpp_bridge.h"
#include "nfp_ipsec.h"
@@ -1067,6 +1068,36 @@ nfp_fw_unload(struct nfp_cpp *cpp)
nfp_nsp_close(nsp);
}
+/* 0 is firmware not change, 1 is firmware changed, < 0 has error */
+static int
+nfp_fw_check_change(struct nfp_cpp *cpp,
+ char *fw_name,
+ bool *fw_changed)
+{
+ int ret;
+ struct nfp_net_hw hw;
+ uint32_t new_buildtime = 0;
+ uint32_t old_buildtime = 0;
+
+ ret = nfp_elf_get_fw_buildtime(&new_buildtime, fw_name);
+ if (ret < 0)
+ return ret;
+
+ hw.cpp = cpp;
+ nfp_net_get_fw_buildtime(&hw, &old_buildtime);
+ if (new_buildtime != old_buildtime) {
+ PMD_DRV_LOG(INFO, "FW version is changed, new %u, old %u",
+ new_buildtime, old_buildtime);
+ *fw_changed = true;
+ } else {
+ PMD_DRV_LOG(INFO, "FW version is not changed, build_time is %u.",
+ new_buildtime);
+ *fw_changed = false;
+ }
+
+ return 0;
+}
+
static int
nfp_fw_reload(struct nfp_nsp *nsp,
char *fw_name)
@@ -1132,15 +1163,39 @@ nfp_fw_skip_load(const struct nfp_dev_info *dev_info,
return false;
}
+static int
+nfp_fw_reload_for_single_pf(struct nfp_nsp *nsp,
+ char *fw_name,
+ struct nfp_cpp *cpp)
+{
+ int err;
+ bool fw_changed = true;
+
+ if (nfp_nsp_fw_loaded(nsp)) {
+ err = nfp_fw_check_change(cpp, fw_name, &fw_changed);
+ if (err < 0)
+ return err;
+ }
+
+ if (!fw_changed)
+ return 0;
+
+ err = nfp_fw_reload(nsp, fw_name);
+ if (err < 0)
+ return err;
+
+ return 0;
+}
static int
-nfp_fw_reload_for_multipf(struct nfp_nsp *nsp,
+nfp_fw_reload_for_multi_pf(struct nfp_nsp *nsp,
char *fw_name,
struct nfp_cpp *cpp,
const struct nfp_dev_info *dev_info,
struct nfp_multi_pf *multi_pf)
{
int err;
+ bool fw_changed = true;
bool skip_load_fw = false;
err = nfp_net_keepalive_init(cpp, multi_pf);
@@ -1151,27 +1206,36 @@ nfp_fw_reload_for_multipf(struct nfp_nsp *nsp,
err = nfp_net_keepalive_start(multi_pf);
if (err != 0) {
- nfp_net_keepalive_uninit(multi_pf);
PMD_DRV_LOG(ERR, "NFP write beat failed");
- return err;
+ goto keepalive_uninit;
}
- if (nfp_nsp_fw_loaded(nsp))
+ if (nfp_nsp_fw_loaded(nsp)) {
+ err = nfp_fw_check_change(cpp, fw_name, &fw_changed);
+ if (err < 0)
+ goto keepalive_stop;
+ }
+
+ if (!fw_changed)
skip_load_fw = nfp_fw_skip_load(dev_info, multi_pf);
if (skip_load_fw)
return 0;
err = nfp_fw_reload(nsp, fw_name);
- if (err != 0) {
- nfp_net_keepalive_stop(multi_pf);
- nfp_net_keepalive_uninit(multi_pf);
- return err;
- }
+ if (err != 0)
+ goto keepalive_stop;
nfp_net_keepalive_clear_others(dev_info, multi_pf);
return 0;
+
+keepalive_stop:
+ nfp_net_keepalive_stop(multi_pf);
+keepalive_uninit:
+ nfp_net_keepalive_uninit(multi_pf);
+
+ return err;
}
static int
@@ -1228,9 +1292,9 @@ nfp_fw_setup(struct rte_pci_device *dev,
}
if (multi_pf->enabled)
- err = nfp_fw_reload_for_multipf(nsp, fw_name, cpp, dev_info, multi_pf);
+ err = nfp_fw_reload_for_multi_pf(nsp, fw_name, cpp, dev_info, multi_pf);
else
- err = nfp_fw_reload(nsp, fw_name);
+ err = nfp_fw_reload_for_single_pf(nsp, fw_name, cpp);
nfp_nsp_close(nsp);
return err;
@@ -2090,6 +2090,23 @@ nfp_net_get_nsp_info(struct nfp_net_hw *hw,
nfp_nsp_close(nsp);
}
+void
+nfp_net_get_fw_buildtime(struct nfp_net_hw *hw,
+ uint32_t *mip_buildtime)
+{
+ struct nfp_mip *mip;
+
+ mip = nfp_mip_open(hw->cpp);
+ if (mip == NULL) {
+ *mip_buildtime = 0;
+ return;
+ }
+
+ *mip_buildtime = nfp_mip_buildtime(mip);
+
+ nfp_mip_close(mip);
+}
+
static void
nfp_net_get_mip_name(struct nfp_net_hw *hw,
char *mip_name)
@@ -295,6 +295,8 @@ int nfp_net_fec_get(struct rte_eth_dev *dev,
uint32_t *fec_capa);
int nfp_net_fec_set(struct rte_eth_dev *dev,
uint32_t fec_capa);
+void nfp_net_get_fw_buildtime(struct nfp_net_hw *hw,
+ uint32_t *fw_buildtimes);
#define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\
((struct nfp_app_fw_nic *)app_fw_priv)