Skip to contentSkip to conversation

arm: fix clang build errors

PATCH New Heinrich Schuchardt 3 participants 13 messages May 27, 2020 – Jul 8, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover arm: fix clang build errors

With this patch series most ARM boards both 32bit and 64bit can be built using Clang 9.

On ARM systems gd is stored in register r9 or x18. When compiling with clang gd is defined as a macro calling function gd_ptr(). So we can not make assignments to gd. Fixes for the UEFI sub-system and lib/trace.c are provided.

Incorrect argument sizes when accessing special registers with inline assembly are fixed.

Heinrich Schuchardt (4):
efi_loader: allow compiling with clang
trace: clang compatible handling of gd register
arm: remove outdated comment concerning -ffixed-x18
arm: use correct argument size of special registers

 arch/arm/include/asm/global_data.h | 13 +++++++++----
 arch/arm/include/asm/system.h      | 10 ++++++----
 lib/efi_loader/efi_boottime.c      | 10 +++++-----
 lib/trace.c                        |  8 ++++----
 4 files changed, 24 insertions(+), 17 deletions(-)

--
2.26.2

#1 lore raw

PATCH 1/4 efi_loader: allow compiling with clang

On ARM systems gd is stored in register r9 or x18. When compiling with clang gd is defined as a macro calling function gd_ptr(). So we can not make assignments to gd.

In the UEFI sub-system we need to save gd when leaving to UEFI binaries and have to restore gd when reentering U-Boot.

Define a new function set_gd() for setting gd and use it in the UEFI sub-system.

---
Resent.

---
 arch/arm/include/asm/global_data.h |  9 +++++++++
 lib/efi_loader/efi_boottime.c      | 10 +++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)
arch/arm/include/asm/global_data.h +9 -0
index f23b6bfb75..7c0905d240 100644
@@ -117,4 +117,13 @@ static inline gd_t *get_gd(void)
 #endif
 #endif
 
+static inline void set_gd(volatile gd_t *gd_ptr)
+{
+#ifdef CONFIG_ARM64
+	__asm__ volatile("ldr x18, %0\n" : : "m"(gd_ptr));
+#else
+	__asm__ volatile("ldr r9, %0\n" : : "m"(gd_ptr));
+#endif
+}
+
 #endif /* __ASM_GBL_DATA_H */
lib/efi_loader/efi_boottime.c +5 -5
index db34938196..1591ad8300 100644
@@ -49,7 +49,7 @@ static efi_handle_t current_image;
  * restriction so we need to manually swap its and our view of that register on
  * EFI callback entry/exit.
  */
-static volatile void *efi_gd, *app_gd;
+static volatile gd_t *efi_gd, *app_gd;
 #endif
 
 /* 1 if inside U-Boot code, 0 if inside EFI payload code */
@@ -89,7 +89,7 @@ int __efi_entry_check(void)
 #ifdef CONFIG_ARM
 	assert(efi_gd);
 	app_gd = gd;
-	gd = efi_gd;
+	set_gd(efi_gd);
 #endif
 	return ret;
 }
@@ -99,7 +99,7 @@ int __efi_exit_check(void)
 {
 	int ret = --entry_count == 0;
 #ifdef CONFIG_ARM
-	gd = app_gd;
+	set_gd(app_gd);
 #endif
 	return ret;
 }
@@ -123,7 +123,7 @@ void efi_restore_gd(void)
 	/* Only restore if we're already in EFI context */
 	if (!efi_gd)
 		return;
-	gd = efi_gd;
+	set_gd(efi_gd);
 #endif
 }
 
@@ -2920,7 +2920,7 @@ efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle,
 		 * otherwise __efi_entry_check() will put the wrong value into
 		 * app_gd.
 		 */
