inteltool: added more device IDs

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

diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
index 613469ca45bc50c84dab17a6c14d41f869b38f49..bddd17c333361ed28cd1dba553d9c0844ee50ee4 100644 (file)
--- a/util/inteltool/inteltool.h
+++ b/util/inteltool/inteltool.h
@@ -2,6 +2,7 @@
  * inteltool - dump all registers on an Intel CPU + chipset based system.
  *
  * Copyright (C) 2008-2010 by coresystems GmbH
+ * Copyright (C) 2009 Carl-Daniel Hailfinger
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,12 +24,17 @@
 #include <sys/io.h>
 #endif
 #if (defined(__MACH__) && defined(__APPLE__))
-/* DirectIO is available here: http://www.coresystems.de/en/directio */
+/* DirectHW is available here: http://www.coreboot.org/DirectHW */
 #define __DARWIN__
-#include <DirectIO/darwinio.h>
+#include <DirectHW/DirectHW.h>
 #endif
 #include <pci/pci.h>
 
+/* This #include is needed for freebsd_{rd,wr}msr. */
+#if defined(__FreeBSD__)
+#include <machine/cpufunc.h>
+#endif
+
 #define INTELTOOL_VERSION "1.0"
 
 /* Tested chipsets: */
@@ -38,11 +44,14 @@
 #define PCI_DEVICE_ID_INTEL_ICH2               0x2440
 #define PCI_DEVICE_ID_INTEL_ICH4               0x24c0
 #define PCI_DEVICE_ID_INTEL_ICH4M              0x24cc
+#define PCI_DEVICE_ID_INTEL_ICH5               0x24d0
 #define PCI_DEVICE_ID_INTEL_ICH6               0x2640
 #define PCI_DEVICE_ID_INTEL_ICH7DH             0x27b0
 #define PCI_DEVICE_ID_INTEL_ICH7               0x27b8
 #define PCI_DEVICE_ID_INTEL_ICH7M              0x27b9
 #define PCI_DEVICE_ID_INTEL_ICH7MDH            0x27bd
+#define PCI_DEVICE_ID_INTEL_NM10               0x27bc
+#define PCI_DEVICE_ID_INTEL_ICH8               0x2810
 #define PCI_DEVICE_ID_INTEL_ICH8M              0x2815
 #define PCI_DEVICE_ID_INTEL_ICH9DH             0x2912
 #define PCI_DEVICE_ID_INTEL_ICH9DO             0x2914
@@ -55,19 +64,29 @@
 
 #define PCI_DEVICE_ID_INTEL_82810              0x7120
 #define PCI_DEVICE_ID_INTEL_82810DC            0x7122
+#define PCI_DEVICE_ID_INTEL_82810E_MC          0x7124
 #define PCI_DEVICE_ID_INTEL_82830M             0x3575
 #define PCI_DEVICE_ID_INTEL_82845              0x1a30
+#define PCI_DEVICE_ID_INTEL_82865              0x2570
 #define PCI_DEVICE_ID_INTEL_82915              0x2580
 #define PCI_DEVICE_ID_INTEL_82945P             0x2770
 #define PCI_DEVICE_ID_INTEL_82945GM            0x27a0
+#define PCI_DEVICE_ID_INTEL_82945GSE           0x27ac
 #define PCI_DEVICE_ID_INTEL_PM965              0x2a00
+#define PCI_DEVICE_ID_INTEL_Q965               0x2990
 #define PCI_DEVICE_ID_INTEL_82975X             0x277c
 #define PCI_DEVICE_ID_INTEL_82Q35              0x29b0
 #define PCI_DEVICE_ID_INTEL_82G33              0x29c0
 #define PCI_DEVICE_ID_INTEL_82Q33              0x29d0
+#define PCI_DEVICE_ID_INTEL_X44                0x29e0
+#define PCI_DEVICE_ID_INTEL_32X0               0x29f0
 #define PCI_DEVICE_ID_INTEL_GS45               0x2a40
 #define PCI_DEVICE_ID_INTEL_X58                        0x3405
 #define PCI_DEVICE_ID_INTEL_SCH_POULSBO                0x8100
+#define PCI_DEVICE_ID_INTEL_ATOM_DXXX          0xa000
+
+/* untested, but almost identical to D-series */
+#define PCI_DEVICE_ID_INTEL_ATOM_NXXX          0xa010
 
 #define PCI_DEVICE_ID_INTEL_82443LX            0x7180
 /* 82443BX has a different device ID if AGP is disabled (hardware-wise). */
@@ -79,21 +98,30 @@
 
 #define ARRAY_SIZE(a) ((int)(sizeof(a) / sizeof((a)[0])))
 
-#ifndef __DARWIN__
+#if !defined(__DARWIN__) && !defined(__FreeBSD__)
 typedef struct { uint32_t hi, lo; } msr_t;
 #endif
+#if defined (__FreeBSD__)
+/* FreeBSD already has conflicting definitions for wrmsr/rdmsr. */
+#undef rdmsr
+#undef wrmsr
+#define rdmsr freebsd_rdmsr
+#define wrmsr freebsd_wrmsr
+typedef struct { uint32_t hi, lo; } msr_t;
+msr_t freebsd_rdmsr(int addr);
+int freebsd_wrmsr(int addr, msr_t msr);
+#endif
 typedef struct { uint16_t addr; int size; char *name; } io_register_t;
 
-void *map_physical(unsigned long phys_addr, size_t len);
+void *map_physical(uint64_t phys_addr, size_t len);
 void unmap_physical(void *virt_addr, size_t len);
 
 unsigned int cpuid(unsigned int op);
 int print_intel_core_msrs(void);
-int print_mchbar(struct pci_dev *nb);
-int print_pmbase(struct pci_dev *sb);
+int print_mchbar(struct pci_dev *nb, struct pci_access *pacc);
+int print_pmbase(struct pci_dev *sb, struct pci_access *pacc);
 int print_rcba(struct pci_dev *sb);
 int print_gpios(struct pci_dev *sb);
 int print_epbar(struct pci_dev *nb);
 int print_dmibar(struct pci_dev *nb);
 int print_pciexbar(struct pci_dev *nb);
-