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>
This commit is contained in:
Angel Pons 2020-01-01 20:52:11 +01:00 committed by Nico Huber
parent 0560a66450
commit a0a3eab36d
9 changed files with 255 additions and 593 deletions

View File

@ -43,6 +43,7 @@ chip northbridge/intel/sandybridge
end end
end end
device domain 0x0 on device domain 0x0 on
subsystemid 0x103c 0x17df inherit
chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
register "c2_latency" = "0x0065" register "c2_latency" = "0x0065"
register "docking_supported" = "0" register "docking_supported" = "0"
@ -61,54 +62,26 @@ chip northbridge/intel/sandybridge
register "superspeed_capable_ports" = "0x0000000f" register "superspeed_capable_ports" = "0x0000000f"
register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_overcurrent_mapping" = "0x00000c03"
register "xhci_switchable_ports" = "0x0000000f" register "xhci_switchable_ports" = "0x0000000f"
device pci 14.0 on # USB 3.0 Controller
subsystemid 0x103c 0x17df device pci 14.0 on end # USB 3.0 Controller
end device pci 16.0 on end # Management Engine Interface 1
device pci 16.0 on # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2
subsystemid 0x103c 0x17df device pci 16.2 off end # Management Engine IDE-R
end device pci 16.3 off end # Management Engine KT
device pci 16.1 off # Management Engine Interface 2 device pci 19.0 on end # Intel Gigabit Ethernet
end device pci 1a.0 on end # USB2 EHCI #2
device pci 16.2 off # Management Engine IDE-R device pci 1b.0 on end # High Definition Audio Audio controller
end device pci 1c.0 on end # PCIe Port #1
device pci 16.3 off # Management Engine KT device pci 1c.1 on end # PCIe Port #2, ExpressCard
end device pci 1c.2 on end # PCIe Port #3, SD/MMC
device pci 19.0 on # Intel Gigabit Ethernet device pci 1c.3 on end # PCIe Port #4, WLAN
subsystemid 0x103c 0x17df device pci 1c.4 off end # PCIe Port #5
end device pci 1c.5 off end # PCIe Port #6
device pci 1a.0 on # USB2 EHCI #2 device pci 1c.6 off end # PCIe Port #7
subsystemid 0x103c 0x17df device pci 1c.7 off end # PCIe Port #8
end device pci 1d.0 on end # USB2 EHCI #1
device pci 1b.0 on # High Definition Audio Audio controller device pci 1e.0 off end # PCI bridge
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 device pci 1f.0 on # LPC bridge PCI-LPC bridge
subsystemid 0x103c 0x17df
chip ec/hp/kbc1126 chip ec/hp/kbc1126
register "ec_data_port" = "0x62" register "ec_data_port" = "0x62"
register "ec_cmd_port" = "0x66" register "ec_cmd_port" = "0x66"
@ -117,23 +90,13 @@ chip northbridge/intel/sandybridge
device pnp ff.1 off end device pnp ff.1 off end
end # kbc1126 end # kbc1126
end end
device pci 1f.2 on # SATA Controller 1 device pci 1f.2 on end # SATA Controller 1
subsystemid 0x103c 0x17df device pci 1f.3 off end # SMBus
end device pci 1f.5 off end # SATA Controller 2
device pci 1f.3 off # SMBus device pci 1f.6 off end # Thermal
end
device pci 1f.5 off # SATA Controller 2
end
device pci 1f.6 off # Thermal
end
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 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
end end

View File

