4 files changed, 12 insertions, 5 deletions

diff --git a/arch/microblaze/kernel/cpu/cache.c b/arch/microblaze/kernel/cpu/cache.c
index a6e44410672d..0bde47e4fa69 100644
--- a/arch/microblaze/kernel/cpu/cache.c
+++ b/arch/microblaze/kernel/cpu/cache.c
@@ -140,10 +140,10 @@ do {									\
 /* It is used only first parameter for OP - for wic, wdc */
 #define CACHE_RANGE_LOOP_1(start, end, line_length, op)                 \
 do {                                                                    \
-        int volatile temp = 0;                                          \
-        int align = ~(line_length - 1);                                 \
+        unsigned int volatile temp = 0;                                         \
+        unsigned int align = ~(line_length - 1);                                        \
         end = ((end & align) == end) ? end - line_length : end & align; \
-        WARN_ON(end - start < 0);                                       \
+        WARN_ON(end < start);                                   \
                                                                         \
         __asm__ __volatile__ (" 1:      " #op " %1, r0;"                \
                                         "cmpu   %0, %1, %2;"            \
diff --git a/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c b/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
index 93c26cf50de5..a32daec96c12 100644
--- a/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
+++ b/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
@@ -33,7 +33,7 @@
 void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu)
 {
         struct pvr_s pvr;
-        int temp; /* for saving temp value */
+        u32 temp; /* for saving temp value */
         get_pvr(&pvr);
 
         CI(ver_code, VERSION);
diff --git a/arch/microblaze/kernel/cpu/cpuinfo-static.c b/arch/microblaze/kernel/cpu/cpuinfo-static.c
index 4854285b26e7..85dbda4a08a8 100644
--- a/arch/microblaze/kernel/cpu/cpuinfo-static.c
+++ b/arch/microblaze/kernel/cpu/cpuinfo-static.c
@@ -22,7 +22,7 @@ static const char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER;
 
 void __init set_cpuinfo_static(struct cpuinfo *ci, struct device_node *cpu)
 {
-        int i = 0;
+        u32 i = 0;
 
         ci->use_instr =
                 (fcpu(cpu, "xlnx,use-barrel") ? PVR0_USE_BARREL_MASK : 0) |
diff --git a/arch/microblaze/kernel/cpu/cpuinfo.c b/arch/microblaze/kernel/cpu/cpuinfo.c
index 234acad79b9e..d1dd6e83d59b 100644
--- a/arch/microblaze/kernel/cpu/cpuinfo.c
+++ b/arch/microblaze/kernel/cpu/cpuinfo.c
@@ -41,8 +41,12 @@ const struct cpu_ver_key cpu_ver_lookup[] = {
         {"8.40.a", 0x18},
         {"8.40.b", 0x19},
         {"8.50.a", 0x1a},
+        {"8.50.b", 0x1c},
+        {"8.50.c", 0x1e},
         {"9.0", 0x1b},
         {"9.1", 0x1d},
+        {"9.2", 0x1f},
+        {"9.3", 0x20},
         {NULL, 0},
 };
 
@@ -61,11 +65,14 @@ const struct family_string_key family_string_lookup[] = {
         {"spartan3adsp", 0xc},
         {"spartan6", 0xd},
         {"virtex6", 0xe},
+        {"virtex7", 0xf},
         /* FIXME There is no key code defined for spartan2 */
         {"spartan2", 0xf0},
         {"kintex7", 0x10},
         {"artix7", 0x11},
         {"zynq7000", 0x12},
+        {"UltraScale Virtex", 0x13},
+        {"UltraScale Kintex", 0x14},
         {NULL, 0},
 };