An optional flag field has been added to the signature segment header.
The field contains two flags, a "valid" bit, and a "last segment" bit
that indicates whether the segment is the last segment that will be
sent to firmware.
If the flag field's valid bit is NOT set, then as was done before,
assume that this is the last segment being downloaded.
However, if the flag field's valid bit IS set, then use the last segment
flag to determine if this segment is the last segment to download.
Co-developed-by: Dan Nowlin <dan.now...@intel.com>
Signed-off-by: Dan Nowlin <dan.now...@intel.com>
Signed-off-by: Paul Greenwalt <paul.greenw...@intel.com>
Signed-off-by: Ahmed Zaki <ahmed.z...@intel.com>
Reviewed-by: Michal Swiatkowski <michal.swiatkow...@linux.intel.com>
Signed-off-by: Przemek Kitszel <przemyslaw.kits...@intel.com>
---
v2: co/- authorship change
---
drivers/net/ethernet/intel/ice/ice_ddp.h | 5 ++++-
drivers/net/ethernet/intel/ice/ice_ddp.c | 24 +++++++++++++++++-------
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_ddp.h
b/drivers/net/ethernet/intel/ice/ice_ddp.h
index 79551da2a4b0..8a2d57fc5dae 100644
--- a/drivers/net/ethernet/intel/ice/ice_ddp.h
+++ b/drivers/net/ethernet/intel/ice/ice_ddp.h
@@ -181,7 +181,10 @@ struct ice_sign_seg {
__le32 signed_seg_idx;
__le32 signed_buf_start;
__le32 signed_buf_count;
-#define ICE_SIGN_SEG_RESERVED_COUNT 44
+#define ICE_SIGN_SEG_FLAGS_VALID 0x80000000
+#define ICE_SIGN_SEG_FLAGS_LAST 0x00000001
+ __le32 flags;
+#define ICE_SIGN_SEG_RESERVED_COUNT 40
u8 reserved[ICE_SIGN_SEG_RESERVED_COUNT];
struct ice_buf_table buf_tbl;
};
diff --git a/drivers/net/ethernet/intel/ice/ice_ddp.c
b/drivers/net/ethernet/intel/ice/ice_ddp.c
index a2bb8442f281..859009940af0 100644
--- a/drivers/net/ethernet/intel/ice/ice_ddp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ddp.c
@@ -1434,6 +1434,12 @@ ice_download_pkg_config_seg(struct ice_ddp_send_ctx *ctx,
return ice_dwnld_cfg_bufs_no_lock(ctx, bufs->buf_array, start, count);
}
+static bool ice_is_last_sign_seg(u32 flags)
+{
+ return !(flags & ICE_SIGN_SEG_FLAGS_VALID) /* behavior prior to valid */
+ || (flags & ICE_SIGN_SEG_FLAGS_LAST);
+}
+
/**
* ice_dwnld_sign_and_cfg_segs - download a signing segment and config segment
* @ctx: context of the current buffers section to send
@@ -1446,11 +1452,9 @@ static enum ice_ddp_state
ice_dwnld_sign_and_cfg_segs(struct ice_ddp_send_ctx *ctx,
struct ice_pkg_hdr *pkg_hdr, u32 idx)
{
+ u32 conf_idx, start, count, flags;
enum ice_ddp_state state;
struct ice_sign_seg *seg;
- u32 conf_idx;
- u32 start;
- u32 count;
seg = (struct ice_sign_seg *)ice_get_pkg_seg_by_idx(pkg_hdr, idx);
if (!seg) {
@@ -1466,7 +1470,15 @@ ice_dwnld_sign_and_cfg_segs(struct ice_ddp_send_ctx *ctx,
conf_idx = le32_to_cpu(seg->signed_seg_idx);
start = le32_to_cpu(seg->signed_buf_start);
- return ice_download_pkg_config_seg(ctx, pkg_hdr, conf_idx, start,
count);
+ state = ice_download_pkg_config_seg(ctx, pkg_hdr, conf_idx, start,
+ count);
+
+ /* finish up by sending last hunk with "last" flag set if requested by
+ * DDP content */
+ flags = le32_to_cpu(seg->flags);
+ if (ice_is_last_sign_seg(flags))
+ state = ice_ddp_send_hunk(ctx, NULL);
+
exit:
ctx->err = state;
return state;
@@ -1544,9 +1556,7 @@ ice_download_pkg_with_sig_seg(struct ice_hw *hw, struct
ice_pkg_hdr *pkg_hdr)
hw->pkg_sign_type))
continue;
- ice_dwnld_sign_and_cfg_segs(&ctx, pkg_hdr, i);
- /* finish up by sending last hunk with "last" flag set */
- state = ice_ddp_send_hunk(&ctx, NULL);
+ state = ice_dwnld_sign_and_cfg_segs(&ctx, pkg_hdr, i);
if (state)
break;
}
--
2.46.0