@ -43,14 +43,11 @@ chip northbridge/intel/sandybridge
end end
end end
device domain 0x0 on device domain 0x0 on
device pci 00.0 on # Host bridge Host bridge subsystemid 0x103c 0x162a inherit
subsystemid 0x103c 0x162a
end device pci 00.0 on end # Host bridge Host bridge
device pci 01.0 off # PCIe Bridge for discrete graphics device pci 01.0 off end # PCIe Bridge for discrete graphics
end device pci 02.0 on end # Internal graphics VGA controller
device pci 02.0 on # Internal graphics VGA controller
subsystemid 0x103c 0x162a
end
chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
register "c2_latency" = "0x0065" register "c2_latency" = "0x0065"
@ -65,54 +62,27 @@ chip northbridge/intel/sandybridge
register "pcie_port_coalesce" = "1" register "pcie_port_coalesce" = "1"
register "sata_interface_speed_support" = "0x3" register "sata_interface_speed_support" = "0x3"
register "sata_port_map" = "0x21" register "sata_port_map" = "0x21"
register "spi_uvscc" = "0x2005" register "spi_uvscc" = "0x2005"
register "spi_lvscc" = "0" register "spi_lvscc" = "0"
device pci 16.0 on # Management Engine Interface 1 device pci 16.0 on end # Management Engine Interface 1
subsystemid 0x103c 0x162a device pci 16.1 off end # Management Engine Interface 2
end device pci 16.2 off end # Management Engine IDE-R
device pci 16.1 off # Management Engine Interface 2 device pci 16.3 off end # Management Engine KT
end device pci 19.0 on end # Intel Gigabit Ethernet
device pci 16.2 off # Management Engine IDE-R device pci 1a.0 on end # USB2 EHCI #2
end device pci 1b.0 on end # High Definition Audio Audio controller
device pci 16.3 off # Management Engine KT device pci 1c.0 on end # PCIe Port #1
end device pci 1c.1 on end # PCIe Port #2, ExpressCard
device pci 19.0 on # Intel Gigabit Ethernet device pci 1c.2 on end # PCIe Port #3, SD/MMC
subsystemid 0x103c 0x162a device pci 1c.3 on end # WLAN
end device pci 1c.4 off end # PCIe Port #5
device pci 1a.0 on # USB2 EHCI #2 device pci 1c.5 off end # PCIe Port #6
subsystemid 0x103c 0x162a device pci 1c.6 on end # PCIe Port #7, WWAN
end device pci 1c.7 off end # PCIe Port #8
device pci 1b.0 on # High Definition Audio Audio controller device pci 1d.0 on end # USB2 EHCI #1
subsystemid 0x103c 0x162a device pci 1e.0 off end # PCI bridge
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 device pci 1f.0 on # LPC bridge PCI-LPC bridge
subsystemid 0x103c 0x162a
chip ec/hp/kbc1126 chip ec/hp/kbc1126
register "ec_data_port" = "0x60" register "ec_data_port" = "0x60"
register "ec_cmd_port" = "0x64" register "ec_cmd_port" = "0x64"
@ -121,15 +91,10 @@ chip northbridge/intel/sandybridge
device pnp ff.1 off end device pnp ff.1 off end
end # kbc1126 end # kbc1126
end end
device pci 1f.2 on # SATA Controller 1 device pci 1f.2 on end # SATA Controller 1
subsystemid 0x103c 0x162a device pci 1f.3 off end # SMBus
end device pci 1f.5 off end # SATA Controller 2
device pci 1f.3 off # SMBus device pci 1f.6 off end # Thermal
end
device pci 1f.5 off # SATA Controller 2
end
device pci 1f.6 off # Thermal
end
end end
end end
end end

View File

