Change in coreboot[master]: mb/prodrive/hermes: Add root port numbers to comments

[Felix Singer (Code Review)]

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44553 )

Change subject: mb/prodrive/hermes: Add root port numbers to comments
......................................................................

mb/prodrive/hermes: Add root port numbers to comments

Change-Id: I06bb0493999f1f6954854f872cda46dc38930370
Signed-off-by: Felix Singer 
---
M src/mainboard/prodrive/hermes/devicetree.cb
M src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb
2 files changed, 14 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/44553/1

diff --git a/src/mainboard/prodrive/hermes/devicetree.cb b/src/mainboard/prodrive/hermes/devicetree.cb
index 1ed15a6..a89ba1b 100644
--- a/src/mainboard/prodrive/hermes/devicetree.cb
+++ b/src/mainboard/prodrive/hermes/devicetree.cb
@@ -31,11 +31,11 @@
    	device pci 16.1 on  end # Management Engine Interface 2
    	device pci 16.4 on  end # Management Engine Interface 3
    	device pci 17.0 on  end # SATA
-		device pci 1d.6 on
+		device pci 1d.6 on	# PCIe root port 15
    		device pci 00.0 on      # Aspeed PCI Bridge
    			device pci 00.0 on end  # Aspeed 2500 VGA
    		end
-		end # PCIe
+		end
    	device pci 1f.0 on	# LPC Interface
    		chip drivers/pc80/tpm
    			device pnp 0c31.0 on end
diff --git a/src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb b/src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb
index c3d148d..8915629 100644
--- a/src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb
+++ b/src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb
@@ -181,22 +181,22 @@
    			register "devid" = "PCI_DEVICE_ID_INTEL_CNP_H_UART2"
    		end # UART #2, in ACPI mode
    	end
-		device pci 1b.4 on
+		device pci 1b.4 on	# PCIe root port 21 (Slot 1)
    		smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "SLOT1" "SlotDataBusWidth4X"
-		end # PCIe Slot 1
-		device pci 1c.0 on
+		end
+		device pci 1c.0 on	# PCIe root port 1 (slot 3)
    		smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "SLOT3" "SlotDataBusWidth4X"
-		end # PCIe Slot 3
-		device pci 1c.4 on end # PHY 3
-		device pci 1c.5 on end # PHY 4
-		device pci 1c.6 on end # PHY 2
-		device pci 1c.7 on end # PHY 1
+		end
+		device pci 1c.4 on end # PCIe root port 4 (PHY 3)
+		device pci 1c.5 on end # PCIe root port 6 (PHY 4)
+		device pci 1c.6 on end # PCIe root port 7 (PHY 2)
+		device pci 1c.7 on end # PCIe root port 8 (PHY 1)

-		device pci 1d.0 on
+		device pci 1d.0 on	# PCIe root port 9 (M2 M)
    		smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "M2 M" "SlotDataBusWidth4X"
-		end # M2 M
-		device pci 1d.5 on end # PHY 0
-		device pci 1d.6 on end # BMC
+		end
+		device pci 1d.5 on end # PCIe root port 14 (PHY 0)
+		device pci 1d.6 on end # PCIe root port 15 (BMC)

device pci 1e.0 on  end # UART #0
    	device pci 1e.1 on  end # UART #1

[Felix Singer (Code Review)]

Hello build bot (Jenkins), Patrick Rudolph, Christian Walter,

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

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

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

Change subject: mb/prodrive/hermes: Add root port numbers to comments
......................................................................

mb/prodrive/hermes: Add root port numbers to comments

Change-Id: I06bb0493999f1f6954854f872cda46dc38930370
Signed-off-by: Felix Singer 
---
M src/mainboard/prodrive/hermes/devicetree.cb
M src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb
2 files changed, 14 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/44553/2

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44553 )

Change subject: mb/prodrive/hermes: Add root port numbers to comments
......................................................................

Patch Set 2: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44553 )

Change subject: mb/prodrive/hermes: Add root port numbers to comments
......................................................................

Patch Set 4: Code-Review+1

(1 comment)

https://review.coreboot.org/c/coreboot/+/44553/4/src/mainboard/prodrive/herm... 
File src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb:

https://review.coreboot.org/c/coreboot/+/44553/4/src/mainboard/prodrive/herm... 
PS4, Line 187: slot
capitalize for consistency with the other line: Slot

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44553 )

Change subject: mb/prodrive/hermes: Add root port numbers to comments
......................................................................

Patch Set 4: Code-Review+2

Other than that, the root port numbers look good

[Felix Singer (Code Review)]

Hello build bot (Jenkins), Nico Huber, Patrick Rudolph, Christian Walter, Angel Pons,

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

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

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

Change subject: mb/prodrive/hermes: Add root port numbers to comments
......................................................................

mb/prodrive/hermes: Add root port numbers to comments

Change-Id: I06bb0493999f1f6954854f872cda46dc38930370
Signed-off-by: Felix Singer 
---
M src/mainboard/prodrive/hermes/devicetree.cb
M src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb
2 files changed, 14 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/44553/5

[Felix Singer (Code Review)]

Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44553 )

Change subject: mb/prodrive/hermes: Add root port numbers to comments
......................................................................

Patch Set 5:

(1 comment)

