sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/amd/pi/00730F01/northbridge: drop nodeid from get_dram_base_limit

Browse Source 
This APU is always a single-node and also only has one DRAM controller,
so there is only one valid DRAM base and limit register. It's also worth
mentioning that the assumption made in get_dram_base_limit that the n-th
node is using the n-tn DRAM range register was valid for K8, but not
necessarily on newer generations than that.

TEST=PC Engines APU2 still boots and doesn't show any new problems

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Id0529c66e8d0e6c8eb42eec2c6d9d2e892287865
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79607
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Felix Held
2023-12-16 01:37:34 +01:00
parent a880720ee1
commit 3eaa850c6a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/northbridge/amd/pi/00730F01/northbridge.c
View File

@@ -33,11 +33,11 @@ static struct device *get_node_pci(u32 nodeid, u32 fn)
return pcidev_on_root(DEV_CDB + nodeid, fn); return pcidev_on_root(DEV_CDB + nodeid, fn);
} }
static int get_dram_base_limit(u32 nodeid, resource_t *basek, resource_t *limitk) static int get_dram_base_limit(resource_t *basek, resource_t *limitk)
{ {
u32 temp; u32 temp;
temp = pci_read_config32(get_node_pci(nodeid, 1), 0x40 + (nodeid << 3)); //[39:24] at [31:16] temp = pci_read_config32(get_node_pci(0, 1), 0x40); //[39:24] at [31:16]
if (!(temp & 1)) if (!(temp & 1))
return 0; // this memory range is not enabled return 0; // this memory range is not enabled
/* /*
@@ -49,7 +49,7 @@ static int get_dram_base_limit(u32 nodeid, resource_t *basek, resource_t *limitk
* BKDG address[39:0] <= {DramLimit[39:24], FF_FFFFh} converted as above but * BKDG address[39:0] <= {DramLimit[39:24], FF_FFFFh} converted as above but
* ORed with 0xffff to get real limit before shifting. * ORed with 0xffff to get real limit before shifting.
*/ */
temp = pci_read_config32(get_node_pci(nodeid, 1), 0x44 + (nodeid << 3)); //[39:24] at [31:16] temp = pci_read_config32(get_node_pci(0, 1), 0x44); //[39:24] at [31:16]
*limitk = ((temp & 0xffff0000) | 0xffff) >> (10 - 8); *limitk = ((temp & 0xffff0000) | 0xffff) >> (10 - 8);
*limitk += 1; // round up last byte *limitk += 1; // round up last byte
@@ -70,7 +70,7 @@ static void add_fixed_resources(struct device *dev, int index)
if (pci_read_config32(get_node_pci(0, 2), 0x118) & (1 << 18)) { if (pci_read_config32(get_node_pci(0, 2), 0x118) & (1 << 18)) {
/* Add CC6 DRAM UC resource residing at DRAM Limit of size 16MB as per BKDG */ /* Add CC6 DRAM UC resource residing at DRAM Limit of size 16MB as per BKDG */
resource_t basek, limitk; resource_t basek, limitk;
if (!get_dram_base_limit(0, &basek, &limitk)) if (!get_dram_base_limit(&basek, &limitk))
return; return;
mmio_resource_kb(dev, index++, limitk, 16 * 1024); mmio_resource_kb(dev, index++, limitk, 16 * 1024);
} }
@@ -572,7 +572,7 @@ static struct hw_mem_hole_info get_hw_mem_hole_info(void)
mem_hole.node_id = -1; mem_hole.node_id = -1;
resource_t basek, limitk; resource_t basek, limitk;
if (get_dram_base_limit(0, &basek, &limitk)) { // memory on this node if (get_dram_base_limit(&basek, &limitk)) { // memory on this node
u32 hole = pci_read_config32(get_node_pci(0, 1), 0xf0); u32 hole = pci_read_config32(get_node_pci(0, 1), 0xf0);
if (hole & 2) { // we find the hole if (hole & 2) { // we find the hole
mem_hole.hole_startk = (hole & (0xff << 24)) >> 10; mem_hole.hole_startk = (hole & (0xff << 24)) >> 10;
@@ -613,7 +613,7 @@ static void domain_read_resources(struct device *dev)
idx = 0x10; idx = 0x10;
resource_t basek, limitk, sizek; resource_t basek, limitk, sizek;
if (get_dram_base_limit(0, &basek, &limitk)) { if (get_dram_base_limit(&basek, &limitk)) {
sizek = limitk - basek; sizek = limitk - basek;
printk(BIOS_DEBUG, "basek=%08llx, limitk=%08llx, sizek=%08llx,\n", printk(BIOS_DEBUG, "basek=%08llx, limitk=%08llx, sizek=%08llx,\n",