mb/lenovo: Add SMBIOS type 9 for ExpressCard

Mark all known PCIe root ports as ExpressCard slot.

Tested on Lenovo T520.

Change-Id: I43fb481512a54ee054c6fd0189053028fb3c3ec2
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32309
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

13 files changed, 21 insertions, 4 deletions

diff --git a/src/mainboard/lenovo/t400/devicetree.cb b/src/mainboard/lenovo/t400/devicetree.cb
index 8e90431d5f..475c45ebbd 100644
--- a/src/mainboard/lenovo/t400/devicetree.cb
+++ b/src/mainboard/lenovo/t400/devicetree.cb
@@ -109,6 +109,7 @@ chip northbridge/intel/gm45
 			end # PCIe Port #3
 			device pci 1c.3 on
 				subsystemid 0x17aa 0x20f3 # Expresscard
+				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
 			end # PCIe Port #4
 			device pci 1c.4 off end # PCIe Port #5
 			device pci 1c.5 off end # PCIe Port #6
diff --git a/src/mainboard/lenovo/t420/devicetree.cb b/src/mainboard/lenovo/t420/devicetree.cb
index 47c14ef909..c4092fe901 100644
--- a/src/mainboard/lenovo/t420/devicetree.cb
+++ b/src/mainboard/lenovo/t420/devicetree.cb
@@ -94,6 +94,7 @@ chip northbridge/intel/sandybridge
 			device pci 1c.2 off end # PCIe Port #3
 			device pci 1c.3 on
 				subsystemid 0x17aa 0x21ce
+				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
 			end # PCIe Port #4 ExpressCard
 			device pci 1c.4 on
 				subsystemid 0x17aa 0x21ce
diff --git a/src/mainboard/lenovo/t420s/devicetree.cb b/src/mainboard/lenovo/t420s/devicetree.cb
index 0f09db8fa9..d1e3f75499 100644
--- a/src/mainboard/lenovo/t420s/devicetree.cb
+++ b/src/mainboard/lenovo/t420s/devicetree.cb
@@ -93,6 +93,7 @@ chip northbridge/intel/sandybridge
 			device pci 1c.2 off end # PCIe Port #3
 			device pci 1c.3 on
 				subsystemid 0x17aa 0x21d2
+				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
 			end # PCIe Port #4 ExpressCard
 			device pci 1c.4 off end # PCIe Port #5
 			device pci 1c.5 off end # PCIe Port #6 Intel Gigabit Ethernet PHY (not PCIe)
diff --git a/src/mainboard/lenovo/t430/devicetree.cb b/src/mainboard/lenovo/t430/devicetree.cb
index 9e731f9fbd..2731b69ec0 100644
--- a/src/mainboard/lenovo/t430/devicetree.cb
+++ b/src/mainboard/lenovo/t430/devicetree.cb
@@ -88,6 +88,7 @@ chip northbridge/intel/sandybridge
 			end
 			device pci 1c.2 on # PCIe Port #3
 				subsystemid 0x17aa 0x21f3
+				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
 			end
 			device pci 1c.3 off # PCIe Port #4
 			end
diff --git a/src/mainboard/lenovo/t430s/devicetree.cb b/src/mainboard/lenovo/t430s/devicetree.cb
index 2ecf05ee43..21d54acf11 100644
--- a/src/mainboard/lenovo/t430s/devicetree.cb
+++ b/src/mainboard/lenovo/t430s/devicetree.cb
@@ -99,6 +99,7 @@ chip northbridge/intel/sandybridge
 			end # PCIe Port #2 Integrated Wireless LAN
 			device pci 1c.2 on
 				subsystemid 0x17aa 0x21fb
+				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
 			end # PCIe Port #3 ExpressCard
 			device pci 1c.3 off end # PCIe Port #4
 			device pci 1c.4 off end # PCIe Port #5
diff --git a/src/mainboard/lenovo/t520/variants/t520/devicetree.cb b/src/mainboard/lenovo/t520/variants/t520/devicetree.cb
index cf8e7ce1d2..5f1bc60863 100644
--- a/src/mainboard/lenovo/t520/variants/t520/devicetree.cb
+++ b/src/mainboard/lenovo/t520/variants/t520/devicetree.cb
@@ -80,7 +80,9 @@ chip northbridge/intel/sandybridge
 			device pci 1c.0 off end # PCIe Port #1
 			device pci 1c.1 on end # PCIe Port #2 Integrated Wireless LAN
 			device pci 1c.2 off end # PCIe Port #3
-			device pci 1c.3 on end # PCIe Port #4 Express Card
+			device pci 1c.3 on
+				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
+			end # PCIe Port #4 Express Card
 			device pci 1c.4 on end # PCIe Port #5 MMC/SDXC + IEEE1394
 			device pci 1c.5 off end # PCIe Port #6 Intel Ethernet PHY
 			device pci 1c.6 off end # PCIe Port #7 USB 3.0 only W520