@ -43,14 +43,12 @@ chip northbridge/intel/sandybridge
end end
end end
device domain 0x0 on device domain 0x0 on
device pci 00.0 on # Host bridge subsystemid 0x103c 0x161c inherit
subsystemid 0x103c 0x161c
end device pci 00.0 on end # Host bridge
device pci 01.0 on # PCIe Bridge for discrete graphics device pci 01.0 on end # PCIe Bridge for discrete graphics
end device pci 02.0 on end # Internal graphics
device pci 02.0 on # Internal graphics
subsystemid 0x103c 0x161c
end
chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
register "c2_latency" = "0x0065" register "c2_latency" = "0x0065"
register "docking_supported" = "0" register "docking_supported" = "0"
@ -65,57 +63,27 @@ chip northbridge/intel/sandybridge
register "sata_interface_speed_support" = "0x3" register "sata_interface_speed_support" = "0x3"
# HDD(0), ODD(1), docking(3,5), eSATA(4) # HDD(0), ODD(1), docking(3,5), eSATA(4)
register "sata_port_map" = "0x3b" register "sata_port_map" = "0x3b"
register "spi_uvscc" = "0x2005" register "spi_uvscc" = "0x2005"
register "spi_lvscc" = "0" register "spi_lvscc" = "0"
device pci 16.0 on # Management Engine Interface 1 device pci 16.0 on end # Management Engine Interface 1
subsystemid 0x103c 0x161c device pci 16.1 off end # Management Engine Interface 2
end device pci 16.2 off end # Management Engine IDE-R
device pci 16.1 off # Management Engine Interface 2 device pci 16.3 on end # Management Engine KT
end device pci 19.0 on end # Intel Gigabit Ethernet
device pci 16.2 off # Management Engine IDE-R device pci 1a.0 on end # USB2 EHCI #2
end device pci 1b.0 on end # High Definition Audio Audio controller
device pci 16.3 on # Management Engine KT device pci 1c.0 on end # PCIe Port #1
subsystemid 0x103c 0x161c device pci 1c.1 on end # PCIe Port #2, ExpressCard
end device pci 1c.2 on end # PCIe Port #3, SD/MMC
device pci 19.0 on # Intel Gigabit Ethernet device pci 1c.3 on end # PCIe Port #4, WLAN
subsystemid 0x103c 0x161c device pci 1c.4 off end # PCIe Port #5
end device pci 1c.5 off end # PCIe Port #6
device pci 1a.0 on # USB2 EHCI #2 device pci 1c.6 on end # PCIe Port #7, WWAN
subsystemid 0x103c 0x161c device pci 1c.7 on end # PCIe Port #8, NEC USB 3.0 Host Controller
end device pci 1d.0 on end # USB2 EHCI #1
device pci 1b.0 on # High Definition Audio Audio controller device pci 1e.0 off end # PCI bridge
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 device pci 1f.0 on # LPC bridge PCI-LPC bridge
subsystemid 0x103c 0x161c
chip ec/hp/kbc1126 chip ec/hp/kbc1126
register "ec_data_port" = "0x60" register "ec_data_port" = "0x60"
register "ec_cmd_port" = "0x64" register "ec_cmd_port" = "0x64"
@ -140,15 +108,10 @@ chip northbridge/intel/sandybridge
device pnp 0c31.0 on end device pnp 0c31.0 on end
end end
end end
device pci 1f.2 on # SATA Controller 1 device pci 1f.2 on end # SATA Controller 1
subsystemid 0x103c 0x161c device pci 1f.3 off end # SMBus
end device pci 1f.5 off end # SATA Controller 2
device pci 1f.3 off # SMBus device pci 1f.6 off end # Thermal
end
device pci 1f.5 off # SATA Controller 2
end
device pci 1f.6 off # Thermal
end
end end
end end
end end

View File

