Chameleon

Chameleon Commit Details

Date:2011-05-17 13:52:17 (12 years 11 months ago)
Author:Cosmosis Jones
Commit:827
Parents: 826
Message:merged bcc9's patches for sandy bridge and fsb calcs and imac 11,1 12,1
Changes:
M/trunk/i386/libsaio/acpi_patcher.c
M/trunk/i386/libsaio/cpu.c
M/trunk/i386/libsaio/platform.h
M/trunk/i386/libsaio/smbios_getters.c
M/trunk/i386/boot2/boot.h
M/trunk/i386/libsaio/cpu.h
M/trunk/i386/libsaio/smbios.c

File differences

trunk/i386/libsaio/acpi_patcher.c
494494
495495
496496
497
497498
498499
499500
␉␉␉␉␉case CPU_MODEL_NEHALEM_EX:␊
␉␉␉␉␉case CPU_MODEL_WESTMERE:␊
␉␉␉␉␉case CPU_MODEL_WESTMERE_EX:␊
␉␉␉␉␉case CPU_MODEL_SANDY:␊
␉␉␉␉␉{␊
␉␉␉␉␉␉maximum.Control = rdmsr64(MSR_IA32_PERF_STATUS) & 0xff; // Seems it always contains maximum multiplier value (with turbo, that's we need)...␊
␉␉␉␉␉␉minimum.Control = (rdmsr64(MSR_PLATFORM_INFO) >> 40) & 0xff;␊
trunk/i386/libsaio/cpu.c
66
77
88
9
10
911
1012
1113
......
9496
9597
9698
97
99
100
101
102
103
98104
99
105
106
100107
101108
102109
......
196203
197204
198205
206
199207
200208
201209
202
210
203211
204212
205
213
214
206215
207216
208217
209218
210
211
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
212237
213238
214239
215
216
240
241
217242
218
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
219275
220276
221277
#include "libsaio.h"␊
#include "platform.h"␊
#include "cpu.h"␊
#include "bootstruct.h"␊
#include "boot.h"␊
␊
#ifndef DEBUG_CPU␊
#define DEBUG_CPU 0␊
{␊
␉uint64_t␉tscFrequency, fsbFrequency, cpuFrequency;␊
␉uint64_t␉msr, flex_ratio;␊
␉uint8_t␉␉maxcoef, maxdiv, currcoef, currdiv;␊
␉uint8_t␉␉maxcoef, maxdiv, currcoef, bus_ratio_max, currdiv;␊
␉const char *newratio;␊
␉int len, myfsb;␊
␉uint8_t bus_ratio_min;␊
␉uint32_t max_ratio, min_ratio;␊
␊
␉maxcoef = maxdiv = currcoef = currdiv = 0;␊
␉max_ratio = min_ratio = myfsb = bus_ratio_min = 0;␊
␉maxcoef = maxdiv = bus_ratio_max = currcoef = currdiv = 0;␊
␊
␉/* get cpuid values */␊
␉do_cpuid(0x00000000, p->CPU.CPUID[CPUID_0]);␊
␉cpuFrequency = 0;␊
␊
␉if ((p->CPU.Vendor == 0x756E6547 /* Intel */) && ((p->CPU.Family == 0x06) || (p->CPU.Family == 0x0f))) {␊
␉␉int intelCPU = p->CPU.Model;␊
␉␉if ((p->CPU.Family == 0x06 && p->CPU.Model >= 0x0c) || (p->CPU.Family == 0x0f && p->CPU.Model >= 0x03)) {␊
␉␉␉/* Nehalem CPU model */␊
␉␉␉if (p->CPU.Family == 0x06 && (p->CPU.Model == 0x1a || p->CPU.Model == 0x1e␊
␉␉␉ || p->CPU.Model == 0x1f || p->CPU.Model == 0x25 || p->CPU.Model == 0x2c)) {␊
␉␉␉ || p->CPU.Model == 0x1f || p->CPU.Model == 0x25 || p->CPU.Model == 0x2c || p->CPU.Model == CPU_MODEL_SANDY)) {␊
␉␉␉␉msr = rdmsr64(MSR_PLATFORM_INFO);␊
␉␉␉␉DBG("msr(%d): platform_info %08x\n", __LINE__, msr & 0xffffffff);␊
␉␉␉␉currcoef = (msr >> 8) & 0xff;␊
␉␉␉␉bus_ratio_max = (msr >> 8) & 0xff;␊
␉␉␉␉bus_ratio_min = (msr >> 40) & 0xff; //valv: not sure about this one (Remarq.1)␊
␉␉␉␉msr = rdmsr64(MSR_FLEX_RATIO);␊
␉␉␉␉DBG("msr(%d): flex_ratio %08x\n", __LINE__, msr & 0xffffffff);␊
␉␉␉␉if ((msr >> 16) & 0x01) {␊
␉␉␉␉␉flex_ratio = (msr >> 8) & 0xff;␊
␉␉␉␉␉if (currcoef > flex_ratio) {␊
␉␉␉␉␉␉currcoef = flex_ratio;␊
␉␉␉␉␉/* bcc9: at least on the gigabyte h67ma-ud2h,␊
␉␉␉␉␉ where the cpu multipler can't be changed to␊
␉␉␉␉␉ allow overclocking, the flex_ratio msr has unexpected (to OSX)␊
␉␉␉␉␉ contents. These contents cause mach_kernel to␊
␉␉␉␉␉ fail to compute the bus ratio correctly, instead␊
␉␉␉␉␉ causing the system to crash since tscGranularity␊
␉␉␉␉␉ is inadvertently set to 0.␊
␉␉␉␉␉*/␊
␉␉␉␉␉if (flex_ratio == 0) {␊
␉␉␉␉␉␉/* Clear bit 16 (evidently the␊
␉␉␉␉␉␉ presence bit) */␊
␉␉␉␉␉␉wrmsr64(MSR_FLEX_RATIO, (msr & 0xFFFFFFFFFFFEFFFFULL));␊
␉␉␉␉␉␉msr = rdmsr64(MSR_FLEX_RATIO);␊
␉␉␉␉␉␉verbose("Unusable flex ratio detected. Patched MSR now %08x\n", msr & 0xffffffff);␊
␉␉␉␉␉} else {␊
␉␉␉␉␉␉if (bus_ratio_max > flex_ratio) {␊
␉␉␉␉␉␉␉bus_ratio_max = flex_ratio;␊
␉␉␉␉␉␉}␊
␉␉␉␉␉}␊
␉␉␉␉}␊
␊
␉␉␉␉if (currcoef) {␊
␉␉␉␉␉fsbFrequency = (tscFrequency / currcoef);␊
␉␉␉␉if (bus_ratio_max) {␊
␉␉␉␉␉fsbFrequency = (tscFrequency / bus_ratio_max);␊
␉␉␉␉}␊
␉␉␉␉cpuFrequency = tscFrequency;␊
␉␉␉␉//valv: Turbo Ratio Limit␊
␉␉␉␉if ((intelCPU != 0x2e) && (intelCPU != 0x2f)) {␊
␉␉␉␉␉msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);␊
␉␉␉␉␉cpuFrequency = bus_ratio_max * fsbFrequency;␊
␉␉␉␉␉max_ratio = bus_ratio_max * 10;␊
␉␉␉␉} else {␊
␉␉␉␉␉cpuFrequency = tscFrequency;␊
␉␉␉␉}␊
␉␉␉␉if ((getValueForKey(kbusratio, &newratio, &len, &bootInfo->bootConfig)) && (len <= 4)) {␊
␉␉␉␉␉max_ratio = atoi(newratio);␊
␉␉␉␉␉max_ratio = (max_ratio * 10);␊
␉␉␉␉␉if (len >= 3) max_ratio = (max_ratio + 5);␊
␊
␉␉␉␉␉verbose("Bus-Ratio: min=%d, max=%s\n", bus_ratio_min, newratio);␊
␊
␉␉␉␉␉// extreme overclockers may love 320 ;)␊
␉␉␉␉␉if ((max_ratio >= min_ratio) && (max_ratio <= 320)) {␊
␉␉␉␉␉␉cpuFrequency = (fsbFrequency * max_ratio) / 10;␊
␉␉␉␉␉␉if (len >= 3) maxdiv = 1;␊
␉␉␉␉␉␉else maxdiv = 0;␊
␉␉␉␉␉} else {␊
␉␉␉␉␉␉max_ratio = (bus_ratio_max * 10);␊
␉␉␉␉␉}␊
␉␉␉␉}␊
␉␉␉␉//valv: to be uncommented if Remarq.1 didn't stick␊
␉␉␉␉/*if(bus_ratio_max > 0) bus_ratio = flex_ratio;*/␊
␉␉␉␉p->CPU.MaxRatio = max_ratio;␊
␉␉␉␉p->CPU.MinRatio = min_ratio;␊
␉␉␉␉␉␉␊
␉␉␉␉myfsb = fsbFrequency / 1000000;␊
␉␉␉␉verbose("Sticking with [BCLK: %dMhz, Bus-Ratio: %d]\n", myfsb, max_ratio);␊
␉␉␉␉currcoef = bus_ratio_max;␊
␉␉␉} else {␊
␉␉␉␉msr = rdmsr64(MSR_IA32_PERF_STATUS);␊
␉␉␉␉DBG("msr(%d): ia32_perf_stat 0x%08x\n", __LINE__, msr & 0xffffffff);␊
trunk/i386/libsaio/platform.h
3131
3232
3333
34
3435
3536
3637
......
120121
121122
122123
124
125
123126
124127
125128
#define CPU_MODEL_FIELDS␉␉0x1E␉/* Lynnfield, Clarksfield, Jasper */␊
#define CPU_MODEL_DALES␉␉␉0x1F␉/* Havendale, Auburndale */␊
#define CPU_MODEL_DALES_32NM␉0x25␉/* Clarkdale, Arrandale */␊
#define CPU_MODEL_SANDY␉␉␉0x2a␉/* Sandy bridge */␊
#define CPU_MODEL_WESTMERE␉␉0x2C␉/* Gulftown, Westmere-EP, Westmere-WS */␊
#define CPU_MODEL_NEHALEM_EX␉0x2E␊
#define CPU_MODEL_WESTMERE_EX␉0x2F␊
␉␉uint64_t␉␉TSCFrequency;␉␉// TSC Frequency Hz␊
␉␉uint64_t␉␉FSBFrequency;␉␉// FSB Frequency Hz␊
␉␉uint64_t␉␉CPUFrequency;␉␉// CPU Frequency Hz␊
␉␉uint32_t␉␉MaxRatio;␉␉␉␉// Max Bus Ratio␊
␉␉uint32_t␉␉MinRatio;␉␉␉␉// Min Bus Ratio␊
␉␉char␉␉␉BrandString[48];␉// 48 Byte Branding String␊
␉␉uint32_t␉␉CPUID[CPUID_MAX][4];␉// CPUID 0..4, 80..81 Raw Values␊
␉} CPU;␊
trunk/i386/libsaio/cpu.h
2020
2121
2222
23
2324
2425
2526
#define MSR_IA32_PERF_CONTROL␉0x199␊
#define MSR_IA32_EXT_CONFIG␉␉0x00EE␊
#define MSR_FLEX_RATIO␉␉␉0x194␊
#define MSR_TURBO_RATIO_LIMIT␉␉0x1AD␊
#define␉MSR_PLATFORM_INFO␉␉0xCE␊
#define K8_FIDVID_STATUS␉␉0xC0010042␊
#define K10_COFVID_STATUS␉␉0xC0010071␊
trunk/i386/libsaio/smbios.c
9494
9595
9696
97
98
99
97100
98101
99102
......
331334
332335
333336
337
338
339
340
341
334342
335343
336344
// defaults for an iMac11,1 core i3/i5/i7␊
#define kDefaultiMacNehalem␉␉␉␉␉␉␉"iMac11,1"␊
#define kDefaultiMacNehalemBIOSVersion␉␉␉␉" IM111.88Z.0034.B00.0903051113"␊
// defaults for an iMac12,1␊
#define kDefaultiMacSandy␉␉␉␉␉␉␉"iMac12,1"␊
#define kDefaultiMacSandyBIOSVersion␉␉␉␉" IM121.88Z.0047.B00.1102091756"␊
␊
// defaults for a Mac Pro␊
#define kDefaultMacProFamily␉␉␉␉␉␉"MacPro"␊
␉␉␉␉␉␉␉␉defaultSystemInfo.family␉␉= kDefaultiMacFamily;␊
␉␉␉␉␉␉␉␉break;␊
␊
␉␉␉␉␉␉␉case CPU_MODEL_SANDY:␊
␉␉␉␉␉␉␉␉defaultBIOSInfo.version␉␉␉= kDefaultiMacSandyBIOSVersion;␊
␉␉␉␉␉␉␉␉defaultSystemInfo.productName␉= kDefaultiMacSandy;␊
␉␉␉␉␉␉␉␉defaultSystemInfo.family␉␉= kDefaultiMacFamily;␊
␉␉␉␉␉␉␉␉break;␊
␉␉␉␉␉␉␉case CPU_MODEL_NEHALEM: ␊
␉␉␉␉␉␉␉case CPU_MODEL_NEHALEM_EX:␊
␉␉␉␉␉␉␉␉defaultBIOSInfo.version␉␉␉= kDefaultMacProNehalemBIOSVersion;␊
trunk/i386/libsaio/smbios_getters.c
4848
4949
5050
51
5152
5253
5354
......
156157
157158
158159
160
159161
160162
161163
␉␉␉␉␉␉return false;␊
␊
␉␉␉␉␉case 0x19:␉␉␉␉␉// Intel Core i5 650 @3.20 Ghz␊
␉␉␉␉␉case CPU_MODEL_SANDY:␉␉// Intel Core i5, i7 LGA1155 sandy bridge␊
␉␉␉␉␉case CPU_MODEL_NEHALEM:␉␉// Intel Core i7 LGA1366 (45nm)␊
␉␉␉␉␉case CPU_MODEL_FIELDS:␉␉// Intel Core i5, i7 LGA1156 (45nm)␊
␉␉␉␉␉case CPU_MODEL_DALES:␉␉// Intel Core i5, i7 LGA1156 (45nm) ???␊
␉␉␉␉␉␉␉value->word = 0x0701;␉␉// Core i7␊
␉␉␉␉␉␉return true;␊
␊
␉␉␉␉␉case CPU_MODEL_SANDY:␉␉␉␉// Intel Core i3, i5, i7 LGA1155 sandy bridge␊
␉␉␉␉␉case CPU_MODEL_DALES_32NM:␉␉␉// Intel Core i3, i5, i7 LGA1156 (32nm) (Clarkdale, Arrandale)␊
␉␉␉␉␉␉if (strstr(Platform.CPU.BrandString, "Core(TM) i3"))␊
␉␉␉␉␉␉␉value->word = 0x901;␉␉// Core i3␊
trunk/i386/boot2/boot.h
109109
110110
111111
112
112113
113114
114115
#define kDefaultPartition␉"Default Partition"␉/* sys.c */␊
␊
#define kMD0Image␉␉␉"md0"␉␉␉␉/* ramdisk.h */␊
#define kbusratio␉␉"busratio"␉␉␉/* cpu.c */␊
␊
/*␊
* Flags to the booter or kernel␊

Archive Download the corresponding diff file

Revision: 827