summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-12 13:10:19 +0300
committerMartin Roth <martinroth@google.com>2019-07-21 18:58:01 +0000
commit71756c21afd14f4114c597487406eb53e23730b2 (patch)
tree7ccb61cf5eb3a5b3fb3024327fce58d141c4e928 /src/mainboard/google
parent6046eb405a4f1cbb4df1ed0d23276f333bc0998b (diff)
soc/intel: Expand SA_DEV_ROOT for ramstage
We do not want to disguise somewhat complex function calls as simple macros. Change-Id: I298f7f9a1c6a64cfba454e919eeaedc7bb2d4801 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34411 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/poppy/variants/atlas/mainboard.c4
-rw-r--r--src/mainboard/google/poppy/variants/nocturne/mainboard.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/mainboard/google/poppy/variants/atlas/mainboard.c b/src/mainboard/google/poppy/variants/atlas/mainboard.c
index d4db98e67e..9c4b2bc75d 100644
--- a/src/mainboard/google/poppy/variants/atlas/mainboard.c
+++ b/src/mainboard/google/poppy/variants/atlas/mainboard.c
@@ -25,8 +25,10 @@
static uint32_t get_pl2(void)
{
+ struct device *igd_dev = pcidev_path_on_root(SA_DEVFN_IGD);
uint16_t id;
- id = pci_read_config16(SA_DEV_IGD, PCI_DEVICE_ID);
+
+ id = pci_read_config16(igd_dev, PCI_DEVICE_ID);
/* Assume we only have KLB-Y and AML-Y SKUs */
if (id == PCI_DEVICE_ID_INTEL_KBL_GT2_SULXM)
return PL2_KBL;
diff --git a/src/mainboard/google/poppy/variants/nocturne/mainboard.c b/src/mainboard/google/poppy/variants/nocturne/mainboard.c
index f00394ced0..7b6b28b0ba 100644
--- a/src/mainboard/google/poppy/variants/nocturne/mainboard.c
+++ b/src/mainboard/google/poppy/variants/nocturne/mainboard.c
@@ -26,8 +26,10 @@
static uint32_t get_pl2(void)
{
+ struct device *igd_dev = pcidev_path_on_root(SA_DEVFN_IGD);
uint16_t id;
- id = pci_read_config16(SA_DEV_IGD, PCI_DEVICE_ID);
+
+ id = pci_read_config16(igd_dev, PCI_DEVICE_ID);
/* Assume we only have KLB-Y and AML-Y SKUs */
if (id == PCI_DEVICE_ID_INTEL_KBL_GT2_SULXM)
return PL2_KBL;