inteltool: add support for CannonPoint-LP

Add support for CannonPoint-LP U Premium
(CoffeeLake-U and WhiskeyLake-U)

GPIO info taken from:
- Intel doc #337867-002
- coreboot soc/intel/cannonlake/include/soc/gpio_soc_defs.h

Test: Read GPIOs from out-of-tree WhiskeyLake-U board

Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
Change-Id: I70f23eec71abb8d7c2a7a109c9e760bb31dee2ff
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39393
Reviewed-by: Michael Niewöhner
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

9 files changed, 366 insertions, 0 deletions

diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c
index 55c32baf43..01b187f731 100644
--- a/util/inteltool/gpio.c
+++ b/util/inteltool/gpio.c
@@ -1047,6 +1047,7 @@ int print_gpios(struct pci_dev *sb, int show_all, int show_diffs)
 	case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_BASE:
 	case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_PREM:
 	case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_IHDCP_PREM:
+	case PCI_DEVICE_ID_INTEL_CANNONPOINT_LP_U_PREM:
 	case PCI_DEVICE_ID_INTEL_C621:
 	case PCI_DEVICE_ID_INTEL_C622:
 	case PCI_DEVICE_ID_INTEL_C624:
diff --git a/util/inteltool/gpio_groups.c b/util/inteltool/gpio_groups.c
index 3d7d708d0c..bb196a914e 100644
--- a/util/inteltool/gpio_groups.c
+++ b/util/inteltool/gpio_groups.c
@@ -25,6 +25,7 @@
 
 #include "gpio_names/apollolake.h"
 #include "gpio_names/cannonlake.h"
+#include "gpio_names/cannonlake_lp.h"
 #include "gpio_names/denverton.h"
 #include "gpio_names/icelake.h"
 #include "gpio_names/lewisburg.h"
