1 files changed, 13 insertions, 2 deletions

diff --git a/arch/mips/mm/uasm.c b/arch/mips/mm/uasm.c
index 4adf30284813..319051c34343 100644
--- a/arch/mips/mm/uasm.c
+++ b/arch/mips/mm/uasm.c
@@ -24,7 +24,8 @@ enum fields {
         JIMM = 0x080,
         FUNC = 0x100,
         SET = 0x200,
-        SCIMM = 0x400
+        SCIMM = 0x400,
+        SIMM9 = 0x800,
 };
 
 #define OP_MASK         0x3f
@@ -41,6 +42,8 @@ enum fields {
 #define FUNC_SH         0
 #define SET_MASK        0x7
 #define SET_SH          0
+#define SIMM9_SH        7
+#define SIMM9_MASK      0x1ff
 
 enum opcode {
         insn_invalid,
@@ -116,6 +119,14 @@ static inline u32 build_scimm(u32 arg)
         return (arg & SCIMM_MASK) << SCIMM_SH;
 }
 
+static inline u32 build_scimm9(s32 arg)
+{
+        WARN((arg > 0xff || arg < -0x100),
+               KERN_WARNING "Micro-assembler field overflow\n");
+
+        return (arg & SIMM9_MASK) << SIMM9_SH;
+}
+
 static inline u32 build_func(u32 arg)
 {
         WARN(arg & ~FUNC_MASK, KERN_WARNING "Micro-assembler field overflow\n");
@@ -330,7 +341,7 @@ I_u3u1u2(_ldx)
 void ISAFUNC(uasm_i_pref)(u32 **buf, unsigned int a, signed int b,
                             unsigned int c)
 {
-        if (OCTEON_IS_MODEL(OCTEON_CN63XX_PASS1_X) && a <= 24 && a != 5)
+        if (CAVIUM_OCTEON_DCACHE_PREFETCH_WAR && a <= 24 && a != 5)
                 /*
                  * As per erratum Core-14449, replace prefetches 0-4,
                  * 6-24 with 'pref 28'.