Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/27122
Change subject: mb/*/*: Harmonise FD and devicetree on boards featuring ICH7 ......................................................................
mb/*/*: Harmonise FD and devicetree on boards featuring ICH7
On some boards the devicetree and Function Disable register did not match. In this case the FD values are put in the devicetree as these were the values that were actually used in practice.
A complete devicetree will make it easier to automatically disable devices in ramstage.
Change-Id: I1692ca5f490ea84e2fc520d3f66044ad7514f76e Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/mainboard/apple/macbook21/devicetree.cb M src/mainboard/asrock/g41c-gs/devicetree.cb M src/mainboard/asus/p5gc-mx/devicetree.cb M src/mainboard/foxconn/g41s-k/devicetree.cb M src/mainboard/getac/p470/devicetree.cb M src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb M src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c M src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb M src/mainboard/ibase/mb899/devicetree.cb M src/mainboard/intel/d510mo/devicetree.cb M src/mainboard/intel/d945gclf/devicetree.cb M src/mainboard/kontron/986lcd-m/devicetree.cb M src/mainboard/lenovo/t60/devicetree.cb M src/mainboard/lenovo/x60/devicetree.cb M src/mainboard/lenovo/z61t/devicetree.cb M src/mainboard/roda/rk886ex/devicetree.cb 16 files changed, 92 insertions(+), 57 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/27122/1
diff --git a/src/mainboard/apple/macbook21/devicetree.cb b/src/mainboard/apple/macbook21/devicetree.cb index b6e61eb..898aae4 100644 --- a/src/mainboard/apple/macbook21/devicetree.cb +++ b/src/mainboard/apple/macbook21/devicetree.cb @@ -83,6 +83,11 @@ end device pci 1c.0 on end # Ethernet device pci 1c.1 on end # Atheros WLAN + device pci 1c.2 off end # PCIe #3 + device pci 1c.3 off end # PCIe #4 + device pci 1c.4 off end # PCIe #5 + device pci 1c.5 off end # PCIe #6 + device pci 1d.0 on # USB UHCI subsystemid 0x8086 0x7270 end @@ -98,6 +103,9 @@ device pci 1d.7 on # USB2 EHCI subsystemid 0x8086 0x7270 end + device pci 1e.0 on end # PCI bridge + device pci 1e.2 off end # AC'97 Audio + device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # PCI-LPC bridge subsystemid 0x8086 0x7270 end diff --git a/src/mainboard/asrock/g41c-gs/devicetree.cb b/src/mainboard/asrock/g41c-gs/devicetree.cb index f58fae7..1e22be6 100644 --- a/src/mainboard/asrock/g41c-gs/devicetree.cb +++ b/src/mainboard/asrock/g41c-gs/devicetree.cb @@ -62,6 +62,8 @@ device pci 1c.1 on end # PCIe 2 device pci 1c.2 off end # PCIe 3 device pci 1c.3 off end # PCIe 4 + device pci 1c.4 off end # PCIe 5 + device pci 1c.5 off end # PCIe 6 device pci 1d.0 on # USB subsystemid 0x1849 0x27c8 end @@ -78,6 +80,8 @@ subsystemid 0x1849 0x27cc end device pci 1e.0 on end # PCI bridge + device pci 1e.2 off end # AC'97 Audio + device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # ISA bridge subsystemid 0x1849 0x27b8 chip superio/nuvoton/nct6776 @@ -147,9 +151,6 @@ device i2c 69 on end end end - device pci 1f.4 off end - device pci 1f.5 off end - device pci 1f.6 off end end end end diff --git a/src/mainboard/asus/p5gc-mx/devicetree.cb b/src/mainboard/asus/p5gc-mx/devicetree.cb index cefa711..642f1ee 100644 --- a/src/mainboard/asus/p5gc-mx/devicetree.cb +++ b/src/mainboard/asus/p5gc-mx/devicetree.cb @@ -62,10 +62,10 @@ end device pci 1c.0 on end # PCIe device pci 1c.1 on end # PCIe - #device pci 1c.2 off end # PCIe port 3 - #device pci 1c.3 off end # PCIe port 4 - #device pci 1c.4 off end # PCIe port 5 - #device pci 1c.5 off end # PCIe port 6 + device pci 1c.2 off end # PCIe port 3 + device pci 1c.3 off end # PCIe port 4 + device pci 1c.4 off end # PCIe port 5 + device pci 1c.5 off end # PCIe port 6 device pci 1d.0 on # USB UHCI ioapic_irq 2 INTA 0x10 end @@ -82,6 +82,8 @@ ioapic_irq 2 INTA 0x10 end device pci 1e.0 on end # PCI bridge + device pci 1e.2 off end # AC'97 Audio + device pci 1e.3 off end # AC'97 Modem
device pci 1f.0 on # LPC bridge ioapic_irq 2 INTA 0x10 diff --git a/src/mainboard/foxconn/g41s-k/devicetree.cb b/src/mainboard/foxconn/g41s-k/devicetree.cb index e57436a..6a5089a 100644 --- a/src/mainboard/foxconn/g41s-k/devicetree.cb +++ b/src/mainboard/foxconn/g41s-k/devicetree.cb @@ -66,6 +66,8 @@ end device pci 1c.2 off end # PCIe 3 device pci 1c.3 off end # PCIe 4 + device pci 1c.4 off end # PCIe 5 + device pci 1c.5 off end # PCIe 6 device pci 1d.0 on # USB subsystemid 0x105b 0x0dda end @@ -82,6 +84,8 @@ subsystemid 0x105b 0x0dda end device pci 1e.0 on end # PCI bridge + device pci 1e.2 off end # AC'97 Audio + device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # ISA bridge subsystemid 0x105b 0x0dda chip superio/ite/it8720f # Super I/O @@ -181,9 +185,6 @@ device pci 1f.3 on # SMbus subsystemid 0x105b 0x0dda end - device pci 1f.4 off end - device pci 1f.5 off end - device pci 1f.6 off end end end end diff --git a/src/mainboard/getac/p470/devicetree.cb b/src/mainboard/getac/p470/devicetree.cb index ad3b625..a81ef3a 100644 --- a/src/mainboard/getac/p470/devicetree.cb +++ b/src/mainboard/getac/p470/devicetree.cb @@ -68,8 +68,8 @@ device pci 1c.1 on 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.4 off end # PCIe port 5 + device pci 1c.5 off end # PCIe port 6 device pci 1d.0 on end # USB UHCI device pci 1d.1 on end # USB UHCI device pci 1d.2 on end # USB UHCI @@ -80,8 +80,8 @@
end end # PCI bridge - #device pci 1e.2 off end # AC'97 Audio - #device pci 1e.3 off end # AC'97 Modem + device pci 1e.2 off end # AC'97 Audio + device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # LPC bridge chip superio/smsc/fdc37n972 device pnp 2e.0 off # Floppy @@ -143,7 +143,7 @@ end
end - device pci 1f.1 on end # IDE + device pci 1f.1 off end # IDE device pci 1f.2 on end # SATA device pci 1f.3 on end # SMBus end diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb b/src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb index 6bdc134..7ed4d19 100644 --- a/src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb +++ b/src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb @@ -86,10 +86,10 @@ end device pci 1c.0 on end # PCIe device pci 1c.1 on end # PCIe - #device pci 1c.2 off end # PCIe port 3 - #device pci 1c.3 off end # PCIe port 4 - #device pci 1c.4 off end # PCIe port 5 - #device pci 1c.5 off end # PCIe port 6 + device pci 1c.2 off end # PCIe port 3 + device pci 1c.3 off end # PCIe port 4 + device pci 1c.4 off end # PCIe port 5 + device pci 1c.5 off end # PCIe port 6 device pci 1d.0 on # USB UHCI ioapic_irq 2 INTA 0x10 end @@ -106,6 +106,8 @@ ioapic_irq 2 INTA 0x10 end device pci 1e.0 on end # PCI bridge + device pci 1e.2 off end # AC'97 Audio + device pci 1e.3 off end # AC'97 Modem
device pci 1f.0 on # LPC bridge ioapic_irq 2 INTA 0x10 diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c index 926a5a7..f30066e 100644 --- a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c +++ b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c @@ -87,7 +87,8 @@ RCBA8(OIC) = 0x03;
/* Disable unused devices */ - RCBA32(FD) = 0x003c0061; + RCBA32(FD) = FD_PCIE6 | FD_PCIE5 | FD_PCIE4 | FD_PCIE3 + | FD_ACMOD | FD_ACAUD | 1;
/* Enable PCIe Root Port Clock Gate */ RCBA32(CG) = 0x00000001; diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb b/src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb index d948398..9f92d2a 100644 --- a/src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb +++ b/src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb @@ -62,7 +62,9 @@ end end device pci 1c.2 on end # PCIe 3 - device pci 1c.3 on end # PCIe 4 + device pci 1c.3 off end # PCIe 4 + device pci 1c.4 off end # PCIe 5 + device pci 1c.5 off end # PCIe 6 device pci 1d.0 on # USB subsystemid 0x1458 0x5004 end @@ -79,6 +81,8 @@ subsystemid 0x1458 0x5006 end device pci 1e.0 on end # PCI bridge + device pci 1e.2 off end # AC'97 Audio + device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # ISA bridge subsystemid 0x1458 0x5001 chip superio/ite/it8718f # Super I/O @@ -164,9 +168,6 @@ device pci 1f.3 on # SMbus subsystemid 0x1458 0x5001 end - device pci 1f.4 off end - device pci 1f.5 off end - device pci 1f.6 off end end end end diff --git a/src/mainboard/ibase/mb899/devicetree.cb b/src/mainboard/ibase/mb899/devicetree.cb index c63e5d6..3544c96 100644 --- a/src/mainboard/ibase/mb899/devicetree.cb +++ b/src/mainboard/ibase/mb899/devicetree.cb @@ -45,17 +45,17 @@ device pci 1c.0 on end # PCIe device pci 1c.1 on end # PCIe device pci 1c.2 on end # PCIe - #device pci 1c.3 off end # PCIe port 4 - #device pci 1c.4 off end # PCIe port 5 - #device pci 1c.5 off end # PCIe port 6 + device pci 1c.3 on end # PCIe port 4 + device pci 1c.4 on end # PCIe port 5 + device pci 1c.5 on end # PCIe port 6 device pci 1d.0 on end # USB UHCI device pci 1d.1 on end # USB UHCI device pci 1d.2 on end # USB UHCI device pci 1d.3 on end # USB UHCI device pci 1d.7 on end # USB2 EHCI device pci 1e.0 on end # PCI bridge - #device pci 1e.2 off end # AC'97 Audio - #device pci 1e.3 off end # AC'97 Modem + device pci 1e.2 on end # AC'97 Audio + device pci 1e.3 on end # AC'97 Modem device pci 1f.0 on # LPC bridge chip superio/winbond/w83627ehg device pnp 4e.0 off end # Floppy @@ -108,7 +108,6 @@ device pci 1f.1 on end # IDE device pci 1f.2 on end # SATA device pci 1f.3 on end # SMBus - # device pci 1f.4 off end # Realtek ID Codec end # chip southbridge/intel/i82801gx
end # device domain0 diff --git a/src/mainboard/intel/d510mo/devicetree.cb b/src/mainboard/intel/d510mo/devicetree.cb index 4733038..782adf4 100644 --- a/src/mainboard/intel/d510mo/devicetree.cb +++ b/src/mainboard/intel/d510mo/devicetree.cb @@ -49,12 +49,15 @@ device pci 1c.1 on end # PCIe 2 device pci 1c.2 on end # PCIe 3 device pci 1c.3 on end # PCIe 4 + # (PCIe 5 and 6 not on nm10?) device pci 1d.0 on end # USB device pci 1d.1 on end # USB device pci 1d.2 on end # USB device pci 1d.3 on end # USB device pci 1d.7 on end # USB device pci 1e.0 on end # PCI bridge + #device pci 1e.2 off end # AC'97 Audio (not on nm10?) + #device pci 1e.3 off end # AC'97 Modem (not on nm10?) device pci 1f.0 on # ISA bridge chip superio/winbond/w83627thg # Super I/O device pnp 4e.0 off end # Floppy diff --git a/src/mainboard/intel/d945gclf/devicetree.cb b/src/mainboard/intel/d945gclf/devicetree.cb index d9eda6b..eaa26ef 100644 --- a/src/mainboard/intel/d945gclf/devicetree.cb +++ b/src/mainboard/intel/d945gclf/devicetree.cb @@ -55,20 +55,20 @@ register "p_cnt_throttling_supported" = "0"
device pci 1b.0 on end # High Definition Audio - device pci 1c.0 on end # PCIe - device pci 1c.1 on end # PCIe - device pci 1c.2 on end # PCIe - #device pci 1c.3 off end # PCIe port 4 - #device pci 1c.4 off end # PCIe port 5 - #device pci 1c.5 off end # PCIe port 6 + 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 1d.0 on end # USB UHCI device pci 1d.1 on end # USB UHCI device pci 1d.2 on end # USB UHCI device pci 1d.3 on end # USB UHCI device pci 1d.7 on end # USB2 EHCI device pci 1e.0 on end # PCI bridge - #device pci 1e.2 off end # AC'97 Audio - #device pci 1e.3 off end # AC'97 Modem + device pci 1e.2 off end # AC'97 Audio + device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # LPC bridge chip superio/smsc/lpc47m15x device pnp 2e.0 off # Floppy @@ -100,10 +100,9 @@ end end end - #device pci 1f.1 off end # IDE + device pci 1f.1 off end # IDE device pci 1f.2 on end # SATA device pci 1f.3 on end # SMBus - #device pci 1f.4 off end # Realtek ID Codec end end end diff --git a/src/mainboard/kontron/986lcd-m/devicetree.cb b/src/mainboard/kontron/986lcd-m/devicetree.cb index c768b64..06f29e0 100644 --- a/src/mainboard/kontron/986lcd-m/devicetree.cb +++ b/src/mainboard/kontron/986lcd-m/devicetree.cb @@ -44,17 +44,17 @@ device pci 1c.0 on end # PCIe device pci 1c.1 on end # PCIe device pci 1c.2 on end # PCIe - #device pci 1c.3 off end # PCIe port 4 - #device pci 1c.4 off end # PCIe port 5 - #device pci 1c.5 off end # PCIe port 6 + device pci 1c.3 off end # PCIe port 4 + device pci 1c.4 off end # PCIe port 5 + device pci 1c.5 off end # PCIe port 6 device pci 1d.0 on end # USB UHCI device pci 1d.1 on end # USB UHCI device pci 1d.2 on end # USB UHCI device pci 1d.3 on end # USB UHCI device pci 1d.7 on end # USB2 EHCI device pci 1e.0 on end # PCI bridge - #device pci 1e.2 off end # AC'97 Audio - #device pci 1e.3 off end # AC'97 Modem + device pci 1e.2 off end # AC'97 Audio + device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # LPC bridge chip superio/winbond/w83627thg device pnp 2e.0 off # Floppy @@ -128,10 +128,9 @@ end
end - #device pci 1f.1 off end # IDE + device pci 1f.1 off end # IDE device pci 1f.2 on end # SATA device pci 1f.3 on end # SMBus - #device pci 1f.4 off end # Realtek ID Codec end end end diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb index 053b9d3..7b1721e 100644 --- a/src/mainboard/lenovo/t60/devicetree.cb +++ b/src/mainboard/lenovo/t60/devicetree.cb @@ -90,6 +90,11 @@ subsystemid 0x17aa 0x2001 end device pci 1c.1 on end # WLAN + 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 1d.0 on # USB UHCI subsystemid 0x17aa 0x200a end @@ -115,6 +120,8 @@
end end + device pci 1e.2 off end # AC'97 Audio + device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # PCI-LPC bridge subsystemid 0x17aa 0x2009 chip ec/lenovo/pmh7 diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb index da9bff7..2a60b87 100644 --- a/src/mainboard/lenovo/x60/devicetree.cb +++ b/src/mainboard/lenovo/x60/devicetree.cb @@ -82,6 +82,11 @@ end device pci 1c.0 on end # Ethernet device pci 1c.1 on end # Atheros WLAN + 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 1d.0 on # USB UHCI subsystemid 0x17aa 0x200a end @@ -97,6 +102,9 @@ device pci 1d.7 on # USB2 EHCI subsystemid 0x17aa 0x200b end + device pci 1e.0 on end # PCI Bridge + device pci 1e.2 off end # AC'97 Audio + device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # PCI-LPC bridge subsystemid 0x17aa 0x2009 chip ec/lenovo/pmh7 diff --git a/src/mainboard/lenovo/z61t/devicetree.cb b/src/mainboard/lenovo/z61t/devicetree.cb index 1c60e6b..92bf3ce 100644 --- a/src/mainboard/lenovo/z61t/devicetree.cb +++ b/src/mainboard/lenovo/z61t/devicetree.cb @@ -97,6 +97,9 @@ device pci 1c.3 on # PCI Express Port 4 subsystemid 0x17aa 0x2011 end + device pci 1c.4 off end # PCIe port 5 + device pci 1c.5 off end # PCIe port 6 + device pci 1d.0 on # USB UHCI subsystemid 0x17aa 0x200a end @@ -122,6 +125,8 @@
end end + device pci 1e.2 off end # AC'97 Audio + device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # PCI-LPC bridge subsystemid 0x17aa 0x2009 chip ec/lenovo/pmh7 diff --git a/src/mainboard/roda/rk886ex/devicetree.cb b/src/mainboard/roda/rk886ex/devicetree.cb index bb057f1..e3bcc5b 100644 --- a/src/mainboard/roda/rk886ex/devicetree.cb +++ b/src/mainboard/roda/rk886ex/devicetree.cb @@ -64,12 +64,12 @@ register "sata_ahci" = "0x0"
device pci 1b.0 on end # High Definition Audio - device pci 1c.0 on end # PCIe - device pci 1c.1 on end # PCIe - device pci 1c.2 on end # PCIe - #device pci 1c.3 off end # PCIe port 4 - #device pci 1c.4 off end # PCIe port 5 - #device pci 1c.5 off end # PCIe port 6 + 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 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 1d.0 on end # USB UHCI device pci 1d.1 on end # USB UHCI device pci 1d.2 on end # USB UHCI @@ -84,8 +84,8 @@ device pci 3.3 off end # smartcard end end # PCI bridge - #device pci 1e.2 off end # AC'97 Audio - #device pci 1e.3 off end # AC'97 Modem + device pci 1e.2 off end # AC'97 Audio + device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # LPC bridge chip superio/smsc/lpc47n227 device pnp 2e.1 on # Parallel port @@ -115,10 +115,9 @@ end
end - #device pci 1f.1 off end # IDE + device pci 1f.1 off end # IDE device pci 1f.2 on end # SATA device pci 1f.3 on end # SMBus - #device pci 1f.4 off end # Realtek ID Codec end end end