Merge tag 'drm-misc-fixes-2018-06-12' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-microblaze.git] / arch / powerpc / lib / test_emulate_step.c

diff --git a/arch/powerpc/lib/test_emulate_step.c b/arch/powerpc/lib/test_emulate_step.c
index 2534c14..6c47daa 100644 (file)
--- a/arch/powerpc/lib/test_emulate_step.c
+++ b/arch/powerpc/lib/test_emulate_step.c
@@ -387,10 +387,14 @@ static void __init test_lxvd2x_stxvd2x(void)
        /* lxvd2x vsr39, r3, r4 */
        stepped = emulate_step(&regs, TEST_LXVD2X(39, 3, 4));
 
-       if (stepped == 1)
+       if (stepped == 1 && cpu_has_feature(CPU_FTR_VSX)) {
                show_result("lxvd2x", "PASS");
-       else
-               show_result("lxvd2x", "FAIL");
+       } else {
+               if (!cpu_has_feature(CPU_FTR_VSX))
+                       show_result("lxvd2x", "PASS (!CPU_FTR_VSX)");
+               else
+                       show_result("lxvd2x", "FAIL");
+       }
 
 
        /*** stxvd2x ***/
@@ -404,10 +408,15 @@ static void __init test_lxvd2x_stxvd2x(void)
        stepped = emulate_step(&regs, TEST_STXVD2X(39, 3, 4));
 
        if (stepped == 1 && cached_b[0] == c.b[0] && cached_b[1] == c.b[1] &&
-           cached_b[2] == c.b[2] && cached_b[3] == c.b[3])
+           cached_b[2] == c.b[2] && cached_b[3] == c.b[3] &&
+           cpu_has_feature(CPU_FTR_VSX)) {
                show_result("stxvd2x", "PASS");
-       else
-               show_result("stxvd2x", "FAIL");
+       } else {
+               if (!cpu_has_feature(CPU_FTR_VSX))
+                       show_result("stxvd2x", "PASS (!CPU_FTR_VSX)");
+               else
+                       show_result("stxvd2x", "FAIL");
+       }
 }
 #else
 static void __init test_lxvd2x_stxvd2x(void)