Skip to contentSkip to conversation

imx6sx: Fix i.MX6SX HAB api function table offset

PATCH Superseded Nitin Garg 3 participants 6 messages Sep 30, 2014 Arm (32-bit)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Nitin Garg

author
#0 lore raw

PATCH 1/1 imx6sx: Fix i.MX6SX HAB api function table offset

i.MX6SX ROM implements unified table sections. The HAB function table is at offset 0x100. Update the HAB function pointers accordingly.

---

 arch/arm/include/asm/arch-mx6/hab.h |   16 +++++++++++-----
 include/configs/mx6_common.h        |    4 ++++
 2 files changed, 15 insertions(+), 5 deletions(-)
arch/arm/include/asm/arch-mx6/hab.h +11 -5
index 1f12695..c53709b 100644
@@ -53,11 +53,17 @@ typedef void *hab_rvt_authenticate_image_t(uint8_t, ptrdiff_t,
 		void **, size_t *, hab_loader_callback_f_t);
 typedef void hapi_clock_init_t(void);
 
-#define HAB_RVT_REPORT_EVENT                   (*(uint32_t *)0x000000B4)
-#define HAB_RVT_REPORT_STATUS                  (*(uint32_t *)0x000000B8)
-#define HAB_RVT_AUTHENTICATE_IMAGE             (*(uint32_t *)0x000000A4)
-#define HAB_RVT_ENTRY                          (*(uint32_t *)0x00000098)
-#define HAB_RVT_EXIT                           (*(uint32_t *)0x0000009C)
+#ifdef CONFIG_ROM_UNIFIED_SECTIONS
+#define HAB_RVT_BASE			0x00000100
+#else
+#define HAB_RVT_BASE			0x00000094
+#endif
+
+#define HAB_RVT_ENTRY			(*(uint32_t *)(HAB_RVT_BASE + 0x04))
+#define HAB_RVT_EXIT			(*(uint32_t *)(HAB_RVT_BASE + 0x08))
+#define HAB_RVT_AUTHENTICATE_IMAGE	(*(uint32_t *)(HAB_RVT_BASE + 0x10))
+#define HAB_RVT_REPORT_EVENT		(*(uint32_t *)(HAB_RVT_BASE + 0x20))
+#define HAB_RVT_REPORT_STATUS		(*(uint32_t *)(HAB_RVT_BASE + 0x24))
 
 #define HAB_RVT_REPORT_EVENT_NEW               (*(uint32_t *)0x000000B8)
 #define HAB_RVT_REPORT_STATUS_NEW              (*(uint32_t *)0x000000BC)
include/configs/mx6_common.h +4 -0
index 135a3f5..824e73f 100644
@@ -30,4 +30,8 @@
 
 #define CONFIG_MP
 
+#ifdef CONFIG_MX6SX
+#define CONFIG_ROM_UNIFIED_SECTIONS
+#endif
+
 #endif
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 imx6sx: Fix i.MX6SX HAB api function table offset

Quoted 6 lines · Nitin Garg

i.MX6SX ROM implements unified table sections. The HAB function table is at offset 0x100. Update the HAB function pointers accordingly.

You should have marked this patch as v2 and described the changes below the --- line.

Thanks

#2 lore raw

PATCH 1/1 imx6sx: Fix i.MX6SX HAB api function table offset

In reply to Nitin Garg

Hi Nitin, hi Fabio,

thanks for immediately fix the issue - I have some comments.

Quoted 21 lines · Nitin Garg

i.MX6SX ROM implements unified table sections. The HAB function table is at offset 0x100. Update the HAB function pointers accordingly.

---

 arch/arm/include/asm/arch-mx6/hab.h |   16 +++++++++++-----
 include/configs/mx6_common.h        |    4 ++++
 2 files changed, 15 insertions(+), 5 deletions(-)
arch/arm/include/asm/arch-mx6/hab.h +0 -0
index 1f12695..c53709b 100644
@@ -53,11 +53,17 @@ typedef void *hab_rvt_authenticate_image_t(uint8_t, ptrdiff_t,
 		void **, size_t *, hab_loader_callback_f_t);
 typedef void hapi_clock_init_t(void);
 