https://review.coreboot.org/c/coreboot/+/44553/4/src/mainboard/prodrive/herm... 
File src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb:

https://review.coreboot.org/c/coreboot/+/44553/4/src/mainboard/prodrive/herm... 
PS4, Line 187: slot
> capitalize for consistency with the other line: Slot

Done

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44553 )

Change subject: mb/prodrive/hermes: Add root port numbers to comments
......................................................................

Patch Set 5:

(1 comment)

https://review.coreboot.org/c/coreboot/+/44553/5/src/mainboard/prodrive/herm... 
File src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb:

https://review.coreboot.org/c/coreboot/+/44553/5/src/mainboard/prodrive/herm... 
PS5, Line 190: 4
Root port 5?

[Felix Singer (Code Review)]

Hello build bot (Jenkins), Nico Huber, Patrick Rudolph, Christian Walter, Angel Pons,

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

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

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

Change subject: mb/prodrive/hermes: Add root port numbers to comments
......................................................................

mb/prodrive/hermes: Add root port numbers to comments

Change-Id: I06bb0493999f1f6954854f872cda46dc38930370
Signed-off-by: Felix Singer 
---
M src/mainboard/prodrive/hermes/devicetree.cb
M src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb
2 files changed, 14 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/44553/6

[Felix Singer (Code Review)]

Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44553 )

Change subject: mb/prodrive/hermes: Add root port numbers to comments
......................................................................

Patch Set 6:

(1 comment)

https://review.coreboot.org/c/coreboot/+/44553/5/src/mainboard/prodrive/herm... 
File src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb:

https://review.coreboot.org/c/coreboot/+/44553/5/src/mainboard/prodrive/herm... 
PS5, Line 190: 4
> Root port 5?

Sorry, I can't rebase. Fixed it.

[Christian Walter (Code Review)]

Christian Walter has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44553 )

Change subject: mb/prodrive/hermes: Add root port numbers to comments
......................................................................

Patch Set 6: Code-Review+2

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44553 )

Change subject: mb/prodrive/hermes: Add root port numbers to comments
......................................................................

mb/prodrive/hermes: Add root port numbers to comments

Change-Id: I06bb0493999f1f6954854f872cda46dc38930370
Signed-off-by: Felix Singer 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44553
Tested-by: build bot (Jenkins) 
Reviewed-by: Christian Walter 
---
M src/mainboard/prodrive/hermes/devicetree.cb
M src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb
2 files changed, 14 insertions(+), 14 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Christian Walter: Looks good to me, approved

diff --git a/src/mainboard/prodrive/hermes/devicetree.cb b/src/mainboard/prodrive/hermes/devicetree.cb
index 1ed15a6..a89ba1b 100644
--- a/src/mainboard/prodrive/hermes/devicetree.cb
+++ b/src/mainboard/prodrive/hermes/devicetree.cb
@@ -31,11 +31,11 @@
    	device pci 16.1 on  end # Management Engine Interface 2
    	device pci 16.4 on  end # Management Engine Interface 3
    	device pci 17.0 on  end # SATA
-		device pci 1d.6 on
+		device pci 1d.6 on	# PCIe root port 15
    		device pci 00.0 on      # Aspeed PCI Bridge
    			device pci 00.0 on end  # Aspeed 2500 VGA
    		end
-		end # PCIe
+		end
    	device pci 1f.0 on	# LPC Interface
    		chip drivers/pc80/tpm
    			device pnp 0c31.0 on end
diff --git a/src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb b/src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb
index c3d148d..8098c56 100644
--- a/src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb
+++ b/src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb
@@ -181,22 +181,22 @@
    			register "devid" = "PCI_DEVICE_ID_INTEL_CNP_H_UART2"
    		end # UART #2, in ACPI mode
    	end
-		device pci 1b.4 on
+		device pci 1b.4 on	# PCIe root port 21 (Slot 1)
    		smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "SLOT1" "SlotDataBusWidth4X"
-		end # PCIe Slot 1
-		device pci 1c.0 on
+		end
+		device pci 1c.0 on	# PCIe root port 1 (Slot 3)
    		smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "SLOT3" "SlotDataBusWidth4X"
-		end # PCIe Slot 3
-		device pci 1c.4 on end # PHY 3
-		device pci 1c.5 on end # PHY 4
-		device pci 1c.6 on end # PHY 2
-		device pci 1c.7 on end # PHY 1
+		end
+		device pci 1c.4 on end # PCIe root port 5 (PHY 3)
+		device pci 1c.5 on end # PCIe root port 6 (PHY 4)
+		device pci 1c.6 on end # PCIe root port 7 (PHY 2)
+		device pci 1c.7 on end # PCIe root port 8 (PHY 1)

-		device pci 1d.0 on
+		device pci 1d.0 on	# PCIe root port 9 (M2 M)
    		smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "M2 M" "SlotDataBusWidth4X"
-		end # M2 M
-		device pci 1d.5 on end # PHY 0
-		device pci 1d.6 on end # BMC
+		end
+		device pci 1d.5 on end # PCIe root port 14 (PHY 0)
+		device pci 1d.6 on end # PCIe root port 15 (BMC)

device pci 1e.0 on  end # UART #0
    	device pci 1e.1 on  end # UART #1