@@ -434,8 +434,7 @@ void intel_check_pch(void);
IS_KBL_GT2(devid) || \
IS_KBL_GT3(devid))
-#define IS_SKYLAKE(devid) (IS_KABYLAKE(devid) || \
- IS_SKL_GT1(devid) || \
+#define IS_SKYLAKE(devid) (IS_SKL_GT1(devid) || \
IS_SKL_GT2(devid) || \
IS_SKL_GT3(devid))
@@ -443,7 +442,9 @@ void intel_check_pch(void);
(devid) == PCI_CHIP_BROXTON_1 || \
(devid) == PCI_CHIP_BROXTON_2)
-#define IS_GEN9(devid) (IS_SKYLAKE(devid) || IS_BROXTON(devid))
+#define IS_GEN9(devid) (IS_KABYLAKE(devid) || \
+ IS_SKYLAKE(devid) || \
+ IS_BROXTON(devid))
#define IS_965(devid) (IS_GEN4(devid) || \
IS_GEN5(devid) || \
Remove the KBL check from IS_SKYLAKE() following the kernel definition. Then, add the KBL check to IS_GEN9(). The idea is to avoid confusion. On the kernel side, the mix of SKY and KBL was nacked so the platforms are split. Signed-off-by: Wayne Boyer <wayne.boyer@intel.com> --- lib/intel_chipset.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)