Force coreboot mconf to create temp files in the output directory

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

diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c
index bf5efc9924c94c026a1020d8a5249aaad0702698..e5c2b867c39ec8dcc8c7127a0786b5811559d5f9 100644 (file)
--- a/util/inteltool/inteltool.c
+++ b/util/inteltool/inteltool.c
@@ -21,6 +21,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <inttypes.h>
 #include <getopt.h>
 #include <fcntl.h>
 #include <sys/mman.h>
@@ -41,6 +42,7 @@ static const struct {
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82810E_MC, "i810E DC-133" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82830M, "i830M" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82845, "i845" },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82865, "i865" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82915, "82915G/P/GV/GL/PL/910GL" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82945P, "i945P" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82945GM, "i945GM" },
@@ -54,7 +56,7 @@ static const struct {
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58, "X58" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_GS45, "GS45ME" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ATOM_DXXX, "Atom D400/500 Series" },
-       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ATOM_NXXX, "Atom N400 Series" }, 
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ATOM_NXXX, "Atom N400 Series" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_POULSBO, "SCH Poulsbo" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_POULSBO_LPC, "SCH Poulsbo" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10R, "ICH10R" },
@@ -72,18 +74,25 @@ static const struct {
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7, "ICH7" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7DH, "ICH7DH" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6, "ICH6" },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH5, "ICH5" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH4M, "ICH4-M" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH4, "ICH4" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH2, "ICH2" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH0, "ICH0" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH, "ICH" },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371XX, "82371AB/EB/MB" },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X44, "82X38/X48" },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_32X0, "3200/3210" },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I63XX, "Intel 63xx I/O Controller Hub" },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000P, "Intel i5000P Memory Controller Hub" },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000X, "Intel i5000X Memory Controller Hub" },
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000Z, "Intel i5000Z Memory Controller Hub" },
 };
 
 #ifndef __DARWIN__
 static int fd_mem;
 
-void *map_physical(unsigned long phys_addr, size_t len)
+void *map_physical(uint64_t phys_addr, size_t len)
 {
        void *virt_addr;
 
@@ -91,7 +100,8 @@ void *map_physical(unsigned long phys_addr, size_t len)
                    fd_mem, (off_t) phys_addr);
 
        if (virt_addr == MAP_FAILED) {
-               printf("Error mapping physical memory 0x%08lx[0x%x]\n", phys_addr, len);
+               printf("Error mapping physical memory 0x%08" PRIx64 "[0x%zx]\n",
+                       phys_addr, len);
                return NULL;
        }
 
@@ -134,6 +144,7 @@ void print_usage(const char *name)
             "   -d | --dmibar:                    dump northbridge DMIBAR registers\n"
             "   -P | --pciexpress:                dump northbridge PCIEXBAR registers\n\n"
             "   -M | --msrs:                      dump CPU MSRs\n"
+            "   -A | --ambs:                      dump AMB registers\n"
             "   -a | --all:                       dump all known registers\n"
             "\n");
        exit(1);
@@ -150,7 +161,7 @@ int main(int argc, char *argv[])
 
        int dump_gpios = 0, dump_mchbar = 0, dump_rcba = 0;
        int dump_pmbase = 0, dump_epbar = 0, dump_dmibar = 0;
-       int dump_pciexbar = 0, dump_coremsrs = 0;
+       int dump_pciexbar = 0, dump_coremsrs = 0, dump_ambs = 0;
 
        static struct option long_options[] = {
                {"version", 0, 0, 'v'},
@@ -163,11 +174,12 @@ int main(int argc, char *argv[])
                {"dmibar", 0, 0, 'd'},
                {"pciexpress", 0, 0, 'P'},
                {"msrs", 0, 0, 'M'},
+               {"ambs", 0, 0, 'A'},
                {"all", 0, 0, 'a'},
                {0, 0, 0, 0}
        };
 
-       while ((opt = getopt_long(argc, argv, "vh?grpmedPMa",
+       while ((opt = getopt_long(argc, argv, "vh?grpmedPMaA",
                                   long_options, &option_index)) != EOF) {
                switch (opt) {
                case 'v':
@@ -207,6 +219,10 @@ int main(int argc, char *argv[])
                        dump_dmibar = 1;
                        dump_pciexbar = 1;
                        dump_coremsrs = 1;
+                       dump_ambs = 1;
+                       break;
+               case 'A':
+                       dump_ambs = 1;
                        break;
                case 'h':
                case '?':
@@ -322,12 +338,12 @@ int main(int argc, char *argv[])
        }
 
        if (dump_pmbase) {
-               print_pmbase(sb);
+               print_pmbase(sb, pacc);
                printf("\n\n");
        }
 
        if (dump_mchbar) {
-               print_mchbar(nb);
+               print_mchbar(nb, pacc);
                printf("\n\n");
        }
 
@@ -351,6 +367,9 @@ int main(int argc, char *argv[])
                printf("\n\n");
        }
 
+       if (dump_ambs) {
+               print_ambs(nb, pacc);
+       }
        /* Clean up */
        pci_free_dev(nb);
        // pci_free_dev(sb); // TODO: glibc detected "double free or corruption"