diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2008-12-04 15:18:20 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2008-12-04 15:18:20 +0000 |
| commit | 1162f25a49e8f39822123d664cda10fef466b351 (patch) | |
| tree | 22afd92c49e7b79fdea37c3e3aef6b34cb70af2f /util/inteltool/inteltool.c | |
| parent | fcf9be3b9305cfddaf74594fcaec4d6f23541154 (diff) | |
| download | coreboot-1162f25a49e8f39822123d664cda10fef466b351.tar.xz | |
Patch to util/inteltool:
* PMBASE dumping now knows the registers.
* Add support for i965, i975, ICH8M
* Add support for Darwin OS using DirectIO
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3794 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/inteltool/inteltool.c')
| -rw-r--r-- | util/inteltool/inteltool.c | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index 94542c98e0..c8fa6ac4fb 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -21,9 +21,8 @@ #include <stdio.h> #include <stdlib.h> #include <getopt.h> -#include <sys/io.h> #include <fcntl.h> - +#include <sys/mman.h> #include "inteltool.h" static const struct { @@ -33,6 +32,9 @@ static const struct { { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82845, "i845" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82945P, "i945P" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82945GM, "i945GM" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PM965, "PM965" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82975X, "i975X" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8M, "ICH8-M" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7MDH, "ICH7-M DH" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7M, "ICH7-M" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7, "ICH7" }, @@ -44,7 +46,29 @@ static const struct { { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH, "ICH" } }; -int fd_mem; +#ifndef DARWIN +static int fd_mem; + +void *map_physical(unsigned long phys_addr, int len) +{ + void *virt_addr; + + virt_addr = mmap(0, len, PROT_WRITE | PROT_READ, MAP_SHARED, + fd_mem, (off_t) phys_addr); + + if (virt_addr == MAP_FAILED) { + printf("Error mapping physical memory 0x%08x[0x%x]\n", phys_addr, len); + return NULL; + } + + return virt_addr; +} + +void unmap_physical(void *virt_addr, int len) +{ + munmap(virt_addr, len); +} +#endif void print_version(void) { @@ -164,10 +188,12 @@ int main(int argc, char *argv[]) exit(1); } +#ifndef DARWIN if ((fd_mem = open("/dev/mem", O_RDWR)) < 0) { perror("Can not open /dev/mem"); exit(1); } +#endif pacc = pci_alloc(); pci_init(pacc); |