GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amd/stoneyridge: Simplify SB link routing 

Remove the check for the southbridge link from Stoney Ridge.  The APU
is an SoC which can never be installed in a multi-node system.  It is
pointless to detect and remember the sblink value, which is set by
hardware and comes up 0.  The BKDG marks this as a reserved field vs.
documentation for multi-node-capable Family 15h devices.

Because there is only one option for SB link now, relocate the register
write done by set_vga_enable_reg() and remove the function.

Change-Id: Ie4ce6b5aa847a184534224db302437ff8d37c14b
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/21494
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Marshall Dawson 2017-09-06 10:46:36 -06:00 committed by Martin Roth
parent b00ba2ae6b
commit e2697de821
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/soc/amd/stoneyridge/northbridge.c
View File

@ -58,7 +58,6 @@ typedef struct dram_base_mask {
} dram_base_mask_t; } dram_base_mask_t;
static unsigned int node_nums; static unsigned int node_nums;
static unsigned int sblink;
static device_t __f0_dev; static device_t __f0_dev;
static device_t __f1_dev; static device_t __f1_dev;
static device_t __f2_dev; static device_t __f2_dev;
@ -143,18 +142,6 @@ static void f1_write_config32(unsigned int reg, u32 value)
pci_write_config32(__f1_dev, reg, value); pci_write_config32(__f1_dev, reg, value);
} }
static void set_vga_enable_reg(u32 nodeid, u32 linkn)
{
u32 val;
val = 1 | (nodeid << 4) | (linkn << 12);
/* Routes:
* mmio 0xa0000:0xbffff
* io 0x3b0:0x3bb, 0x3c0:0x3df
*/
f1_write_config32(0xf4, val);
}
static void read_resources(device_t dev) static void read_resources(device_t dev)
{ {
/* /*
@ -228,9 +215,8 @@ static void create_vga_resource(device_t dev)
if (link == NULL) if (link == NULL)
return; return;
printk(BIOS_DEBUG, "VGA: %s link %d has VGA device\n", printk(BIOS_DEBUG, "VGA: %s has VGA device\n", dev_path(dev));
dev_path(dev), sblink); f1_write_config32(0xf4, 1); /* Route A0000-BFFFF, IO 3B0-3BB 3C0-3DF */
set_vga_enable_reg(0, sblink);
} }
static void set_resources(device_t dev) static void set_resources(device_t dev)
@ -605,8 +591,6 @@ void domain_set_resources(device_t dev)
/* first node */ /* first node */
static void sysconf_init(device_t dev) static void sysconf_init(device_t dev)
{ {
/* don't forget sublink1 */
sblink = (pci_read_config32(dev, 0x64) >> 8) & 7;
/* NodeCnt[2:0] */ /* NodeCnt[2:0] */
node_nums = ((pci_read_config32(dev, 0x60) >> 4) & 7) + 1; node_nums = ((pci_read_config32(dev, 0x60) >> 4) & 7) + 1;
} }