All of lore.kernel.org
 help / color / mirror / Atom feed
From: Siew Chin Lim <elly.siew.chin.lim@intel.com>
To: u-boot@lists.denx.de
Subject: [PATCH] arm: include: secure: Don't include asm\global_data.h in .S file
Date: Fri, 19 Feb 2021 10:31:43 +0800	[thread overview]
Message-ID: <20210219023143.24373-1-elly.siew.chin.lim@intel.com> (raw)

Commit "common: Drop asm/global_data.h from common header" added
asm\global_data.h into secure.h. However, secure.h will be included
by psci.S. Adding asm\global_data.h has caused compilation failure in
pcsi.S. Update secure.h to only include asm\global_data.h in non-assembly
section.

Signed-off-by: Siew Chin Lim <elly.siew.chin.lim@intel.com>
---
 arch/arm/include/asm/secure.h | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/arch/arm/include/asm/secure.h b/arch/arm/include/asm/secure.h
index 64e5582c1f..63a21f89ce 100644
--- a/arch/arm/include/asm/secure.h
+++ b/arch/arm/include/asm/secure.h
@@ -2,7 +2,9 @@
 #define __ASM_SECURE_H
 
 #include <config.h>
+#ifndef __ASSEMBLY__
 #include <asm/global_data.h>
+#endif
 
 #define __secure __attribute__ ((section ("._secure.text")))
 #define __secure_data __attribute__ ((section ("._secure.data")))
@@ -27,17 +29,6 @@ typedef struct secure_svc_tbl {
 				.id = _id, \
 				.func = _fn }
 
-#else
-
-#ifdef CONFIG_ARMV8_PSCI
-#define SECURE_SVC_TBL_OFFSET		16
-#else
-#define SECURE_SVC_TBL_OFFSET		8
-
-#endif
-
-#endif /* __ASSEMBLY__ */
-
 #if defined(CONFIG_ARMV7_SECURE_BASE) || defined(CONFIG_ARMV8_SECURE_BASE)
 /*
  * Warning, horror ahead.
@@ -58,4 +49,14 @@ typedef struct secure_svc_tbl {
 #define secure_ram_addr(_fn)	(_fn)
 #endif
 
+#else /* __ASSEMBLY__ */
+
+#ifdef CONFIG_ARMV8_PSCI
+#define SECURE_SVC_TBL_OFFSET		16
+#else
+#define SECURE_SVC_TBL_OFFSET		8
+#endif
+
+#endif /* __ASSEMBLY__ */
+
 #endif
-- 
2.13.0

             reply	other threads:[~2021-02-19  2:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-19  2:31 Siew Chin Lim [this message]
2021-02-20 11:55 ` [PATCH] arm: include: secure: Don't include asm\global_data.h in .S file Simon Glass
2021-02-22  1:10   ` Lim, Elly Siew Chin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210219023143.24373-1-elly.siew.chin.lim@intel.com \
    --to=elly.siew.chin.lim@intel.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.