coreboot-gerrit August 2018

coreboot-gerrit@coreboot.org

1 participants
1120 discussions

Change in coreboot[master]: [WIP] Nvidia Optimus support for ThinkPads
by Evgeny Zinoviev (Code Review) 30 Aug '18

30 Aug '18

Hello Patrick Rudolph, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/28380 to look at the new patch set (#7). Change subject: [WIP] Nvidia Optimus support for ThinkPads ...................................................................... [WIP] Nvidia Optimus support for ThinkPads Based on siro's work #23041. Tested on ThinkPad W530. Adds ACPI code for dGPU power management. Depends on: https://review.coreboot.org/#/c/coreboot/+/28392 https://review.coreboot.org/#/c/coreboot/+/28393 What works (tested on 4.16.13-gentoo kernel): - power management via _PS0 and _DSM + _PS3 ACPI calls - nouveau driver (with a workaround, see below) - bumblebee (from the "develop" branch) - bbswitch Known problems: - `lspci -s 01:00.0 -vv` turns dGPU on if it was off before. Not sure why it happens (probably it calls _PS0 at some point) or whether it should happen. - nouveau driver unloading (`rmmod` or `modprobe -r`) does not work well: it crashes in nouveau_backlight_exit (invalid pointer). The current hack is to comment out these lines in drivers/gpu/drm/nouveau/nouveau_backlight.c, function `nouveau_backlight_exit`: list_for_each_entry(connector, &drm->bl_connectors, head) { if (connector->id >= 0) ida_simple_remove(&bl_ida, connector->id); } Need to debug why it happens. - VGA ROM for Nvidia GPU is not loaded from BIOS (i.e. coreboot). Need to debug and fix this too. (Or maybe I'm just doing it wrong.) The current workaround is to load it from a file. To do this automatically, create a new file in /etc/modprobe.d with this line: options nouveau config=NvBios=pci10de-0ffc.rom where "pci10de-0ffc.rom" is a file in /lib/firmware directory (the path is relative to /lib/firmware). VGA ROM has to be extracted from vendor UEFI dump, GUID is 9781FA9D-5A3B-431A-AD59-2748C9A170EC. Not tested yet: - nvidia proprietary driver Change-Id: I277808d6c1d8bd6e0a267a53f25471597698f8d5 Signed-off-by: Evgeny Zinoviev <me(a)ch1p.com> --- A src/drivers/lenovo/hybrid_graphics/acpi/gpu.asl A src/drivers/nvidia/optimus/acpi/optimus.asl A src/ec/lenovo/pmh7/acpi/pmh7.asl M src/mainboard/lenovo/t420/acpi/ec.asl M src/mainboard/lenovo/t420/dsdt.asl M src/mainboard/lenovo/t420s/acpi/ec.asl M src/mainboard/lenovo/t420s/dsdt.asl M src/mainboard/lenovo/t430/acpi/ec.asl M src/mainboard/lenovo/t430/dsdt.asl M src/mainboard/lenovo/t430s/acpi/ec.asl M src/mainboard/lenovo/t430s/dsdt.asl M src/mainboard/lenovo/t520/acpi/ec.asl M src/mainboard/lenovo/t520/dsdt.asl M src/mainboard/lenovo/t530/acpi/ec.asl M src/mainboard/lenovo/t530/dsdt.asl M src/northbridge/intel/sandybridge/acpi/peg.asl 16 files changed, 357 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/28380/7 -- To view, visit https://review.coreboot.org/28380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I277808d6c1d8bd6e0a267a53f25471597698f8d5 Gerrit-Change-Number: 28380 Gerrit-PatchSet: 7 Gerrit-Owner: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: [WIP] Nvidia Optimus support for ThinkPads
by Evgeny Zinoviev (Code Review) 30 Aug '18

30 Aug '18

Hello Patrick Rudolph, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/28380 to look at the new patch set (#6). Change subject: [WIP] Nvidia Optimus support for ThinkPads ...................................................................... [WIP] Nvidia Optimus support for ThinkPads Based on siro's work #23041. Tested on ThinkPad W530. Adds ACPI code for dGPU power management. Depends on: https://review.coreboot.org/#/c/coreboot/+/28392 https://review.coreboot.org/#/c/coreboot/+/28393 What works (tested on 4.16.13-gentoo kernel): - power management via _PS0 and _DSM + _PS3 ACPI calls - nouveau driver (with a workaround, see below) - bumblebee (from the "develop" branch) - bbswitch Known problems: - `lspci -s 01:00.0 -vv` turns dGPU on if it was off before. Not sure why it happens (probably it calls _PS0 at some point) or whether it should happen. - nouveau driver unloading (`rmmod` or `modprobe -r`) does not work well: it crashes in nouveau_backlight_exit (invalid pointer). The current hack is to comment out these lines in drivers/gpu/drm/nouveau/nouveau_backlight.c, function `nouveau_backlight_exit`: list_for_each_entry(connector, &drm->bl_connectors, head) { if (connector->id >= 0) ida_simple_remove(&bl_ida, connector->id); } Need to debug why it happens. - VGA ROM for Nvidia GPU is not loaded from BIOS (i.e. coreboot). Need to debug and fix this too. (Or maybe I'm just doing it wrong.) The current workaround is to load it from a file. To do this automatically, create a new file in /etc/modprobe.d with this line: options nouveau config=NvBios=pci10de-0ffc.rom where "pci10de-0ffc.rom" is a file in /lib/firmware directory (the path is relative to /lib/firmware). VGA ROM has to be extracted from vendor UEFI dump, GUID is 9781FA9D-5A3B-431A-AD59-2748C9A170EC. Not tested yet: - nvidia proprietary driver Change-Id: I277808d6c1d8bd6e0a267a53f25471597698f8d5 Signed-off-by: Evgeny Zinoviev <me(a)ch1p.com> --- A src/drivers/lenovo/hybrid_graphics/acpi/gpu.asl A src/drivers/nvidia/optimus/acpi/optimus.asl A src/ec/lenovo/pmh7/acpi/pmh7.asl M src/mainboard/lenovo/t420/acpi/ec.asl M src/mainboard/lenovo/t420/dsdt.asl M src/mainboard/lenovo/t420s/acpi/ec.asl M src/mainboard/lenovo/t420s/dsdt.asl M src/mainboard/lenovo/t430/acpi/ec.asl M src/mainboard/lenovo/t430/dsdt.asl M src/mainboard/lenovo/t430s/acpi/ec.asl M src/mainboard/lenovo/t430s/cmos.default M src/mainboard/lenovo/t430s/dsdt.asl M src/mainboard/lenovo/t520/acpi/ec.asl M src/mainboard/lenovo/t520/dsdt.asl M src/mainboard/lenovo/t530/acpi/ec.asl M src/mainboard/lenovo/t530/dsdt.asl M src/northbridge/intel/sandybridge/acpi/peg.asl 17 files changed, 358 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/28380/6 -- To view, visit https://review.coreboot.org/28380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I277808d6c1d8bd6e0a267a53f25471597698f8d5 Gerrit-Change-Number: 28380 Gerrit-PatchSet: 6 Gerrit-Owner: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: [WIP] Nvidia Optimus support for ThinkPads
by Evgeny Zinoviev (Code Review) 30 Aug '18

30 Aug '18

Hello Patrick Rudolph, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/28380 to look at the new patch set (#5). Change subject: [WIP] Nvidia Optimus support for ThinkPads ...................................................................... [WIP] Nvidia Optimus support for ThinkPads Based on siro's work #23041. Tested on ThinkPad W530. Adds ACPI code for dGPU power management. Depends on: https://review.coreboot.org/#/c/coreboot/+/28392 https://review.coreboot.org/#/c/coreboot/+/28393 What works (tested on 4.16.13-gentoo kernel): - power management via _PS0 and _DSM + _PS3 ACPI calls - nouveau driver (with a workaround, see below) - bumblebee (from the "develop" branch) - bbswitch Known problems: - `lspci -s 01:00.0 -vv` turns dGPU on if it was off before. Not sure why it happens (probably it calls _PS0 at some point) or whether it should happen. - nouveau driver unloading (`rmmod` or `modprobe -r`) does not work well: it crashes in nouveau_backlight_exit (invalid pointer). The current hack is to comment out these lines in drivers/gpu/drm/nouveau/nouveau_backlight.c, function `nouveau_backlight_exit`: list_for_each_entry(connector, &drm->bl_connectors, head) { if (connector->id >= 0) ida_simple_remove(&bl_ida, connector->id); } Need to debug why it happens. - VGA ROM for Nvidia GPU is not loaded from BIOS (i.e. coreboot). Need to debug and fix this too. (Or maybe I'm just doing it wrong.) The current workaround is to load it from a file. To do this automatically, create a new file in /etc/modprobe.d with this line: options nouveau config=NvBios=pci10de-0ffc.rom where "pci10de-0ffc.rom" is a file in /lib/firmware directory (the path is relative to /lib/firmware). VGA ROM has to be extracted from vendor UEFI dump, GUID is 9781FA9D-5A3B-431A-AD59-2748C9A170EC. Not tested yet: - nvidia proprietary driver Change-Id: I277808d6c1d8bd6e0a267a53f25471597698f8d5 Signed-off-by: Evgeny Zinoviev <me(a)ch1p.com> --- A src/drivers/lenovo/hybrid_graphics/acpi/gpu.asl A src/drivers/nvidia/optimus/acpi/optimus.asl A src/ec/lenovo/pmh7/acpi/pmh7.asl M src/mainboard/lenovo/t420/acpi/ec.asl M src/mainboard/lenovo/t420/dsdt.asl M src/mainboard/lenovo/t420s/acpi/ec.asl M src/mainboard/lenovo/t420s/dsdt.asl M src/mainboard/lenovo/t430/acpi/ec.asl M src/mainboard/lenovo/t430/dsdt.asl M src/mainboard/lenovo/t430s/Makefile.inc M src/mainboard/lenovo/t430s/acpi/ec.asl M src/mainboard/lenovo/t430s/cmos.default M src/mainboard/lenovo/t430s/dsdt.asl M src/mainboard/lenovo/t520/acpi/ec.asl M src/mainboard/lenovo/t520/dsdt.asl M src/mainboard/lenovo/t530/acpi/ec.asl M src/mainboard/lenovo/t530/dsdt.asl M src/northbridge/intel/sandybridge/acpi/peg.asl 18 files changed, 359 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/28380/5 -- To view, visit https://review.coreboot.org/28380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I277808d6c1d8bd6e0a267a53f25471597698f8d5 Gerrit-Change-Number: 28380 Gerrit-PatchSet: 5 Gerrit-Owner: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: mb/lenovo: Dual Graphics for xx20/xx30 ThinkPads
by Evgeny Zinoviev (Code Review) 30 Aug '18

30 Aug '18

Evgeny Zinoviev has posted comments on this change. ( https://review.coreboot.org/28393 ) Change subject: mb/lenovo: Dual Graphics for xx20/xx30 ThinkPads ...................................................................... Patch Set 1: Tested on W530. I hope someone can test on T430s, I'm not sure about it. -- To view, visit https://review.coreboot.org/28393 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8842fef0fa1235eb91abf6b7e655ed4d8598adc7 Gerrit-Change-Number: 28393 Gerrit-PatchSet: 1 Gerrit-Owner: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Comment-Date: Thu, 30 Aug 2018 00:03:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No

1 0

Change in coreboot[master]: mb/lenovo: dGPU power handling on T430, T530
by Evgeny Zinoviev (Code Review) 30 Aug '18

30 Aug '18

Evgeny Zinoviev has uploaded a new patch set (#2). ( https://review.coreboot.org/28392 ) Change subject: mb/lenovo: dGPU power handling on T430, T530 ...................................................................... mb/lenovo: dGPU power handling on T430, T530 Enable dGPU power handling on Lenovo ThinkPad T430, T530 via PMH7 register 0x50. Although there's no Thinker-1 chip on these models according to schematics, dGPU power control via PMH7 works the same as on T420/T520, so they can be considered Thinker-1-compatible. It can be tested from linux userpace using util/pmh7tool. To turn dGPU power off: pmh7tool -c 0x50 7 pmh7tool -c 0x50 3 To turn it on: pmh7tool -s 0x50 3 pmh7tool -s 0x50 7 To check whether it is on (bash): reg=0x$(pmh7tool -r 0x50) echo "$(( (( reg & 0x08 )) >> 3 ))" or just `pmh7tool -b 0x50 3` with https://review.coreboot.org/#/c/coreboot/+/28388/ Tested on ThinkPad W530. Change-Id: Ieab1a33b3c680c757cc0999660b5cb7e122474cc Signed-off-by: Evgeny Zinoviev <me(a)ch1p.com> --- M src/mainboard/lenovo/t430/devicetree.cb M src/mainboard/lenovo/t530/variants/t530/devicetree.cb M src/mainboard/lenovo/t530/variants/w530/devicetree.cb 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/28392/2 -- To view, visit https://review.coreboot.org/28392 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ieab1a33b3c680c757cc0999660b5cb7e122474cc Gerrit-Change-Number: 28392 Gerrit-PatchSet: 2 Gerrit-Owner: Evgeny Zinoviev <me(a)ch1p.com>

1 0

Change in coreboot[master]: [WIP] Nvidia Optimus support for ThinkPads
by Evgeny Zinoviev (Code Review) 30 Aug '18

30 Aug '18

Hello Patrick Rudolph, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/28380 to look at the new patch set (#4). Change subject: [WIP] Nvidia Optimus support for ThinkPads ...................................................................... [WIP] Nvidia Optimus support for ThinkPads Based on siro's work #23041. Tested on ThinkPad W530. Adds ACPI code for dGPU power management. Depends on: https://review.coreboot.org/#/c/coreboot/+/28392 https://review.coreboot.org/#/c/coreboot/+/28393 What works (tested on 4.16.13-gentoo kernel): - power management via _PS0 and _DSM + _PS3 ACPI calls - nouveau driver (with a workaround, see below) - bumblebee (from the "develop" branch) - bbswitch Known problems: - `lspci -s 01:00.0 -vv` turns dGPU on if it was off before. Not sure why it happens (probably it calls _PS0 at some point) or whether it should happen. - nouveau driver unloading (`rmmod` or `modprobe -r`) does not work well: it crashes in nouveau_backlight_exit (invalid pointer). The current hack is to comment out these lines in drivers/gpu/drm/nouveau/nouveau_backlight.c, function `nouveau_backlight_exit`: list_for_each_entry(connector, &drm->bl_connectors, head) { if (connector->id >= 0) ida_simple_remove(&bl_ida, connector->id); } Need to debug why it happens. - VGA ROM for Nvidia GPU is not loaded from BIOS (i.e. coreboot). Need to debug and fix this too. (Or maybe I'm just doing it wrong.) The current workaround is to load it from a file. To do this automatically, create a new file in /etc/modprobe.d with this line: options nouveau config=NvBios=pci10de-0ffc.rom where "pci10de-0ffc.rom" is a file in /lib/firmware directory (the path is relative to /lib/firmware). VGA ROM has to be extracted from vendor UEFI dump, GUID is 9781FA9D-5A3B-431A-AD59-2748C9A170EC. Not tested yet: - nvidia proprietary driver Change-Id: I277808d6c1d8bd6e0a267a53f25471597698f8d5 Signed-off-by: Evgeny Zinoviev <me(a)ch1p.com> --- A src/drivers/lenovo/hybrid_graphics/acpi/gpu.asl A src/drivers/nvidia/optimus/acpi/optimus.asl A src/ec/lenovo/pmh7/acpi/pmh7.asl M src/mainboard/lenovo/t420/acpi/ec.asl M src/mainboard/lenovo/t420/dsdt.asl M src/mainboard/lenovo/t420s/acpi/ec.asl M src/mainboard/lenovo/t420s/dsdt.asl M src/mainboard/lenovo/t430/acpi/ec.asl M src/mainboard/lenovo/t430/dsdt.asl M src/mainboard/lenovo/t430s/Kconfig M src/mainboard/lenovo/t430s/Makefile.inc M src/mainboard/lenovo/t430s/acpi/ec.asl M src/mainboard/lenovo/t430s/cmos.default M src/mainboard/lenovo/t430s/dsdt.asl M src/mainboard/lenovo/t520/acpi/ec.asl M src/mainboard/lenovo/t520/dsdt.asl M src/mainboard/lenovo/t530/acpi/ec.asl M src/mainboard/lenovo/t530/dsdt.asl M src/northbridge/intel/sandybridge/acpi/peg.asl 19 files changed, 360 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/28380/4 -- To view, visit https://review.coreboot.org/28380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I277808d6c1d8bd6e0a267a53f25471597698f8d5 Gerrit-Change-Number: 28380 Gerrit-PatchSet: 4 Gerrit-Owner: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: mb/lenovo: Dual Graphics for xx20/xx30 ThinkPads
by Evgeny Zinoviev (Code Review) 30 Aug '18

30 Aug '18

Evgeny Zinoviev has uploaded this change for review. ( https://review.coreboot.org/28393 Change subject: mb/lenovo: Dual Graphics for xx20/xx30 ThinkPads ...................................................................... mb/lenovo: Dual Graphics for xx20/xx30 ThinkPads Add CMOS option that allows to use both integrated and discrete GPU. Change-Id: I8842fef0fa1235eb91abf6b7e655ed4d8598adc7 Signed-off-by: Evgeny Zinoviev <me(a)ch1p.com> --- M src/mainboard/lenovo/t420/cmos.layout M src/mainboard/lenovo/t420/romstage.c M src/mainboard/lenovo/t420s/cmos.layout M src/mainboard/lenovo/t420s/romstage.c M src/mainboard/lenovo/t430/cmos.layout M src/mainboard/lenovo/t430/romstage.c M src/mainboard/lenovo/t430s/cmos.default M src/mainboard/lenovo/t430s/cmos.layout M src/mainboard/lenovo/t430s/romstage.c M src/mainboard/lenovo/t520/romstage.c M src/mainboard/lenovo/t530/cmos.layout M src/mainboard/lenovo/t530/romstage.c 12 files changed, 39 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/28393/1 diff --git a/src/mainboard/lenovo/t420/cmos.layout b/src/mainboard/lenovo/t420/cmos.layout index 5a9e570..f55c203 100644 --- a/src/mainboard/lenovo/t420/cmos.layout +++ b/src/mainboard/lenovo/t420/cmos.layout @@ -129,6 +129,7 @@ 11 6 224M 12 0 Integrated Only 12 1 Discrete Only +12 2 Dual Graphics 13 0 Disable 13 1 AC and battery 13 2 AC only diff --git a/src/mainboard/lenovo/t420/romstage.c b/src/mainboard/lenovo/t420/romstage.c index 36e83a3..bef2562 100644 --- a/src/mainboard/lenovo/t420/romstage.c +++ b/src/mainboard/lenovo/t420/romstage.c @@ -30,6 +30,9 @@ early_hybrid_graphics(&igd, &peg); + if (peg && igd) + return; + /* Hide disabled devices */ reg32 = pci_read_config32(PCI_DEV(0, 0, 0), DEVEN); reg32 &= ~(DEVEN_PEG10 | DEVEN_IGD); diff --git a/src/mainboard/lenovo/t420s/cmos.layout b/src/mainboard/lenovo/t420s/cmos.layout index f395c0c..2be55f6 100644 --- a/src/mainboard/lenovo/t420s/cmos.layout +++ b/src/mainboard/lenovo/t420s/cmos.layout @@ -129,6 +129,7 @@ 11 6 224M 12 0 Integrated Only 12 1 Discrete Only +12 2 Dual Graphics 13 0 Disable 13 1 AC and battery 13 2 AC only diff --git a/src/mainboard/lenovo/t420s/romstage.c b/src/mainboard/lenovo/t420s/romstage.c index 55011cf2..be8052c 100644 --- a/src/mainboard/lenovo/t420s/romstage.c +++ b/src/mainboard/lenovo/t420s/romstage.c @@ -32,6 +32,9 @@ early_hybrid_graphics(&igd, &peg); + if (peg && igd) + return; + /* Hide disabled devices */ reg32 = pci_read_config32(PCI_DEV(0, 0, 0), DEVEN); reg32 &= ~(DEVEN_PEG10 | DEVEN_IGD); diff --git a/src/mainboard/lenovo/t430/cmos.layout b/src/mainboard/lenovo/t430/cmos.layout index 2b687c2..1b50e7f 100644 --- a/src/mainboard/lenovo/t430/cmos.layout +++ b/src/mainboard/lenovo/t430/cmos.layout @@ -128,6 +128,7 @@ 11 6 224M 12 0 Integrated Only 12 1 Discrete Only +12 2 Dual Graphics 13 0 Disable 13 1 AC and battery 13 2 AC only diff --git a/src/mainboard/lenovo/t430/romstage.c b/src/mainboard/lenovo/t430/romstage.c index 94679df..90d0886 100644 --- a/src/mainboard/lenovo/t430/romstage.c +++ b/src/mainboard/lenovo/t430/romstage.c @@ -30,6 +30,9 @@ early_hybrid_graphics(&igd, &peg); + if (peg && igd) + return; + /* Hide disabled devices */ reg32 = pci_read_config32(PCI_DEV(0, 0, 0), DEVEN); reg32 &= ~(DEVEN_PEG10 | DEVEN_IGD); diff --git a/src/mainboard/lenovo/t430s/cmos.default b/src/mainboard/lenovo/t430s/cmos.default index 979f132..6e61dae 100644 --- a/src/mainboard/lenovo/t430s/cmos.default +++ b/src/mainboard/lenovo/t430s/cmos.default @@ -13,4 +13,5 @@ sticky_fn=Disable trackpoint=Enable backlight=Both +hybrid_graphics_mode=Integrated Only usb_always_on=Disable diff --git a/src/mainboard/lenovo/t430s/cmos.layout b/src/mainboard/lenovo/t430s/cmos.layout index 538e624..eac168f 100644 --- a/src/mainboard/lenovo/t430s/cmos.layout +++ b/src/mainboard/lenovo/t430s/cmos.layout @@ -76,7 +76,8 @@ # coreboot config options: northbridge 432 3 e 11 gfx_uma_size -#435 5 r 0 unused +435 2 e 13 hybrid_graphics_mode +#437 3 r 0 unused 440 8 h 0 volume # SandyBridge MRC Scrambler Seed values @@ -128,6 +129,8 @@ 12 0 Disable 12 1 AC and battery 12 2 AC only +13 0 Integrated Only +13 2 Dual Graphics # ----------------------------------------------------------------- checksums diff --git a/src/mainboard/lenovo/t430s/romstage.c b/src/mainboard/lenovo/t430s/romstage.c index 3f6d9f2..de9e944 100644 --- a/src/mainboard/lenovo/t430s/romstage.c +++ b/src/mainboard/lenovo/t430s/romstage.c @@ -15,12 +15,16 @@ * GNU General Public License for more details. */ +#include <option.h> +#include <delay.h> #include <arch/byteorder.h> #include <arch/io.h> #include <device/pci_def.h> #include <console/console.h> #include <northbridge/intel/sandybridge/raminit_native.h> #include <southbridge/intel/bd82x6x/pch.h> +#include <drivers/lenovo/hybrid_graphics/chip.h> +#include <ec/lenovo/pmh7/pmh7.h> void pch_enable_lpc(void) { @@ -64,6 +68,17 @@ } void mainboard_early_init(int s3resume) { + enum hybrid_graphics_req mode = HYBRID_GRAPHICS_INTEGRATED; + get_option(&mode, "hybrid_graphics_mode"); + + if (mode == HYBRID_GRAPHICS_INTEGRATED) { + const size_t power_en = !!(pmh7_register_read(0x50) & 0x08); + if (power_en) { + pmh7_register_clear_bit(0x50, 7); // DGPU_RST + udelay(100); + pmh7_register_clear_bit(0x50, 3); // DGPU_PWR + } + } } void mainboard_config_superio(void) diff --git a/src/mainboard/lenovo/t520/romstage.c b/src/mainboard/lenovo/t520/romstage.c index 328ae37..4fcd651 100644 --- a/src/mainboard/lenovo/t520/romstage.c +++ b/src/mainboard/lenovo/t520/romstage.c @@ -42,6 +42,9 @@ early_hybrid_graphics(&igd, &peg); + if (peg && igd) + return; + /* Hide disabled devices */ reg32 = pci_read_config32(PCI_DEV(0, 0, 0), DEVEN); reg32 &= ~(DEVEN_PEG10 | DEVEN_IGD); diff --git a/src/mainboard/lenovo/t530/cmos.layout b/src/mainboard/lenovo/t530/cmos.layout index 9a099f5..3400a4d 100644 --- a/src/mainboard/lenovo/t530/cmos.layout +++ b/src/mainboard/lenovo/t530/cmos.layout @@ -129,6 +129,7 @@ 11 6 224M 12 0 Integrated Only 12 1 Discrete Only +12 2 Dual Graphics 13 0 Disable 13 1 AC and battery 13 2 AC only diff --git a/src/mainboard/lenovo/t530/romstage.c b/src/mainboard/lenovo/t530/romstage.c index ba7a229..88e07c1 100644 --- a/src/mainboard/lenovo/t530/romstage.c +++ b/src/mainboard/lenovo/t530/romstage.c @@ -34,6 +34,9 @@ early_hybrid_graphics(&igd, &peg); + if (peg && igd) + return; + /* Hide disabled devices */ reg32 = pci_read_config32(PCI_DEV(0, 0, 0), DEVEN); reg32 &= ~(DEVEN_PEG10 | DEVEN_IGD); -- To view, visit https://review.coreboot.org/28393 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8842fef0fa1235eb91abf6b7e655ed4d8598adc7 Gerrit-Change-Number: 28393 Gerrit-PatchSet: 1 Gerrit-Owner: Evgeny Zinoviev <me(a)ch1p.com>

1 0

Change in coreboot[master]: mb/lenovo: dGPU power handling on T430(s), T530
by Evgeny Zinoviev (Code Review) 30 Aug '18

30 Aug '18

Evgeny Zinoviev has uploaded this change for review. ( https://review.coreboot.org/28392 Change subject: mb/lenovo: dGPU power handling on T430(s), T530 ...................................................................... mb/lenovo: dGPU power handling on T430(s), T530 Enable dGPU power handling on Lenovo ThinkPad T430, T430s, T530 via PMH7 register 0x50. Although there's no Thinker-1 chip on these models according to schematics, dGPU power control via PMH7 works the same as on T420/T520, so they can be considered Thinker-1-compatible. It can be tested from linux userpace using util/pmh7tool. To turn dGPU power off: pmh7tool -c 0x50 7 pmh7tool -c 0x50 3 To turn it on: pmh7tool -s 0x50 3 pmh7tool -s 0x50 7 To check whether it is on (bash): reg=0x$(pmh7tool -r 0x50) echo "$(( (( reg & 0x08 )) >> 3 ))" or just `pmh7tool -b 0x50 3` with https://review.coreboot.org/#/c/coreboot/+/28388/ Tested on ThinkPad W530. Change-Id: Ieab1a33b3c680c757cc0999660b5cb7e122474cc Signed-off-by: Evgeny Zinoviev <me(a)ch1p.com> --- M src/mainboard/lenovo/t430/devicetree.cb M src/mainboard/lenovo/t530/variants/t530/devicetree.cb M src/mainboard/lenovo/t530/variants/w530/devicetree.cb 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/28392/1 diff --git a/src/mainboard/lenovo/t430/devicetree.cb b/src/mainboard/lenovo/t430/devicetree.cb index d466b36..5eb92bc 100644 --- a/src/mainboard/lenovo/t430/devicetree.cb +++ b/src/mainboard/lenovo/t430/devicetree.cb @@ -167,7 +167,7 @@ register "has_backlight_gpio" = "0" register "has_dgpu_power_gpio" = "0" - register "has_thinker1" = "0" + register "has_thinker1" = "1" end chip drivers/pc80/tpm device pnp 0c31.0 on end diff --git a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb b/src/mainboard/lenovo/t530/variants/t530/devicetree.cb index 0da05e0..4dcdc9d 100644 --- a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb +++ b/src/mainboard/lenovo/t530/variants/t530/devicetree.cb @@ -157,7 +157,7 @@ register "has_backlight_gpio" = "0" register "has_dgpu_power_gpio" = "0" - register "has_thinker1" = "0" + register "has_thinker1" = "1" end end # LPC bridge device pci 1f.2 on end # SATA Controller 1 diff --git a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb index d9d9df5..7a72b26 100644 --- a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb +++ b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb @@ -179,7 +179,7 @@ register "has_backlight_gpio" = "0" register "has_dgpu_power_gpio" = "0" - register "has_thinker1" = "0" + register "has_thinker1" = "1" end end device pci 1f.2 on # SATA Controller 1 -- To view, visit https://review.coreboot.org/28392 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ieab1a33b3c680c757cc0999660b5cb7e122474cc Gerrit-Change-Number: 28392 Gerrit-PatchSet: 1 Gerrit-Owner: Evgeny Zinoviev <me(a)ch1p.com>

1 0

Change in coreboot[master]: util/pmh7tool: Add option to read specific bit
by Felix Held (Code Review) 30 Aug '18

30 Aug '18

Felix Held has posted comments on this change. ( https://review.coreboot.org/28388 ) Change subject: util/pmh7tool: Add option to read specific bit ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/28388 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I045383eedbcf438270e9c64329a8d910bb941ab8 Gerrit-Change-Number: 28388 Gerrit-PatchSet: 2 Gerrit-Owner: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 29 Aug 2018 23:55:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: util/pmh7tool: Add option to read specific bit
by Evgeny Zinoviev (Code Review) 30 Aug '18

30 Aug '18

Evgeny Zinoviev has posted comments on this change. ( https://review.coreboot.org/28388 ) Change subject: util/pmh7tool: Add option to read specific bit ...................................................................... Patch Set 2: (1 comment) https://review.coreboot.org/#/c/28388/1/util/pmh7tool/pmh7tool.c File util/pmh7tool/pmh7tool.c: https://review.coreboot.org/#/c/28388/1/util/pmh7tool/pmh7tool.c@170 PS1, Line 170: if (act == SET || act == CLEAR || act == READBIT) { > add "|| act == READBIT" Done -- To view, visit https://review.coreboot.org/28388 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I045383eedbcf438270e9c64329a8d910bb941ab8 Gerrit-Change-Number: 28388 Gerrit-PatchSet: 2 Gerrit-Owner: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Comment-Date: Wed, 29 Aug 2018 23:15:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
112
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit August 2018