Gets rid of the "unknown i686 model 0xXX, can't get bus clock" message
on the Xeon 3600/5600. Also pre-emptively adds the Xeon 6500/7500. I
updated the comments to include the names of the matching Xeon
variants; the market people seem to have less influence on those.
ok?
Index: i386/i386/machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/machdep.c,v
retrieving revision 1.485
diff -u -p -r1.485 machdep.c
--- i386/i386/machdep.c 2 Oct 2010 23:31:34 -0000 1.485
+++ i386/i386/machdep.c 29 Dec 2010 12:37:47 -0000
@@ -2101,9 +2101,11 @@ p3_get_bus_clock(struct cpu_info *ci)
goto print_msr;
}
break;
- case 0x1a: /* Core i7 */
- case 0x1e: /* Core i5 */
- case 0x25: /* Core i3 */
+ case 0x1a: /* Core i7, Xeon 3500/5500 */
+ case 0x1e: /* Core i5/i7, Xeon 3400 */
+ case 0x25: /* Core i3/i5, Xeon 3400 */
+ case 0x2c: /* Core i7, Xeon 3600/5600 */
+ case 0x2e: /* Xeon 6500/7500 */
break;
default:
printf("%s: unknown i686 model 0x%x, can't get bus clock",
Index: amd64/amd64/est.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/est.c,v
retrieving revision 1.21
diff -u -p -r1.21 est.c
--- amd64/amd64/est.c 5 Jul 2010 22:47:41 -0000 1.21
+++ amd64/amd64/est.c 29 Dec 2010 12:37:47 -0000
@@ -216,9 +216,11 @@ p3_get_bus_clock(struct cpu_info *ci)
break;
}
break;
- case 0x1a: /* Core i7 */
- case 0x1e: /* Core i5 */
- case 0x25: /* Core i3 */
+ case 0x1a: /* Core i7, Xeon 3500/5500 */
+ case 0x1e: /* Core i5/i7, Xeon 3400 */
+ case 0x25: /* Core i3/i5, Xeon 3400 */
+ case 0x2c: /* Core i7, Xeon 3600/5600 */
+ case 0x2e: /* Xeon 6500/7500 */
break;
default:
printf("%s: unknown i686 model 0x%x, can't get bus clock\n",