@ -43,14 +43,11 @@ chip northbridge/intel/sandybridge
end end
end end
device domain 0x0 on device domain 0x0 on
device pci 00.0 on # Host bridge subsystemid 0x103c 0x179b inherit
subsystemid 0x103c 0x179b
end device pci 00.0 on end # Host bridge
device pci 01.0 on # PCIe Bridge for discrete graphics device pci 01.0 on end # PCIe Bridge for discrete graphics
end device pci 02.0 on end # Internal graphics VGA controller
device pci 02.0 on # Internal graphics VGA controller
subsystemid 0x103c 0x179b
end
chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
register "c2_latency" = "0x0065" register "c2_latency" = "0x0065"
@ -69,59 +66,28 @@ chip northbridge/intel/sandybridge
register "superspeed_capable_ports" = "0x0000000f" register "superspeed_capable_ports" = "0x0000000f"
register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_overcurrent_mapping" = "0x00000c03"
register "xhci_switchable_ports" = "0x0000000f" register "xhci_switchable_ports" = "0x0000000f"
register "spi_uvscc" = "0x2005" register "spi_uvscc" = "0x2005"
register "spi_lvscc" = "0" register "spi_lvscc" = "0"
device pci 14.0 on # USB 3.0 Controller device pci 14.0 on end # USB 3.0 Controller
subsystemid 0x103c 0x179b device pci 16.0 on end # Management Engine Interface 1
end device pci 16.1 off end # Management Engine Interface 2
device pci 16.0 on # Management Engine Interface 1 device pci 16.2 off end # Management Engine IDE-R
subsystemid 0x103c 0x179b device pci 16.3 on end # Management Engine KT
end device pci 19.0 on end # Intel Gigabit Ethernet
device pci 16.1 off # Management Engine Interface 2 device pci 1a.0 on end # USB2 EHCI #2
end device pci 1b.0 on end # High Definition Audio Audio controller
device pci 16.2 off # Management Engine IDE-R device pci 1c.0 on end # PCIe Port #1
end device pci 1c.1 on end # PCIe Port #2, ExpressCard
device pci 16.3 on # Management Engine KT device pci 1c.2 on end # PCIe Port #3, SD/MMC
subsystemid 0x103c 0x179b device pci 1c.3 on end # PCIe Port #4, WLAN
end device pci 1c.4 off end # PCIe Port #5
device pci 19.0 on # Intel Gigabit Ethernet device pci 1c.5 off end # PCIe Port #6
subsystemid 0x103c 0x179b device pci 1c.6 off end # PCIe Port #7
end device pci 1c.7 off end # PCIe Port #8
device pci 1a.0 on # USB2 EHCI #2 device pci 1d.0 on end # USB2 EHCI #1
subsystemid 0x103c 0x179b device pci 1e.0 off end # PCI bridge
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 device pci 1f.0 on # LPC bridge PCI-LPC bridge
subsystemid 0x103c 0x179b
chip ec/hp/kbc1126 chip ec/hp/kbc1126
register "ec_data_port" = "0x62" register "ec_data_port" = "0x62"
register "ec_cmd_port" = "0x66" register "ec_cmd_port" = "0x66"
@ -142,15 +108,10 @@ chip northbridge/intel/sandybridge
end end
end #chip superio/smsc/lpc47n217 end #chip superio/smsc/lpc47n217
end end
device pci 1f.2 on # SATA Controller 1 device pci 1f.2 on end # SATA Controller 1
subsystemid 0x103c 0x179b device pci 1f.3 off end # SMBus
end device pci 1f.5 off end # SATA Controller 2
device pci 1f.3 off # SMBus device pci 1f.6 off end # Thermal
end
device pci 1f.5 off # SATA Controller 2
end
device pci 1f.6 off # Thermal
end
end end
end end
end end

View File

