Change in coreboot[master]: mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs

[Matt DeVillier (Code Review)]

Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47189 )

Change subject: mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs
......................................................................

mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs

Change-Id: Id306100fc691dcbde48b65092d0be9d7e73c0722
Signed-off-by: Matt DeVillier 
---
M src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb
1 file changed, 10 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/47189/1

diff --git a/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb b/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb
index c69f3f6..9fde5e9 100644
--- a/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb
+++ b/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb
@@ -204,22 +204,29 @@
    	device pci 1c.4 off end # PCI Express Port 5
    	device pci 1c.5 off end # PCI Express Port 6
    	device pci 1c.6 off end # PCI Express Port 7
-		device pci 1c.7 on	# PCI Express Port 8  (WLAN)
+		device pci 1c.7 on	# PCI Express Port 8
+			chip drivers/wifi/generic
+				device pci 00.0 on end	# x1 M.2/E 2230 (WLAN)
+			end
    		register "PcieRpSlotImplemented[7]" = "1"
    		register "PcieRpEnable[7]" = "1"
    		register "PcieRpLtrEnable[7]" = "1"
+			smbios_slot_desc "SlotTypeM2Socket1_SD" "SlotLengthOther"
    	end
    	device pci 1d.0 off end # PCI Express Port 9
-		device pci 1d.1 on	# PCI Express Port 10 (LAN)
+		device pci 1d.1 on	# PCI Express Port 10
+			device pci 00.0 on end # x1 (LAN)
    		register "PcieRpSlotImplemented[9]" = "1"
    		register "PcieRpEnable[9]" = "1"
    	end
    	device pci 1d.2 off end # PCI Express Port 11
    	device pci 1d.3 off end # PCI Express Port 12
-		device pci 1d.4 on	# PCI Express Port 13 (NVMe)
+		device pci 1d.4 on	# PCI Express Port 13
+			device pci 00.0 on end # x4 M.2/M 2280 (NVMe)
    		register "PcieRpSlotImplemented[12]" = "1"
    		register "PcieRpEnable[12]" = "1"
    		register "PcieRpLtrEnable[12]" = "1"
+			smbios_slot_desc "SlotTypeM2Socket3" "SlotLengthOther" "M.2/M 2280" "SlotDataBusWidth4X"
    	end
    	device pci 1d.5 off end # PCI Express Port 14
    	device pci 1d.6 off end # PCI Express Port 15

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47189 )

Change subject: mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs
......................................................................

Patch Set 1:

Can we split a devices and slot descriptions, please?

[Matt DeVillier (Code Review)]

Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47189 )

Change subject: mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs
......................................................................

Patch Set 1:
> Patch Set 1:
>
> Can we split a devices and slot descriptions, please?

I'm not sure what you're asking for exactly

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47189 )

Change subject: mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs
......................................................................

Patch Set 1:

(1 comment)
> Patch Set 1:
> > Patch Set 1:
> >
> > Can we split a devices and slot descriptions, please?
>
> I'm not sure what you're asking for exactly

I just realized the devices are M.2 slots (sorry, it's late :S). The LAN dev could go to a separate commit, though

https://review.coreboot.org/c/coreboot/+/47189/1/src/mainboard/purism/librem... 
File src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb:

https://review.coreboot.org/c/coreboot/+/47189/1/src/mainboard/purism/librem... 
PS1, Line 218: 			device pci 00.0 on end # x1 (LAN)
nit: this could be a separate commit

[Matt DeVillier (Code Review)]

Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47189 )

Change subject: mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/47189/1/src/mainboard/purism/librem... 
File src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb:

https://review.coreboot.org/c/coreboot/+/47189/1/src/mainboard/purism/librem... 
PS1, Line 218: 			device pci 00.0 on end # x1 (LAN)
> nit: this could be a separate commit

why just this one? I'm adding to all 3 (enabled) RPs

[Matt DeVillier (Code Review)]

Hello build bot (Jenkins), Paul Menzel, Angel Pons, Michael Niewöhner,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/47189

to look at the new patch set (#2).

Change subject: mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs
......................................................................

mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs

Change-Id: Id306100fc691dcbde48b65092d0be9d7e73c0722
Signed-off-by: Matt DeVillier 
---
M src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb
1 file changed, 10 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/47189/2

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47189 )

Change subject: mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/47189/1/src/mainboard/purism/librem... 
File src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb:

https://review.coreboot.org/c/coreboot/+/47189/1/src/mainboard/purism/librem... 
PS1, Line 218: 			device pci 00.0 on end # x1 (LAN)
> why just this one? I'm adding to all 3 (enabled) RPs

erm. it was late... actually the slot descriptions could be a separate one, but it's not that important I guess. let's see what others say :-)

[Stefan Reinauer (Code Review)]

Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47189 )

Change subject: mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs
......................................................................

Patch Set 2: Code-Review+2

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47189 )

Change subject: mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs
......................................................................

Patch Set 2: Code-Review+2

[Michael Niewöhner (Code Review)]

Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47189 )

Change subject: mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs
......................................................................

mb/purism_librem_mini: Add child device, slot descriptions to PCIe RPs

Change-Id: Id306100fc691dcbde48b65092d0be9d7e73c0722
Signed-off-by: Matt DeVillier 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47189
Reviewed-by: Stefan Reinauer 
Reviewed-by: Michael Niewöhner 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb
1 file changed, 10 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Stefan Reinauer: Looks good to me, approved
  Michael Niewöhner: Looks good to me, approved

diff --git a/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb b/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb
index c69f3f6..9fde5e9 100644
--- a/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb
+++ b/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb
@@ -204,22 +204,29 @@
    	device pci 1c.4 off end # PCI Express Port 5
    	device pci 1c.5 off end # PCI Express Port 6
    	device pci 1c.6 off end # PCI Express Port 7
-		device pci 1c.7 on	# PCI Express Port 8  (WLAN)
+		device pci 1c.7 on	# PCI Express Port 8
+			chip drivers/wifi/generic
+				device pci 00.0 on end	# x1 M.2/E 2230 (WLAN)
+			end
    		register "PcieRpSlotImplemented[7]" = "1"
    		register "PcieRpEnable[7]" = "1"
    		register "PcieRpLtrEnable[7]" = "1"
+			smbios_slot_desc "SlotTypeM2Socket1_SD" "SlotLengthOther"
    	end
    	device pci 1d.0 off end # PCI Express Port 9
-		device pci 1d.1 on	# PCI Express Port 10 (LAN)
+		device pci 1d.1 on	# PCI Express Port 10
+			device pci 00.0 on end # x1 (LAN)
    		register "PcieRpSlotImplemented[9]" = "1"
    		register "PcieRpEnable[9]" = "1"
    	end
    	device pci 1d.2 off end # PCI Express Port 11
    	device pci 1d.3 off end # PCI Express Port 12
-		device pci 1d.4 on	# PCI Express Port 13 (NVMe)
+		device pci 1d.4 on	# PCI Express Port 13
+			device pci 00.0 on end # x4 M.2/M 2280 (NVMe)
    		register "PcieRpSlotImplemented[12]" = "1"
    		register "PcieRpEnable[12]" = "1"
    		register "PcieRpLtrEnable[12]" = "1"
+			smbios_slot_desc "SlotTypeM2Socket3" "SlotLengthOther" "M.2/M 2280" "SlotDataBusWidth4X"
    	end
    	device pci 1d.5 off end # PCI Express Port 14
    	device pci 1d.6 off end # PCI Express Port 15