imx: hab: Check if IVT header is HABv4

The HABv4 implementation in ROM checks if HAB major version
in IVT header is 4.x.

The current implementation in hab.c code is only validating
HAB v4.0 and HAB v4.1 and may be incompatible with newer
HABv4 versions.

Modify verify_ivt_header() function to align with HABv4
implementation in ROM code.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h
index c4393ef..6221881 100644 (file)
--- a/arch/arm/include/asm/mach-imx/hab.h
+++ b/arch/arm/include/asm/mach-imx/hab.h
@@ -18,8 +18,6 @@
  */
 #define IVT_HEADER_MAGIC       0xD1
 #define IVT_TOTAL_LENGTH       0x20
-#define IVT_HEADER_V1          0x40
-#define IVT_HEADER_V2          0x41
 
 struct __packed ivt_header {
        uint8_t         magic;

diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index 264e148..5f46df0 100644 (file)
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -45,8 +45,7 @@ static int verify_ivt_header(struct ivt_header *ivt_hdr)
        if (be16_to_cpu(ivt_hdr->length) != IVT_TOTAL_LENGTH)
                result = ivt_header_error("bad length", ivt_hdr);
 
-       if (ivt_hdr->version != IVT_HEADER_V1 &&
-           ivt_hdr->version != IVT_HEADER_V2)
+       if ((ivt_hdr->version & HAB_MAJ_MASK) != HAB_MAJ_VER)
                result = ivt_header_error("bad version", ivt_hdr);
 
        return result;