Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 195cee92 authored by James Hogan's avatar James Hogan Committed by Ralf Baechle
Browse files

MIPS: Fix duplicate CP0_* definitions. 



Remove the definition in locore.S and move a few of the other similar
definitions in asm/mipsregs.h too. CP0_INTCTL, CP0_SRSCTL, & CP0_SRSMAP
are unused so they're just dropped instead. CP0_DDATA_LO is left where
it is as I have patches to eliminate its use in locore.S and it
otherwise is unlikely to need to be used from assembly code.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/11461/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 8fe2c547

arch/mips/include/asm/mipsregs.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,7 @@ 
#define CP0_PAGEMASK $5

#define CP0_PAGEMASK $5

#define CP0_WIRED $6

#define CP0_WIRED $6

#define CP0_INFO $7

#define CP0_INFO $7

#define CP0_HWRENA $7, 0

#define CP0_BADVADDR $8

#define CP0_BADVADDR $8

#define CP0_COUNT $9

#define CP0_COUNT $9

#define CP0_ENTRYHI $10

#define CP0_ENTRYHI $10
@@ -59,6 +60,8 @@ 
#define CP0_EPC $14

#define CP0_EPC $14

#define CP0_PRID $15

#define CP0_PRID $15

#define CP0_CONFIG $16

#define CP0_CONFIG $16

#define CP0_CONFIG3 $16, 3

#define CP0_CONFIG5 $16, 5

#define CP0_LLADDR $17

#define CP0_LLADDR $17

#define CP0_WATCHLO $18

#define CP0_WATCHLO $18

#define CP0_WATCHHI $19

#define CP0_WATCHHI $19

arch/mips/kvm/locore.S

+0 −8
Original line number Original line Diff line number Diff line
@@ -36,14 +36,6 @@ 
#define PT_HOST_USERLOCAL   PT_EPC

#define PT_HOST_USERLOCAL   PT_EPC





#define CP0_DDATA_LO        $28,3

#define CP0_DDATA_LO        $28,3

#define CP0_CONFIG3         $16,3

#define CP0_CONFIG5         $16,5

#define CP0_EBASE           $15,1



#define CP0_INTCTL          $12,1

#define CP0_SRSCTL          $12,2

#define CP0_SRSMAP          $12,3

#define CP0_HWRENA          $7,0





/* Resume Flags */

/* Resume Flags */

#define RESUME_FLAG_HOST        (1<<1)  /* Resume host? */

#define RESUME_FLAG_HOST        (1<<1)  /* Resume host? */