mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Frederik Haxel <haxel@fzi.de>
To: unlisted-recipients:; (no To-header on input)
Cc: "Vitaly Wool" <vitaly.wool@konsulko.com>,
	"Frederik Haxel" <haxel@fzi.de>,
	"Paul Walmsley" <paul.walmsley@sifive.com>,
	"Palmer Dabbelt" <palmer@dabbelt.com>,
	"Albert Ou" <aou@eecs.berkeley.edu>,
	"Andy Chiu" <andy.chiu@sifive.com>,
	"Heiko Stuebner" <heiko@sntech.de>,
	"Greentime Hu" <greentime.hu@sifive.com>,
	"Conor Dooley" <conor.dooley@microchip.com>,
	"Sami Tolvanen" <samitolvanen@google.com>,
	"Clément Léger" <cleger@rivosinc.com>,
	"Nam Cao" <namcaov@gmail.com>, "Guo Ren" <guoren@kernel.org>,
	"Alexandre Ghiti" <alexghiti@rivosinc.com>,
	"Andrew Jones" <ajones@ventanamicro.com>,
	"Björn Töpel" <bjorn@rivosinc.com>, "Baoquan He" <bhe@redhat.com>,
	"Chen Jiahao" <chenjiahao16@huawei.com>,
	linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] riscv: Fixed wrong register in XIP_FIXUP_FLASH_OFFSET macro
Date: Tue, 12 Dec 2023 14:01:13 +0100	[thread overview]
Message-ID: <20231212130116.848530-3-haxel@fzi.de> (raw)
In-Reply-To: <20231212130116.848530-1-haxel@fzi.de>

During the refactoring, a bug was introduced in the rarly used
XIP_FIXUP_FLASH_OFFSET macro.

Fixes: bee7fbc38579 ("RISC-V CPU Idle Support")
Fixes: e7681beba992 ("RISC-V: Split out the XIP fixups into their own file")

Signed-off-by: Frederik Haxel <haxel@fzi.de>
---
 arch/riscv/include/asm/xip_fixup.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/include/asm/xip_fixup.h b/arch/riscv/include/asm/xip_fixup.h
index d4ffc3c37649..b65bf6306f69 100644
--- a/arch/riscv/include/asm/xip_fixup.h
+++ b/arch/riscv/include/asm/xip_fixup.h
@@ -13,7 +13,7 @@
         add \reg, \reg, t0
 .endm
 .macro XIP_FIXUP_FLASH_OFFSET reg
-	la t1, __data_loc
+	la t0, __data_loc
 	REG_L t1, _xip_phys_offset
 	sub \reg, \reg, t1
 	add \reg, \reg, t0
-- 
2.34.1


  parent reply	other threads:[~2023-12-12 13:17 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-12 13:01 [PATCH 0/3] Fix XIP boot and make XIP testable in QEMU Frederik Haxel
2023-12-12 13:01 ` [PATCH 1/3] riscv: Make XIP bootable again Frederik Haxel
2023-12-12 13:01 ` Frederik Haxel [this message]
2023-12-12 13:01 ` [PATCH 3/3] riscv: Allow disabling of BUILTIN_DTB for XIP Frederik Haxel
2023-12-12 13:22 ` [PATCH 0/3] Fix XIP boot and make XIP testable in QEMU Conor Dooley
     [not found]   ` <CAM4kBBKBC=ZSQPzAq5MFQvd1g9=Up_oRAK5CV74oJHt=SbcPqg@mail.gmail.com>
2023-12-12 15:14     ` Conor Dooley
2023-12-13 16:08       ` Palmer Dabbelt
2024-01-11 14:50 ` patchwork-bot+linux-riscv

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=20231212130116.848530-3-haxel@fzi.de \
    --to=haxel@fzi.de \
    --cc=ajones@ventanamicro.com \
    --cc=alexghiti@rivosinc.com \
    --cc=andy.chiu@sifive.com \
    --cc=aou@eecs.berkeley.edu \
    --cc=bhe@redhat.com \
    --cc=bjorn@rivosinc.com \
    --cc=chenjiahao16@huawei.com \
    --cc=cleger@rivosinc.com \
    --cc=conor.dooley@microchip.com \
    --cc=greentime.hu@sifive.com \
    --cc=guoren@kernel.org \
    --cc=heiko@sntech.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=namcaov@gmail.com \
    --cc=palmer@dabbelt.com \
    --cc=paul.walmsley@sifive.com \
    --cc=samitolvanen@google.com \
    --cc=vitaly.wool@konsulko.com \
    /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

all inboxes | Powered by JetHome®