diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2170p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/2170p/overridetree.cb
index 8e9688f2e0..092049c286 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/2170p/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/2170p/overridetree.cb
@@ -29,7 +29,10 @@ chip northbridge/intel/sandybridge
 			device ref pcie_rp1 on  end
 			device ref pcie_rp2 off end
 			device ref pcie_rp3 on  end	# SD/MMC
-			device ref pcie_rp4 on  end	# WLAN
+			device ref pcie_rp4 on     	# WLAN
+				smbios_slot_desc "SlotTypePciExpressMini52pinWithoutBSKO"
+					"SlotLengthShort" "Mini PCIe" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp5 off end
 			device ref pcie_rp6 off end
 			device ref pcie_rp7 off end
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2570p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/2570p/overridetree.cb
index b1cc9feb0f..af80813ae0 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/2570p/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/2570p/overridetree.cb
@@ -25,9 +25,15 @@ chip northbridge/intel/sandybridge
 
 			device ref xhci on  end
 			device ref pcie_rp1 on  end
-			device ref pcie_rp2 on  end	# ExpressCard
+			device ref pcie_rp2 on
+				smbios_slot_desc "SlotTypePcmcia" "SlotLengthShort"
+					"ExpressCard Slot" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp3 on  end	# SD/MMC
-			device ref pcie_rp4 on  end	# WLAN
+			device ref pcie_rp4 on     	# WLAN
+				smbios_slot_desc "SlotTypePciExpressMini52pinWithoutBSKO"
+					"SlotLengthShort" "Mini PCIe" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp5 off end
 			device ref pcie_rp6 off end
 			device ref pcie_rp7 off end
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2760p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/2760p/overridetree.cb
index 8299cceb2c..9d1890a15a 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/2760p/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/2760p/overridetree.cb
@@ -21,12 +21,21 @@ chip northbridge/intel/sandybridge
 			register "sata_port_map" = "0x21"
 
 			device ref pcie_rp1 on  end
-			device ref pcie_rp2 on  end	# ExpressCard
+			device ref pcie_rp2 on
+				smbios_slot_desc "SlotTypePcmcia" "SlotLengthShort"
+					"ExpressCard Slot" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp3 on  end	# SD/MMC
-			device ref pcie_rp4 on  end	# WLAN
+			device ref pcie_rp4 on     	# WLAN
+				smbios_slot_desc "SlotTypePciExpressMini52pinWithoutBSKO"
+					"SlotLengthShort" "Mini PCIe" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp5 off end
 			device ref pcie_rp6 off end
-			device ref pcie_rp7 on  end	# WWAN
+			device ref pcie_rp7 on     	# WWAN
+				smbios_slot_desc "SlotTypePciExpressMini52pinWithoutBSKO"
+					"SlotLengthLong" "Mini PCIe" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp8 off end
 			device ref lpc on
 				chip ec/hp/kbc1126
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8460p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/8460p/overridetree.cb
index b87c80a96e..bf640995e9 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/8460p/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/8460p/overridetree.cb
@@ -23,12 +23,21 @@ chip northbridge/intel/sandybridge
 
 			device ref me_kt on  end
 			device ref pcie_rp1 on  end
-			device ref pcie_rp2 on  end	# ExpressCard
+			device ref pcie_rp2 on
+				smbios_slot_desc "SlotTypePcmcia" "SlotLengthShort"
+					"ExpressCard Slot" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp3 on  end	# SD/MMC
-			device ref pcie_rp4 on  end	# WLAN
+			device ref pcie_rp4 on     	# WLAN
+				smbios_slot_desc "SlotTypePciExpressMini52pinWithoutBSKO"
+					"SlotLengthShort" "Mini PCIe" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp5 off end
 			device ref pcie_rp6 off end
-			device ref pcie_rp7 on  end	# WWAN
+			device ref pcie_rp7 on     	# WWAN
+				smbios_slot_desc "SlotTypePciExpressMini52pinWithoutBSKO"
+					"SlotLengthLong" "Mini PCIe" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp8 on  end	# NEC USB 3.0 Host Controller
 			device ref lpc on
 				chip ec/hp/kbc1126
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8470p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/overridetree.cb
index b02b2f931a..cfc53727e2 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/8470p/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/overridetree.cb
@@ -27,9 +27,15 @@ chip northbridge/intel/sandybridge
 			device ref xhci on  end
 			device ref me_kt on  end
 			device ref pcie_rp1 on  end
-			device ref pcie_rp2 on  end	# ExpressCard
+			device ref pcie_rp2 on     	# ExpressCard
+				smbios_slot_desc "SlotTypePcmcia" "SlotLengthShort"
+					"ExpressCard Slot" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp3 on  end	# SD/MMC
-			device ref pcie_rp4 on  end	# WLAN
+			device ref pcie_rp4 on     	# WLAN
+				smbios_slot_desc "SlotTypePciExpressMini52pinWithoutBSKO"
+					"SlotLengthShort" "Mini PCIe" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp5 off end
 			device ref pcie_rp6 off end
 			device ref pcie_rp7 off end
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8770w/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/8770w/overridetree.cb
index d30f17908c..f326c40191 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/8770w/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/8770w/overridetree.cb
@@ -29,7 +29,10 @@ chip northbridge/intel/sandybridge
 			device ref pcie_rp1 on  end
 			device ref pcie_rp2 on  end
 			device ref pcie_rp3 on  end	# Media Card and FireWire host controller
-			device ref pcie_rp4 on  end	# Wireless LAN Adapter
+			device ref pcie_rp4 on     	# Wireless LAN Adapter
+				smbios_slot_desc "SlotTypePciExpressMini52pinWithoutBSKO"
+					"SlotLengthShort" "Mini PCIe" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp5 on  end	# SATA Controller 2 for dock
 			device ref pcie_rp6 off end
 			device ref pcie_rp7 off end
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/overridetree.cb
index 1e690b5738..1e3984d4ba 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/overridetree.cb
@@ -27,7 +27,10 @@ chip northbridge/intel/sandybridge
 			device ref pcie_rp1 on  end
 			device ref pcie_rp2 off end
 			device ref pcie_rp3 on  end	# SDHCI
-			device ref pcie_rp4 on  end	# WLAN
+			device ref pcie_rp4 on     	# WLAN
+				smbios_slot_desc "SlotTypePciExpressMini52pinWithoutBSKO"
+					"SlotLengthShort" "Mini PCIe" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp5 off end
 			device ref pcie_rp6 off end
 			device ref pcie_rp7 off end
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/probook_6360b/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/probook_6360b/overridetree.cb
index b76fe5b3c9..64653bc015 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/probook_6360b/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/probook_6360b/overridetree.cb
@@ -32,7 +32,10 @@ chip northbridge/intel/sandybridge
 			end
 			device ref pcie_rp5 off end
 			device ref pcie_rp6 off end
-			device ref pcie_rp7 on  end # WWAN
+			device ref pcie_rp7 on      # WWAN
+				smbios_slot_desc "SlotTypePciExpressMini52pinWithoutBSKO"
+					"SlotLengthLong" "Mini PCIe" "SlotDataBusWidth1X"
+			end
 			device ref pcie_rp8 off end
 			device ref lpc on
 				chip ec/hp/kbc1126