diff options
author | Reka Norman <rekanorman@chromium.org> | 2023-10-09 10:57:17 +1100 |
---|---|---|
committer | Felix Held <felix-coreboot@felixheld.de> | 2023-10-10 13:39:01 +0000 |
commit | e486082dfb1658b0916915bc944c1d3266862423 (patch) | |
tree | 0cb92fe72b554455884c8ed5df46e34ccd5574b5 /src/mainboard/google/dedede/mainboard.c | |
parent | 7c193b9480eaa0692b4d68ed768262ff34ae35e6 (diff) | |
download | coreboot-e486082dfb1658b0916915bc944c1d3266862423.tar.gz coreboot-e486082dfb1658b0916915bc944c1d3266862423.tar.bz2 coreboot-e486082dfb1658b0916915bc944c1d3266862423.zip |
mb/google/dedede: Wait for HPD on dibbi variants
Some Type-C monitors do not immediately assert HPD. If we enter FSP-S
before HDP is asserted, display initialisation may fail. So wait for
HPD.
This is similar to commit b40c6009141e ("mainboard/hatch: Fix puff DP
output on cold boots") on puff, except we don't use
google_chromeec_wait_for_displayport() since that EC command was removed
for TCPMv2 (https://crrev.com/c/4221975). Instead we use the HPD signals
only. By waiting for any HPD signal (Type-C or HDMI), we skip waiting if
HDMI is connected, which is the same behaviour as puff and fizz.
TEST=On dibbi, connect a display via a Type-C to HDMI dongle and check
the dev and recovery screens are now displayed correctly. Also check the
logs in the following cases:
Cold reboot in dev mode, Type-C to HDMI dongle:
HPD ready after 800 ms
Warm reboot in dev mode, Type-C to HDMI dongle:
HPD ready after 0 ms
Cold/warm reboot in dev mode, direct Type-C:
HPD ready after 0 ms
Cold/warm reboot in dev mode, direct HDMI:
HPD ready after 0 ms
Cold/warm reboot in dev mode, no display:
HPD not ready after 3000 ms. Abort.
Change-Id: Id4657b5d5a95a68ecbd9efcf3585cf96ad1e13e1
Signed-off-by: Reka Norman <rekanorman@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78294
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Sam McNally <sammc@google.com>
Diffstat (limited to 'src/mainboard/google/dedede/mainboard.c')
-rw-r--r-- | src/mainboard/google/dedede/mainboard.c | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/src/mainboard/google/dedede/mainboard.c b/src/mainboard/google/dedede/mainboard.c index a0a537c4cbfd..b381d9867f38 100644 --- a/src/mainboard/google/dedede/mainboard.c +++ b/src/mainboard/google/dedede/mainboard.c @@ -3,12 +3,15 @@ #include <acpi/acpi.h> #include <acpi/acpigen.h> #include <baseboard/variants.h> +#include <bootmode.h> #include <console/console.h> +#include <delay.h> #include <device/device.h> #include <drivers/tpm/cr50.h> #include <ec/ec.h> #include <security/tpm/tss.h> #include <soc/soc_chip.h> +#include <timer.h> #include <vb2_api.h> static void mainboard_update_soc_chip_config(void) @@ -30,12 +33,62 @@ static void mainboard_update_soc_chip_config(void) } } +static bool any_hpd_ready(const gpio_t *gpios, size_t num_gpios) +{ + for (size_t i = 0; i < num_gpios; i++) { + if (gpio_get(gpios[i])) + return true; + } + + return false; +} + +static void mainboard_wait_for_hpd(void) +{ + static const long display_timeout_ms = 3000; + struct stopwatch sw; + size_t num_gpios; + const gpio_t *hpd_gpios = variant_hpd_gpios(&num_gpios); + + if (num_gpios == 0) { + printk(BIOS_WARNING, "No HPD GPIOs, skip waiting\n"); + return; + } + + printk(BIOS_INFO, "Waiting for HPD\n"); + + /* Pins will be configured back by gpio_configure_pads. */ + for (size_t i = 0; i < num_gpios; i++) { + gpio_input(hpd_gpios[i]); + } + + stopwatch_init_msecs_expire(&sw, display_timeout_ms); + while (!any_hpd_ready(hpd_gpios, num_gpios)) { + if (stopwatch_expired(&sw)) { + printk(BIOS_WARNING, + "HPD not ready after %ld ms. Abort.\n", + display_timeout_ms); + return; + } + mdelay(200); + } + printk(BIOS_INFO, "HPD ready after %lld ms\n", + stopwatch_duration_msecs(&sw)); +} + static void mainboard_init(void *chip_info) { const struct pad_config *base_pads; const struct pad_config *override_pads; size_t base_num, override_num; + /* + * For chromeboxes, wait for DP HPD to be asserted before + * entering FSP-S, otherwise display init may fail. + */ + if (!CONFIG(SYSTEM_TYPE_LAPTOP) && display_init_required()) + mainboard_wait_for_hpd(); + base_pads = baseboard_gpio_table(&base_num); override_pads = variant_override_gpio_table(&override_num); |