From 088f5694009f710dc0a7fc9437a02d05b08829ed Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Tue, 28 May 2013 11:30:25 +0200 Subject: util/inteltool: Add support for other 5 chipsets e4e8e090fa36cb3a098e1ddf0ea44c796c140572 does add support for QM57, but there are many more that should work with that code(?). Does not explode on... CPU: Processor Type: 0, Family 6, Model 25, Stepping 2 Northbridge: 8086:0044 (1st generation (Westmere family) Core Processor) Southbridge: 8086:3b0f (QS57) Change-Id: I85e15ba45678a5bd635415a7a8d69c05bff8f7ef Signed-off-by: Stefan Tauner Reviewed-on: http://review.coreboot.org/3321 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Anton Kochkov --- util/inteltool/gpio.c | 18 +++++++++++++++++- util/inteltool/inteltool.c | 34 +++++++++++++++++----------------- util/inteltool/inteltool.h | 18 +++++++++++++++++- util/inteltool/powermgt.c | 18 +++++++++++++++++- util/inteltool/rootcmplx.c | 18 +++++++++++++++++- 5 files changed, 85 insertions(+), 21 deletions(-) (limited to 'util') diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c index 820e266826..42e7272c23 100644 --- a/util/inteltool/gpio.c +++ b/util/inteltool/gpio.c @@ -523,7 +523,23 @@ int print_gpios(struct pci_dev *sb, int show_all, int show_diffs) size = ARRAY_SIZE(i631x_gpio_registers); break; - case PCI_DEVICE_ID_INTEL_MOBILE_5: + case PCI_DEVICE_ID_INTEL_3400_DESKTOP: + case PCI_DEVICE_ID_INTEL_3400_MOBILE: + case PCI_DEVICE_ID_INTEL_P55: + case PCI_DEVICE_ID_INTEL_PM55: + case PCI_DEVICE_ID_INTEL_H55: + case PCI_DEVICE_ID_INTEL_QM57: + case PCI_DEVICE_ID_INTEL_H57: + case PCI_DEVICE_ID_INTEL_HM55: + case PCI_DEVICE_ID_INTEL_Q57: + case PCI_DEVICE_ID_INTEL_HM57: + case PCI_DEVICE_ID_INTEL_3400_MOBILE_SFF: + case PCI_DEVICE_ID_INTEL_B55_A: + case PCI_DEVICE_ID_INTEL_QS57: + case PCI_DEVICE_ID_INTEL_3400: + case PCI_DEVICE_ID_INTEL_3420: + case PCI_DEVICE_ID_INTEL_3450: + case PCI_DEVICE_ID_INTEL_B55_B: gpiobase = pci_read_word(sb, 0x48) & 0xfffc; gpio_registers = i631x_gpio_registers; size = ARRAY_SIZE(i631x_gpio_registers); diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index 0618f4bb04..a4edca96df 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -100,23 +100,23 @@ static const struct { { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH, "ICH" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I63XX, "631xESB/632xESB/3100" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_POULSBO_LPC, "SCH Poulsbo" }, - { PCI_VENDOR_ID_INTEL, 0x3b00, "3400 Desktop" }, - { PCI_VENDOR_ID_INTEL, 0x3b01, "3400 Mobile" }, - { PCI_VENDOR_ID_INTEL, 0x3b02, "P55" }, - { PCI_VENDOR_ID_INTEL, 0x3b03, "PM55" }, - { PCI_VENDOR_ID_INTEL, 0x3b06, "H55" }, - { PCI_VENDOR_ID_INTEL, 0x3b07, "QM57" }, - { PCI_VENDOR_ID_INTEL, 0x3b08, "H57" }, - { PCI_VENDOR_ID_INTEL, 0x3b09, "HM55" }, - { PCI_VENDOR_ID_INTEL, 0x3b0a, "Q57" }, - { PCI_VENDOR_ID_INTEL, 0x3b0b, "HM57" }, - { PCI_VENDOR_ID_INTEL, 0x3b0d, "3400 Mobile SFF" }, - { PCI_VENDOR_ID_INTEL, 0x3b0e, "B55" }, - { PCI_VENDOR_ID_INTEL, 0x3b0f, "QS57" }, - { PCI_VENDOR_ID_INTEL, 0x3b12, "3400" }, - { PCI_VENDOR_ID_INTEL, 0x3b14, "3420" }, - { PCI_VENDOR_ID_INTEL, 0x3b16, "3450" }, - { PCI_VENDOR_ID_INTEL, 0x3b1e, "B55" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_3400_DESKTOP, "3400 Desktop" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_3400_MOBILE, "3400 Mobile" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_P55, "P55" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PM55, "PM55" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_H55, "H55" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_QM57, "QM57" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_H57, "H57" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HM55, "HM55" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Q57, "Q57" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HM57, "HM57" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_3400_MOBILE_SFF, "3400 Mobile SFF" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_B55_A, "B55" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_QS57, "QS57" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_3400, "3400" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_3420, "3420" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_3450, "3450" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_B55_B, "B55" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Z68, "Z68" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_P67, "P67" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UM67, "UM67" }, diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h index 7872a5f4a1..dc5c832e6e 100644 --- a/util/inteltool/inteltool.h +++ b/util/inteltool/inteltool.h @@ -60,7 +60,23 @@ #define PCI_DEVICE_ID_INTEL_ICH9M 0x2919 #define PCI_DEVICE_ID_INTEL_ICH9ME 0x2917 #define PCI_DEVICE_ID_INTEL_ICH10R 0x3a16 -#define PCI_DEVICE_ID_INTEL_MOBILE_5 0x3b07 +#define PCI_DEVICE_ID_INTEL_3400_DESKTOP 0x3b00 +#define PCI_DEVICE_ID_INTEL_3400_MOBILE 0x3b01 +#define PCI_DEVICE_ID_INTEL_P55 0x3b02 +#define PCI_DEVICE_ID_INTEL_PM55 0x3b03 +#define PCI_DEVICE_ID_INTEL_H55 0x3b06 +#define PCI_DEVICE_ID_INTEL_QM57 0x3b07 +#define PCI_DEVICE_ID_INTEL_H57 0x3b08 +#define PCI_DEVICE_ID_INTEL_HM55 0x3b09 +#define PCI_DEVICE_ID_INTEL_Q57 0x3b0a +#define PCI_DEVICE_ID_INTEL_HM57 0x3b0b +#define PCI_DEVICE_ID_INTEL_3400_MOBILE_SFF 0x3b0d +#define PCI_DEVICE_ID_INTEL_B55_A 0x3b0e +#define PCI_DEVICE_ID_INTEL_QS57 0x3b0f +#define PCI_DEVICE_ID_INTEL_3400 0x3b12 +#define PCI_DEVICE_ID_INTEL_3420 0x3b14 +#define PCI_DEVICE_ID_INTEL_3450 0x3b16 +#define PCI_DEVICE_ID_INTEL_B55_B 0x3b1e #define PCI_DEVICE_ID_INTEL_SCH_POULSBO_LPC 0x8119 #define PCI_DEVICE_ID_INTEL_Z68 0x1c44 #define PCI_DEVICE_ID_INTEL_P67 0x1c46 diff --git a/util/inteltool/powermgt.c b/util/inteltool/powermgt.c index 3c874db106..3bc4efc379 100644 --- a/util/inteltool/powermgt.c +++ b/util/inteltool/powermgt.c @@ -761,7 +761,23 @@ int print_pmbase(struct pci_dev *sb, struct pci_access *pacc) size = ARRAY_SIZE(i63xx_pm_registers); break; - case PCI_DEVICE_ID_INTEL_MOBILE_5: + case PCI_DEVICE_ID_INTEL_3400_DESKTOP: + case PCI_DEVICE_ID_INTEL_3400_MOBILE: + case PCI_DEVICE_ID_INTEL_P55: + case PCI_DEVICE_ID_INTEL_PM55: + case PCI_DEVICE_ID_INTEL_H55: + case PCI_DEVICE_ID_INTEL_QM57: + case PCI_DEVICE_ID_INTEL_H57: + case PCI_DEVICE_ID_INTEL_HM55: + case PCI_DEVICE_ID_INTEL_Q57: + case PCI_DEVICE_ID_INTEL_HM57: + case PCI_DEVICE_ID_INTEL_3400_MOBILE_SFF: + case PCI_DEVICE_ID_INTEL_B55_A: + case PCI_DEVICE_ID_INTEL_QS57: + case PCI_DEVICE_ID_INTEL_3400: + case PCI_DEVICE_ID_INTEL_3420: + case PCI_DEVICE_ID_INTEL_3450: + case PCI_DEVICE_ID_INTEL_B55_B: pmbase = pci_read_word(sb, 0x40) & 0xfffc; pm_registers = i63xx_pm_registers; size = ARRAY_SIZE(i63xx_pm_registers); diff --git a/util/inteltool/rootcmplx.c b/util/inteltool/rootcmplx.c index 8cf2ffb22b..f1e902dd3d 100644 --- a/util/inteltool/rootcmplx.c +++ b/util/inteltool/rootcmplx.c @@ -47,7 +47,23 @@ int print_rcba(struct pci_dev *sb) case PCI_DEVICE_ID_INTEL_ICH10R: case PCI_DEVICE_ID_INTEL_NM10: case PCI_DEVICE_ID_INTEL_I63XX: - case PCI_DEVICE_ID_INTEL_MOBILE_5: + case PCI_DEVICE_ID_INTEL_3400_DESKTOP: + case PCI_DEVICE_ID_INTEL_3400_MOBILE: + case PCI_DEVICE_ID_INTEL_P55: + case PCI_DEVICE_ID_INTEL_PM55: + case PCI_DEVICE_ID_INTEL_H55: + case PCI_DEVICE_ID_INTEL_QM57: + case PCI_DEVICE_ID_INTEL_H57: + case PCI_DEVICE_ID_INTEL_HM55: + case PCI_DEVICE_ID_INTEL_Q57: + case PCI_DEVICE_ID_INTEL_HM57: + case PCI_DEVICE_ID_INTEL_3400_MOBILE_SFF: + case PCI_DEVICE_ID_INTEL_B55_A: + case PCI_DEVICE_ID_INTEL_QS57: + case PCI_DEVICE_ID_INTEL_3400: + case PCI_DEVICE_ID_INTEL_3420: + case PCI_DEVICE_ID_INTEL_3450: + case PCI_DEVICE_ID_INTEL_B55_B: case PCI_DEVICE_ID_INTEL_Z68: case PCI_DEVICE_ID_INTEL_P67: case PCI_DEVICE_ID_INTEL_UM67: -- cgit v1.2.3