From f8f682b024f7b9ff0a8c98147c45147d8266d55f Mon Sep 17 00:00:00 2001 From: Naresh G Solanki Date: Sat, 8 Apr 2017 17:46:06 +0530 Subject: soc/intel/skylake: Add ID's for Kabylake-R Add CPUID, IGD, MCH & LPC ID of Kabylake-R. Change-Id: I5ee7b3a2616f71137bba83c071288dbda2acde3d Signed-off-by: Naresh G Solanki Reviewed-on: https://review.coreboot.org/19218 Reviewed-by: Aaron Durbin Reviewed-by: Balaji Manigandan Reviewed-by: Furquan Shaikh Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel --- src/soc/intel/skylake/bootblock/report_platform.c | 3 +++ src/soc/intel/skylake/cpu.c | 1 + src/soc/intel/skylake/igd.c | 1 + src/soc/intel/skylake/include/soc/cpu.h | 1 + src/soc/intel/skylake/include/soc/pch.h | 1 + src/soc/intel/skylake/include/soc/systemagent.h | 2 ++ src/soc/intel/skylake/lpc.c | 1 + src/soc/intel/skylake/systemagent.c | 1 + 8 files changed, 11 insertions(+) (limited to 'src/soc/intel/skylake') diff --git a/src/soc/intel/skylake/bootblock/report_platform.c b/src/soc/intel/skylake/bootblock/report_platform.c index 63cd6367ab..c50a6dd5eb 100644 --- a/src/soc/intel/skylake/bootblock/report_platform.c +++ b/src/soc/intel/skylake/bootblock/report_platform.c @@ -36,6 +36,7 @@ static struct { { CPUID_SKYLAKE_HR0, "Skylake H R0" }, { CPUID_KABYLAKE_G0, "Kabylake G0" }, { CPUID_KABYLAKE_H0, "Kabylake H0" }, + { CPUID_KABYLAKE_Y0, "Kabylake Y0" }, { CPUID_KABYLAKE_HA0, "Kabylake H A0" }, { CPUID_KABYLAKE_HB0, "Kabylake H B0" }, }; @@ -50,6 +51,7 @@ static struct { { MCH_SKYLAKE_ID_H, "Skylake-H" }, { MCH_SKYLAKE_ID_H_EM, "Skylake-H Embedded" }, { MCH_KABYLAKE_ID_U, "Kabylake-U" }, + { MCH_KABYLAKE_ID_U_R, "Kabylake-R ULT"}, { MCH_KABYLAKE_ID_Y, "Kabylake-Y" }, { MCH_KABYLAKE_ID_H, "Kabylake-H" }, }; @@ -82,6 +84,7 @@ static struct { { IGD_KABYLAKE_GT1_SULTM, "Kabylake ULT GT1"}, { IGD_KABYLAKE_GT2_SULXM, "Kabylake ULX GT2" }, { IGD_KABYLAKE_GT2_SULTM, "Kabylake ULT GT2" }, + { IGD_KABYLAKE_GT2_SULTMR, "Kabylake-R ULT GT2"}, { IGD_KABYLAKE_GT2_SHALM, "Kabylake HALO GT2" }, }; diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c index 600a15f3d9..0b1b9af6ce 100644 --- a/src/soc/intel/skylake/cpu.c +++ b/src/soc/intel/skylake/cpu.c @@ -400,6 +400,7 @@ static struct cpu_device_id cpu_table[] = { { X86_VENDOR_INTEL, CPUID_SKYLAKE_HR0 }, { X86_VENDOR_INTEL, CPUID_KABYLAKE_G0 }, { X86_VENDOR_INTEL, CPUID_KABYLAKE_H0 }, + { X86_VENDOR_INTEL, CPUID_KABYLAKE_Y0 }, { X86_VENDOR_INTEL, CPUID_KABYLAKE_HA0 }, { X86_VENDOR_INTEL, CPUID_KABYLAKE_HB0 }, { 0, 0 }, diff --git a/src/soc/intel/skylake/igd.c b/src/soc/intel/skylake/igd.c index 30c9eda9b0..2d0187fffc 100644 --- a/src/soc/intel/skylake/igd.c +++ b/src/soc/intel/skylake/igd.c @@ -195,6 +195,7 @@ static const unsigned short pci_device_ids[] = { IGD_KABYLAKE_GT1_SULTM, IGD_KABYLAKE_GT2_SULXM, IGD_KABYLAKE_GT2_SULTM, + IGD_KABYLAKE_GT2_SULTMR, IGD_KABYLAKE_GT2_SHALM, 0, }; diff --git a/src/soc/intel/skylake/include/soc/cpu.h b/src/soc/intel/skylake/include/soc/cpu.h index a259a2bafb..9171172272 100644 --- a/src/soc/intel/skylake/include/soc/cpu.h +++ b/src/soc/intel/skylake/include/soc/cpu.h @@ -30,6 +30,7 @@ #define CPUID_SKYLAKE_HR0 0x506e3 #define CPUID_KABYLAKE_G0 0x406e8 #define CPUID_KABYLAKE_H0 0x806e9 +#define CPUID_KABYLAKE_Y0 0x806ea #define CPUID_KABYLAKE_HA0 0x506e8 #define CPUID_KABYLAKE_HB0 0x906e9 diff --git a/src/soc/intel/skylake/include/soc/pch.h b/src/soc/intel/skylake/include/soc/pch.h index 9be75bf98f..d984b8deba 100644 --- a/src/soc/intel/skylake/include/soc/pch.h +++ b/src/soc/intel/skylake/include/soc/pch.h @@ -30,6 +30,7 @@ #define PCH_SPT_H_PREMIUM 0xa14e #define PCH_SPT_H_QM170 0xa14d #define PCH_KBL_LP_Y_PREMIUM_HDCP22 0x9d4b +#define PCH_KBL_LP_U_PREMIUM_HDCP22 0x9d4e #define PCH_KBL_LP_U_PREMIUM 0x9d58 #define PCH_KBL_LP_Y_PREMIUM 0x9d56 diff --git a/src/soc/intel/skylake/include/soc/systemagent.h b/src/soc/intel/skylake/include/soc/systemagent.h index c9b0bac5c7..4b26387e1a 100644 --- a/src/soc/intel/skylake/include/soc/systemagent.h +++ b/src/soc/intel/skylake/include/soc/systemagent.h @@ -31,6 +31,7 @@ #define IGD_KABYLAKE_GT1_SULTM 0x5906 #define IGD_KABYLAKE_GT2_SULXM 0x591E #define IGD_KABYLAKE_GT2_SULTM 0x5916 +#define IGD_KABYLAKE_GT2_SULTMR 0x5917 #define IGD_KABYLAKE_GT2_SHALM 0x591B #define MCH_SKYLAKE_ID_U 0x1904 @@ -41,6 +42,7 @@ #define MCH_KABYLAKE_ID_U 0x5904 #define MCH_KABYLAKE_ID_Y 0x590c #define MCH_KABYLAKE_ID_H 0x5910 +#define MCH_KABYLAKE_ID_U_R 0x5914 /* Device 0:0.0 PCI configuration space */ diff --git a/src/soc/intel/skylake/lpc.c b/src/soc/intel/skylake/lpc.c index 82207ed012..db2b9607a5 100644 --- a/src/soc/intel/skylake/lpc.c +++ b/src/soc/intel/skylake/lpc.c @@ -324,6 +324,7 @@ static const unsigned short pci_device_ids[] = { PCH_KBL_LP_U_PREMIUM, PCH_KBL_LP_Y_PREMIUM, PCH_KBL_LP_Y_PREMIUM_HDCP22, + PCH_KBL_LP_U_PREMIUM_HDCP22, 0 }; diff --git a/src/soc/intel/skylake/systemagent.c b/src/soc/intel/skylake/systemagent.c index 6182164f48..f15d26e25b 100644 --- a/src/soc/intel/skylake/systemagent.c +++ b/src/soc/intel/skylake/systemagent.c @@ -417,6 +417,7 @@ static const unsigned short systemagent_ids[] = { MCH_SKYLAKE_ID_H, MCH_SKYLAKE_ID_H_EM, MCH_KABYLAKE_ID_U, + MCH_KABYLAKE_ID_U_R, MCH_KABYLAKE_ID_Y, MCH_KABYLAKE_ID_H, 0 -- cgit v1.2.3