arch/arm/include/asm/arch-mx6/hab.h typedef void *hab_rvt_authenticate_image_t(uint8_t, ptrdiff_t, · line 60

Quoted 10 lines
arch/arm/include/asm/arch-mx6/hab.h +5 -5
-#define HAB_RVT_REPORT_EVENT                   (*(uint32_t *)0x000000B4)
-#define HAB_RVT_REPORT_STATUS                  (*(uint32_t *)0x000000B8)
-#define HAB_RVT_AUTHENTICATE_IMAGE             (*(uint32_t *)0x000000A4)
-#define HAB_RVT_ENTRY                          (*(uint32_t *)0x00000098)
-#define HAB_RVT_EXIT                           (*(uint32_t *)0x0000009C)
+#ifdef CONFIG_ROM_UNIFIED_SECTIONS
+#define HAB_RVT_BASE			0x00000100
+#else
+#define HAB_RVT_BASE			0x00000094
+#endif

It would be nice to understand how the choice is done. In my understanding, even HAB_RVT_REPORT_EVENT_NEW and HAB_RVT_REPORT_STATUS_NEW can be dropped and substituted by an offset.

I see then three cases:

	mx6sx	HAB_RVT_BASE = 0x00000100

	mx6q with soc_rev() > 1.5 	HAB_RVT_BASE = 0x0000098
		or
	mx6dl with soc_rev > 1.2


	mx6q with soc_rev() < 1.5 	HAB_RVT_BASE = 0x0000094
		or
	mx6d with soc_rev() < 1.2

then the single entries can be calculated from the base address.

Quoted 14 lines
arch/arm/include/asm/arch-mx6/hab.h +6 -0
+
+#define HAB_RVT_ENTRY			(*(uint32_t *)(HAB_RVT_BASE + 0x04))
+#define HAB_RVT_EXIT			(*(uint32_t *)(HAB_RVT_BASE + 0x08))
+#define HAB_RVT_AUTHENTICATE_IMAGE	(*(uint32_t *)(HAB_RVT_BASE + 0x10))
+#define HAB_RVT_REPORT_EVENT		(*(uint32_t *)(HAB_RVT_BASE + 0x20))
+#define HAB_RVT_REPORT_STATUS		(*(uint32_t *)(HAB_RVT_BASE + 0x24))
 
 #define HAB_RVT_REPORT_EVENT_NEW               (*(uint32_t *)0x000000B8)
 #define HAB_RVT_REPORT_STATUS_NEW              (*(uint32_t *)0x000000BC)
include/configs/mx6_common.h +0 -0
index 135a3f5..824e73f 100644

include/configs/mx6_common.h line 34

Quoted 5 lines
include/configs/mx6_common.h +2 -0
@@ -30,4 +30,8 @@
 
 #define CONFIG_MP
 
+#ifdef CONFIG_MX6SX
+#define CONFIG_ROM_UNIFIED_SECTIONS

I do not like this approach because we do not need an additional CONFIG_, that remains undocumented. If CONFIG_MX6SX, HAB_RVT_BASE is always 0x100 - CONFIG_ROM_UNIFIED_SECTIONS is like a redundant information, because it is not possible (or is it ?) to have a sx processor with a different base address.

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#3 lore raw

PATCH 1/1 imx6sx: Fix i.MX6SX HAB api function table offset

Hi Stefano,

Quoted 5 lines · Stefano Babic

I do not like this approach because we do not need an additional CONFIG_, that remains undocumented. If CONFIG_MX6SX, HAB_RVT_BASE is always 0x100 - CONFIG_ROM_UNIFIED_SECTIONS is like a redundant information, because it is not possible (or is it ?) to have a sx processor with a different base address.

Yes, I agree that we should avoid introducing a new config like CONFIG_ROM_UNIFIED_SECTIONS.

What about this?

arch/arm/include/asm/arch-mx6/hab.h +11 -5
index 1f12695..c9e5318 100644
@@ -53,11 +53,17 @@ typedef void *hab_rvt_authenticate_image_t(uint8_t, ptrdiff_
                void **, size_t *, hab_loader_callback_f_t);
 typedef void hapi_clock_init_t(void);
 
-#define HAB_RVT_REPORT_EVENT                   (*(uint32_t *)0x000000B4)
-#define HAB_RVT_REPORT_STATUS                  (*(uint32_t *)0x000000B8)
-#define HAB_RVT_AUTHENTICATE_IMAGE             (*(uint32_t *)0x000000A4)
-#define HAB_RVT_ENTRY                          (*(uint32_t *)0x00000098)
-#define HAB_RVT_EXIT                           (*(uint32_t *)0x0000009C)
+#ifdef CONFIG_MX6SX
+#define HAB_RVT_BASE                   0x00000100
+#else
+#define HAB_RVT_BASE                   0x00000094
+#endif
+
+#define HAB_RVT_ENTRY                  (*(uint32_t *)(HAB_RVT_BASE + 0x04))
+#define HAB_RVT_EXIT                   (*(uint32_t *)(HAB_RVT_BASE + 0x08))
+#define HAB_RVT_AUTHENTICATE_IMAGE     (*(uint32_t *)(HAB_RVT_BASE + 0x10))
+#define HAB_RVT_REPORT_EVENT           (*(uint32_t *)(HAB_RVT_BASE + 0x20))
+#define HAB_RVT_REPORT_STATUS          (*(uint32_t *)(HAB_RVT_BASE + 0x24))
 
 #define HAB_RVT_REPORT_EVENT_NEW               (*(uint32_t *)0x000000B8)
 #define HAB_RVT_REPORT_STATUS_NEW              (*(uint32_t *)0x000000BC)
#4 lore raw

PATCH 1/1 imx6sx: Fix i.MX6SX HAB api function table offset

Hi Fabio,

Quoted 33 lines · Fabio Estevam

Hi Stefano,

Quoted 5 lines · Stefano Babic

I do not like this approach because we do not need an additional CONFIG_, that remains undocumented. If CONFIG_MX6SX, HAB_RVT_BASE is always 0x100 - CONFIG_ROM_UNIFIED_SECTIONS is like a redundant information, because it is not possible (or is it ?) to have a sx processor with a different base address.

Yes, I agree that we should avoid introducing a new config like CONFIG_ROM_UNIFIED_SECTIONS.

What about this?

arch/arm/include/asm/arch-mx6/hab.h +4 -5
index 1f12695..c9e5318 100644
@@ -53,11 +53,17 @@ typedef void *hab_rvt_authenticate_image_t(uint8_t, ptrdiff_
                void **, size_t *, hab_loader_callback_f_t);
 typedef void hapi_clock_init_t(void);
 
-#define HAB_RVT_REPORT_EVENT                   (*(uint32_t *)0x000000B4)
-#define HAB_RVT_REPORT_STATUS                  (*(uint32_t *)0x000000B8)
-#define HAB_RVT_AUTHENTICATE_IMAGE             (*(uint32_t *)0x000000A4)
-#define HAB_RVT_ENTRY                          (*(uint32_t *)0x00000098)
-#define HAB_RVT_EXIT                           (*(uint32_t *)0x0000009C)
+#ifdef CONFIG_MX6SX
+#define HAB_RVT_BASE                   0x00000100
+#else
+#define HAB_RVT_BASE                   0x00000094

arch/arm/include/asm/arch-mx6/hab.h typedef void *hab_rvt_authenticate_image_t(uint8_t, ptrdiff_ · line 69

Quoted 10 lines
arch/arm/include/asm/arch-mx6/hab.h +7 -0
+#endif
+
+#define HAB_RVT_ENTRY                  (*(uint32_t *)(HAB_RVT_BASE + 0x04))
+#define HAB_RVT_EXIT                   (*(uint32_t *)(HAB_RVT_BASE + 0x08))
+#define HAB_RVT_AUTHENTICATE_IMAGE     (*(uint32_t *)(HAB_RVT_BASE + 0x10))
+#define HAB_RVT_REPORT_EVENT           (*(uint32_t *)(HAB_RVT_BASE + 0x20))
+#define HAB_RVT_REPORT_STATUS          (*(uint32_t *)(HAB_RVT_BASE + 0x24))
 
 #define HAB_RVT_REPORT_EVENT_NEW               (*(uint32_t *)0x000000B8)
 #define HAB_RVT_REPORT_STATUS_NEW              (*(uint32_t *)0x000000BC)

ok - I have seen V3, I will apply it.

Regards,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#5 lore raw

PATCH 1/1 imx6sx: Fix i.MX6SX HAB api function table offset

Quoted 1 line · Stefano Babic

ok - I have seen V3, I will apply it.

Thanks, Stefano!