From: "Marek Behún" <kabel@kernel.org>
To: Stefan Roese <sr@denx.de>
Cc: pali@kernel.org, "U-Boot Mailing List" <u-boot@lists.denx.de>,
"Marek Behún" <kabel@kernel.org>
Subject: [PATCH u-boot-marvell 2/5] arm: mvebu: Guard non-AXP code by checking for AXP
Date: Thu, 8 Sep 2022 16:06:51 +0200 [thread overview]
Message-ID: <20220908140654.7051-3-kabel@kernel.org> (raw)
In-Reply-To: <20220908140654.7051-1-kabel@kernel.org>
From: Pali Rohár <pali@kernel.org>
Commit c86d53fd88df ("arm: mvebu: Don't disable cache at startup on Armada
XP at all") introduced branch for non-AXP code which was guarded by A38X
condition. Fix this issue by checking for AXP platform, not by A38X.
Fixes: c86d53fd88df ("arm: mvebu: Don't disable cache at startup on Armada XP at all")
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <kabel@kernel.org>
---
arch/arm/mach-mvebu/cpu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index b512ccc501..8e5d1ba21e 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -448,7 +448,7 @@ int arch_cpu_init(void)
struct pl310_regs *const pl310 =
(struct pl310_regs *)CONFIG_SYS_PL310_BASE;
- if (IS_ENABLED(CONFIG_ARMADA_38X)) {
+ if (!IS_ENABLED(CONFIG_ARMADA_XP)) {
/*
* To fully release / unlock this area from cache, we need
* to flush all caches and disable the L2 cache.
--
2.35.1
next prev parent reply other threads:[~2022-09-08 14:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-08 14:06 [PATCH u-boot-marvell 0/5] mvebu important fixes Marek Behún
2022-09-08 14:06 ` [PATCH u-boot-marvell 1/5] arm: mvebu: Fix function enable_caches Marek Behún
2022-09-12 6:57 ` Stefan Roese
2022-09-08 14:06 ` Marek Behún [this message]
2022-09-12 6:58 ` [PATCH u-boot-marvell 2/5] arm: mvebu: Guard non-AXP code by checking for AXP Stefan Roese
2022-09-08 14:06 ` [PATCH u-boot-marvell 3/5] arm: mvebu: lowlevel.S: Use CR_M from asm/system.h Marek Behún
2022-09-12 6:58 ` Stefan Roese
2022-09-08 14:06 ` [PATCH u-boot-marvell 4/5] arm: mvebu: Enable L2 cache also on Armada 38x Marek Behún
2022-09-12 6:58 ` Stefan Roese
2022-09-08 14:06 ` [PATCH u-boot-marvell 5/5] arm: mvebu: Fix moving internal registers Marek Behún
2022-09-12 6:59 ` Stefan Roese
2022-09-12 7:04 ` [PATCH u-boot-marvell 0/5] mvebu important fixes Stefan Roese
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=20220908140654.7051-3-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=pali@kernel.org \
--cc=sr@denx.de \
--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.