mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Raphael Poggi <poggi.raph@gmail.com>
To: barebox@lists.infradead.org
Cc: Raphael Poggi <poggi.raph@gmail.com>
Subject: [PATCH v4 09/13] arm: cpu: disable code portion in armv8 case
Date: Wed, 29 Jun 2016 10:22:16 +0200	[thread overview]
Message-ID: <1467188540-76509-10-git-send-email-poggi.raph@gmail.com> (raw)
In-Reply-To: <1467188540-76509-1-git-send-email-poggi.raph@gmail.com>

Enclosed by #if directive OMAP specific code
and mmu_disable (ARMv8 code will implemented it somewhere else).

Signed-off-by: Raphael Poggi <poggi.raph@gmail.com>
---
 arch/arm/cpu/cpu.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c
index eb12166..cc54324 100644
--- a/arch/arm/cpu/cpu.c
+++ b/arch/arm/cpu/cpu.c
@@ -68,6 +68,7 @@ int icache_status(void)
 	return (get_cr () & CR_I) != 0;
 }
 
+#if __LINUX_ARM_ARCH__ <= 7
 /*
  * SoC like the ux500 have the l2x0 always enable
  * with or without MMU enable
@@ -86,6 +87,7 @@ void mmu_disable(void)
 	}
 	__mmu_cache_off();
 }
+#endif
 
 /**
  * Disable MMU and D-cache, flush caches
@@ -100,6 +102,8 @@ static void arch_shutdown(void)
 
 	mmu_disable();
 	flush_icache();
+
+#if __LINUX_ARM_ARCH__ <= 7
 	/*
 	 * barebox normally does not use interrupts, but some functionalities
 	 * (eg. OMAP4_USBBOOT) require them enabled. So be sure interrupts are
@@ -108,6 +112,7 @@ static void arch_shutdown(void)
 	__asm__ __volatile__("mrs %0, cpsr" : "=r"(r));
 	r |= PSR_I_BIT;
 	__asm__ __volatile__("msr cpsr, %0" : : "r"(r));
+#endif
 }
 archshutdown_exitcall(arch_shutdown);
 
-- 
2.1.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2016-06-29  8:23 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-29  8:22 [PATCH v4 0/12] Add basic support for arm64 Raphael Poggi
2016-06-29  8:22 ` [PATCH v4 01/13] arm64: add armv8 Kconfig entries Raphael Poggi
2016-06-29  8:22 ` [PATCH v4 02/13] arm: Makefile: rework makefile to handle armv8 Raphael Poggi
2016-06-29  8:22 ` [PATCH v4 03/13] arm: rework lib directory to support arm64 Raphael Poggi
2016-06-29  8:22 ` [PATCH v4 04/13] arm: cpu: add arm64 specific code Raphael Poggi
2016-06-29  8:22 ` [PATCH v4 05/13] arm: include: system: add arm64 helper functions Raphael Poggi
2016-06-29  8:22 ` [PATCH v4 06/13] arm: include: bitops: arm64 use generic __fls Raphael Poggi
2016-06-29  8:22 ` [PATCH v4 07/13] arm: include: system_info: add armv8 identification Raphael Poggi
2016-06-29  8:22 ` [PATCH v4 08/13] arm: cpu: cpuinfo: add armv8 support Raphael Poggi
2016-06-29  8:22 ` Raphael Poggi [this message]
2016-06-29  8:22 ` [PATCH v4 10/13] arm: cpu: add basic arm64 mmu support Raphael Poggi
2016-06-29  8:22 ` [PATCH v4 11/13] arm: boards: add mach-qemu and virt64 board Raphael Poggi
2016-06-29  8:22 ` [PATCH v4 12/13] arm: include: swab: use rigth assembly for armv8 Raphael Poggi
2016-06-29  8:22 ` [PATCH v4 13/13] uimage: add define for ARM64 architecture Raphael Poggi
2016-07-04  7:27 ` [PATCH v4 0/12] Add basic support for arm64 Sascha Hauer
2016-07-04  8:38   ` Raphaël Poggi

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=1467188540-76509-10-git-send-email-poggi.raph@gmail.com \
    --to=poggi.raph@gmail.com \
    --cc=barebox@lists.infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox