diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 6c3c2980d1..59a3883ec7 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -3399,9 +3399,11 @@
 #define PCI_DEVICE_ID_INTEL_CML_ULT_6_2		0x9B51
 #define PCI_DEVICE_ID_INTEL_CML_ULX		0x9B60
 #define PCI_DEVICE_ID_INTEL_CML_S		0x9B55
-#define PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2	0x9B53
-#define PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2	0x9B35
+#define PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2	0x9B33
 #define PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2	0x9B43
+#define PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2	0x9B53
+#define PCI_DEVICE_ID_INTEL_CML_S_G0G1_4	0x9B63
+#define PCI_DEVICE_ID_INTEL_CML_S_G0G1_2	0x9B73
 #define PCI_DEVICE_ID_INTEL_CML_H		0x9B54
 #define PCI_DEVICE_ID_INTEL_CML_H_4_2		0x9B64
 #define PCI_DEVICE_ID_INTEL_CML_H_8_2		0x9B44
diff --git a/src/soc/intel/cannonlake/bootblock/report_platform.c b/src/soc/intel/cannonlake/bootblock/report_platform.c
index 19dce0002a..67dd452e8e 100644
--- a/src/soc/intel/cannonlake/bootblock/report_platform.c
+++ b/src/soc/intel/cannonlake/bootblock/report_platform.c
@@ -83,6 +83,8 @@ static struct {
 	{ PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2, "CometLake-S G0/G1/P0/P1 (6+2)" },
 	{ PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2, "CometLake-S P0/P1 (8+2)" },
 	{ PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2, "CometLake-S P0/P1 (10+2)" },
+	{ PCI_DEVICE_ID_INTEL_CML_S_G0G1_4, "CometLake-S G0/G1 (4+2)" },
+	{ PCI_DEVICE_ID_INTEL_CML_S_G0G1_2, "CometLake-S G0/G1 (2+2)" },
 	{ PCI_DEVICE_ID_INTEL_CML_H, "CometLake-H (6+2)" },
 	{ PCI_DEVICE_ID_INTEL_CML_H_4_2, "CometLake-H (4+2)" },
 	{ PCI_DEVICE_ID_INTEL_CML_H_8_2, "CometLake-H (8+2)" },
diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c
index 0fab7d9619..50e052414a 100644
--- a/src/soc/intel/common/block/systemagent/systemagent.c
+++ b/src/soc/intel/common/block/systemagent/systemagent.c
@@ -391,6 +391,8 @@ static const unsigned short systemagent_ids[] = {
 	PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2,
 	PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2,
 	PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2,
+	PCI_DEVICE_ID_INTEL_CML_S_G0G1_4,
+	PCI_DEVICE_ID_INTEL_CML_S_G0G1_2,
 	PCI_DEVICE_ID_INTEL_CML_H,
 	PCI_DEVICE_ID_INTEL_CML_H_4_2,
 	PCI_DEVICE_ID_INTEL_CML_H_8_2,