diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/inteltool/inteltool.c | 3 | ||||
| -rw-r--r-- | util/inteltool/inteltool.h | 3 | ||||
| -rw-r--r-- | util/inteltool/memory.c | 6 | ||||
| -rw-r--r-- | util/inteltool/pcie.c | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index 5e320e21b4..79f0f3c361 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -73,7 +73,8 @@ static const struct { /* Host bridges /DRAM controllers integrated in CPUs */ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_0TH_GEN, "0th generation (Nehalem family) Core Processor" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_1ST_GEN, "1st generation (Westmere family) Core Processor" }, - { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_2ND_GEN, "2nd generation (Sandy Bridge family) Core Processor" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_2ND_GEN_D, "2nd generation (Sandy Bridge family) Core Processor (Desktop)" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_2ND_GEN_M, "2nd generation (Sandy Bridge family) Core Processor (Mobile)" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_3RD_GEN_A, "3rd generation (Ivy Bridge family) Core Processor" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_3RD_GEN_B, "3rd generation (Ivy Bridge family) Core Processor" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_3RD_GEN_C, "3rd generation (Ivy Bridge family) Core Processor" }, diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h index cfee808eab..e031df316c 100644 --- a/util/inteltool/inteltool.h +++ b/util/inteltool/inteltool.h @@ -155,7 +155,8 @@ /* Intel starts counting these generations with the integration of the DRAM controller */ #define PCI_DEVICE_ID_INTEL_CORE_0TH_GEN 0xd132 /* Nehalem */ #define PCI_DEVICE_ID_INTEL_CORE_1ST_GEN 0x0044 /* Westmere */ -#define PCI_DEVICE_ID_INTEL_CORE_2ND_GEN 0x0104 /* Sandy Bridge */ +#define PCI_DEVICE_ID_INTEL_CORE_2ND_GEN_D 0x0100 /* Sandy Bridge (Desktop) */ +#define PCI_DEVICE_ID_INTEL_CORE_2ND_GEN_M 0x0104 /* Sandy Bridge (Mobile) */ #define PCI_DEVICE_ID_INTEL_CORE_3RD_GEN_A 0x0150 /* Ivy Bridge */ #define PCI_DEVICE_ID_INTEL_CORE_3RD_GEN_B 0x0154 /* Ivy Bridge */ #define PCI_DEVICE_ID_INTEL_CORE_3RD_GEN_C 0x0158 /* Ivy Bridge */ diff --git a/util/inteltool/memory.c b/util/inteltool/memory.c index a0f0a65412..e2b0ab488c 100644 --- a/util/inteltool/memory.c +++ b/util/inteltool/memory.c @@ -205,7 +205,8 @@ int print_mchbar(struct pci_dev *nb, struct pci_access *pacc) mchbar_phys |= ((uint64_t)pci_read_long(nb, 0x4c)) << 32; mchbar_phys &= 0x0000000fffffc000UL; /* 35:14 */ break; - case PCI_DEVICE_ID_INTEL_CORE_2ND_GEN: + case PCI_DEVICE_ID_INTEL_CORE_2ND_GEN_D: + case PCI_DEVICE_ID_INTEL_CORE_2ND_GEN_M: case PCI_DEVICE_ID_INTEL_CORE_3RD_GEN_A: /* pretty printing not implemented yet */ case PCI_DEVICE_ID_INTEL_CORE_3RD_GEN_B: case PCI_DEVICE_ID_INTEL_CORE_3RD_GEN_C: @@ -251,7 +252,8 @@ int print_mchbar(struct pci_dev *nb, struct pci_access *pacc) case PCI_DEVICE_ID_INTEL_CORE_3RD_GEN_B: case PCI_DEVICE_ID_INTEL_CORE_3RD_GEN_C: case PCI_DEVICE_ID_INTEL_CORE_3RD_GEN_D: - case PCI_DEVICE_ID_INTEL_CORE_2ND_GEN: + case PCI_DEVICE_ID_INTEL_CORE_2ND_GEN_D: + case PCI_DEVICE_ID_INTEL_CORE_2ND_GEN_M: ivybridge_dump_timings(); break; } diff --git a/util/inteltool/pcie.c b/util/inteltool/pcie.c index c1d06f18d6..549ef4b678 100644 --- a/util/inteltool/pcie.c +++ b/util/inteltool/pcie.c @@ -294,7 +294,8 @@ int print_dmibar(struct pci_dev *nb) dmi_registers = westmere_dmi_registers; size = ARRAY_SIZE(westmere_dmi_registers); break; - case PCI_DEVICE_ID_INTEL_CORE_2ND_GEN: + case PCI_DEVICE_ID_INTEL_CORE_2ND_GEN_D: + case PCI_DEVICE_ID_INTEL_CORE_2ND_GEN_M: dmi_registers = sandybridge_dmi_registers; size = ARRAY_SIZE(sandybridge_dmi_registers); case PCI_DEVICE_ID_INTEL_CORE_3RD_GEN_A: /* pretty printing not implemented yet */ |