From 7e5778f880570fc3dfa3d12de15ad153e333a74a Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Thu, 29 Aug 2019 10:36:08 +0800 Subject: [PATCH] net/ice/base: add NVM pkg flag Add flag for case where active package has been loaded from NVM. Signed-off-by: Ashish Shah Signed-off-by: Paul M Stillwell Jr Signed-off-by: Qi Zhang Acked-by: Xiaolong Ye --- drivers/net/ice/base/ice_flex_pipe.c | 1 + drivers/net/ice/base/ice_type.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c index afb8678779..5a5dbff5b0 100644 --- a/drivers/net/ice/base/ice_flex_pipe.c +++ b/drivers/net/ice/base/ice_flex_pipe.c @@ -1144,6 +1144,7 @@ static enum ice_status ice_get_pkg_info(struct ice_hw *hw) pkg_info->pkg_info[i].name, sizeof(hw->active_pkg_name), ICE_NONDMA_TO_NONDMA); + hw->active_pkg_in_nvm = pkg_info->pkg_info[i].is_in_nvm; } if (pkg_info->pkg_info[i].is_active_at_boot) flags[place++] = 'B'; diff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h index 0dba94a537..79d7bb1ddd 100644 --- a/drivers/net/ice/base/ice_type.h +++ b/drivers/net/ice/base/ice_type.h @@ -773,6 +773,7 @@ struct ice_hw { /* Active package version (currently active) */ struct ice_pkg_ver active_pkg_ver; u8 active_pkg_name[ICE_PKG_NAME_SIZE]; + u8 active_pkg_in_nvm; /* Driver's package ver - (from the Metadata seg) */ struct ice_pkg_ver pkg_ver; -- 2.20.1