@ -29,16 +29,14 @@ chip northbridge/intel/sandybridge
end end
end end
device domain 0x0 on device domain 0x0 on
device pci 00.0 on # Host bridge subsystemid 0x103c 0x176c inherit
subsystemid 0x103c 0x176c
end device pci 00.0 on end # Host bridge
device pci 01.0 on # PCIe Bridge for discrete graphics device pci 01.0 on # PCIe Bridge for discrete graphics
device pci 00.0 on end # GPU device pci 00.0 on end # GPU
device pci 00.1 on end # HDMI Audio on GPU device pci 00.1 on end # HDMI Audio on GPU
end end
device pci 02.0 off # Internal graphics VGA controller device pci 02.0 off end # Internal graphics VGA controller
subsystemid 0x103c 0x176c
end
chip southbridge/intel/bd82x6x # Intel Series 7 Panther Point PCH chip southbridge/intel/bd82x6x # Intel Series 7 Panther Point PCH
register "c2_latency" = "0x0065" register "c2_latency" = "0x0065"
@ -56,59 +54,28 @@ chip northbridge/intel/sandybridge
register "superspeed_capable_ports" = "0x0000000f" register "superspeed_capable_ports" = "0x0000000f"
register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_overcurrent_mapping" = "0x00000c03"
register "xhci_switchable_ports" = "0x0000000f" register "xhci_switchable_ports" = "0x0000000f"
register "spi_uvscc" = "0x2005" register "spi_uvscc" = "0x2005"
register "spi_lvscc" = "0" register "spi_lvscc" = "0"
device pci 14.0 on # USB 3.0 Controller device pci 14.0 on end # USB 3.0 Controller
subsystemid 0x103c 0x176c device pci 16.0 on end # Management Engine Interface 1
end device pci 16.1 off end # Management Engine Interface 2
device pci 16.0 on # Management Engine Interface 1 device pci 16.2 off end # Management Engine IDE-R
subsystemid 0x103c 0x176c device pci 16.3 off end # Management Engine KT
end device pci 19.0 on end # Intel Gigabit Ethernet
device pci 16.1 off # Management Engine Interface 2 device pci 1a.0 on end # USB2 EHCI #2
end device pci 1b.0 on end # High Definition Audio Audio controller
device pci 16.2 off # Management Engine IDE-R device pci 1c.0 on end # PCIe Port #1
end device pci 1c.1 on end # PCIe Port #2
device pci 16.3 off # Management Engine KT device pci 1c.2 on end # Media Card and FireWire host controller
end device pci 1c.3 on end # Wireless LAN Adapter
device pci 19.0 on # Intel Gigabit Ethernet device pci 1c.4 on end # SATA Controller 2 for dock
subsystemid 0x103c 0x176c device pci 1c.5 off end # PCIe Port #6
end device pci 1c.6 off end # PCIe Port #7
device pci 1a.0 on # USB2 EHCI #2 device pci 1c.7 off end # PCIe Port #8
subsystemid 0x103c 0x176c device pci 1d.0 on end # USB2 EHCI #1
end device pci 1e.0 off end # PCI bridge
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 device pci 1f.0 on # LPC bridge PCI-LPC bridge
subsystemid 0x103c 0x176c
chip ec/hp/kbc1126 chip ec/hp/kbc1126
register "ec_data_port" = "0x62" register "ec_data_port" = "0x62"
register "ec_cmd_port" = "0x66" register "ec_cmd_port" = "0x66"
@ -129,15 +96,10 @@ chip northbridge/intel/sandybridge
end end
end #chip superio/smsc/lpc47n217 end #chip superio/smsc/lpc47n217
end end
device pci 1f.2 on # SATA Controller 1 device pci 1f.2 on end # SATA Controller 1
subsystemid 0x103c 0x176c device pci 1f.3 off end # SMBus
end device pci 1f.5 off end # SATA Controller 2
device pci 1f.3 off # SMBus device pci 1f.6 off end # Thermal
end
device pci 1f.5 off # SATA Controller 2
end
device pci 1f.6 off # Thermal
end
end end
end end
end end

View File