@@ -149,6 +150,10 @@ const struct gpio_community *const *get_gpio_communities(struct pci_dev *const s
 	case PCI_DEVICE_ID_INTEL_APL_LPC:
 		*community_count = ARRAY_SIZE(apl_communities);
 		return apl_communities;
+	case PCI_DEVICE_ID_INTEL_CANNONPOINT_LP_U_PREM:
+		*community_count = ARRAY_SIZE(cannonlake_pch_lp_communities);
+		*pad_stepping = 16;
+		return cannonlake_pch_lp_communities;
 	case PCI_DEVICE_ID_INTEL_H310:
 	case PCI_DEVICE_ID_INTEL_H370:
 	case PCI_DEVICE_ID_INTEL_Z390:
diff --git a/util/inteltool/gpio_names/cannonlake_lp.h b/util/inteltool/gpio_names/cannonlake_lp.h
new file mode 100644
index 0000000000..0aa69b0101
--- /dev/null
+++ b/util/inteltool/gpio_names/cannonlake_lp.h
@@ -0,0 +1,341 @@
+#ifndef GPIO_NAMES_CANNONLAKE_LP
+#define GPIO_NAMES_CANNONLAKE_LP
+
+#include "gpio_groups.h"
+
+const char *const cannonlake_pch_lp_group_a_names[] = {
+	"GPP_A0",	"RCIN#",		"TIME_SYNC1",		"n/a",
+	"GPP_A1",	"LAD0",			"ESPI_IO0",		"n/a",
+	"GPP_A2",	"LAD1",			"ESPI_IO1",		"n/a",
+	"GPP_A3",	"LAD2",			"ESPI_IO2",		"n/a",
+	"GPP_A4",	"LAD3",			"ESPI_IO3",		"n/a",
+	"GPP_A5",	"LFRAME#",		"ESPI_CS0#",		"n/a",
+	"GPP_A6",	"SERIRQ",		"n/a",			"n/a",
+	"GPP_A7",	"PIRQA#",		"GSPI0_CS1#",		"n/a",
+	"GPP_A8",	"CLKRUN#",		"n/a",			"n/a",
+	"GPP_A9",	"CLKOUT_LPC0",		"ESPI_CLK",		"n/a",
+	"GPP_A10",	"CLKOUT_LPC1",		"n/a",			"n/a",
+	"GPP_A11",	"PME#",			"GSPI1_CS1#",		"SD_VDD2_PWR_EN#",
+	"GPP_A12",	"BM_BUSY#",		"ISH_GP6",		"SX_EXIT_HOLDOFF#",
+	"GPP_A13",	"SUSWARN#/SUSPWRDNACK",	"n/a",			"n/a",
+	"GPP_A14",	"SUS_STAT#",		"ESPI_RESET#",		"n/a",
+	"GPP_A15",	"SUSACK#",		"n/a",			"n/a",
+	"GPP_A16",	"SD_1P8_SEL",		"n/a",			"n/a",
+	"GPP_A17",	"SD_VDD1_PWR_EN#",	"ISH_GP7",		"n/a",
+	"GPP_A18",	"ISH_GP0",		"n/a",			"n/a",
+	"GPP_A19",	"ISH_GP1",		"n/a",			"n/a",
+	"GPP_A20",	"ISH_GP2",		"n/a",			"n/a",
+	"GPP_A21",	"ISH_GP3",		"n/a",			"n/a",
+	"GPP_A22",	"ISH_GP4",		"n/a",			"n/a",
+	"GPP_A23",	"ISH_GP5",		"n/a",			"n/a",
+	"GPIO_RSVD_0",	"n/a",			"n/a",			"n/a",
+};
+
+const struct gpio_group cannonlake_pch_lp_group_a = {
+	.display	= "------- GPIO Group GPP_A -------",
+	.pad_count	= ARRAY_SIZE(cannonlake_pch_lp_group_a_names) / 4,
+	.func_count	= 4,
+	.pad_names	= cannonlake_pch_lp_group_a_names,
+};
+
+const char *const cannonlake_pch_lp_group_b_names[] = {
+	"GPP_B0",	"Reserved",		"n/a",
+	"GPP_B1",	"Reserved",		"n/a",
+	"GPP_B2",	"VRALERT#",		"n/a",
+	"GPP_B3",	"CPU_GP2",		"n/a",
+	"GPP_B4",	"CPU_GP3",		"n/a",
+	"GPP_B5",	"SRCCLKREQ0#",		"n/a",
+	"GPP_B6",	"SRCCLKREQ1#",		"n/a",
+	"GPP_B7",	"SRCCLKREQ2#",		"n/a",
+	"GPP_B8",	"SRCCLKREQ3#",		"n/a",
+	"GPP_B9",	"SRCCLKREQ4#",		"n/a",
+	"GPP_B10",	"SRCCLKREQ5#",		"n/a",
+	"GPP_B11",	"EXT_PWR_GATE#",	"n/a",
+	"GPP_B12",	"SLP_S0#",		"n/a",
+	"GPP_B13",	"PLTRST#",		"n/a",
+	"GPP_B14",	"SPKR",			"n/a",
+	"GPP_B15",	"GSPI0_CS0#",		"n/a",
+	"GPP_B16",	"GSPI0_CLK",		"n/a",
+	"GPP_B17",	"GSPI0_MISO",		"n/a",
+	"GPP_B18",	"GSPI0_MOSI",		"n/a",
+	"GPP_B19",	"GSPI1_CS0#",		"n/a",
+	"GPP_B20",	"GSPI1_CLK",		"n/a",
+	"GPP_B21",	"GSPI1_MISO",		"n/a",
+	"GPP_B22",	"GSPI1_MOSI",		"n/a",
+	"GPP_B23",	"SML1ALERT#",		"PCHHOT#",
+	"GPIO_RSVD_1",	"n/a",			"n/a",
+	"GPIO_RSVD_2",	"n/a",			"n/a",
+};
+
+const struct gpio_group cannonlake_pch_lp_group_b = {
+	.display	= "------- GPIO Group GPP_B -------",
+	.pad_count	= ARRAY_SIZE(cannonlake_pch_lp_group_b_names) / 3,
+	.func_count	= 3,
+	.pad_names	= cannonlake_pch_lp_group_b_names,
+};
+
+const char *const cannonlake_pch_lp_group_c_names[] = {
+	"GPP_C0",	"SMBCLK",	"n/a",
+	"GPP_C1",	"SMBDATA",	"n/a",
+	"GPP_C2",	"SMBALERT#",	"n/a",
+	"GPP_C3",	"SML0CLK",	"n/a",
+	"GPP_C4",	"SML0DATA",	"n/a",
+	"GPP_C5",	"SML0ALERT#",	"n/a",
+	"GPP_C6",	"SML1CLK",	"n/a",
+	"GPP_C7",	"SML1DATA",	"n/a",
+	"GPP_C8",	"UART0_RXD",	"n/a",
+	"GPP_C9",	"UART0_TXD",	"n/a",
+	"GPP_C10",	"UART0_RTS#",	"n/a",
+	"GPP_C11",	"UART0_CTS#",	"n/a",
+	"GPP_C12",	"UART1_RXD",	"ISH_UART1_RXD",
+	"GPP_C13",	"UART1_TXD",	"ISH_UART1_TXD",
+	"GPP_C14",	"UART1_RTS#",	"ISH_UART1_RTS#",
+	"GPP_C15",	"UART1_CTS#",	"ISH_UART1_CTS#",
+	"GPP_C16",	"I2C0_SDA",	"n/a",
+	"GPP_C17",	"I2C0_SCL",	"n/a",
+	"GPP_C18",	"I2C1_SDA",	"n/a",
+	"GPP_C19",	"I2C1_SCL",	"n/a",
+	"GPP_C20",	"UART2_RXD",	"n/a",
+	"GPP_C21",	"UART2_TXD",	"n/a",
+	"GPP_C22",	"UART2_RTS#",	"n/a",
+	"GPP_C23",	"UART2_CTS#",	"n/a",
+};
+
+const struct gpio_group cannonlake_pch_lp_group_c = {
+	.display	= "------- GPIO Group GPP_C -------",
+	.pad_count	= ARRAY_SIZE(cannonlake_pch_lp_group_c_names) / 3,
+	.func_count	= 3,
+	.pad_names	= cannonlake_pch_lp_group_c_names,
+};
+
+const char *const cannonlake_pch_lp_group_d_names[] = {
+	"GPP_D0",	"SPI1_CS#",		"BK0",		"SBK0",
+	"GPP_D1",	"SPI1_CLK",		"BK1",		"SBK1",
+	"GPP_D2",	"SPI1_MISO",		"BK2",		"SBK2",
+	"GPP_D3",	"SPI1_MOSI",		"BK3",		"SBK3",
+	"GPP_D4",	"IMGCLKOUT0",		"BK4",		"SBK4",
+	"GPP_D5",	"ISH_I2C0_SDA",		"n/a",		"n/a",
+	"GPP_D6",	"ISH_I2C0_SCL",		"n/a",		"n/a",
+	"GPP_D7",	"ISH_I2C1_SDA",		"n/a",		"n/a",
+	"GPP_D8",	"ISH_I2C1_SCL",		"n/a",		"n/a",
+	"GPP_D9",	"ISH_SPI_CS#",		"n/a",		"GSPI2_CS0#",
+	"GPP_D10",	"ISH_SPI_CLK",		"n/a",		"GSPI2_CLK",
+	"GPP_D11",	"ISH_SPI_MISO",		"n/a",		"GSPI2_MISO",
+	"GPP_D12",	"ISH_SPI_MOSI",		"n/a",		"GSPI2_MOSI",
+	"GPP_D13",	"ISH_UART0_RXD",	"SML0BDATA",	"I2C4B_SDA",
+	"GPP_D14",	"ISH_UART0_TXD",	"SML0BCLK",	"I2C4B_SCL",
+	"GPP_D15",	"ISH_UART0_RTS#",	"GSPI2_CS1#",	"n/a",
+	"GPP_D16",	"ISH_UART0_CTS#",	"SML0BALERT",	"n/a",
+	"GPP_D17",	"DMIC_CLK1",		"SNDW3_CLK",	"n/a",
+	"GPP_D18",	"DMIC_DATA1",		"SNDW3_DATA",	"n/a",
+	"GPP_D19",	"DMIC_CLK0",		"SNDW4_CLK",	"n/a",
+	"GPP_D20",	"DMIC_DATA0",		"SNDW4_DATA",	"n/a",
+	"GPP_D21",	"SPI1_IO2",		"n/a",		"n/a",
+	"GPP_D22",	"SPI1_IO3",		"n/a",		"n/a",
+	"GPP_D23",	"I2S_MCLK",		"n/a",		"n/a",
+	"GPIO_RSVD_12",	"n/a",			"n/a",		"n/a",
+};
+
+const struct gpio_group cannonlake_pch_lp_group_d = {
+	.display	= "------- GPIO Group GPP_D -------",
+	.pad_count	= ARRAY_SIZE(cannonlake_pch_lp_group_d_names) / 4,
+	.func_count	= 4,
+	.pad_names	= cannonlake_pch_lp_group_d_names,
+};
+
+const char *const cannonlake_pch_lp_group_e_names[] = {
+	"GPP_E0",	"SATAXPCIE0",		"SATAGP0",	"n/a",
+	"GPP_E1",	"SATAXPCIE1",		"n/a",		"n/a",
+	"GPP_E2",	"SATAXPCIE2",		"n/a",		"n/a",
+	"GPP_E3",	"CPU_GP0",		"n/a",		"n/a",
+	"GPP_E4",	"SATA_DEVSLP0",		"n/a",		"n/a",
+	"GPP_E5",	"SATA_DEVSLP1",		"n/a",		"n/a",
+	"GPP_E6",	"SATA_DEVSLP2",		"n/a",		"n/a",
+	"GPP_E7",	"CPU_GP1",		"n/a",		"n/a",
+	"GPP_E8",	"SATALED#",		"n/a",		"n/a",
+	"GPP_E9",	"USB2_OC0#",		"n/a",		"n/a",
+	"GPP_E10",	"USB2_OC1#",		"n/a",		"n/a",
+	"GPP_E11",	"USB2_OC2#",		"n/a",		"n/a",
+	"GPP_E12",	"USB2_OC3#",		"n/a",		"n/a",
+	"GPP_E13",	"DDPB_HPD0",		"DISP_MISC0",	"n/a",
+	"GPP_E14",	"DDPC_HPD1",		"DISP_MISC1",	"n/a",
+	"GPP_E15",	"DDPD_HPD2",		"DISP_MISC2",	"n/a",
+	"GPP_E16",	"n/a",			"DISP_MISC3",	"n/a",
+	"GPP_E17",	"EDP_HPD",		"DISP_MISC4",	"n/a",
+	"GPP_E18",	"DPPB_CTRLCLK",		"n/a",		"CNV_BT_HOST_WAKE#",
+	"GPP_E19",	"DPPB_CTRLDATA",	"n/a",		"CNV_BT_IF_SELECT",
+	"GPP_E20",	"DPPC_CTRLCLK",		"n/a",		"n/a",
+	"GPP_E21",	"DPPC_CTRLDATA",	"n/a",		"n/a",
+	"GPP_E22",	"DPPD_CTRLCLK",		"n/a",		"n/a",
+	"GPP_E23",	"DPPD_CTRLDATA",	"n/a",		"n/a",
+};
+
+const struct gpio_group cannonlake_pch_lp_group_e = {
+	.display	= "------- GPIO Group GPP_E -------",
+	.pad_count	= ARRAY_SIZE(cannonlake_pch_lp_group_e_names) / 4,
+	.func_count	= 4,
+	.pad_names	= cannonlake_pch_lp_group_e_names,
+};
+
+const char *const cannonlake_pch_lp_group_f_names[] = {
+	"GPP_F0",	"CNV_PA_BLANKING",	"n/a",
+	"GPP_F1",	"n/a",			"n/a",
+	"GPP_F2",	"n/a",			"n/a",
+	"GPP_F3",	"n/a",			"n/a",
+	"GPP_F4",	"CNV_BRI_DT",		"UART0_RTS#",
+	"GPP_F5",	"CNV_BRI_RSP",		"UART0_RXD",
+	"GPP_F6",	"CNV_RGI_DT",		"UART0_TXD",
+	"GPP_F7",	"CNV_RGI_RSP",		"UART0_CTS#",
+	"GPP_F8",	"CNV_MFUART2_RXD",	"n/a",
+	"GPP_F9",	"CNV_MFUART2_TXD",	"n/a",
+	"GPP_F10",	"n/a",			"n/a",
+	"GPP_F11",	"EMMC_CMD",		"n/a",
+	"GPP_F12",	"EMMC_DATA0",		"n/a",
+	"GPP_F13",	"EMMC_DATA1",		"n/a",
+	"GPP_F14",	"EMMC_DATA2",		"n/a",
+	"GPP_F15",	"EMMC_DATA3",		"n/a",
+	"GPP_F16",	"EMMC_DATA4",		"n/a",
+	"GPP_F17",	"EMMC_DATA5",		"n/a",
+	"GPP_F18",	"EMMC_DATA6",		"n/a",
+	"GPP_F19",	"EMMC_DATA7",		"n/a",
+	"GPP_F20",	"EMMC_RCLK",		"n/a",
+	"GPP_F21",	"EMMC_CLK",		"n/a",
+	"GPP_F22",	"EMMC_RESET#",		"n/a",
+	"GPP_F23",	"A4WP_PRESENT",		"n/a",
+};
+
+const struct gpio_group cannonlake_pch_lp_group_f = {
+	.display	= "------- GPIO Group GPP_F -------",
+	.pad_count	= ARRAY_SIZE(cannonlake_pch_lp_group_f_names) / 3,
+	.func_count	= 3,
+	.pad_names	= cannonlake_pch_lp_group_f_names,
+};
+
+const char *const cannonlake_pch_lp_group_g_names[] = {
+	"GPP_G0",	"SD_CMD",
+	"GPP_G1",	"SD_DATA0",
+	"GPP_G2",	"SD_DATA1",
+	"GPP_G3",	"SD_DATA2",
+	"GPP_G4",	"SD_DATA3",
+	"GPP_G5",	"SD3_CD#",
+	"GPP_G6",	"SD3_CLK",
+	"GPP_G7",	"SD3_WP",
+};
+
+const struct gpio_group cannonlake_pch_lp_group_g = {
+	.display	= "------- GPIO Group GPP_G -------",
+	.pad_count	= ARRAY_SIZE(cannonlake_pch_lp_group_g_names) / 2,
+	.func_count	= 2,
+	.pad_names	= cannonlake_pch_lp_group_g_names,
+};
+
+const char *const cannonlake_pch_lp_group_h_names[] = {
+	"GPP_H0",	"I2S2_SCLK",		"CNV_BT_I2S_SCLK",	"n/a",
+	"GPP_H1",	"I2S2_SFRM",		"CNV_BT_I2S_BCLK",	"CNV_RF_RESET#",
+	"GPP_H2",	"I2S2_TXD",		"CNV_BT_I2S_SDI",	"MODEM_CLKREQ",
+	"GPP_H3",	"I2S2_RXD",		"CNV_BT_I2S_SDO",	"n/a",
+	"GPP_H4",	"I2C2_SDA",		"n/a",			"n/a",
+	"GPP_H5",	"I2C2_SCL",		"n/a",			"n/a",
+	"GPP_H6",	"I2C3_SDA",		"n/a",			"n/a",
+	"GPP_H7",	"I2C3_SCL",		"n/a",			"n/a",
+	"GPP_H8",	"I2C4_SDA",		"n/a",			"n/a",
+	"GPP_H9",	"I2C4_SCL",		"n/a",			"n/a",
+	"GPP_H10",	"I2C5_SDA",		"ISH_I2C2_SDA",		"n/a",
+	"GPP_H11",	"I2C5_SCL",		"ISH_I2C2_SCL",		"n/a",
+	"GPP_H12",	"M2_SKT2_CFG0",		"n/a",			"n/a",
+	"GPP_H13",	"M2_SKT2_CFG1",		"n/a",			"n/a",
+	"GPP_H14",	"M2_SKT2_CFG2",		"n/a",			"n/a",
+	"GPP_H15",	"M2_SKT2_CFG3",		"n/a",			"n/a",
+	"GPP_H16",	"n/a",			"n/a",			"n/a",
+	"GPP_H17",	"n/a",			"n/a",			"n/a",
+	"GPP_H18",	"CPU_C10_GATE#",	"n/a",			"n/a",
+	"GPP_H19",	"TIME_SYNC0",		"n/a",			"n/a",
+	"GPP_H20",	"IMGCLKOUT1",		"n/a",			"n/a",
+	"GPP_H21",	"n/a",			"n/a",			"n/a",
+	"GPP_H22",	"n/a",			"n/a",			"n/a",
+	"GPP_H23",	"n/a",			"n/a",			"n/a",
+};
+
+const struct gpio_group cannonlake_pch_lp_group_h = {
+	.display	= "------- GPIO Group GPP_H -------",
+	.pad_count	= ARRAY_SIZE(cannonlake_pch_lp_group_h_names) / 4,
+	.func_count	= 4,
+	.pad_names	= cannonlake_pch_lp_group_h_names,
+};
+
+const char *const cannonlake_pch_lp_group_gpd_names[] = {
+	"GPD0",		"BATLOW#",
+	"GPD1",		"ACPRESENT",
+	"GPD2",		"LAN_WAKE#",
+	"GPD3",		"PRWBTN#",
+	"GPD4",		"SLP_S3#",
+	"GPD5",		"SLP_S4#",
+	"GPD6",		"SLP_A#",
+	"GPD7",		"n/a",
+	"GPD8",		"SUSCLK",
+	"GPD9",		"SLP_WLAN#",
+	"GPD10",	"SLP_S5#",
+	"GPD11",	"LANPHYPC",
+};
+const struct gpio_group cannonlake_pch_lp_group_gpd = {
+	.display	= "------- GPIO Group GPD -------",
+	.pad_count	= ARRAY_SIZE(cannonlake_pch_lp_group_gpd_names) / 2,
+	.func_count	= 2,
+	.pad_names	= cannonlake_pch_lp_group_gpd_names,
+};
+
+const struct gpio_group *const cannonlake_pch_lp_community_0_groups[] = {
+	&cannonlake_pch_lp_group_a,
+	&cannonlake_pch_lp_group_b,
+	&cannonlake_pch_lp_group_g,
+};
+const struct gpio_community cannonlake_pch_lp_community_0 = {
+	.name		= "------- GPIO Community 0 -------",
+	.pcr_port_id	= 0x6e,
+	.group_count	= ARRAY_SIZE(cannonlake_pch_lp_community_0_groups),
+	.groups		= cannonlake_pch_lp_community_0_groups,
+};
+
+const struct gpio_group *const cannonlake_pch_lp_community_1_groups[] = {
+	&cannonlake_pch_lp_group_d,
+	&cannonlake_pch_lp_group_f,
+	&cannonlake_pch_lp_group_h,
+};
+const struct gpio_community cannonlake_pch_lp_community_1 = {
+	.name		= "------- GPIO Community 1 -------",
+	.pcr_port_id	= 0x6d,
+	.group_count	= ARRAY_SIZE(cannonlake_pch_lp_community_1_groups),
+	.groups		= cannonlake_pch_lp_community_1_groups,
+};
+
+const struct gpio_group *const cannonlake_pch_lp_community_2_groups[] = {
+	&cannonlake_pch_lp_group_gpd,
+};
+
+const struct gpio_community cannonlake_pch_lp_community_2 = {
+	.name		= "------- GPIO Community 2 -------",
+	.pcr_port_id	= 0x6c,
+	.group_count	= ARRAY_SIZE(cannonlake_pch_lp_community_2_groups),
+	.groups		= cannonlake_pch_lp_community_2_groups,
+};
+
+const struct gpio_group *const cannonlake_pch_lp_community_4_groups[] = {
+	&cannonlake_pch_lp_group_c,
+	&cannonlake_pch_lp_group_e,
+};
+
+const struct gpio_community cannonlake_pch_lp_community_4 = {
+	.name		= "------- GPIO Community 4 -------",
+	.pcr_port_id	= 0x6a,
+	.group_count	= ARRAY_SIZE(cannonlake_pch_lp_community_4_groups),
+	.groups		= cannonlake_pch_lp_community_4_groups,
+};
+
+const struct gpio_community *const cannonlake_pch_lp_communities[] = {
+	&cannonlake_pch_lp_community_0,
+	&cannonlake_pch_lp_community_1,
+	&cannonlake_pch_lp_community_2,
+	&cannonlake_pch_lp_community_4,
+};
+
+#endif
diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c
index d51767c9fa..0e84b550fc 100644
--- a/util/inteltool/inteltool.c
+++ b/util/inteltool/inteltool.c
@@ -143,6 +143,10 @@ static const struct {
 	  "7th generation (Kaby Lake family) Core Processor (Mobile)" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_E3,
 	  "7th generation (Kaby Lake family) Core Processor Xeon E3-1200" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_8TH_GEN_U_1,
+	  "8th generation (Coffee Lake family) Core Processor (Mobile)" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_8TH_GEN_U_2,
+	  "8th generation (Whiskey Lake family) Core Processor (Mobile)" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_10TH_GEN_U,
 	  "10th generation (Icelake family) Core Processor (Mobile)" },
 	/* Southbridges (LPC controllers) */
@@ -258,6 +262,8 @@ static const struct {
 	  "Sunrise Point-LP U iHDCP 2.2 Premium/Kabylake" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_IHDCP_PREM,
 	  "Sunrise Point-LP Y iHDCP 2.2 Premium/Kabylake" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONPOINT_LP_U_PREM,
+	  "Cannon Point-LP U Premium/CoffeeLake/Whiskeylake" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_H110, "H110" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_H170, "H170" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Z170, "Z170" },
diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
index 49af276107..2bd2afcb40 100644
--- a/util/inteltool/inteltool.h
+++ b/util/inteltool/inteltool.h
@@ -156,6 +156,7 @@ static inline uint32_t inl(unsigned port)
 #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_BASE	0x9d50
 #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_PREM	0x9d4e
 #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_IHDCP_PREM	0x9d4b
+#define PCI_DEVICE_ID_INTEL_CANNONPOINT_LP_U_PREM	0x9d84
 #define PCI_DEVICE_ID_INTEL_H110		0xa143
 #define PCI_DEVICE_ID_INTEL_H170		0xa144
 #define PCI_DEVICE_ID_INTEL_Z170		0xa145
@@ -294,6 +295,8 @@ static inline uint32_t inl(unsigned port)
 #define PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_Y	0x590C /* Kabylake (Mobile) */
 #define PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_U_Q	0x5914 /* Kabylake (Mobile) */
 #define PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_E3	0x5918 /* Kabylake Xeon E3 */
+#define PCI_DEVICE_ID_INTEL_CORE_8TH_GEN_U_1	0x3ed0 /* Coffeelake (Mobile) */
+#define PCI_DEVICE_ID_INTEL_CORE_8TH_GEN_U_2	0x3e34 /* Whiskeylake (Mobile) */
 #define PCI_DEVICE_ID_INTEL_CORE_10TH_GEN_U	0x8a12 /* Icelake U */
 
 
diff --git a/util/inteltool/memory.c b/util/inteltool/memory.c
index e7523f3501..22de2a9f9d 100644
--- a/util/inteltool/memory.c
+++ b/util/inteltool/memory.c
@@ -227,6 +227,8 @@ int print_mchbar(struct pci_dev *nb, struct pci_access *pacc, const char *dump_s
 	case PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_Y:
 	case PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_U_Q:
 	case PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_E3:
+	case PCI_DEVICE_ID_INTEL_CORE_8TH_GEN_U_1:
+	case PCI_DEVICE_ID_INTEL_CORE_8TH_GEN_U_2:
 		mchbar_phys = pci_read_long(nb, 0x48);
 		mchbar_phys |= ((uint64_t)pci_read_long(nb, 0x4c)) << 32;
 		mchbar_phys &= 0x0000007fffff8000UL; /* 38:15 */
diff --git a/util/inteltool/pcie.c b/util/inteltool/pcie.c
index b7c72cb140..9b13087c5d 100644
--- a/util/inteltool/pcie.c
+++ b/util/inteltool/pcie.c
@@ -272,6 +272,8 @@ int print_epbar(struct pci_dev *nb)
 	case PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_Y:
 	case PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_U_Q:
 	case PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_E3:
+	case PCI_DEVICE_ID_INTEL_CORE_8TH_GEN_U_1:
+	case PCI_DEVICE_ID_INTEL_CORE_8TH_GEN_U_2:
 		epbar_phys = pci_read_long(nb, 0x40) & 0xfffffffe;
 		epbar_phys |= ((uint64_t)pci_read_long(nb, 0x44)) << 32;
 		break;
@@ -399,6 +401,8 @@ int print_dmibar(struct pci_dev *nb)
 	case PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_Y:
 	case PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_U_Q:
 	case PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_E3:
+	case PCI_DEVICE_ID_INTEL_CORE_8TH_GEN_U_1:
+	case PCI_DEVICE_ID_INTEL_CORE_8TH_GEN_U_2:
 		dmi_registers = skylake_dmi_registers;
 		size = ARRAY_SIZE(skylake_dmi_registers);
 		dmibar_phys = pci_read_long(nb, 0x68);
@@ -510,6 +514,8 @@ int print_pciexbar(struct pci_dev *nb)
 	case PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_Y:
 	case PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_U_Q:
 	case PCI_DEVICE_ID_INTEL_CORE_7TH_GEN_E3:
+	case PCI_DEVICE_ID_INTEL_CORE_8TH_GEN_U_1:
+	case PCI_DEVICE_ID_INTEL_CORE_8TH_GEN_U_2:
 		pciexbar_reg = pci_read_long(nb, 0x60);
 		pciexbar_reg |= ((uint64_t)pci_read_long(nb, 0x64)) << 32;
 		break;
diff --git a/util/inteltool/pcr.c b/util/inteltool/pcr.c
index f4bf87bfb2..8131fdd6a7 100644
--- a/util/inteltool/pcr.c
+++ b/util/inteltool/pcr.c
@@ -132,6 +132,7 @@ void pcr_init(struct pci_dev *const sb)
 	case PCI_DEVICE_ID_INTEL_QM370:
 	case PCI_DEVICE_ID_INTEL_HM370:
 	case PCI_DEVICE_ID_INTEL_CM246:
+	case PCI_DEVICE_ID_INTEL_CANNONPOINT_LP_U_PREM:
 	case PCI_DEVICE_ID_INTEL_ICELAKE_LP_U:
 		sbbar_phys = 0xfd000000;
 		use_p2sb = false;
diff --git a/util/inteltool/powermgt.c b/util/inteltool/powermgt.c
index 54a3045b84..3f489b88fa 100644
--- a/util/inteltool/powermgt.c
+++ b/util/inteltool/powermgt.c
@@ -837,6 +837,7 @@ int print_pmbase(struct pci_dev *sb, struct pci_access *pacc)
 
 	case PCI_DEVICE_ID_INTEL_CM236:
 	case PCI_DEVICE_ID_INTEL_C236:
+	case PCI_DEVICE_ID_INTEL_CANNONPOINT_LP_U_PREM:
 		acpi = pci_get_dev(pacc, sb->domain, sb->bus, sb->dev, 2);
 		if (!acpi) {
 			printf("PMC device not found.\n");