From 667d0f8966d5938a81c37202be7568fce42e2b81 Mon Sep 17 00:00:00 2001 From: Maximilian Brune Date: Thu, 11 Aug 2022 12:58:06 +0200 Subject: Fix Alder Lake and Raptor Lake Device ID's - ADP_P_* -> RPP_S_* (got mixed up I guess) - Remove duplicates of ADP_S_ESPI_* - Add infix _ESPI_ to all ADP_S device ID's Document: 619362 Change-Id: Ic18ecbd420fc598f0ef6e3cf38e987ac3ae6067e Signed-off-by: Maximilian Brune Reviewed-on: https://review.coreboot.org/c/coreboot/+/66629 Reviewed-by: Lean Sheng Tan Tested-by: build bot (Jenkins) --- .../intel/alderlake/bootblock/report_platform.c | 84 +++++++++++----------- 1 file changed, 41 insertions(+), 43 deletions(-) (limited to 'src/soc/intel/alderlake') diff --git a/src/soc/intel/alderlake/bootblock/report_platform.c b/src/soc/intel/alderlake/bootblock/report_platform.c index 517f24279f..3c27ded892 100644 --- a/src/soc/intel/alderlake/bootblock/report_platform.c +++ b/src/soc/intel/alderlake/bootblock/report_platform.c @@ -81,54 +81,52 @@ static struct { u16 espiid; const char *name; } pch_table[] = { - { PCI_DID_INTEL_ADP_P_ESPI_0, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_1, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_2, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_3, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_4, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_5, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_6, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_7, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_8, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_9, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_10, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_11, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_12, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_13, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_14, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_15, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_16, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_17, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_18, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_19, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_20, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_21, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_22, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_23, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_24, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_25, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_26, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_27, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_28, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_29, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_30, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_31, "Alderlake-P SKU" }, { PCI_DID_INTEL_ADP_M_N_ESPI_1, "Alderlake-N SKU" }, { PCI_DID_INTEL_ADP_M_N_ESPI_2, "Alderlake-N SKU" }, { PCI_DID_INTEL_ADP_S_ESPI_H610E, "AlderLake-S H610E" }, { PCI_DID_INTEL_ADP_S_ESPI_Q670E, "AlderLake-S Q670E" }, { PCI_DID_INTEL_ADP_S_ESPI_R680E, "AlderLake-S R680E" }, - { PCI_DID_INTEL_ADP_S_H610, "AlderLake-S H610" }, - { PCI_DID_INTEL_ADP_S_B660, "AlderLake-S B660" }, - { PCI_DID_INTEL_ADP_S_H670, "AlderLake-S H670" }, - { PCI_DID_INTEL_ADP_S_Q670, "AlderLake-S Q670" }, - { PCI_DID_INTEL_ADP_S_Z690, "AlderLake-S Z690" }, - { PCI_DID_INTEL_ADP_S_W680, "AlderLake-S W680" }, - { PCI_DID_INTEL_ADP_S_W685, "AlderLake-S W685" }, - { PCI_DID_INTEL_ADP_S_WM690, "AlderLake-S WM690" }, - { PCI_DID_INTEL_ADP_S_HM670, "AlderLake-S HM670" }, - { PCI_DID_INTEL_ADP_S_WM790, "AlderLake-S WM790" }, - { PCI_DID_INTEL_ADP_S_HM770, "AlderLake-S HM770" }, + { PCI_DID_INTEL_ADP_S_ESPI_H610, "AlderLake-S H610" }, + { PCI_DID_INTEL_ADP_S_ESPI_B660, "AlderLake-S B660" }, + { PCI_DID_INTEL_ADP_S_ESPI_H670, "AlderLake-S H670" }, + { PCI_DID_INTEL_ADP_S_ESPI_Q670, "AlderLake-S Q670" }, + { PCI_DID_INTEL_ADP_S_ESPI_Z690, "AlderLake-S Z690" }, + { PCI_DID_INTEL_ADP_S_ESPI_W680, "AlderLake-S W680" }, + { PCI_DID_INTEL_ADP_S_ESPI_W685, "AlderLake-S W685" }, + { PCI_DID_INTEL_ADP_S_ESPI_WM690, "AlderLake-S WM690" }, + { PCI_DID_INTEL_ADP_S_ESPI_HM670, "AlderLake-S HM670" }, + { PCI_DID_INTEL_RPP_S_ESPI_0, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_1, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_2, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_3, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_4, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_5, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_6, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_7, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_8, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_9, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_10, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_11, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_HM770, "Raptorlake-S HM770" }, + { PCI_DID_INTEL_RPP_S_ESPI_WM790, "Raptorlake-S WM790" }, + { PCI_DID_INTEL_RPP_S_ESPI_14, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_15, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_16, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_17, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_18, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_19, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_20, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_21, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_22, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_23, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_24, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_25, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_26, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_27, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_28, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_29, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_30, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_31, "Raptorlake-S SKU" }, { PCI_DID_INTEL_RPP_P_ESPI_0, "Raptorlake-P SKU" }, { PCI_DID_INTEL_RPP_P_ADP_P_ESPI_1, "Raptorlake-P SKU" }, { PCI_DID_INTEL_RPP_P_ADP_P_ESPI_2, "Raptorlake-P SKU" }, -- cgit v1.2.3