Chameleon

Chameleon Commit Details

Date:2011-05-26 05:42:07 (12 years 11 months ago)
Author:Azimutz
Commit:883
Parents: 882
Message:Merge trunk (r876,877).
Changes:
M/branches/azimutz/Cleancut/i386/libsaio/dram_controllers.c
M/branches/azimutz/Cleancut/i386/libsaio/pci_setup.c
M/branches/azimutz/Cleancut/i386/libsaio/smbios.c

File differences

branches/azimutz/Cleancut/i386/libsaio/dram_controllers.c
5252
5353
5454
55
55
5656
5757
5858
5959
60
61
60
61
6262
6363
6464
......
9191
9292
9393
94
94
9595
9696
9797
......
495495
496496
497497
498
499
500
498
499
500
501501
502
503
504
502
503
504
505505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
526525
527526
528527
......
533532
534533
535534
536
535
537536
538537
539538
......
557556
558557
559558
560
559
561560
562561
563562
␉static long possible_nhm_bus[] = {0xFF, 0x7F, 0x3F};␊
␉unsigned long did, vid;␊
␉int i;␊
␉␊
␊
␉// Nehalem supports Scrubbing␊
␉// First, locate the PCI bus where the MCH is located␊
␉for(i = 0; i < sizeof(possible_nhm_bus); i++)␊
␉{␊
␉␉vid = pci_config_read16(PCIADDR(possible_nhm_bus[i], 3, 4), 0x00);␊
␉␉did = pci_config_read16(PCIADDR(possible_nhm_bus[i], 3, 4), 0x02);␊
␉␉vid = pci_config_read16(PCIADDR(possible_nhm_bus[i], 3, 4), PCI_VENDOR_ID);␊
␉␉did = pci_config_read16(PCIADDR(possible_nhm_bus[i], 3, 4), PCI_DEVICE_ID);␊
␉␉vid &= 0xFFFF;␊
␉␉did &= 0xFF00;␊
␉␉␊
␉{␊
␉␉case 0: mch_fsb = 1066; break;␊
␉␉case 1: mch_fsb = 533; break;␊
␉ default: ␊
␉␉default: ␊
␉␉case 2: mch_fsb = 800; break;␊
␉␉case 3: mch_fsb = 667; break;␉␉␊
␉␉case 4: mch_fsb = 1333; break;␊
␊
␉{ 0x8086, 0x1A30, "i845",␉NULL, NULL, NULL },␊
␉␊
␉{ 0x8086, 0x2970, "i946PL/GZ",␉␉setup_p35, get_fsb_i965, get_timings_i965 },␊
␉{ 0x8086, 0x2990, "Q963/Q965",␉␉setup_p35, get_fsb_i965, get_timings_i965 },␊
␉{ 0x8086, 0x29A0, "P965/G965",␉␉setup_p35, get_fsb_i965, get_timings_i965 },␊
␉{ 0x8086, 0x2970, "i946PL/GZ",␉␉setup_p35, get_fsb_i965,␉get_timings_i965␉},␊
␉{ 0x8086, 0x2990, "Q963/Q965",␉␉setup_p35, get_fsb_i965,␉get_timings_i965␉},␊
␉{ 0x8086, 0x29A0, "P965/G965",␉␉setup_p35, get_fsb_i965,␉get_timings_i965␉},␊
␊
␉{ 0x8086, 0x2A00, "GM965/GL960",␉setup_p35, get_fsb_im965, get_timings_im965 },␊
␉{ 0x8086, 0x2A10, "GME965/GLE960",␉setup_p35, get_fsb_im965, get_timings_im965 },␊
␉{ 0x8086, 0x2A40, "PM/GM45/47",␉␉setup_p35, get_fsb_im965, get_timings_im965 },␉␊
␉{ 0x8086, 0x2A00, "GM965/GL960",␉setup_p35, get_fsb_im965,␉get_timings_im965␉},␊
␉{ 0x8086, 0x2A10, "GME965/GLE960",␉setup_p35, get_fsb_im965,␉get_timings_im965␉},␊
␉{ 0x8086, 0x2A40, "PM/GM45/47",␉␉setup_p35, get_fsb_im965,␉get_timings_im965␉},␊
␊
␉{ 0x8086, 0x29B0, "Q35",␉␉␉setup_p35, get_fsb_i965, get_timings_p35 },␉␊
␉{ 0x8086, 0x29C0, "P35/G33",␉␉setup_p35, get_fsb_i965, get_timings_p35 },␉␊
␉{ 0x8086, 0x29D0, "Q33",␉␉␉setup_p35, get_fsb_i965, get_timings_p35 },␉␊
␉{ 0x8086, 0x29E0, "X38/X48",␉␉setup_p35, get_fsb_i965, get_timings_p35 },␉␉␉␊
␉{ 0x8086, 0x2E00, "Eaglelake",␉␉setup_p35, get_fsb_i965, get_timings_p35 },␊
␉{ 0x8086, 0x2E10, "Q45/Q43",␉␉setup_p35, get_fsb_i965, get_timings_p35 },␉␊
␉{ 0x8086, 0x2E20, "P45/G45",␉␉setup_p35, get_fsb_i965, get_timings_p35 },␉␊
␉{ 0x8086, 0x2E30, "G41",␉␉␉setup_p35, get_fsb_i965, get_timings_p35 },␊
␉␊
␉{ 0x8086, 0xD131, "NHM IMC",␉␉setup_nhm, get_fsb_nhm, get_timings_nhm },␊
␉{ 0x8086, 0xD132, "NHM IMC",␉␉setup_nhm, get_fsb_nhm, get_timings_nhm },␊
␉{ 0x8086, 0x3400, "NHM IMC",␉␉setup_nhm, get_fsb_nhm,␉ get_timings_nhm },␊
␉{ 0x8086, 0x3401, "NHM IMC",␉␉setup_nhm, get_fsb_nhm, get_timings_nhm },␊
␉{ 0x8086, 0x3402, "NHM IMC",␉␉setup_nhm, get_fsb_nhm, get_timings_nhm },␊
␉{ 0x8086, 0x3403, "NHM IMC",␉␉setup_nhm, get_fsb_nhm, get_timings_nhm },␊
␉{ 0x8086, 0x3404, "NHM IMC",␉␉setup_nhm, get_fsb_nhm, get_timings_nhm },␊
␉{ 0x8086, 0x3405, "NHM IMC",␉␉setup_nhm, get_fsb_nhm, get_timings_nhm },␊
␉{ 0x8086, 0x3406, "NHM IMC",␉␉setup_nhm, get_fsb_nhm, get_timings_nhm },␊
␉{ 0x8086, 0x3407, "NHM IMC",␉␉setup_nhm, get_fsb_nhm, get_timings_nhm },␊
␉␊
␉{ 0x8086, 0x29B0, "Q35",␉␉␉setup_p35, get_fsb_i965,␉get_timings_p35␉␉},␊
␉{ 0x8086, 0x29C0, "P35/G33",␉␉setup_p35, get_fsb_i965,␉get_timings_p35␉␉},␊
␉{ 0x8086, 0x29D0, "Q33",␉␉␉setup_p35, get_fsb_i965,␉get_timings_p35␉␉},␊
␉{ 0x8086, 0x29E0, "X38/X48",␉␉setup_p35, get_fsb_i965,␉get_timings_p35␉␉},␊
␉{ 0x8086, 0x2E00, "Eaglelake",␉␉setup_p35, get_fsb_i965,␉get_timings_p35␉␉},␊
␉{ 0x8086, 0x2E10, "Q45/Q43",␉␉setup_p35, get_fsb_i965,␉get_timings_p35␉␉},␊
␉{ 0x8086, 0x2E20, "P45/G45",␉␉setup_p35, get_fsb_i965,␉get_timings_p35␉␉},␊
␉{ 0x8086, 0x2E30, "G41",␉␉␉setup_p35, get_fsb_i965,␉get_timings_p35␉␉},␊
␊
␉{ 0x8086, 0xD131, "NHM IMC",␉␉setup_nhm, get_fsb_nhm,␉␉get_timings_nhm␉␉},␊
␉{ 0x8086, 0xD132, "NHM IMC",␉␉setup_nhm, get_fsb_nhm,␉␉get_timings_nhm␉␉},␊
␉{ 0x8086, 0x3400, "NHM IMC",␉␉setup_nhm, get_fsb_nhm,␉␉get_timings_nhm␉␉},␊
␉{ 0x8086, 0x3401, "NHM IMC",␉␉setup_nhm, get_fsb_nhm,␉␉get_timings_nhm␉␉},␊
␉{ 0x8086, 0x3402, "NHM IMC",␉␉setup_nhm, get_fsb_nhm,␉␉get_timings_nhm␉␉},␊
␉{ 0x8086, 0x3403, "NHM IMC",␉␉setup_nhm, get_fsb_nhm,␉␉get_timings_nhm␉␉},␊
␉{ 0x8086, 0x3404, "NHM IMC",␉␉setup_nhm, get_fsb_nhm,␉␉get_timings_nhm␉␉},␊
␉{ 0x8086, 0x3405, "NHM IMC",␉␉setup_nhm, get_fsb_nhm,␉␉get_timings_nhm␉␉},␊
␉{ 0x8086, 0x3406, "NHM IMC",␉␉setup_nhm, get_fsb_nhm,␉␉get_timings_nhm␉␉},␊
␉{ 0x8086, 0x3407, "NHM IMC",␉␉setup_nhm, get_fsb_nhm,␉␉get_timings_nhm␉␉},␊
};␊
␊
static const char *memory_channel_types[] =␊
void scan_dram_controller(pci_dt_t *dram_dev)␊
{␊
␉int i;␊
␉for(i = 1; i < sizeof(dram_controllers) / sizeof(dram_controllers[0]); i++)␊
␉for(i = 1; i < sizeof(dram_controllers) / sizeof(dram_controllers[0]); i++)␊
␉if ((dram_controllers[i].vendor == dram_dev->vendor_id) ␊
␉␉␉␉&& (dram_controllers[i].device == dram_dev->device_id))␊
␉␉{␊
␉␉␉␉␉␉memory_channel_types[Platform.RAM.Channels]␊
␉␉␉␉␉,Platform.RAM.CAS, Platform.RAM.TRC, Platform.RAM.TRP, Platform.RAM.RAS␊
␉␉␉␉␉,Platform.RAM.CAS, Platform.RAM.TRC, Platform.RAM.TRP, Platform.RAM.RAS␊
␉␉␉␉ );␊
␉␉␉␉␉);␊
␉␉␉/* getc();␊
␉␉␉ */␉␉␉␊
␉␉}␉␊
branches/azimutz/Cleancut/i386/libsaio/pci_setup.c
2828
2929
3030
31
31
32
3233
3334
3435
␉␉switch (current->class_id)␊
␉␉{␊
␉␉␉case PCI_CLASS_BRIDGE_HOST:␊
␉␉␉␉␉dram_controller_dev = current;␊
␉␉␉␉␉if (current->dev.addr == PCIADDR(0, 0, 0))␊
␉␉␉␉␉␉dram_controller_dev = current;␊
␉␉␉␉break;␊
␉␉␉␊
␉␉␉case PCI_CLASS_NETWORK_ETHERNET: ␊
branches/azimutz/Cleancut/i386/libsaio/smbios.c
405405
406406
407407
408
408
409409
410410
411411
......
428428
429429
430430
431
431
432432
433433
434434
......
604604
605605
606606
607
607
608608
609
610
611609
612610
613611
␉uint8_t *stringPtr = (uint8_t *)structHeader + structHeader->length;␊
␊
␉if (!field)␊
␉␉return (char *)0;␊
␉␉return NULL;␊
␊
␉for (field--; field != 0 && strlen((char *)stringPtr) > 0; ␊
␉␉field--, stringPtr = (uint8_t *)((uint32_t)stringPtr + strlen((char *)stringPtr) + 1));␊
␉strSize = strlen(string);␊
␊
␉// remove any spaces found at the end␊
␉while ((string[strSize - 1] == ' ') && strSize != 0)␊
␉while ((strSize != 0) && (string[strSize - 1] == ' '))␊
␉␉strSize--;␊
␊
␉if (strSize == 0)␊
␉memcpy((void *)structPtr->new, structPtr->orig, structPtr->orig->length);␊
␊
␉for (i = 0; i < numOfSetters; i++)␊
␉␉if (structPtr->orig->type == SMBSetters[i].type)␊
␉␉if ((structPtr->orig->type == SMBSetters[i].type) && (SMBSetters[i].fieldOffset < structPtr->orig->length))␊
␉␉{␊
␉␉␉if (SMBSetters[i].fieldOffset > structPtr->orig->length)␊
␉␉␉␉continue;␊
␉␉␉setterFound = true;␊
␉␉␉setSMBValue(structPtr, i, (returnType *)((uint8_t *)structPtr->new + SMBSetters[i].fieldOffset));␊
␉␉}␊

Archive Download the corresponding diff file

Revision: 883