lkml.org 
[lkml]   [2018]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH RFC 3/6] MIPS: BMIPS: Avoid referencing CKSEG1
Date
From: Florian Fainelli <florian.fainelli@broadcom.com>

bmips_smp_movevec() references the CKSEG1 constant, which is about to be
updated in order to support processors that might enable eXtended
KSEG0/1. In doing so, we will generate a reference to a function, which
is obviously not permissible within assembly. Fortunately,
bmips_smp_movevec() is only used on BMIPS4350 which does not support
eXtended KSEG0/1.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
arch/mips/kernel/bmips_vec.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/mips/kernel/bmips_vec.S b/arch/mips/kernel/bmips_vec.S
index 921a5fa55da6..10ea69f3859f 100644
--- a/arch/mips/kernel/bmips_vec.S
+++ b/arch/mips/kernel/bmips_vec.S
@@ -39,7 +39,7 @@

LEAF(bmips_smp_movevec)
la k0, 1f
- li k1, CKSEG1
+ li k1, 0xa0000000
or k0, k1
jr k0

@@ -58,7 +58,7 @@ LEAF(bmips_smp_movevec)
mfc0 k1, $22, 3
srl k1, 16
andi k1, 0x8000
- or k1, CKSEG1 | BMIPS_RELO_VECTOR_CONTROL_0
+ or k1, 0xa0000000 | BMIPS_RELO_VECTOR_CONTROL_0
or k0, k1
li k1, 0xa0080000
sw k1, 0(k0)
@@ -67,7 +67,7 @@ LEAF(bmips_smp_movevec)
wait

la k0, bmips_reset_nmi_vec
- li k1, CKSEG1
+ li k1, 0xa0000000
or k0, k1
jr k0
END(bmips_smp_movevec)
--
2.7.4
\
 
 \ /
  Last update: 2018-01-24 02:49    [W:0.075 / U:1.180 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site