Changeset 76886 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jan 18, 2019 10:57:02 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128254

Message:

VMM (and related changes): Add support for Shanghai/Zhaoxin CPUs. Modified and improved contribution by Journey Ren submitted under MIT license. Thank you!

Location:

trunk/src/VBox/ValidationKit

Files:

• bootsectors/bs3-cpu-generated-1-template.c (modified) (1 diff)
• bootsectors/bs3-cpu-generated-1.h (modified) (1 diff)
• bootsectors/bs3kit/bs3-cmn-GetCpuVendor.c (modified) (1 diff)
• bootsectors/bs3kit/bs3kit.h (modified) (1 diff)
• testdriver/vbox.py (modified) (1 diff)
• testdriver/vboxtestvms.py (modified) (2 diffs)
• testmanager/core/testbox.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1-template.c

@@ -4747 +4747 @@
             CASE_PRED(BS3CG1PRED_VENDOR_INTEL, pThis->bCpuVendor == BS3CPUVENDOR_INTEL);
             CASE_PRED(BS3CG1PRED_VENDOR_VIA,   pThis->bCpuVendor == BS3CPUVENDOR_VIA);
+            CASE_PRED(BS3CG1PRED_VENDOR_SHANGHAI, pThis->bCpuVendor == BS3CPUVENDOR_SHANGHAI);
 
 #undef CASE_PRED

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1.h

@@ -775 +775 @@
     BS3CG1PRED_VENDOR_INTEL,
     BS3CG1PRED_VENDOR_VIA,
+    BS3CG1PRED_VENDOR_SHANGHAI,
 
     BS3CG1PRED_END

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-GetCpuVendor.c

@@ -43 +43 @@
         if (ASMIsViaCentaurCpuEx(uEbx, uEcx, uEdx))
             return BS3CPUVENDOR_VIA;
+        if (ASMIsShanghaiCpuEx(uEbx, uEcx, uEdx))
+            return BS3CPUVENDOR_SHANGHAI;
         return BS3CPUVENDOR_UNKNOWN;
     }

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -1537 +1537 @@
     BS3CPUVENDOR_VIA,
     BS3CPUVENDOR_CYRIX,
+    BS3CPUVENDOR_SHANGHAI,
     BS3CPUVENDOR_UNKNOWN,
     BS3CPUVENDOR_END

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -3097 +3097 @@
         return sCpuDesc.startswith("VIA") or sCpuDesc == 'CentaurHauls';
 
+    def isHostCpuShanghai(self, fQuiet = False):
+        """
+        Checks if the host CPU vendor is Shanghai (or Zhaoxin).
+
+        Returns True / False.
+        """
+        sCpuDesc = self._getHostCpuDesc(fQuiet);
+        return sCpuDesc.startswith("ZHAOXIN") or sCpuDesc.strip(' ') == 'Shanghai';
+
     def isHostCpuP4(self, fQuiet = False):
         """

trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py

@@ -443 +443 @@
                 elif self.isViaIncompatible() and oTestDrv.isHostCpuVia():
                     fRc = None; # Skip the test.
+                elif self.isShanghaiIncompatible() and oTestDrv.isHostCpuShanghai():
+                    fRc = None; # Skip the test.
                 elif self.isP4Incompatible() and oTestDrv.isHostCpuP4():
                     fRc = None; # Skip the test.
@@ -561 +563 @@
             return True;
         return False;
+
+    def isShanghaiIncompatible(self):
+        """
+        Identifies VMs that doesn't work on Shanghai.
+
+        Returns True if NOT supported on Shanghai, False if it IS supported.
+        """
+        # For now treat it just like VIA, to be adjusted later
+        return self.isViaIncompatible()
 
     def isP4Incompatible(self):

trunk/src/VBox/ValidationKit/testmanager/core/testbox.py

@@ -504 +504 @@
                 if uMod == 0x0a: return 'VIA_C7_C5J';
                 if uMod == 0x0f: return 'VIA_Isaiah';
+        elif sCpuVendor == '  Shanghai  ':
+            if uFam == 0x07:
+                if uMod == 0x0b: return 'Shanghai_KX-5000';
         return None;
 
@@ -544 +547 @@
         if self.sCpuVendor == 'AuthenticAMD':     return 'AMD';
         if self.sCpuVendor == 'CentaurHauls':     return 'VIA';
+        if self.sCpuVendor == '  Shanghai  ':     return 'Shanghai';
         return self.sCpuVendor;