Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38081 )
Change subject: mb/hp/*/devicetree.cb: Inherit the subsystemid ......................................................................
mb/hp/*/devicetree.cb: Inherit the subsystemid
Since the same subsystemid is used for all the devices on the devicetree, factor it out via inheritance. While we are at it, tidy up all the now-empty device blocks.
Change-Id: Iccd74fff9456e1204735a80ecc4f7685624cb78e Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/hp/2570p/devicetree.cb M src/mainboard/hp/2760p/devicetree.cb M src/mainboard/hp/8460p/devicetree.cb M src/mainboard/hp/8470p/devicetree.cb M src/mainboard/hp/8770w/devicetree.cb M src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb M src/mainboard/hp/folio_9470m/devicetree.cb M src/mainboard/hp/revolve_810_g1/devicetree.cb M src/mainboard/hp/z220_sff_workstation/devicetree.cb 9 files changed, 255 insertions(+), 593 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/38081/1
diff --git a/src/mainboard/hp/2570p/devicetree.cb b/src/mainboard/hp/2570p/devicetree.cb index c638676..abac787 100644 --- a/src/mainboard/hp/2570p/devicetree.cb +++ b/src/mainboard/hp/2570p/devicetree.cb @@ -43,6 +43,7 @@ end end device domain 0x0 on + subsystemid 0x103c 0x17df inherit chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" register "docking_supported" = "0" @@ -61,54 +62,26 @@ register "superspeed_capable_ports" = "0x0000000f" register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" - device pci 14.0 on # USB 3.0 Controller - subsystemid 0x103c 0x17df - end - device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x17df - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 off # Management Engine KT - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x17df - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x17df - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x17df - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x17df - end - device pci 1c.1 on # PCIe Port #2, ExpressCard - subsystemid 0x103c 0x17df - end - device pci 1c.2 on # PCIe Port #3, SD/MMC - subsystemid 0x103c 0x17df - end - device pci 1c.3 on # PCIe Port #4, WLAN - subsystemid 0x103c 0x17df - end - device pci 1c.4 off # PCIe Port #5 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 off # PCIe Port #7 - end - device pci 1c.7 off # PCIe Port #8 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x17df - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x17df + + device pci 14.0 on end # USB 3.0 Controller + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 off end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 on end # PCIe Port #2, ExpressCard + device pci 1c.2 on end # PCIe Port #3, SD/MMC + device pci 1c.3 on end # PCIe Port #4, WLAN + device pci 1c.4 off end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 off end # PCIe Port #7 + device pci 1c.7 off end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x62" register "ec_cmd_port" = "0x66" @@ -117,23 +90,13 @@ device pnp ff.1 off end end # kbc1126 end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x17df - end - device pci 1f.3 off # SMBus - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 off end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end - device pci 00.0 on # Host bridge Host bridge - subsystemid 0x103c 0x17df - end - device pci 01.0 off # PCIe Bridge for discrete graphics - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x17df - end + device pci 00.0 on end # Host bridge Host bridge + device pci 01.0 off end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller end end diff --git a/src/mainboard/hp/2760p/devicetree.cb b/src/mainboard/hp/2760p/devicetree.cb index 06124ed..f33d016 100644 --- a/src/mainboard/hp/2760p/devicetree.cb +++ b/src/mainboard/hp/2760p/devicetree.cb @@ -43,14 +43,11 @@ end end device domain 0x0 on - device pci 00.0 on # Host bridge Host bridge - subsystemid 0x103c 0x162a - end - device pci 01.0 off # PCIe Bridge for discrete graphics - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x162a - end + subsystemid 0x103c 0x162a inherit + + device pci 00.0 on end # Host bridge Host bridge + device pci 01.0 off end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller
chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" @@ -65,54 +62,27 @@ register "pcie_port_coalesce" = "1" register "sata_interface_speed_support" = "0x3" register "sata_port_map" = "0x21" - register "spi_uvscc" = "0x2005" register "spi_lvscc" = "0"
- device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x162a - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 off # Management Engine KT - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x162a - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x162a - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x162a - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x162a - end - device pci 1c.1 on # PCIe Port #2, ExpressCard - subsystemid 0x103c 0x162a - end - device pci 1c.2 on # PCIe Port #3, SD/MMC - subsystemid 0x103c 0x162a - end - device pci 1c.3 on # WLAN - end - device pci 1c.4 off # PCIe Port #5 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 on # PCIe Port #7, WWAN - end - device pci 1c.7 off # PCIe Port #8 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x162a - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x162a + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 off end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 on end # PCIe Port #2, ExpressCard + device pci 1c.2 on end # PCIe Port #3, SD/MMC + device pci 1c.3 on end # WLAN + device pci 1c.4 off end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 on end # PCIe Port #7, WWAN + device pci 1c.7 off end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x60" register "ec_cmd_port" = "0x64" @@ -121,15 +91,10 @@ device pnp ff.1 off end end # kbc1126 end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x162a - end - device pci 1f.3 off # SMBus - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 off end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end end end diff --git a/src/mainboard/hp/8460p/devicetree.cb b/src/mainboard/hp/8460p/devicetree.cb index 6852f02..972ee48 100644 --- a/src/mainboard/hp/8460p/devicetree.cb +++ b/src/mainboard/hp/8460p/devicetree.cb @@ -43,14 +43,12 @@ end end device domain 0x0 on - device pci 00.0 on # Host bridge - subsystemid 0x103c 0x161c - end - device pci 01.0 on # PCIe Bridge for discrete graphics - end - device pci 02.0 on # Internal graphics - subsystemid 0x103c 0x161c - end + subsystemid 0x103c 0x161c inherit + + device pci 00.0 on end # Host bridge + device pci 01.0 on end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics + chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" register "docking_supported" = "0" @@ -65,57 +63,27 @@ register "sata_interface_speed_support" = "0x3" # HDD(0), ODD(1), docking(3,5), eSATA(4) register "sata_port_map" = "0x3b" - register "spi_uvscc" = "0x2005" register "spi_lvscc" = "0"
- device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x161c - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 on # Management Engine KT - subsystemid 0x103c 0x161c - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x161c - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x161c - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x161c - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x161c - end - device pci 1c.1 on # PCIe Port #2, ExpressCard - subsystemid 0x103c 0x161c - end - device pci 1c.2 on # PCIe Port #3, SD/MMC - subsystemid 0x103c 0x161c - end - device pci 1c.3 on # PCIe Port #4, WLAN - subsystemid 0x103c 0x161c - end - device pci 1c.4 off # PCIe Port #5 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 on # PCIe Port #7, WWAN - end - device pci 1c.7 on # PCIe Port #8, NEC USB 3.0 Host Controller - subsystemid 0x103c 0x161c - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x161c - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x161c + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 on end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 on end # PCIe Port #2, ExpressCard + device pci 1c.2 on end # PCIe Port #3, SD/MMC + device pci 1c.3 on end # PCIe Port #4, WLAN + device pci 1c.4 off end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 on end # PCIe Port #7, WWAN + device pci 1c.7 on end # PCIe Port #8, NEC USB 3.0 Host Controller + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x60" register "ec_cmd_port" = "0x64" @@ -140,15 +108,10 @@ device pnp 0c31.0 on end end end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x161c - end - device pci 1f.3 off # SMBus - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 off end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end end end diff --git a/src/mainboard/hp/8470p/devicetree.cb b/src/mainboard/hp/8470p/devicetree.cb index 3725b08..afb254f 100644 --- a/src/mainboard/hp/8470p/devicetree.cb +++ b/src/mainboard/hp/8470p/devicetree.cb @@ -43,14 +43,11 @@ end end device domain 0x0 on - device pci 00.0 on # Host bridge - subsystemid 0x103c 0x179b - end - device pci 01.0 on # PCIe Bridge for discrete graphics - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x179b - end + subsystemid 0x103c 0x179b inherit + + device pci 00.0 on end # Host bridge + device pci 01.0 on end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller
chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" @@ -69,59 +66,28 @@ register "superspeed_capable_ports" = "0x0000000f" register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" - register "spi_uvscc" = "0x2005" register "spi_lvscc" = "0"
- device pci 14.0 on # USB 3.0 Controller - subsystemid 0x103c 0x179b - end - device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x179b - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 on # Management Engine KT - subsystemid 0x103c 0x179b - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x179b - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x179b - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x179b - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x179b - end - device pci 1c.1 on # PCIe Port #2, ExpressCard - subsystemid 0x103c 0x179b - end - device pci 1c.2 on # PCIe Port #3, SD/MMC - subsystemid 0x103c 0x179b - end - device pci 1c.3 on # PCIe Port #4, WLAN - subsystemid 0x103c 0x179b - end - device pci 1c.4 off # PCIe Port #5 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 off # PCIe Port #7 - end - device pci 1c.7 off # PCIe Port #8 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x179b - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x179b + device pci 14.0 on end # USB 3.0 Controller + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 on end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 on end # PCIe Port #2, ExpressCard + device pci 1c.2 on end # PCIe Port #3, SD/MMC + device pci 1c.3 on end # PCIe Port #4, WLAN + device pci 1c.4 off end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 off end # PCIe Port #7 + device pci 1c.7 off end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x62" register "ec_cmd_port" = "0x66" @@ -142,15 +108,10 @@ end end #chip superio/smsc/lpc47n217 end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x179b - end - device pci 1f.3 off # SMBus - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 off end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end end end diff --git a/src/mainboard/hp/8770w/devicetree.cb b/src/mainboard/hp/8770w/devicetree.cb index 0a30de2..a9096c5 100644 --- a/src/mainboard/hp/8770w/devicetree.cb +++ b/src/mainboard/hp/8770w/devicetree.cb @@ -29,16 +29,14 @@ end end device domain 0x0 on - device pci 00.0 on # Host bridge - subsystemid 0x103c 0x176c + subsystemid 0x103c 0x176c inherit + + device pci 00.0 on end # Host bridge + device pci 01.0 on # PCIe Bridge for discrete graphics + device pci 00.0 on end # GPU + device pci 00.1 on end # HDMI Audio on GPU end - device pci 01.0 on # PCIe Bridge for discrete graphics - device pci 00.0 on end # GPU - device pci 00.1 on end # HDMI Audio on GPU - end - device pci 02.0 off # Internal graphics VGA controller - subsystemid 0x103c 0x176c - end + device pci 02.0 off end # Internal graphics VGA controller
chip southbridge/intel/bd82x6x # Intel Series 7 Panther Point PCH register "c2_latency" = "0x0065" @@ -56,59 +54,28 @@ register "superspeed_capable_ports" = "0x0000000f" register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" - register "spi_uvscc" = "0x2005" register "spi_lvscc" = "0"
- device pci 14.0 on # USB 3.0 Controller - subsystemid 0x103c 0x176c - end - device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x176c - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 off # Management Engine KT - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x176c - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x176c - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x176c - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x176c - end - device pci 1c.1 on # PCIe Port #2 - subsystemid 0x103c 0x176c - end - device pci 1c.2 on # Media Card and FireWire host controller - subsystemid 0x103c 0x176c - end - device pci 1c.3 on # Wireless LAN Adapter - subsystemid 0x103c 0x176c - end - device pci 1c.4 on # SATA Controller 2 for dock - subsystemid 0x103c 0x176c - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 off # PCIe Port #7 - end - device pci 1c.7 off # PCIe Port #8 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x176c - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x176c + device pci 14.0 on end # USB 3.0 Controller + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 off end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 on end # PCIe Port #2 + device pci 1c.2 on end # Media Card and FireWire host controller + device pci 1c.3 on end # Wireless LAN Adapter + device pci 1c.4 on end # SATA Controller 2 for dock + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 off end # PCIe Port #7 + device pci 1c.7 off end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x62" register "ec_cmd_port" = "0x66" @@ -129,15 +96,10 @@ end end #chip superio/smsc/lpc47n217 end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x176c - end - device pci 1f.3 off # SMBus - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 off end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end end end diff --git a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb index 1472f84..660e3b0 100644 --- a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb +++ b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb @@ -39,6 +39,8 @@ register "pci_mmio_size" = "2048"
device domain 0x0 on + subsystemid 0x103c 0x1495 inherit + chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" register "docking_supported" = "0" @@ -50,53 +52,25 @@ register "sata_port_map" = "0xf" register "spi_lvscc" = "0x2005" register "spi_uvscc" = "0x0" - device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x1495 - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 on # Management Engine KT - subsystemid 0x103c 0x1495 - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x1495 - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x1495 - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x1495 - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x1495 - end - device pci 1c.1 off # PCIe Port #2 - end - device pci 1c.2 off # PCIe Port #3 - end - device pci 1c.3 off # PCIe Port #4 - end - device pci 1c.4 on # PCIe Port #5 - subsystemid 0x103c 0x1495 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 on # PCIe Port #7 - subsystemid 0x103c 0x1495 - end - device pci 1c.7 on # PCIe Port #8 - subsystemid 0x103c 0x1495 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x1495 - end - device pci 1e.0 on # PCI bridge - subsystemid 0x103c 0x1495 - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x1495 + + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 on end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 off end # PCIe Port #2 + device pci 1c.2 off end # PCIe Port #3 + device pci 1c.3 off end # PCIe Port #4 + device pci 1c.4 on end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 on end # PCIe Port #7 + device pci 1c.7 on end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 on end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip superio/nuvoton/npcd378 device pnp 2e.0 off end # Floppy device pnp 2e.1 on # Parallel port @@ -197,25 +171,13 @@ device pnp 4e.0 on end # TPM module end end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x1495 - end - device pci 1f.3 on # SMBus - subsystemid 0x103c 0x1495 - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 on end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end - device pci 00.0 on # Host bridge Host bridge - subsystemid 0x103c 0x1495 - end - device pci 01.0 on # PCIe Bridge for discrete graphics - subsystemid 0x103c 0x1495 - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x1495 - end + device pci 00.0 on end # Host bridge Host bridge + device pci 01.0 on end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller end end diff --git a/src/mainboard/hp/folio_9470m/devicetree.cb b/src/mainboard/hp/folio_9470m/devicetree.cb index cd610b6..7d0265d 100644 --- a/src/mainboard/hp/folio_9470m/devicetree.cb +++ b/src/mainboard/hp/folio_9470m/devicetree.cb @@ -43,6 +43,8 @@ end end device domain 0x0 on + subsystemid 0x103c 0x18df inherit + chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" register "docking_supported" = "0" @@ -61,54 +63,26 @@ register "superspeed_capable_ports" = "0x0000000f" register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" - device pci 14.0 on # USB 3.0 Controller - subsystemid 0x103c 0x18df - end - device pci 16.0 off # Management Engine Interface 1 - subsystemid 0x103c 0x18df - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 off # Management Engine KT - subsystemid 0x103c 0x18df - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x18df - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x18df - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x18df - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x18df - end - device pci 1c.1 off # PCIe Port #2 - end - device pci 1c.2 on # PCIe Port #3 - subsystemid 0x103c 0x18df - end # SDHCI - device pci 1c.3 on # PCIe Port #4 - subsystemid 0x103c 0x18df - end # WLAN - device pci 1c.4 off # PCIe Port #5 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 off # PCIe Port #7 - end - device pci 1c.7 off # PCIe Port #8 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x18df - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x18df + + device pci 14.0 on end # USB 3.0 Controller + device pci 16.0 off end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 off end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 off end # PCIe Port #2 + device pci 1c.2 on end # PCIe Port #3 SDHCI + device pci 1c.3 on end # PCIe Port #4 WLAN + device pci 1c.4 off end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 off end # PCIe Port #7 + device pci 1c.7 off end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x62" register "ec_cmd_port" = "0x66" @@ -121,24 +95,13 @@ device pnp 0c31.0 on end end end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x18df - end - device pci 1f.3 on # SMBus - subsystemid 0x103c 0x18df - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 on end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end - device pci 00.0 on # Host bridge Host bridge - subsystemid 0x103c 0x18df - end - device pci 01.0 off # PCIe Bridge for discrete graphics - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x18df - end + device pci 00.0 on end # Host bridge Host bridge + device pci 01.0 off end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller end end diff --git a/src/mainboard/hp/revolve_810_g1/devicetree.cb b/src/mainboard/hp/revolve_810_g1/devicetree.cb index 32d04ea..4a08f42 100644 --- a/src/mainboard/hp/revolve_810_g1/devicetree.cb +++ b/src/mainboard/hp/revolve_810_g1/devicetree.cb @@ -43,6 +43,8 @@ end end device domain 0x0 on + subsystemid 0x103c 0x18f8 inherit + chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" register "docking_supported" = "0" @@ -61,54 +63,26 @@ register "superspeed_capable_ports" = "0x0000000f" register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" - device pci 14.0 on # USB 3.0 Controller - subsystemid 0x103c 0x18f8 - end - device pci 16.0 off # Management Engine Interface 1 - subsystemid 0x103c 0x18f8 - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 off # Management Engine KT - subsystemid 0x103c 0x18f8 - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x8086 0x18f8 - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x18f8 - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x18f8 - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x18f8 - end - device pci 1c.1 off # PCIe Port #2 - end - device pci 1c.2 on # PCIe Port #3 - subsystemid 0x103c 0x18f8 - end - device pci 1c.3 on # PCIe Port #4 - subsystemid 0x103c 0x18f8 - end - device pci 1c.4 off # PCIe Port #5 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 off # PCIe Port #7 - end - device pci 1c.7 off # PCIe Port #8 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x18f8 - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x18f8 + + device pci 14.0 on end # USB 3.0 Controller + device pci 16.0 off end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 off end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 off end # PCIe Port #2 + device pci 1c.2 on end # PCIe Port #3 + device pci 1c.3 on end # PCIe Port #4 + device pci 1c.4 off end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 off end # PCIe Port #7 + device pci 1c.7 off end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x62" register "ec_cmd_port" = "0x66" @@ -121,23 +95,13 @@ device pnp 0c31.0 on end end end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x18f8 - end - device pci 1f.3 off # SMBus - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 off end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end - device pci 00.0 on # Host bridge Host bridge - subsystemid 0x103c 0x18f8 - end - device pci 01.0 off # PCIe Bridge for discrete graphics - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x18f8 - end + device pci 00.0 on end # Host bridge Host bridge + device pci 01.0 off end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller end end diff --git a/src/mainboard/hp/z220_sff_workstation/devicetree.cb b/src/mainboard/hp/z220_sff_workstation/devicetree.cb index 5108db4..94d079a 100644 --- a/src/mainboard/hp/z220_sff_workstation/devicetree.cb +++ b/src/mainboard/hp/z220_sff_workstation/devicetree.cb @@ -39,6 +39,7 @@ register "pci_mmio_size" = "2048"
device domain 0x0 on + subsystemid 0x103c 0x1791 inherit chip southbridge/intel/bd82x6x # Intel Series 7 PCH register "c2_latency" = "0x0065" register "docking_supported" = "0" @@ -50,56 +51,26 @@ register "sata_port_map" = "0xf" register "spi_lvscc" = "0x2005" register "spi_uvscc" = "0x2005" - device pci 14.0 on # xHCI - subsystemid 0x103c 0x1791 - end - device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x1791 - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 on # Management Engine KT - subsystemid 0x103c 0x1791 - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x1791 - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x1791 - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x1791 - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x1791 - end - device pci 1c.1 off # PCIe Port #2 - end - device pci 1c.2 off # PCIe Port #3 - end - device pci 1c.3 off # PCIe Port #4 - end - device pci 1c.4 on # PCIe Port #5 - subsystemid 0x103c 0x1791 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 on # PCIe Port #7 - subsystemid 0x103c 0x1791 - end - device pci 1c.7 on # PCIe Port #8 - subsystemid 0x103c 0x1791 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x1791 - end - device pci 1e.0 on # PCI bridge - subsystemid 0x103c 0x1791 - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x1791 + + device pci 14.0 on end # xHCI + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 on end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 off end # PCIe Port #2 + device pci 1c.2 off end # PCIe Port #3 + device pci 1c.3 off end # PCIe Port #4 + device pci 1c.4 on end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 on end # PCIe Port #7 + device pci 1c.7 on end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 on end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip superio/nuvoton/npcd378 device pnp 2e.0 off end # Floppy device pnp 2e.1 on # Parallel port @@ -200,25 +171,13 @@ device pnp 4e.0 on end # TPM module end end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x1791 - end - device pci 1f.3 on # SMBus - subsystemid 0x103c 0x1791 - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 on end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end - device pci 00.0 on # Host bridge Host bridge - subsystemid 0x103c 0x1791 - end - device pci 01.0 on # PCIe Bridge for discrete graphics - subsystemid 0x103c 0x1791 - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x1791 - end + device pci 00.0 on end # Host bridge Host bridge + device pci 01.0 on end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller end end
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38081 )
Change subject: mb/hp/*/devicetree.cb: Inherit the subsystemid ......................................................................
Patch Set 1: Code-Review-1
(4 comments)
Not sure if it's necessary to check OS drivers if they are affected by SID changes... but the changes should be properly documented in the commit message at least. If unsure, build and compare `static.c`.
https://review.coreboot.org/c/coreboot/+/38081/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/38081/1//COMMIT_MSG@9 PS1, Line 9: Since the same subsystemid is used for all the devices on the This is not true, some were left at their default.
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/2760p/devi... File src/mainboard/hp/2760p/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/2760p/devi... PS1, Line 78: device pci 1c.3 on end # WLAN Didn't have a subsystem id before.
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/2760p/devi... PS1, Line 81: device pci 1c.6 on end # PCIe Port #7, WWAN Didn't either.
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... File src/mainboard/hp/8770w/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... PS1, Line 36: device pci 00.0 on end # GPU : device pci 00.1 on end # HDMI Audio on GPU Note, these inherit the sid too, intended?
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38081 )
Change subject: mb/hp/*/devicetree.cb: Inherit the subsystemid ......................................................................
Patch Set 1:
(4 comments)
https://review.coreboot.org/c/coreboot/+/38081/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/38081/1//COMMIT_MSG@9 PS1, Line 9: Since the same subsystemid is used for all the devices on the
This is not true, some were left at their default.
Seems to be unintentional, though. Suggestions to reword this?
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/2760p/devi... File src/mainboard/hp/2760p/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/2760p/devi... PS1, Line 78: device pci 1c.3 on end # WLAN
Didn't have a subsystem id before.
Why shouldn't it? In any case, there are no fixups associated with Subsystem ID `0x162a` in Linux:
https://github.com/torvalds/linux/search?q=0x162a&unscoped_q=0x162a
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/2760p/devi... PS1, Line 81: device pci 1c.6 on end # PCIe Port #7, WWAN
Didn't either.
See (and discuss) above
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... File src/mainboard/hp/8770w/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... PS1, Line 36: device pci 00.0 on end # GPU : device pci 00.1 on end # HDMI Audio on GPU
Note, these inherit the sid too, intended?
Yes, the kernel has code for some GPUs with Subvendor ID `0x103c`:
https://github.com/torvalds/linux/search?q=0x103c&unscoped_q=0x103c
However, no fixups for Subsystem ID `0x176c`:
https://github.com/torvalds/linux/search?q=0x176c&unscoped_q=0x176c
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38081 )
Change subject: mb/hp/*/devicetree.cb: Inherit the subsystemid ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... File src/mainboard/hp/8770w/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... PS1, Line 36: device pci 00.0 on end # GPU : device pci 00.1 on end # HDMI Audio on GPU
Yes, the kernel has code for some GPUs with Subvendor ID `0x103c`: […]
Yeah, but what about the IDs it had before?
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38081 )
Change subject: mb/hp/*/devicetree.cb: Inherit the subsystemid ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... File src/mainboard/hp/8770w/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... PS1, Line 36: device pci 00.0 on end # GPU : device pci 00.1 on end # HDMI Audio on GPU
Yeah, but what about the IDs it had before?
I doubt that the subsystem IDs that these devices had before were tied to any vendor-specific workarounds.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38081 )
Change subject: mb/hp/*/devicetree.cb: Inherit the subsystemid ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... File src/mainboard/hp/8770w/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... PS1, Line 40: subsystemid 0x103c 0x176c Er... wut? This slipped out on CB:23651 (8770w initial port). Since that commit is the only one from that author that got merged, and that the other changes are duplicates of it, I am pretty sure this is a copypasta error. Comments?
Hello Iru Cai (vimacs), Patrick Rudolph, build bot (Jenkins), Nico Huber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38081
to look at the new patch set (#2).
Change subject: mb/hp/*/devicetree.cb: Inherit the subsystemid ......................................................................
mb/hp/*/devicetree.cb: Inherit the subsystemid
Since all the `subsystemid` lines in these devicetrees use the same values, factor them out via inheritance.
There are some exceptions though. There are some enabled devices which lack a `subsystemid` entry. Looks like HP uses the same subsystem ID on every device, so assume that these devices should also use that subsystem ID as well.
While we are at it, tidy up all the now-empty device blocks.
Change-Id: Iccd74fff9456e1204735a80ecc4f7685624cb78e Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/hp/2570p/devicetree.cb M src/mainboard/hp/2760p/devicetree.cb M src/mainboard/hp/8460p/devicetree.cb M src/mainboard/hp/8470p/devicetree.cb M src/mainboard/hp/8770w/devicetree.cb M src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb M src/mainboard/hp/folio_9470m/devicetree.cb M src/mainboard/hp/revolve_810_g1/devicetree.cb M src/mainboard/hp/z220_sff_workstation/devicetree.cb 9 files changed, 255 insertions(+), 593 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/38081/2
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38081 )
Change subject: mb/hp/*/devicetree.cb: Inherit the subsystemid ......................................................................
Patch Set 2: Code-Review+2
(2 comments)
https://review.coreboot.org/c/coreboot/+/38081/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/38081/1//COMMIT_MSG@9 PS1, Line 9: Since the same subsystemid is used for all the devices on the
Seems to be unintentional, though. […]
Done
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/2760p/devi... File src/mainboard/hp/2760p/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/2760p/devi... PS1, Line 78: device pci 1c.3 on end # WLAN
Why shouldn't it? In any case, there are no fixups associated with Subsystem ID `0x162a` in Linux: […]
Ack
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38081 )
Change subject: mb/hp/*/devicetree.cb: Inherit the subsystemid ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... File src/mainboard/hp/8770w/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... PS1, Line 36: device pci 00.0 on end # GPU : device pci 00.1 on end # HDMI Audio on GPU
I doubt that the subsystem IDs that these devices had before were tied to any vendor-specific workar […]
Ack
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38081 )
Change subject: mb/hp/*/devicetree.cb: Inherit the subsystemid ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... File src/mainboard/hp/8770w/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/38081/1/src/mainboard/hp/8770w/devi... PS1, Line 40: subsystemid 0x103c 0x176c
Er... wut? This slipped out on CB:23651 (8770w initial port). […]
Doesn't matter, we're not changing it ;)
Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38081 )
Change subject: mb/hp/*/devicetree.cb: Inherit the subsystemid ......................................................................
mb/hp/*/devicetree.cb: Inherit the subsystemid
Since all the `subsystemid` lines in these devicetrees use the same values, factor them out via inheritance.
There are some exceptions though. There are some enabled devices which lack a `subsystemid` entry. Looks like HP uses the same subsystem ID on every device, so assume that these devices should also use that subsystem ID as well.
While we are at it, tidy up all the now-empty device blocks.
Change-Id: Iccd74fff9456e1204735a80ecc4f7685624cb78e Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/38081 Reviewed-by: Nico Huber nico.h@gmx.de Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/hp/2570p/devicetree.cb M src/mainboard/hp/2760p/devicetree.cb M src/mainboard/hp/8460p/devicetree.cb M src/mainboard/hp/8470p/devicetree.cb M src/mainboard/hp/8770w/devicetree.cb M src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb M src/mainboard/hp/folio_9470m/devicetree.cb M src/mainboard/hp/revolve_810_g1/devicetree.cb M src/mainboard/hp/z220_sff_workstation/devicetree.cb 9 files changed, 255 insertions(+), 593 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
diff --git a/src/mainboard/hp/2570p/devicetree.cb b/src/mainboard/hp/2570p/devicetree.cb index c638676..abac787 100644 --- a/src/mainboard/hp/2570p/devicetree.cb +++ b/src/mainboard/hp/2570p/devicetree.cb @@ -43,6 +43,7 @@ end end device domain 0x0 on + subsystemid 0x103c 0x17df inherit chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" register "docking_supported" = "0" @@ -61,54 +62,26 @@ register "superspeed_capable_ports" = "0x0000000f" register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" - device pci 14.0 on # USB 3.0 Controller - subsystemid 0x103c 0x17df - end - device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x17df - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 off # Management Engine KT - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x17df - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x17df - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x17df - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x17df - end - device pci 1c.1 on # PCIe Port #2, ExpressCard - subsystemid 0x103c 0x17df - end - device pci 1c.2 on # PCIe Port #3, SD/MMC - subsystemid 0x103c 0x17df - end - device pci 1c.3 on # PCIe Port #4, WLAN - subsystemid 0x103c 0x17df - end - device pci 1c.4 off # PCIe Port #5 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 off # PCIe Port #7 - end - device pci 1c.7 off # PCIe Port #8 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x17df - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x17df + + device pci 14.0 on end # USB 3.0 Controller + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 off end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 on end # PCIe Port #2, ExpressCard + device pci 1c.2 on end # PCIe Port #3, SD/MMC + device pci 1c.3 on end # PCIe Port #4, WLAN + device pci 1c.4 off end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 off end # PCIe Port #7 + device pci 1c.7 off end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x62" register "ec_cmd_port" = "0x66" @@ -117,23 +90,13 @@ device pnp ff.1 off end end # kbc1126 end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x17df - end - device pci 1f.3 off # SMBus - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 off end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end - device pci 00.0 on # Host bridge Host bridge - subsystemid 0x103c 0x17df - end - device pci 01.0 off # PCIe Bridge for discrete graphics - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x17df - end + device pci 00.0 on end # Host bridge Host bridge + device pci 01.0 off end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller end end diff --git a/src/mainboard/hp/2760p/devicetree.cb b/src/mainboard/hp/2760p/devicetree.cb index 06124ed..f33d016 100644 --- a/src/mainboard/hp/2760p/devicetree.cb +++ b/src/mainboard/hp/2760p/devicetree.cb @@ -43,14 +43,11 @@ end end device domain 0x0 on - device pci 00.0 on # Host bridge Host bridge - subsystemid 0x103c 0x162a - end - device pci 01.0 off # PCIe Bridge for discrete graphics - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x162a - end + subsystemid 0x103c 0x162a inherit + + device pci 00.0 on end # Host bridge Host bridge + device pci 01.0 off end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller
chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" @@ -65,54 +62,27 @@ register "pcie_port_coalesce" = "1" register "sata_interface_speed_support" = "0x3" register "sata_port_map" = "0x21" - register "spi_uvscc" = "0x2005" register "spi_lvscc" = "0"
- device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x162a - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 off # Management Engine KT - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x162a - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x162a - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x162a - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x162a - end - device pci 1c.1 on # PCIe Port #2, ExpressCard - subsystemid 0x103c 0x162a - end - device pci 1c.2 on # PCIe Port #3, SD/MMC - subsystemid 0x103c 0x162a - end - device pci 1c.3 on # WLAN - end - device pci 1c.4 off # PCIe Port #5 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 on # PCIe Port #7, WWAN - end - device pci 1c.7 off # PCIe Port #8 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x162a - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x162a + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 off end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 on end # PCIe Port #2, ExpressCard + device pci 1c.2 on end # PCIe Port #3, SD/MMC + device pci 1c.3 on end # WLAN + device pci 1c.4 off end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 on end # PCIe Port #7, WWAN + device pci 1c.7 off end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x60" register "ec_cmd_port" = "0x64" @@ -121,15 +91,10 @@ device pnp ff.1 off end end # kbc1126 end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x162a - end - device pci 1f.3 off # SMBus - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 off end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end end end diff --git a/src/mainboard/hp/8460p/devicetree.cb b/src/mainboard/hp/8460p/devicetree.cb index 6852f02..972ee48 100644 --- a/src/mainboard/hp/8460p/devicetree.cb +++ b/src/mainboard/hp/8460p/devicetree.cb @@ -43,14 +43,12 @@ end end device domain 0x0 on - device pci 00.0 on # Host bridge - subsystemid 0x103c 0x161c - end - device pci 01.0 on # PCIe Bridge for discrete graphics - end - device pci 02.0 on # Internal graphics - subsystemid 0x103c 0x161c - end + subsystemid 0x103c 0x161c inherit + + device pci 00.0 on end # Host bridge + device pci 01.0 on end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics + chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" register "docking_supported" = "0" @@ -65,57 +63,27 @@ register "sata_interface_speed_support" = "0x3" # HDD(0), ODD(1), docking(3,5), eSATA(4) register "sata_port_map" = "0x3b" - register "spi_uvscc" = "0x2005" register "spi_lvscc" = "0"
- device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x161c - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 on # Management Engine KT - subsystemid 0x103c 0x161c - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x161c - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x161c - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x161c - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x161c - end - device pci 1c.1 on # PCIe Port #2, ExpressCard - subsystemid 0x103c 0x161c - end - device pci 1c.2 on # PCIe Port #3, SD/MMC - subsystemid 0x103c 0x161c - end - device pci 1c.3 on # PCIe Port #4, WLAN - subsystemid 0x103c 0x161c - end - device pci 1c.4 off # PCIe Port #5 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 on # PCIe Port #7, WWAN - end - device pci 1c.7 on # PCIe Port #8, NEC USB 3.0 Host Controller - subsystemid 0x103c 0x161c - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x161c - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x161c + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 on end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 on end # PCIe Port #2, ExpressCard + device pci 1c.2 on end # PCIe Port #3, SD/MMC + device pci 1c.3 on end # PCIe Port #4, WLAN + device pci 1c.4 off end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 on end # PCIe Port #7, WWAN + device pci 1c.7 on end # PCIe Port #8, NEC USB 3.0 Host Controller + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x60" register "ec_cmd_port" = "0x64" @@ -140,15 +108,10 @@ device pnp 0c31.0 on end end end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x161c - end - device pci 1f.3 off # SMBus - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 off end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end end end diff --git a/src/mainboard/hp/8470p/devicetree.cb b/src/mainboard/hp/8470p/devicetree.cb index 3725b08..afb254f 100644 --- a/src/mainboard/hp/8470p/devicetree.cb +++ b/src/mainboard/hp/8470p/devicetree.cb @@ -43,14 +43,11 @@ end end device domain 0x0 on - device pci 00.0 on # Host bridge - subsystemid 0x103c 0x179b - end - device pci 01.0 on # PCIe Bridge for discrete graphics - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x179b - end + subsystemid 0x103c 0x179b inherit + + device pci 00.0 on end # Host bridge + device pci 01.0 on end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller
chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" @@ -69,59 +66,28 @@ register "superspeed_capable_ports" = "0x0000000f" register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" - register "spi_uvscc" = "0x2005" register "spi_lvscc" = "0"
- device pci 14.0 on # USB 3.0 Controller - subsystemid 0x103c 0x179b - end - device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x179b - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 on # Management Engine KT - subsystemid 0x103c 0x179b - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x179b - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x179b - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x179b - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x179b - end - device pci 1c.1 on # PCIe Port #2, ExpressCard - subsystemid 0x103c 0x179b - end - device pci 1c.2 on # PCIe Port #3, SD/MMC - subsystemid 0x103c 0x179b - end - device pci 1c.3 on # PCIe Port #4, WLAN - subsystemid 0x103c 0x179b - end - device pci 1c.4 off # PCIe Port #5 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 off # PCIe Port #7 - end - device pci 1c.7 off # PCIe Port #8 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x179b - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x179b + device pci 14.0 on end # USB 3.0 Controller + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 on end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 on end # PCIe Port #2, ExpressCard + device pci 1c.2 on end # PCIe Port #3, SD/MMC + device pci 1c.3 on end # PCIe Port #4, WLAN + device pci 1c.4 off end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 off end # PCIe Port #7 + device pci 1c.7 off end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x62" register "ec_cmd_port" = "0x66" @@ -142,15 +108,10 @@ end end #chip superio/smsc/lpc47n217 end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x179b - end - device pci 1f.3 off # SMBus - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 off end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end end end diff --git a/src/mainboard/hp/8770w/devicetree.cb b/src/mainboard/hp/8770w/devicetree.cb index 0a30de2..a9096c5 100644 --- a/src/mainboard/hp/8770w/devicetree.cb +++ b/src/mainboard/hp/8770w/devicetree.cb @@ -29,16 +29,14 @@ end end device domain 0x0 on - device pci 00.0 on # Host bridge - subsystemid 0x103c 0x176c + subsystemid 0x103c 0x176c inherit + + device pci 00.0 on end # Host bridge + device pci 01.0 on # PCIe Bridge for discrete graphics + device pci 00.0 on end # GPU + device pci 00.1 on end # HDMI Audio on GPU end - device pci 01.0 on # PCIe Bridge for discrete graphics - device pci 00.0 on end # GPU - device pci 00.1 on end # HDMI Audio on GPU - end - device pci 02.0 off # Internal graphics VGA controller - subsystemid 0x103c 0x176c - end + device pci 02.0 off end # Internal graphics VGA controller
chip southbridge/intel/bd82x6x # Intel Series 7 Panther Point PCH register "c2_latency" = "0x0065" @@ -56,59 +54,28 @@ register "superspeed_capable_ports" = "0x0000000f" register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" - register "spi_uvscc" = "0x2005" register "spi_lvscc" = "0"
- device pci 14.0 on # USB 3.0 Controller - subsystemid 0x103c 0x176c - end - device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x176c - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 off # Management Engine KT - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x176c - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x176c - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x176c - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x176c - end - device pci 1c.1 on # PCIe Port #2 - subsystemid 0x103c 0x176c - end - device pci 1c.2 on # Media Card and FireWire host controller - subsystemid 0x103c 0x176c - end - device pci 1c.3 on # Wireless LAN Adapter - subsystemid 0x103c 0x176c - end - device pci 1c.4 on # SATA Controller 2 for dock - subsystemid 0x103c 0x176c - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 off # PCIe Port #7 - end - device pci 1c.7 off # PCIe Port #8 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x176c - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x176c + device pci 14.0 on end # USB 3.0 Controller + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 off end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 on end # PCIe Port #2 + device pci 1c.2 on end # Media Card and FireWire host controller + device pci 1c.3 on end # Wireless LAN Adapter + device pci 1c.4 on end # SATA Controller 2 for dock + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 off end # PCIe Port #7 + device pci 1c.7 off end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x62" register "ec_cmd_port" = "0x66" @@ -129,15 +96,10 @@ end end #chip superio/smsc/lpc47n217 end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x176c - end - device pci 1f.3 off # SMBus - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 off end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end end end diff --git a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb index 1472f84..660e3b0 100644 --- a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb +++ b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb @@ -39,6 +39,8 @@ register "pci_mmio_size" = "2048"
device domain 0x0 on + subsystemid 0x103c 0x1495 inherit + chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" register "docking_supported" = "0" @@ -50,53 +52,25 @@ register "sata_port_map" = "0xf" register "spi_lvscc" = "0x2005" register "spi_uvscc" = "0x0" - device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x1495 - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 on # Management Engine KT - subsystemid 0x103c 0x1495 - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x1495 - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x1495 - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x1495 - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x1495 - end - device pci 1c.1 off # PCIe Port #2 - end - device pci 1c.2 off # PCIe Port #3 - end - device pci 1c.3 off # PCIe Port #4 - end - device pci 1c.4 on # PCIe Port #5 - subsystemid 0x103c 0x1495 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 on # PCIe Port #7 - subsystemid 0x103c 0x1495 - end - device pci 1c.7 on # PCIe Port #8 - subsystemid 0x103c 0x1495 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x1495 - end - device pci 1e.0 on # PCI bridge - subsystemid 0x103c 0x1495 - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x1495 + + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 on end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 off end # PCIe Port #2 + device pci 1c.2 off end # PCIe Port #3 + device pci 1c.3 off end # PCIe Port #4 + device pci 1c.4 on end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 on end # PCIe Port #7 + device pci 1c.7 on end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 on end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip superio/nuvoton/npcd378 device pnp 2e.0 off end # Floppy device pnp 2e.1 on # Parallel port @@ -197,25 +171,13 @@ device pnp 4e.0 on end # TPM module end end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x1495 - end - device pci 1f.3 on # SMBus - subsystemid 0x103c 0x1495 - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 on end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end - device pci 00.0 on # Host bridge Host bridge - subsystemid 0x103c 0x1495 - end - device pci 01.0 on # PCIe Bridge for discrete graphics - subsystemid 0x103c 0x1495 - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x1495 - end + device pci 00.0 on end # Host bridge Host bridge + device pci 01.0 on end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller end end diff --git a/src/mainboard/hp/folio_9470m/devicetree.cb b/src/mainboard/hp/folio_9470m/devicetree.cb index cd610b6..7d0265d 100644 --- a/src/mainboard/hp/folio_9470m/devicetree.cb +++ b/src/mainboard/hp/folio_9470m/devicetree.cb @@ -43,6 +43,8 @@ end end device domain 0x0 on + subsystemid 0x103c 0x18df inherit + chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" register "docking_supported" = "0" @@ -61,54 +63,26 @@ register "superspeed_capable_ports" = "0x0000000f" register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" - device pci 14.0 on # USB 3.0 Controller - subsystemid 0x103c 0x18df - end - device pci 16.0 off # Management Engine Interface 1 - subsystemid 0x103c 0x18df - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 off # Management Engine KT - subsystemid 0x103c 0x18df - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x18df - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x18df - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x18df - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x18df - end - device pci 1c.1 off # PCIe Port #2 - end - device pci 1c.2 on # PCIe Port #3 - subsystemid 0x103c 0x18df - end # SDHCI - device pci 1c.3 on # PCIe Port #4 - subsystemid 0x103c 0x18df - end # WLAN - device pci 1c.4 off # PCIe Port #5 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 off # PCIe Port #7 - end - device pci 1c.7 off # PCIe Port #8 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x18df - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x18df + + device pci 14.0 on end # USB 3.0 Controller + device pci 16.0 off end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 off end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 off end # PCIe Port #2 + device pci 1c.2 on end # PCIe Port #3 SDHCI + device pci 1c.3 on end # PCIe Port #4 WLAN + device pci 1c.4 off end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 off end # PCIe Port #7 + device pci 1c.7 off end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x62" register "ec_cmd_port" = "0x66" @@ -121,24 +95,13 @@ device pnp 0c31.0 on end end end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x18df - end - device pci 1f.3 on # SMBus - subsystemid 0x103c 0x18df - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 on end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end - device pci 00.0 on # Host bridge Host bridge - subsystemid 0x103c 0x18df - end - device pci 01.0 off # PCIe Bridge for discrete graphics - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x18df - end + device pci 00.0 on end # Host bridge Host bridge + device pci 01.0 off end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller end end diff --git a/src/mainboard/hp/revolve_810_g1/devicetree.cb b/src/mainboard/hp/revolve_810_g1/devicetree.cb index 32d04ea..4a08f42 100644 --- a/src/mainboard/hp/revolve_810_g1/devicetree.cb +++ b/src/mainboard/hp/revolve_810_g1/devicetree.cb @@ -43,6 +43,8 @@ end end device domain 0x0 on + subsystemid 0x103c 0x18f8 inherit + chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" register "docking_supported" = "0" @@ -61,54 +63,26 @@ register "superspeed_capable_ports" = "0x0000000f" register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f" - device pci 14.0 on # USB 3.0 Controller - subsystemid 0x103c 0x18f8 - end - device pci 16.0 off # Management Engine Interface 1 - subsystemid 0x103c 0x18f8 - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 off # Management Engine KT - subsystemid 0x103c 0x18f8 - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x8086 0x18f8 - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x18f8 - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x18f8 - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x18f8 - end - device pci 1c.1 off # PCIe Port #2 - end - device pci 1c.2 on # PCIe Port #3 - subsystemid 0x103c 0x18f8 - end - device pci 1c.3 on # PCIe Port #4 - subsystemid 0x103c 0x18f8 - end - device pci 1c.4 off # PCIe Port #5 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 off # PCIe Port #7 - end - device pci 1c.7 off # PCIe Port #8 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x18f8 - end - device pci 1e.0 off # PCI bridge - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x18f8 + + device pci 14.0 on end # USB 3.0 Controller + device pci 16.0 off end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 off end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 off end # PCIe Port #2 + device pci 1c.2 on end # PCIe Port #3 + device pci 1c.3 on end # PCIe Port #4 + device pci 1c.4 off end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 off end # PCIe Port #7 + device pci 1c.7 off end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 off end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip ec/hp/kbc1126 register "ec_data_port" = "0x62" register "ec_cmd_port" = "0x66" @@ -121,23 +95,13 @@ device pnp 0c31.0 on end end end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x18f8 - end - device pci 1f.3 off # SMBus - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 off end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end - device pci 00.0 on # Host bridge Host bridge - subsystemid 0x103c 0x18f8 - end - device pci 01.0 off # PCIe Bridge for discrete graphics - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x18f8 - end + device pci 00.0 on end # Host bridge Host bridge + device pci 01.0 off end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller end end diff --git a/src/mainboard/hp/z220_sff_workstation/devicetree.cb b/src/mainboard/hp/z220_sff_workstation/devicetree.cb index 5108db4..94d079a 100644 --- a/src/mainboard/hp/z220_sff_workstation/devicetree.cb +++ b/src/mainboard/hp/z220_sff_workstation/devicetree.cb @@ -39,6 +39,7 @@ register "pci_mmio_size" = "2048"
device domain 0x0 on + subsystemid 0x103c 0x1791 inherit chip southbridge/intel/bd82x6x # Intel Series 7 PCH register "c2_latency" = "0x0065" register "docking_supported" = "0" @@ -50,56 +51,26 @@ register "sata_port_map" = "0xf" register "spi_lvscc" = "0x2005" register "spi_uvscc" = "0x2005" - device pci 14.0 on # xHCI - subsystemid 0x103c 0x1791 - end - device pci 16.0 on # Management Engine Interface 1 - subsystemid 0x103c 0x1791 - end - device pci 16.1 off # Management Engine Interface 2 - end - device pci 16.2 off # Management Engine IDE-R - end - device pci 16.3 on # Management Engine KT - subsystemid 0x103c 0x1791 - end - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x103c 0x1791 - end - device pci 1a.0 on # USB2 EHCI #2 - subsystemid 0x103c 0x1791 - end - device pci 1b.0 on # High Definition Audio Audio controller - subsystemid 0x103c 0x1791 - end - device pci 1c.0 on # PCIe Port #1 - subsystemid 0x103c 0x1791 - end - device pci 1c.1 off # PCIe Port #2 - end - device pci 1c.2 off # PCIe Port #3 - end - device pci 1c.3 off # PCIe Port #4 - end - device pci 1c.4 on # PCIe Port #5 - subsystemid 0x103c 0x1791 - end - device pci 1c.5 off # PCIe Port #6 - end - device pci 1c.6 on # PCIe Port #7 - subsystemid 0x103c 0x1791 - end - device pci 1c.7 on # PCIe Port #8 - subsystemid 0x103c 0x1791 - end - device pci 1d.0 on # USB2 EHCI #1 - subsystemid 0x103c 0x1791 - end - device pci 1e.0 on # PCI bridge - subsystemid 0x103c 0x1791 - end - device pci 1f.0 on # LPC bridge PCI-LPC bridge - subsystemid 0x103c 0x1791 + + device pci 14.0 on end # xHCI + device pci 16.0 on end # Management Engine Interface 1 + device pci 16.1 off end # Management Engine Interface 2 + device pci 16.2 off end # Management Engine IDE-R + device pci 16.3 on end # Management Engine KT + device pci 19.0 on end # Intel Gigabit Ethernet + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio Audio controller + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 off end # PCIe Port #2 + device pci 1c.2 off end # PCIe Port #3 + device pci 1c.3 off end # PCIe Port #4 + device pci 1c.4 on end # PCIe Port #5 + device pci 1c.5 off end # PCIe Port #6 + device pci 1c.6 on end # PCIe Port #7 + device pci 1c.7 on end # PCIe Port #8 + device pci 1d.0 on end # USB2 EHCI #1 + device pci 1e.0 on end # PCI bridge + device pci 1f.0 on # LPC bridge PCI-LPC bridge chip superio/nuvoton/npcd378 device pnp 2e.0 off end # Floppy device pnp 2e.1 on # Parallel port @@ -200,25 +171,13 @@ device pnp 4e.0 on end # TPM module end end - device pci 1f.2 on # SATA Controller 1 - subsystemid 0x103c 0x1791 - end - device pci 1f.3 on # SMBus - subsystemid 0x103c 0x1791 - end - device pci 1f.5 off # SATA Controller 2 - end - device pci 1f.6 off # Thermal - end + device pci 1f.2 on end # SATA Controller 1 + device pci 1f.3 on end # SMBus + device pci 1f.5 off end # SATA Controller 2 + device pci 1f.6 off end # Thermal end - device pci 00.0 on # Host bridge Host bridge - subsystemid 0x103c 0x1791 - end - device pci 01.0 on # PCIe Bridge for discrete graphics - subsystemid 0x103c 0x1791 - end - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x103c 0x1791 - end + device pci 00.0 on end # Host bridge Host bridge + device pci 01.0 on end # PCIe Bridge for discrete graphics + device pci 02.0 on end # Internal graphics VGA controller end end
-
Angel Pons (Code Review) -
Nico Huber (Code Review)