diff --git a/src/mainboard/prodrive/hermes/Kconfig b/src/mainboard/prodrive/hermes/Kconfig
index 2fecc06f6d..af07ee10c8 100644
--- a/src/mainboard/prodrive/hermes/Kconfig
+++ b/src/mainboard/prodrive/hermes/Kconfig
@@ -14,6 +14,7 @@ config BOARD_PRODRIVE_HERMES_BASEBOARD
 	select INTEL_GMA_HAVE_VBT
 	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
 	select ONBOARD_VGA_IS_PRIMARY
+	select SMBIOS_TYPE41_PROVIDED_BY_DEVTREE
 	select HAVE_ACPI_RESUME if !HERMES_USES_SPS_FIRMWARE
 	select DISABLE_ACPI_HIBERNATE if HERMES_USES_SPS_FIRMWARE
 
diff --git a/src/mainboard/prodrive/hermes/devicetree.cb b/src/mainboard/prodrive/hermes/devicetree.cb
index 8faf016e7c..e0655c5630 100644
--- a/src/mainboard/prodrive/hermes/devicetree.cb
+++ b/src/mainboard/prodrive/hermes/devicetree.cb
@@ -199,18 +199,30 @@ chip soc/intel/cannonlake
 		device pci 1c.4 on	# PCIe root port 5 (PHY 3)
 			register "PcieRpEnable[4]" = "1"
 			register "PcieRpLtrEnable[4]" = "1"
+			device pci 00.0 on
+				smbios_dev_info 3
+			end
 		end
 		device pci 1c.5 on	# PCIe root port 6 (PHY 4)
 			register "PcieRpEnable[5]" = "1"
 			register "PcieRpLtrEnable[5]" = "1"
+			device pci 00.0 on
+				smbios_dev_info 4
+			end
 		end
 		device pci 1c.6 on	# PCIe root port 7 (PHY 2)
 			register "PcieRpEnable[6]" = "1"
 			register "PcieRpLtrEnable[6]" = "1"
+			device pci 00.0 on
+				smbios_dev_info 2
+			end
 		end
 		device pci 1c.7 on	# PCIe root port 8 (PHY 1)
 			register "PcieRpEnable[7]" = "1"
 			register "PcieRpLtrEnable[7]" = "1"
+			device pci 00.0 on
+				smbios_dev_info 1
+			end
 		end
 		device pci 1d.0 on	# PCIe root port 9 (M2 M)
 			smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "M2 M" "SlotDataBusWidth4X"
@@ -221,6 +233,9 @@ chip soc/intel/cannonlake
 		device pci 1d.5 on	# PCIe root port 14 (PHY 0)
 			register "PcieRpEnable[13]" = "1"
 			register "PcieRpLtrEnable[13]" = "1"
+			device pci 00.0 on
+				smbios_dev_info 0
+			end
 		end
 		device pci 1d.6 on	# PCIe root port 15 (BMC)
 			device pci 00.0 on	# Aspeed PCI Bridge