Peter Lemenkov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37297 )
Change subject: mb/lenovo/x220/devicetree: Use subsystemid inheritance ......................................................................
mb/lenovo/x220/devicetree: Use subsystemid inheritance
Change-Id: Ia9367d03b6f97f1eb8c35045fd7bb79e5f45b535 Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/x220/devicetree.cb 1 file changed, 15 insertions(+), 42 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/37297/1
diff --git a/src/mainboard/lenovo/x220/devicetree.cb b/src/mainboard/lenovo/x220/devicetree.cb index 26fa1a4..5ae1427 100644 --- a/src/mainboard/lenovo/x220/devicetree.cb +++ b/src/mainboard/lenovo/x220/devicetree.cb @@ -37,13 +37,11 @@ register "pci_mmio_size" = "1024"
device domain 0 on - device pci 00.0 on - subsystemid 0x17aa 0x21db - end # host bridge + subsystemid 0x17aa 0x21db inherit + + device pci 00.0 on end # host bridge device pci 01.0 off end # PCIe Bridge for discrete graphics - device pci 02.0 on - subsystemid 0x17aa 0x21db - end # vga controller + device pci 02.0 on end # vga controller
chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH # GPI routing @@ -80,49 +78,29 @@ device pci 19.0 on subsystemid 0x17aa 0x21ce end # Intel Gigabit Ethernet - device pci 1a.0 on - subsystemid 0x17aa 0x21db - end # USB2 EHCI #2 - device pci 1b.0 on - subsystemid 0x17aa 0x21db - end # High Definition Audio - device pci 1c.0 on - subsystemid 0x17aa 0x21db - end # PCIe Port #1 - device pci 1c.1 on - subsystemid 0x17aa 0x21db - end # PCIe Port #2 (wlan) - device pci 1c.2 on - subsystemid 0x17aa 0x21db - end # PCIe Port #3 + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 on end # PCIe Port #2 (wlan) + device pci 1c.2 on end # PCIe Port #3 device pci 1c.3 on - subsystemid 0x17aa 0x21db smbios_slot_desc "7" "3" "ExpressCard Slot" "8" end # PCIe Port #4 device pci 1c.4 on - subsystemid 0x17aa 0x21db chip drivers/ricoh/rce822 register "sdwppol" = "1" register "disable_mask" = "0x87" - device pci 00.0 on - subsystemid 0x17aa 0x21fa - end + device pci 00.0 on end end end # PCIe Port #5 (SD) device pci 1c.5 off end # PCIe Port #6 - device pci 1c.6 on - subsystemid 0x17aa 0x21db - end # PCIe Port #7 + device pci 1c.6 on end # PCIe Port #7 device pci 1c.7 off end # PCIe Port #8 - device pci 1d.0 on - subsystemid 0x17aa 0x21db - end # USB2 EHCI #1 + device pci 1d.0 on end # USB2 EHCI #1 device pci 1e.0 off end # PCI bridge device pci 1f.0 on #LPC bridge - subsystemid 0x17aa 0x21db chip ec/lenovo/pmh7 - device pnp ff.1 on # dummy - end + device pnp ff.1 on end # dummy register "backlight_enable" = "0x01" register "dock_event_enable" = "0x01" end @@ -172,11 +150,8 @@ register "wwan_gpio_lvl" = "0" end end # LPC bridge - device pci 1f.2 on - subsystemid 0x17aa 0x21db - end # SATA Controller 1 + device pci 1f.2 on end # SATA Controller 1 device pci 1f.3 on - subsystemid 0x17aa 0x21db # eeprom, 8 virtual devices, same chip chip drivers/i2c/at24rf08c device i2c 54 on end @@ -190,9 +165,7 @@ end end # SMBus device pci 1f.5 off end # SATA Controller 2 - device pci 1f.6 on - subsystemid 0x17aa 0x21db - end # Thermal + device pci 1f.6 on end # Thermal end end end
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37297 )
Change subject: mb/lenovo/x220/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 1: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37297 )
Change subject: mb/lenovo/x220/devicetree: Use subsystemid inheritance ......................................................................
mb/lenovo/x220/devicetree: Use subsystemid inheritance
Change-Id: Ia9367d03b6f97f1eb8c35045fd7bb79e5f45b535 Signed-off-by: Peter Lemenkov lemenkov@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/37297 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: HAOUAS Elyes ehaouas@noos.fr --- M src/mainboard/lenovo/x220/devicetree.cb 1 file changed, 15 insertions(+), 42 deletions(-)
Approvals: build bot (Jenkins): Verified HAOUAS Elyes: Looks good to me, approved
diff --git a/src/mainboard/lenovo/x220/devicetree.cb b/src/mainboard/lenovo/x220/devicetree.cb index 26fa1a4..5ae1427 100644 --- a/src/mainboard/lenovo/x220/devicetree.cb +++ b/src/mainboard/lenovo/x220/devicetree.cb @@ -37,13 +37,11 @@ register "pci_mmio_size" = "1024"
device domain 0 on - device pci 00.0 on - subsystemid 0x17aa 0x21db - end # host bridge + subsystemid 0x17aa 0x21db inherit + + device pci 00.0 on end # host bridge device pci 01.0 off end # PCIe Bridge for discrete graphics - device pci 02.0 on - subsystemid 0x17aa 0x21db - end # vga controller + device pci 02.0 on end # vga controller
chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH # GPI routing @@ -80,49 +78,29 @@ device pci 19.0 on subsystemid 0x17aa 0x21ce end # Intel Gigabit Ethernet - device pci 1a.0 on - subsystemid 0x17aa 0x21db - end # USB2 EHCI #2 - device pci 1b.0 on - subsystemid 0x17aa 0x21db - end # High Definition Audio - device pci 1c.0 on - subsystemid 0x17aa 0x21db - end # PCIe Port #1 - device pci 1c.1 on - subsystemid 0x17aa 0x21db - end # PCIe Port #2 (wlan) - device pci 1c.2 on - subsystemid 0x17aa 0x21db - end # PCIe Port #3 + device pci 1a.0 on end # USB2 EHCI #2 + device pci 1b.0 on end # High Definition Audio + device pci 1c.0 on end # PCIe Port #1 + device pci 1c.1 on end # PCIe Port #2 (wlan) + device pci 1c.2 on end # PCIe Port #3 device pci 1c.3 on - subsystemid 0x17aa 0x21db smbios_slot_desc "7" "3" "ExpressCard Slot" "8" end # PCIe Port #4 device pci 1c.4 on - subsystemid 0x17aa 0x21db chip drivers/ricoh/rce822 register "sdwppol" = "1" register "disable_mask" = "0x87" - device pci 00.0 on - subsystemid 0x17aa 0x21fa - end + device pci 00.0 on end end end # PCIe Port #5 (SD) device pci 1c.5 off end # PCIe Port #6 - device pci 1c.6 on - subsystemid 0x17aa 0x21db - end # PCIe Port #7 + device pci 1c.6 on end # PCIe Port #7 device pci 1c.7 off end # PCIe Port #8 - device pci 1d.0 on - subsystemid 0x17aa 0x21db - end # USB2 EHCI #1 + device pci 1d.0 on end # USB2 EHCI #1 device pci 1e.0 off end # PCI bridge device pci 1f.0 on #LPC bridge - subsystemid 0x17aa 0x21db chip ec/lenovo/pmh7 - device pnp ff.1 on # dummy - end + device pnp ff.1 on end # dummy register "backlight_enable" = "0x01" register "dock_event_enable" = "0x01" end @@ -172,11 +150,8 @@ register "wwan_gpio_lvl" = "0" end end # LPC bridge - device pci 1f.2 on - subsystemid 0x17aa 0x21db - end # SATA Controller 1 + device pci 1f.2 on end # SATA Controller 1 device pci 1f.3 on - subsystemid 0x17aa 0x21db # eeprom, 8 virtual devices, same chip chip drivers/i2c/at24rf08c device i2c 54 on end @@ -190,9 +165,7 @@ end end # SMBus device pci 1f.5 off end # SATA Controller 2 - device pci 1f.6 on - subsystemid 0x17aa 0x21db - end # Thermal + device pci 1f.6 on end # Thermal end end end
Attention is currently required from: Peter Lemenkov. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37297 )
Change subject: mb/lenovo/x220/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 4:
(1 comment)
File src/mainboard/lenovo/x220/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/37297/comment/8efc2a93_86e60e3a PS4, Line 108: subsystemid 0x17aa 0x21fa Hmmm, just noticed that this one is different...
Peter Lemenkov has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37297 )
Change subject: mb/lenovo/x220/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 4:
(1 comment)
File src/mainboard/lenovo/x220/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/37297/comment/fc352f95_91c98934 PS4, Line 108: subsystemid 0x17aa 0x21fa
Hmmm, just noticed that this one is different...
Oopsm thanks for pointing on it. Looks like a typo, yes. Let me investigate why I did it first.
Peter Lemenkov has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37297 )
Change subject: mb/lenovo/x220/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 4:
(1 comment)
File src/mainboard/lenovo/x220/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/37297/comment/37a14db5_95100368 PS4, Line 108: subsystemid 0x17aa 0x21fa
Oopsm thanks for pointing on it. Looks like a typo, yes. Let me investigate why I did it first.
I think I've got access to a different X220. I've just grep through the database of Lenovo lspci dumps (see here https://github.com/linuxhw/LsPCI/tree/master/Notebook/Lenovo/ThinkPad ) and here is what I've got:
Sulaco ~/work/LsPCI (git::master): grep -R Ricoh Notebook/Lenovo/ThinkPad/ThinkPad\ X220\ * -A 1 |grep -o "Subsystem: Lenovo Device [17aa:.*]" |LANG=C sort| uniq -c 136 Subsystem: Lenovo Device [17aa:21da] 35 Subsystem: Lenovo Device [17aa:21db] 2 Subsystem: Lenovo Device [17aa:21fa] Sulaco ~/work/LsPCI (git::master):
So certainly there are machines with 0x21fa, 0x21db and 0x21da PCI IDs. Don't know how to handle it but it *looks* like (I'm not sure) that 0x21da is a most popular PCI ID.
Peter Lemenkov has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37297 )
Change subject: mb/lenovo/x220/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 4:
(1 comment)
File src/mainboard/lenovo/x220/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/37297/comment/86e59974_21dfff09 PS4, Line 108: subsystemid 0x17aa 0x21fa
I think I've got access to a different X220. […]
Ok, even more precisely 0x21db belongs entiorely to Tablet version. So X220 laptop only has 0x21da and 0x21fa
Attention is currently required from: Peter Lemenkov. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37297 )
Change subject: mb/lenovo/x220/devicetree: Use subsystemid inheritance ......................................................................
Patch Set 4:
(1 comment)
File src/mainboard/lenovo/x220/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/37297/comment/869130e4_849ef0c0 PS4, Line 108: subsystemid 0x17aa 0x21fa
Ok, even more precisely 0x21db belongs entiorely to Tablet version. […]
I'd inherit the subsystem ID that appears most often. For the different subsystem IDs, don't remove the subsystemid lines in the devicetree.
-
Angel Pons (Code Review) -
HAOUAS Elyes (Code Review)
-
Patrick Georgi (Code Review)
-
Peter Lemenkov (Code Review)