diff options
| author | Nico Huber <nico.h@gmx.de> | 2017-10-03 16:03:07 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2018-03-27 15:42:14 +0000 |
| commit | 54fe32f6772bce3348b513435b88627b361afd05 (patch) | |
| tree | ef62d17cde1f785c42887c22fe114c9026f57ec2 /util | |
| parent | be045833316c7fe71621366ed2934e6cf6385a44 (diff) | |
inteltool: Add some Skylake desktop ids
Change-Id: I1738a2544eb2435cb4b8718bcce5170d1ef04f72
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/25144
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/inteltool/gpio.c | 1 | ||||
| -rw-r--r-- | util/inteltool/gpio_groups.c | 1 | ||||
| -rw-r--r-- | util/inteltool/inteltool.c | 2 | ||||
| -rw-r--r-- | util/inteltool/inteltool.h | 1 | ||||
| -rw-r--r-- | util/inteltool/memory.c | 1 | ||||
| -rw-r--r-- | util/inteltool/pcie.c | 3 |
6 files changed, 9 insertions, 0 deletions
diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c index 3dcfc24929..5e310359f7 100644 --- a/util/inteltool/gpio.c +++ b/util/inteltool/gpio.c @@ -1005,6 +1005,7 @@ int print_gpios(struct pci_dev *sb, int show_all, int show_diffs) gpio_registers = baytrail_score_ssus_gpio_registers; size = ARRAY_SIZE(baytrail_score_ssus_gpio_registers); break; + case PCI_DEVICE_ID_INTEL_B150: case PCI_DEVICE_ID_INTEL_CM236: print_gpio_groups(sb); return 0; diff --git a/util/inteltool/gpio_groups.c b/util/inteltool/gpio_groups.c index 11f680842b..2bb4edc219 100644 --- a/util/inteltool/gpio_groups.c +++ b/util/inteltool/gpio_groups.c @@ -454,6 +454,7 @@ void print_gpio_groups(struct pci_dev *const sb) const struct gpio_community *const *communities; switch (sb->device_id) { + case PCI_DEVICE_ID_INTEL_B150: case PCI_DEVICE_ID_INTEL_CM236: community_count = ARRAY_SIZE(sunrise_communities); communities = sunrise_communities; diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index 862ec64b80..ac30fdd242 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -119,6 +119,8 @@ static const struct { "6th generation (Skylake-S/H family) Core Processor (Workstation)" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D, "6th generation (Skylake-S family) Core Processor (Desktop)" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D2, + "6th generation (Skylake-S family) Core Processor (Desktop)" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BAYTRAIL, "Bay Trail" }, /* Southbridges (LPC controllers) */ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371XX, "371AB/EB/MB" }, diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h index b8d6d0de07..3ca91cdb6d 100644 --- a/util/inteltool/inteltool.h +++ b/util/inteltool/inteltool.h @@ -226,6 +226,7 @@ static inline uint32_t inl(unsigned port) #define PCI_DEVICE_ID_INTEL_CORE_4TH_GEN_E3 0x0c08 /* Haswell (Xeon E3 v3) */ #define PCI_DEVICE_ID_INTEL_CORE_4TH_GEN_U 0x0a04 /* Haswell-ULT */ #define PCI_DEVICE_ID_INTEL_CORE_5TH_GEN_U 0x1604 /* Broadwell-ULT */ +#define PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D2 0x190f /* Skylake (Desktop) */ #define PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_M 0x1910 /* Skylake (Mobile) */ #define PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_WST 0x1918 /* Skylake (Workstation) */ #define PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D 0x191f /* Skylake (Desktop) */ diff --git a/util/inteltool/memory.c b/util/inteltool/memory.c index 67a29a7e02..233d6a9440 100644 --- a/util/inteltool/memory.c +++ b/util/inteltool/memory.c @@ -218,6 +218,7 @@ int print_mchbar(struct pci_dev *nb, struct pci_access *pacc, const char *dump_s case PCI_DEVICE_ID_INTEL_CORE_4TH_GEN_E3: case PCI_DEVICE_ID_INTEL_CORE_4TH_GEN_U: case PCI_DEVICE_ID_INTEL_CORE_5TH_GEN_U: + case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D2: case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_WST: case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D: case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_M: diff --git a/util/inteltool/pcie.c b/util/inteltool/pcie.c index 2eb65c1819..cf4b6b6379 100644 --- a/util/inteltool/pcie.c +++ b/util/inteltool/pcie.c @@ -263,6 +263,7 @@ int print_epbar(struct pci_dev *nb) case PCI_DEVICE_ID_INTEL_CORE_4TH_GEN_E3: case PCI_DEVICE_ID_INTEL_CORE_4TH_GEN_U: case PCI_DEVICE_ID_INTEL_CORE_5TH_GEN_U: + case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D2: case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_M: case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_WST: case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D: @@ -384,6 +385,7 @@ int print_dmibar(struct pci_dev *nb) dmibar_phys |= ((uint64_t)pci_read_long(nb, 0x6c)) << 32; dmibar_phys &= 0x0000007ffffff000UL; /* 38:12 */ break; + case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D2: case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_M: case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_WST: case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D: @@ -489,6 +491,7 @@ int print_pciexbar(struct pci_dev *nb) case PCI_DEVICE_ID_INTEL_CORE_4TH_GEN_E3: case PCI_DEVICE_ID_INTEL_CORE_4TH_GEN_U: case PCI_DEVICE_ID_INTEL_CORE_5TH_GEN_U: + case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D2: case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_M: case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_WST: case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D: |