Due to company changes, Zhaoxin is currently using the CPU ID
CentaurHauls. CPUs designed and developed by Zhaoxin start with
a family of 7, and the model may be less than 10.

Zhaoxin CPUs do not have cache coherence problems, add this patch
to avoid executing wbinvd on Zhaoxin CPUs.

Signed-off-by: Tony W Wang-oc <tonywwang...@zhaoxin.com>
---
 grub-core/kern/i386/pc/init.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/grub-core/kern/i386/pc/init.c b/grub-core/kern/i386/pc/init.c
index 326d491c5..f42c1295e 100644
--- a/grub-core/kern/i386/pc/init.c
+++ b/grub-core/kern/i386/pc/init.c
@@ -204,6 +204,11 @@ grub_via_workaround_init (void)
     {
       grub_cpuid (1, proc_info, /* Don't care. */ manufacturer[0],
                   manufacturer[2], manufacturer[1]);
+
+      /* Check family, apply only to family 6 and lower. */
+      if (((proc_info & 0xf00) >> 8) > 6)
+        return;
+
       /* Check model, apply only to VIA C3 and lower. */
       if (((proc_info & 0xf0) >> 4 | (proc_info & 0xf0000) >> 12) > 10)
         return;
-- 
2.25.1


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Reply via email to