mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jiaxun Yang <jiaxun.yang@flygoat.com>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Gregory CLEMENT <gregory.clement@bootlin.com>,
	 linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
	 Jiaxun Yang <jiaxun.yang@flygoat.com>
Subject: [PATCH 4/8] MIPS: traps: Use GPR number macros
Date: Fri, 09 Feb 2024 18:07:50 +0000	[thread overview]
Message-ID: <20240209-regname-v1-4-2125efa016ef@flygoat.com> (raw)
In-Reply-To: <20240209-regname-v1-0-2125efa016ef@flygoat.com>

Use GPR number macros in uasm code generation parts to
reduce code duplication.

No functional change.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 arch/mips/kernel/traps.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index a1c1cb5de913..2d95e9971a2d 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -58,6 +58,7 @@
 #include <asm/module.h>
 #include <asm/msa.h>
 #include <asm/ptrace.h>
+#include <asm/regdef.h>
 #include <asm/sections.h>
 #include <asm/siginfo.h>
 #include <asm/tlbdebug.h>
@@ -2041,13 +2042,12 @@ void __init *set_except_vector(int n, void *addr)
 		unsigned long jump_mask = ~((1 << 28) - 1);
 #endif
 		u32 *buf = (u32 *)(ebase + 0x200);
-		unsigned int k0 = 26;
 		if ((handler & jump_mask) == ((ebase + 0x200) & jump_mask)) {
 			uasm_i_j(&buf, handler & ~jump_mask);
 			uasm_i_nop(&buf);
 		} else {
-			UASM_i_LA(&buf, k0, handler);
-			uasm_i_jr(&buf, k0);
+			UASM_i_LA(&buf, GPR_K0, handler);
+			uasm_i_jr(&buf, GPR_K0);
 			uasm_i_nop(&buf);
 		}
 		local_flush_icache_range(ebase + 0x200, (unsigned long)buf);

-- 
2.43.0


  parent reply	other threads:[~2024-02-09 18:08 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-09 18:07 [PATCH 0/8] MIPS: Unify register numbering macros for uasm Jiaxun Yang
2024-02-09 18:07 ` [PATCH 1/8] MIPS: Unify define of CP0 registers for uasm code Jiaxun Yang
2024-02-09 18:07 ` [PATCH 2/8] MIPS: regdefs.h: Guard all defines with __ASSEMBLY__ Jiaxun Yang
2024-02-09 18:07 ` [PATCH 3/8] MIPS: regdefs.h: Define a set of register numbers Jiaxun Yang
2024-02-09 18:07 ` Jiaxun Yang [this message]
2024-02-09 18:07 ` [PATCH 5/8] MIPS: page: Use GPR number macros Jiaxun Yang
2024-02-09 18:07 ` [PATCH 6/8] MIPS: tlbex: " Jiaxun Yang
2024-02-09 18:07 ` [PATCH 7/8] MIPS: kvm/entry: " Jiaxun Yang
2024-02-09 18:07 ` [PATCH 8/8] MIPS: pm-cps: " Jiaxun Yang
2024-02-20 13:39 ` [PATCH 0/8] MIPS: Unify register numbering macros for uasm Thomas Bogendoerfer

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=20240209-regname-v1-4-2125efa016ef@flygoat.com \
    --to=jiaxun.yang@flygoat.com \
    --cc=gregory.clement@bootlin.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=tsbogend@alpha.franken.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 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®