[coreboot-gerrit] Change in ...coreboot[master]: nb/intel/i945: Reduce pcidev_on_root() calls

[Nico Huber (Code Review)]

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30881 )

Change subject: nb/intel/i945: Reduce pcidev_on_root() calls
......................................................................

nb/intel/i945: Reduce pcidev_on_root() calls

Also removes one call for 0:2.0 (integrated graphics) that might be
disabled.

Change-Id: I494aa366030b77baf431f29ba331f13f7c567025
Signed-off-by: Nico Huber 
Reviewed-on: https://review.coreboot.org/c/30881
Tested-by: build bot (Jenkins) 
Reviewed-by: Kyösti Mälkki 
---
M src/northbridge/intel/i945/northbridge.c
1 file changed, 7 insertions(+), 7 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved

diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 2b51b5e..10a7ba4 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -66,6 +66,7 @@
    unsigned long long tomk, tomk_stolen;
    uint64_t uma_memory_base = 0, uma_memory_size = 0;
    uint64_t tseg_memory_base = 0, tseg_memory_size = 0;
+	struct device *const d0f0 = pcidev_on_root(0, 0);

pci_domain_read_resources(dev);

@@ -75,17 +76,14 @@
    pci_tolm = find_pci_tolm(dev->link_list);
    printk(BIOS_DEBUG, "pci_tolm: 0x%x\n", pci_tolm);

-	printk(BIOS_SPEW, "Base of stolen memory: 0x%08x\n",
-		    pci_read_config32(pcidev_on_root(2, 0), BSM));
-
-	tolud = pci_read_config8(pcidev_on_root(0, 0), TOLUD);
+	tolud = pci_read_config8(d0f0, TOLUD);
    printk(BIOS_SPEW, "Top of Low Used DRAM: 0x%08x\n", tolud << 24);

tomk = tolud << 14;
    tomk_stolen = tomk;

/* Note: subtract IGD device and TSEG */
-	reg16 = pci_read_config16(pcidev_on_root(0, 0), GGC);
+	reg16 = pci_read_config16(d0f0, GGC);
    if (!(reg16 & 2)) {
    	printk(BIOS_DEBUG, "IGD decoded, subtracting ");
    	int uma_size = decode_igd_memory_size((reg16 >> 4) & 7);
@@ -96,10 +94,12 @@
    	/* For reserving UMA memory in the memory map */
    	uma_memory_base = tomk_stolen * 1024ULL;
    	uma_memory_size = uma_size * 1024ULL;
+
+		printk(BIOS_SPEW, "Base of stolen memory: 0x%08x\n",
+		       (unsigned int)uma_memory_base);
    }

-	tseg_sizek = decode_tseg_size(pci_read_config8(pcidev_on_root(0, 0),
-							ESMRAMC)) >> 10;
+	tseg_sizek = decode_tseg_size(pci_read_config8(d0f0, ESMRAMC)) >> 10;
    printk(BIOS_DEBUG, "TSEG decoded, subtracting %dM\n", tseg_sizek >> 10);
    tomk_stolen -= tseg_sizek;
    tseg_memory_base = tomk_stolen * 1024ULL;