From 349f13071dbb5e3c5e6e5fdf72d5f7cf8b3e0cb7 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Tue, 31 Aug 2021 17:49:53 -0600 Subject: [PATCH] mb/google/guybrush: Update PCIe WWAN path for WWAN PCIe check variant_has_pcie_wwan() was always coming back as disabled because find_dev_nested_path() couldn't find the device until the domain was added to the array. BUG=b:193036827 TEST=Boot guybrush with PCIe & USB WWAN devices. Signed-off-by: Martin Roth Change-Id: Id94fa0b0ff5c29fa447e869220d27ccfe61438c6 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57315 Tested-by: build bot (Jenkins) Reviewed-by: Karthik Ramasubramanian --- .../google/guybrush/variants/baseboard/helpers.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/mainboard/google/guybrush/variants/baseboard/helpers.c b/src/mainboard/google/guybrush/variants/baseboard/helpers.c index 5297a4925b..cde31c22d9 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/helpers.c +++ b/src/mainboard/google/guybrush/variants/baseboard/helpers.c @@ -34,11 +34,15 @@ __weak bool variant_has_fpmcu(void) __weak bool variant_has_pcie_wwan(void) { static const struct device_path pcie_wwan_path[] = { - { - .type = DEVICE_PATH_PCI, - .pci.devfn = PCIE_GPP_2_2_DEVFN, - }, - }; + { + .type = DEVICE_PATH_DOMAIN, + .domain.domain = 0x0, + }, + { + .type = DEVICE_PATH_PCI, + .pci.devfn = WWAN_DEVFN + }, +}; return variant_has_device_enabled(pcie_wwan_path, ARRAY_SIZE(pcie_wwan_path)); }