-		gd = app_gd;
+		set_gd(app_gd);
 #endif
 		/*
 		 * To get ready to call EFI_EXIT below we have to execute the

--
2.26.2

#2 lore raw

PATCH 1/4 efi_loader: allow compiling with clang

Quoted 8 lines · Heinrich Schuchardt

On ARM systems gd is stored in register r9 or x18. When compiling with clang gd is defined as a macro calling function gd_ptr(). So we can not make assignments to gd.

In the UEFI sub-system we need to save gd when leaving to UEFI binaries and have to restore gd when reentering U-Boot.

Quoted 7 lines

Define a new function set_gd() for setting gd and use it in the UEFI sub-system.

---
Resent.

Series-prefix: Resend

does that for you

Quoted 4 lines
---
 arch/arm/include/asm/global_data.h |  9 +++++++++
 lib/efi_loader/efi_boottime.c      | 10 +++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)
#3 lore raw

PATCH 2/4 trace: clang compatible handling of gd register

In reply to Heinrich Schuchardt

On ARM systems gd is stored in register r9 or x18. When compiling with clang gd is defined as a macro calling function gd_ptr(). So we can not make assignments to gd.

Use function set_gd() for setting the register on ARM.

---
 lib/trace.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
lib/trace.c +4 -4
index ea8c8e0d40..831283c283 100644
@@ -57,12 +57,12 @@ static inline uintptr_t __attribute__((no_instrument_function))
 	return offset / FUNC_SITE_SIZE;
 }
 
-#ifdef CONFIG_EFI_LOADER
+#if defined(CONFIG_EFI_LOADER) && defined(CONFIG_ARM)
 
 /**
  * trace_gd - the value of the gd register
  */
-static volatile void *trace_gd;
+static volatile gd_t *trace_gd;
 
 /**
  * trace_save_gd() - save the value of the gd register
@@ -82,10 +82,10 @@ static void __attribute__((no_instrument_function)) trace_save_gd(void)
  */
 static void __attribute__((no_instrument_function)) trace_swap_gd(void)
 {
-	volatile void *temp_gd = trace_gd;
+	volatile gd_t *temp_gd = trace_gd;
 
 	trace_gd = gd;
-	gd = temp_gd;
+	set_gd(temp_gd);
 }
 
 #else

--
2.26.2

#4 lore raw

PATCH 2/4 trace: clang compatible handling of gd register

Quoted 5 lines · Heinrich Schuchardt

On ARM systems gd is stored in register r9 or x18. When compiling with clang gd is defined as a macro calling function gd_ptr(). So we can not make assignments to gd.

Quoted 7 lines

Use function set_gd() for setting the register on ARM.

---
 lib/trace.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
#5 lore raw

PATCH 2/4 trace: clang compatible handling of gd register

In reply to Heinrich Schuchardt
Quoted 8 lines · Heinrich Schuchardt

On ARM systems gd is stored in register r9 or x18. When compiling with clang gd is defined as a macro calling function gd_ptr(). So we can not make assignments to gd.

Use function set_gd() for setting the register on ARM.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200707/e817c4d4/attachment.sig>
#6 lore raw

PATCH 3/4 arm: remove outdated comment concerning -ffixed-x18

In reply to Heinrich Schuchardt

Clang 9 supports -ffixed-x18.

---
 arch/arm/include/asm/global_data.h | 4 ----
 1 file changed, 4 deletions(-)
arch/arm/include/asm/global_data.h +0 -4
index 7c0905d240..2aafc6d206 100644
@@ -96,10 +96,6 @@ static inline gd_t *get_gd(void)
 	gd_t *gd_ptr;
 
 #ifdef CONFIG_ARM64
-	/*
-	 * Make will already error that reserving x18 is not supported at the
-	 * time of writing, clang: error: unknown argument: '-ffixed-x18'
-	 */
 	__asm__ volatile("mov %0, x18\n" : "=r" (gd_ptr));
 #else
 	__asm__ volatile("mov %0, r9\n" : "=r" (gd_ptr));

--
2.26.2

#8 lore raw

PATCH 3/4 arm: remove outdated comment concerning -ffixed-x18

In reply to Heinrich Schuchardt
Quoted 4 lines · Heinrich Schuchardt

Clang 9 supports -ffixed-x18.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200707/293bae7f/attachment.sig>
#9 lore raw

PATCH 4/4 arm: use correct argument size of special registers

In reply to Heinrich Schuchardt

Compiling with clang on ARMv8 shows errors like:

