GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
Reviewed-on: https://review.coreboot.org/27122
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Arthur Heymans 2018-06-15 22:02:28 +02:00 committed by Felix Held
parent 81dd52b7eb
commit b9d2589ca4
18 changed files with 93 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mainboard/apple/macbook21/devicetree.cb
View File

@ -83,6 +83,11 @@ chip northbridge/intel/i945
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 @@ chip northbridge/intel/i945
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

3
src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/devicetree.cb
View File

@ -151,9 +151,6 @@ chip northbridge/intel/x4x # Northbridge
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

3
src/mainboard/asrock/g41c-gs/variants/g41m-gs/devicetree.cb
View File

@ -131,9 +131,6 @@ chip northbridge/intel/x4x # Northbridge
device pci 1f.3 on # SMbus
subsystemid 0x1849 0x27da
end
device pci 1f.4 off end
device pci 1f.5 off end
device pci 1f.6 off end
end
end
end

10
src/mainboard/asus/p5gc-mx/devicetree.cb
View File

@ -62,10 +62,10 @@ chip northbridge/intel/i945
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 @@ chip northbridge/intel/i945
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

8
src/mainboard/foxconn/d41s/devicetree.cb
View File

@ -48,12 +48,15 @@ chip northbridge/intel/pineview # Northbridge
device pci 1c.1 on end # PCIe 2 (NIC)
device pci 1c.2 off end # PCIe 3
device pci 1c.3 off 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/ite/it8721f # Super I/O
device pnp 2e.0 off end # Floppy
@ -90,7 +93,7 @@ chip northbridge/intel/pineview # Northbridge
end
end
end
device pci 1f.1 off end
device pci 1f.1 off end # PATA
device pci 1f.2 on end # SATA
device pci 1f.3 on # SMbus
chip drivers/i2c/ck505
@ -101,9 +104,6 @@ chip northbridge/intel/pineview # Northbridge
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

7
src/mainboard/foxconn/g41s-k/devicetree.cb
View File

@ -66,6 +66,8 @@ chip northbridge/intel/x4x # Northbridge
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 @@ chip northbridge/intel/x4x # Northbridge
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 @@ chip northbridge/intel/x4x # Northbridge
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

10
src/mainboard/getac/p470/devicetree.cb
View File

@ -68,8 +68,8 @@ chip northbridge/intel/i945
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 @@ chip northbridge/intel/i945
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 @@ chip northbridge/intel/i945
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

10
src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb
View File

@ -86,10 +86,10 @@ chip northbridge/intel/i945
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 @@ chip northbridge/intel/i945
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

3
src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
View File

@ -85,7 +85,8 @@ static void rcba_config(void)
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;

9
src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb
View File

@ -62,7 +62,9 @@ chip northbridge/intel/x4x # Northbridge
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 @@ chip northbridge/intel/x4x # Northbridge
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 @@ chip northbridge/intel/x4x # Northbridge
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

11
src/mainboard/ibase/mb899/devicetree.cb
View File

@ -45,17 +45,17 @@ chip northbridge/intel/i945
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 @@ chip northbridge/intel/i945
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

5
src/mainboard/intel/d510mo/devicetree.cb
View File

@ -49,12 +49,15 @@ chip northbridge/intel/pineview # Northbridge
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
@ -90,7 +93,7 @@ chip northbridge/intel/pineview # Northbridge
end
end
end
device pci 1f.1 off end
device pci 1f.1 off end # PATA
device pci 1f.2 on end # SATA
device pci 1f.3 on # SMbus
chip drivers/i2c/ck505 # ICS9EPRS525

19
src/mainboard/intel/d945gclf/devicetree.cb
View File

@ -55,20 +55,20 @@ chip northbridge/intel/i945
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 @@ chip northbridge/intel/i945
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

13
src/mainboard/kontron/986lcd-m/devicetree.cb
View File

@ -44,17 +44,17 @@ chip northbridge/intel/i945
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 @@ chip northbridge/intel/i945
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

7
src/mainboard/lenovo/t60/devicetree.cb
View File

@ -90,6 +90,11 @@ chip northbridge/intel/i945
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 @@ chip northbridge/intel/i945
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

8
src/mainboard/lenovo/x60/devicetree.cb
View File

@ -82,6 +82,11 @@ chip northbridge/intel/i945
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 @@ chip northbridge/intel/i945
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

5
src/mainboard/lenovo/z61t/devicetree.cb
View File

@ -97,6 +97,9 @@ chip northbridge/intel/i945
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 @@ chip northbridge/intel/i945
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

19
src/mainboard/roda/rk886ex/devicetree.cb
View File

@ -64,12 +64,12 @@ chip northbridge/intel/i945
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 @@ chip northbridge/intel/i945
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 @@ chip northbridge/intel/i945
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