@ -39,6 +39,8 @@ chip northbridge/intel/sandybridge
register "pci_mmio_size" = "2048" register "pci_mmio_size" = "2048"
device domain 0x0 on device domain 0x0 on
subsystemid 0x103c 0x1495 inherit
chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
register "c2_latency" = "0x0065" register "c2_latency" = "0x0065"
register "docking_supported" = "0" register "docking_supported" = "0"
@ -50,53 +52,25 @@ chip northbridge/intel/sandybridge
register "sata_port_map" = "0xf" register "sata_port_map" = "0xf"
register "spi_lvscc" = "0x2005" register "spi_lvscc" = "0x2005"
register "spi_uvscc" = "0x0" register "spi_uvscc" = "0x0"
device pci 16.0 on # Management Engine Interface 1
subsystemid 0x103c 0x1495 device pci 16.0 on end # Management Engine Interface 1
end device pci 16.1 off end # Management Engine Interface 2
device pci 16.1 off # Management Engine Interface 2 device pci 16.2 off end # Management Engine IDE-R
end device pci 16.3 on end # Management Engine KT
device pci 16.2 off # Management Engine IDE-R device pci 19.0 on end # Intel Gigabit Ethernet
end device pci 1a.0 on end # USB2 EHCI #2
device pci 16.3 on # Management Engine KT device pci 1b.0 on end # High Definition Audio Audio controller
subsystemid 0x103c 0x1495 device pci 1c.0 on end # PCIe Port #1
end device pci 1c.1 off end # PCIe Port #2
device pci 19.0 on # Intel Gigabit Ethernet device pci 1c.2 off end # PCIe Port #3
subsystemid 0x103c 0x1495 device pci 1c.3 off end # PCIe Port #4
end device pci 1c.4 on end # PCIe Port #5
device pci 1a.0 on # USB2 EHCI #2 device pci 1c.5 off end # PCIe Port #6
subsystemid 0x103c 0x1495 device pci 1c.6 on end # PCIe Port #7
end device pci 1c.7 on end # PCIe Port #8
device pci 1b.0 on # High Definition Audio Audio controller device pci 1d.0 on end # USB2 EHCI #1
subsystemid 0x103c 0x1495 device pci 1e.0 on end # PCI bridge
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 device pci 1f.0 on # LPC bridge PCI-LPC bridge
subsystemid 0x103c 0x1495
chip superio/nuvoton/npcd378 chip superio/nuvoton/npcd378
device pnp 2e.0 off end # Floppy device pnp 2e.0 off end # Floppy
device pnp 2e.1 on # Parallel port device pnp 2e.1 on # Parallel port
@ -197,25 +171,13 @@ chip northbridge/intel/sandybridge
device pnp 4e.0 on end # TPM module device pnp 4e.0 on end # TPM module
end end
end end
device pci 1f.2 on # SATA Controller 1 device pci 1f.2 on end # SATA Controller 1
subsystemid 0x103c 0x1495 device pci 1f.3 on end # SMBus
end device pci 1f.5 off end # SATA Controller 2
device pci 1f.3 on # SMBus device pci 1f.6 off end # Thermal
subsystemid 0x103c 0x1495
end
device pci 1f.5 off # SATA Controller 2
end
device pci 1f.6 off # Thermal
end
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 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
end end

View File

@ -43,6 +43,8 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
end end
end end
device domain 0x0 on device domain 0x0 on
subsystemid 0x103c 0x18df inherit
chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
register "c2_latency" = "0x0065" register "c2_latency" = "0x0065"
register "docking_supported" = "0" register "docking_supported" = "0"
@ -61,54 +63,26 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
register "superspeed_capable_ports" = "0x0000000f" register "superspeed_capable_ports" = "0x0000000f"
register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_overcurrent_mapping" = "0x00000c03"
register "xhci_switchable_ports" = "0x0000000f" register "xhci_switchable_ports" = "0x0000000f"
device pci 14.0 on # USB 3.0 Controller
subsystemid 0x103c 0x18df device pci 14.0 on end # USB 3.0 Controller
end device pci 16.0 off end # Management Engine Interface 1
device pci 16.0 off # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2
subsystemid 0x103c 0x18df device pci 16.2 off end # Management Engine IDE-R
end device pci 16.3 off end # Management Engine KT
device pci 16.1 off # Management Engine Interface 2 device pci 19.0 on end # Intel Gigabit Ethernet
end device pci 1a.0 on end # USB2 EHCI #2
device pci 16.2 off # Management Engine IDE-R device pci 1b.0 on end # High Definition Audio Audio controller
end device pci 1c.0 on end # PCIe Port #1
device pci 16.3 off # Management Engine KT device pci 1c.1 off end # PCIe Port #2
subsystemid 0x103c 0x18df device pci 1c.2 on end # PCIe Port #3 SDHCI
end device pci 1c.3 on end # PCIe Port #4 WLAN
device pci 19.0 on # Intel Gigabit Ethernet device pci 1c.4 off end # PCIe Port #5
subsystemid 0x103c 0x18df device pci 1c.5 off end # PCIe Port #6
end device pci 1c.6 off end # PCIe Port #7
device pci 1a.0 on # USB2 EHCI #2 device pci 1c.7 off end # PCIe Port #8
subsystemid 0x103c 0x18df device pci 1d.0 on end # USB2 EHCI #1
end device pci 1e.0 off end # PCI bridge
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 device pci 1f.0 on # LPC bridge PCI-LPC bridge
subsystemid 0x103c 0x18df
chip ec/hp/kbc1126 chip ec/hp/kbc1126
register "ec_data_port" = "0x62" register "ec_data_port" = "0x62"
register "ec_cmd_port" = "0x66" register "ec_cmd_port" = "0x66"
@ -121,24 +95,13 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
device pnp 0c31.0 on end device pnp 0c31.0 on end
end end
end end
device pci 1f.2 on # SATA Controller 1 device pci 1f.2 on end # SATA Controller 1
subsystemid 0x103c 0x18df device pci 1f.3 on end # SMBus
end device pci 1f.5 off end # SATA Controller 2
device pci 1f.3 on # SMBus device pci 1f.6 off end # Thermal
subsystemid 0x103c 0x18df
end
device pci 1f.5 off # SATA Controller 2
end
device pci 1f.6 off # Thermal
end
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 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
end end