./arch/arm/include/asm/system.h:162:32: note: use constraint modifier "w"

                asm volatile("msr sctlr_el1, %0" : : "r" (val) : "cc");
                                             ^~
                                             %w0

These errors are due to using an incorrect size for the variables used for writing to and reading from special registers which have 64 bits on ARMv8.

Mask off reserved bits when reading the exception level.

---
 arch/arm/include/asm/system.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
arch/arm/include/asm/system.h +6 -4
index 1e3f574403..952057d8ca 100644
@@ -133,14 +133,16 @@ enum dcache_option {
 
 static inline unsigned int current_el(void)
 {
-	unsigned int el;
+	unsigned long el;
+
 	asm volatile("mrs %0, CurrentEL" : "=r" (el) : : "cc");
-	return el >> 2;
+	return 3 & (el >> 2);
 }
 
 static inline unsigned int get_sctlr(void)
 {
-	unsigned int el, val;
+	unsigned int el;
+	unsigned long val;
 
 	el = current_el();
 	if (el == 1)
@@ -153,7 +155,7 @@ static inline unsigned int get_sctlr(void)
 	return val;
 }
 
-static inline void set_sctlr(unsigned int val)
+static inline void set_sctlr(unsigned long val)
 {
 	unsigned int el;
 

--
2.26.2

#10 lore raw

PATCH 4/4 arm: use correct argument size of special registers

Quoted 7 lines · Heinrich Schuchardt

Compiling with clang on ARMv8 shows errors like:

./arch/arm/include/asm/system.h:162:32: note: use constraint modifier "w"

                asm volatile("msr sctlr_el1, %0" : : "r" (val) : "cc");
                                             ^~
                                             %w0
Quoted 7 lines

These errors are due to using an incorrect size for the variables used for writing to and reading from special registers which have 64 bits on ARMv8.

Mask off reserved bits when reading the exception level.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200707/6528ac34/attachment.sig>
#11 lore raw

cover arm: fix clang build errors

In reply to Heinrich Schuchardt
Quoted 10 lines · Heinrich Schuchardt

With this patch series most ARM boards both 32bit and 64bit can be built using Clang 9.

On ARM systems gd is stored in register r9 or x18. When compiling with clang gd is defined as a macro calling function gd_ptr(). So we can not make assignments to gd. Fixes for the UEFI sub-system and lib/trace.c are provided.

Incorrect argument sizes when accessing special registers with inline assembly are fixed.

Hello Tom,

will you take this series via next?

https://patchwork.ozlabs.org/project/uboot/list/?series=179688

1/4 is already merged via an EFI pull request.

Best regards

Heinrich

Quoted 16 lines

Heinrich Schuchardt (4):
efi_loader: allow compiling with clang
trace: clang compatible handling of gd register
arm: remove outdated comment concerning -ffixed-x18
arm: use correct argument size of special registers

  arch/arm/include/asm/global_data.h | 13 +++++++++----
  arch/arm/include/asm/system.h      | 10 ++++++----
  lib/efi_loader/efi_boottime.c      | 10 +++++-----
  lib/trace.c                        |  8 ++++----
  4 files changed, 24 insertions(+), 17 deletions(-)

--
2.26.2

#12 lore raw

cover arm: fix clang build errors

Quoted 12 lines · Heinrich Schuchardt
Quoted 10 lines · Heinrich Schuchardt

With this patch series most ARM boards both 32bit and 64bit can be built using Clang 9.

On ARM systems gd is stored in register r9 or x18. When compiling with clang gd is defined as a macro calling function gd_ptr(). So we can not make assignments to gd. Fixes for the UEFI sub-system and lib/trace.c are provided.

Incorrect argument sizes when accessing special registers with inline assembly are fixed.

Quoted 7 lines

Hello Tom,

will you take this series via next?

https://patchwork.ozlabs.org/project/uboot/list/?series=179688

1/4 is already merged via an EFI pull request.

Either -next or the MW when it opens itself. As this doesn't look too tricky overall it's not at the top of my TODO list for -next as I'm focusing on longer outstanding or tricky thingy first. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200614/f6ae3e86/attachment.sig>