diff --git a/src/mainboard/lenovo/t520/variants/w520/devicetree.cb b/src/mainboard/lenovo/t520/variants/w520/devicetree.cb
index 1770ad9722..ceca46ea84 100644
--- a/src/mainboard/lenovo/t520/variants/w520/devicetree.cb
+++ b/src/mainboard/lenovo/t520/variants/w520/devicetree.cb
@@ -80,7 +80,9 @@ chip northbridge/intel/sandybridge
 			device pci 1c.0 off end # PCIe Port #1
 			device pci 1c.1 on end # PCIe Port #2 Integrated Wireless LAN
 			device pci 1c.2 off end # PCIe Port #3
-			device pci 1c.3 on end # PCIe Port #4 Express Card
+			device pci 1c.3 on
+				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
+			end # PCIe Port #4 Express Card
 			device pci 1c.4 on end # PCIe Port #5 MMC/SDXC + IEEE1394
 			device pci 1c.5 off end # PCIe Port #6 Intel Ethernet PHY
 			device pci 1c.6 on end # PCIe Port #7 USB 3.0 only W520
diff --git a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb b/src/mainboard/lenovo/t530/variants/t530/devicetree.cb
index 1a1e7075f2..335543a8f7 100644
--- a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb
+++ b/src/mainboard/lenovo/t530/variants/t530/devicetree.cb
@@ -83,7 +83,9 @@ chip northbridge/intel/sandybridge
 			device pci 1b.0 on end # High Definition Audio
 			device pci 1c.0 on end # PCIe Port #1
 			device pci 1c.1 on end # PCIe Port #2
-			device pci 1c.2 on end # PCIe Port #3 (expresscard)
+			device pci 1c.2 on
+				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
+			end # PCIe Port #3 (expresscard)
 			device pci 1c.3 off end # PCIe Port #4
 			device pci 1c.4 off end # PCIe Port #5
 			device pci 1c.5 off end # PCIe Port #6
diff --git a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb
index 253096c316..0a80fa1d8c 100644
--- a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb
+++ b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb
@@ -98,6 +98,7 @@ chip northbridge/intel/sandybridge
 			end
 			device pci 1c.2 on # PCIe Port #3
 				subsystemid 0x17aa 0x21f6
+				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
 			end
 			device pci 1c.3 off # PCIe Port #4
 			end
diff --git a/src/mainboard/lenovo/x200/devicetree.cb b/src/mainboard/lenovo/x200/devicetree.cb
index d800e4fdfe..2ed4308cfa 100644
--- a/src/mainboard/lenovo/x200/devicetree.cb
+++ b/src/mainboard/lenovo/x200/devicetree.cb
@@ -113,6 +113,7 @@ chip northbridge/intel/gm45
 			end # PCIe Port #3
 			device pci 1c.3 on
 				subsystemid 0x17aa 0x20f3 # Expresscard
+				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
 			end # PCIe Port #4
 			device pci 1c.4 off end # PCIe Port #5
 			device pci 1c.5 off end # PCIe Port #6
diff --git a/src/mainboard/lenovo/x201/devicetree.cb b/src/mainboard/lenovo/x201/devicetree.cb
index fa33aeb431..6ece08bee6 100644
--- a/src/mainboard/lenovo/x201/devicetree.cb
+++ b/src/mainboard/lenovo/x201/devicetree.cb
@@ -92,7 +92,9 @@ chip northbridge/intel/nehalem
 
 			device pci 1c.0 on end # PCIe Port #1
 			device pci 1c.1 on end # PCIe Port #2 (wwan)
-			device pci 1c.3 on end # PCIe Port #4 (Expresscard)
+			device pci 1c.3 on
+				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
+			end # PCIe Port #4 (Expresscard)
 			device pci 1c.4 on end # PCIe Port #5 (wlan)
 
 			device pci 1d.0 on # USB2 EHCI
diff --git a/src/mainboard/lenovo/x220/devicetree.cb b/src/mainboard/lenovo/x220/devicetree.cb
index 0ec66f59b8..360de04943 100644
--- a/src/mainboard/lenovo/x220/devicetree.cb
+++ b/src/mainboard/lenovo/x220/devicetree.cb
@@ -98,6 +98,7 @@ chip northbridge/intel/sandybridge
 			end # PCIe Port #3
 			device pci 1c.3 on
 				subsystemid 0x17aa 0x21db
+				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
 			end # PCIe Port #4
 			device pci 1c.4 on
 				subsystemid 0x17aa 0x21db
diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb
index 68e2f8ea2c..4687e9ccc3 100644
--- a/src/mainboard/lenovo/x230/devicetree.cb
+++ b/src/mainboard/lenovo/x230/devicetree.cb
@@ -110,6 +110,7 @@ chip northbridge/intel/sandybridge
 			end # PCIe Port #2
 			device pci 1c.2 on
 				subsystemid 0x17aa 0x21fa
+				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
 			end # PCIe Port #3 (expresscard)
 			device pci 1c.3 off end # PCIe Port #4
 			device pci 1c.4 off end # PCIe Port #5