View File

@ -43,6 +43,8 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
end end
end end
device domain 0x0 on device domain 0x0 on
subsystemid 0x103c 0x18f8 inherit
chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
register "c2_latency" = "0x0065" register "c2_latency" = "0x0065"
register "docking_supported" = "0" register "docking_supported" = "0"
@ -61,54 +63,26 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
register "superspeed_capable_ports" = "0x0000000f" register "superspeed_capable_ports" = "0x0000000f"
register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_overcurrent_mapping" = "0x00000c03"
register "xhci_switchable_ports" = "0x0000000f" register "xhci_switchable_ports" = "0x0000000f"
device pci 14.0 on # USB 3.0 Controller
subsystemid 0x103c 0x18f8 device pci 14.0 on end # USB 3.0 Controller
end device pci 16.0 off end # Management Engine Interface 1
device pci 16.0 off # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2
subsystemid 0x103c 0x18f8 device pci 16.2 off end # Management Engine IDE-R
end device pci 16.3 off end # Management Engine KT
device pci 16.1 off # Management Engine Interface 2 device pci 19.0 on end # Intel Gigabit Ethernet
end device pci 1a.0 on end # USB2 EHCI #2
device pci 16.2 off # Management Engine IDE-R device pci 1b.0 on end # High Definition Audio Audio controller
end device pci 1c.0 on end # PCIe Port #1
device pci 16.3 off # Management Engine KT device pci 1c.1 off end # PCIe Port #2
subsystemid 0x103c 0x18f8 device pci 1c.2 on end # PCIe Port #3
end device pci 1c.3 on end # PCIe Port #4
device pci 19.0 on # Intel Gigabit Ethernet device pci 1c.4 off end # PCIe Port #5
subsystemid 0x8086 0x18f8 device pci 1c.5 off end # PCIe Port #6
end device pci 1c.6 off end # PCIe Port #7
device pci 1a.0 on # USB2 EHCI #2 device pci 1c.7 off end # PCIe Port #8
subsystemid 0x103c 0x18f8 device pci 1d.0 on end # USB2 EHCI #1
end device pci 1e.0 off end # PCI bridge
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 device pci 1f.0 on # LPC bridge PCI-LPC bridge
subsystemid 0x103c 0x18f8
chip ec/hp/kbc1126 chip ec/hp/kbc1126
register "ec_data_port" = "0x62" register "ec_data_port" = "0x62"
register "ec_cmd_port" = "0x66" register "ec_cmd_port" = "0x66"
@ -121,23 +95,13 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
device pnp 0c31.0 on end device pnp 0c31.0 on end
end end
end end
device pci 1f.2 on # SATA Controller 1 device pci 1f.2 on end # SATA Controller 1
subsystemid 0x103c 0x18f8 device pci 1f.3 off end # SMBus
end device pci 1f.5 off end # SATA Controller 2
device pci 1f.3 off # SMBus device pci 1f.6 off end # Thermal
end
device pci 1f.5 off # SATA Controller 2
end
device pci 1f.6 off # Thermal
end
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 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
end end

