Add support for dumping ACPI registers for i7

[coreboot.git] / util / inteltool / memory.c

diff --git a/util/inteltool/memory.c b/util/inteltool/memory.c
index 0dae58998de60c85f01f5eede11788fe5b713dd5..94796a998280323571b2810e1393850fa71ee18f 100644 (file)
--- a/util/inteltool/memory.c
+++ b/util/inteltool/memory.c
@@ -36,6 +36,7 @@ int print_mchbar(struct pci_dev *nb)
        switch (nb->device_id) {
        case PCI_DEVICE_ID_INTEL_82915:
        case PCI_DEVICE_ID_INTEL_82945GM:
+       case PCI_DEVICE_ID_INTEL_82945GSE:
        case PCI_DEVICE_ID_INTEL_82945P:
        case PCI_DEVICE_ID_INTEL_82975X:
                mchbar_phys = pci_read_long(nb, 0x44) & 0xfffffffe;
@@ -47,9 +48,35 @@ int print_mchbar(struct pci_dev *nb)
                mchbar_phys = pci_read_long(nb, 0x48) & 0xfffffffe;
                mchbar_phys |= ((uint64_t)pci_read_long(nb, 0x4c)) << 32;
                break;
+       case PCI_DEVICE_ID_INTEL_Q965:
+       case PCI_DEVICE_ID_INTEL_ATOM_DXXX:
+       case PCI_DEVICE_ID_INTEL_ATOM_NXXX:
+               mchbar_phys = pci_read_long(nb, 0x48);
+
+               /* Test if bit 0 of the MCHBAR reg is 1 to enable memory reads.
+                * If it isn't, try to set it. This may fail, because there is 
+                * some bit that locks that bit, and isn't in the public 
+                * datasheets.
+                */
+
+               if(!(mchbar_phys & 1))
+               {
+                       printf("Access to the MCHBAR is currently disabled, "\
+                                               "attempting to enable.\n");
+                       mchbar_phys |= 0x1;
+                       pci_write_long(nb, 0x48, mchbar_phys);
+                       if(pci_read_long(nb, 0x48) & 1)
+                               printf("Enabled successfully.\n");
+                       else
+                               printf("Enable FAILED!\n");
+               }
+               mchbar_phys &= 0xfffffffe;
+               mchbar_phys |= ((uint64_t)pci_read_long(nb, 0x4c)) << 32;
+               break;
        case PCI_DEVICE_ID_INTEL_82443LX:
        case PCI_DEVICE_ID_INTEL_82443BX:
        case PCI_DEVICE_ID_INTEL_82810:
+       case PCI_DEVICE_ID_INTEL_82810E_MC:
        case PCI_DEVICE_ID_INTEL_82810DC:
        case PCI_DEVICE_ID_INTEL_82830M:
                printf("This northbrigde does not have MCHBAR.\n");