View File

@ -39,6 +39,7 @@ chip northbridge/intel/sandybridge
register "pci_mmio_size" = "2048" register "pci_mmio_size" = "2048"
device domain 0x0 on device domain 0x0 on
subsystemid 0x103c 0x1791 inherit
chip southbridge/intel/bd82x6x # Intel Series 7 PCH chip southbridge/intel/bd82x6x # Intel Series 7 PCH
register "c2_latency" = "0x0065" register "c2_latency" = "0x0065"
register "docking_supported" = "0" register "docking_supported" = "0"
@ -50,56 +51,26 @@ chip northbridge/intel/sandybridge
register "sata_port_map" = "0xf" register "sata_port_map" = "0xf"
register "spi_lvscc" = "0x2005" register "spi_lvscc" = "0x2005"
register "spi_uvscc" = "0x2005" register "spi_uvscc" = "0x2005"
device pci 14.0 on # xHCI
subsystemid 0x103c 0x1791 device pci 14.0 on end # xHCI
end device pci 16.0 on end # Management Engine Interface 1
device pci 16.0 on # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2
subsystemid 0x103c 0x1791 device pci 16.2 off end # Management Engine IDE-R
end device pci 16.3 on end # Management Engine KT
device pci 16.1 off # Management Engine Interface 2 device pci 19.0 on end # Intel Gigabit Ethernet
end device pci 1a.0 on end # USB2 EHCI #2
device pci 16.2 off # Management Engine IDE-R device pci 1b.0 on end # High Definition Audio Audio controller
end device pci 1c.0 on end # PCIe Port #1
device pci 16.3 on # Management Engine KT device pci 1c.1 off end # PCIe Port #2
subsystemid 0x103c 0x1791 device pci 1c.2 off end # PCIe Port #3
end device pci 1c.3 off end # PCIe Port #4
device pci 19.0 on # Intel Gigabit Ethernet device pci 1c.4 on end # PCIe Port #5
subsystemid 0x103c 0x1791 device pci 1c.5 off end # PCIe Port #6
end device pci 1c.6 on end # PCIe Port #7
device pci 1a.0 on # USB2 EHCI #2 device pci 1c.7 on end # PCIe Port #8
subsystemid 0x103c 0x1791 device pci 1d.0 on end # USB2 EHCI #1
end device pci 1e.0 on end # PCI bridge
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 device pci 1f.0 on # LPC bridge PCI-LPC bridge
subsystemid 0x103c 0x1791
chip superio/nuvoton/npcd378 chip superio/nuvoton/npcd378
device pnp 2e.0 off end # Floppy device pnp 2e.0 off end # Floppy
device pnp 2e.1 on # Parallel port device pnp 2e.1 on # Parallel port
@ -200,25 +171,13 @@ chip northbridge/intel/sandybridge
device pnp 4e.0 on end # TPM module device pnp 4e.0 on end # TPM module
end end
end end
device pci 1f.2 on # SATA Controller 1 device pci 1f.2 on end # SATA Controller 1
subsystemid 0x103c 0x1791 device pci 1f.3 on end # SMBus
end device pci 1f.5 off end # SATA Controller 2
device pci 1f.3 on # SMBus device pci 1f.6 off end # Thermal
subsystemid 0x103c 0x1791
end
device pci 1f.5 off # SATA Controller 2
end
device pci 1f.6 off # Thermal
end
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 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
end end