Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

This patch fixes white space in northbridge/amd/pci with the help of indent.

Browse source 
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://coreboot.org/repository/coreboot-v3@1042 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Myles Watson 2008-11-18 16:59:09 +00:00
parent 4e9c6f3669
commit f75b0fe103
1 changed files with 242 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

174
northbridge/amd/k8/pci.c
View file

@ -47,13 +47,15 @@
#include <lapic.h> #include <lapic.h>
#define FX_DEVS 8 #define FX_DEVS 8
extern struct device * __f0_dev[FX_DEVS]; extern struct device *__f0_dev[FX_DEVS];
extern void get_fx_devs(void); extern void get_fx_devs(void);
u32 f1_read_config32(unsigned int reg); u32 f1_read_config32(unsigned int reg);
void f1_write_config32(unsigned int reg, u32 value); void f1_write_config32(unsigned int reg, u32 value);
unsigned int amdk8_nodeid(struct device * dev); unsigned int amdk8_nodeid(struct device *dev);
static unsigned int amdk8_scan_chain(struct device * dev, unsigned nodeid, unsigned link, unsigned sblink, unsigned int max, unsigned offset_unitid) static unsigned int amdk8_scan_chain(struct device *dev, unsigned nodeid,
unsigned link, unsigned sblink,
unsigned int max, unsigned offset_unitid)
{ {
u32 link_type; u32 link_type;
@ -64,18 +66,18 @@ static unsigned int amdk8_scan_chain(struct device * dev, unsigned nodeid, unsig
unsigned max_bus; unsigned max_bus;
unsigned min_bus; unsigned min_bus;
unsigned max_devfn; unsigned max_devfn;
printk(BIOS_SPEW, "amdk8_scan_chain link %x\n",link); printk(BIOS_SPEW, "amdk8_scan_chain link %x\n", link);
dev->link[link].cap = 0x80 + (link *0x20); dev->link[link].cap = 0x80 + (link * 0x20);
do { do {
link_type = pci_read_config32(dev, dev->link[link].cap + 0x18); link_type = pci_read_config32(dev, dev->link[link].cap + 0x18);
} while(link_type & ConnectionPending); } while (link_type & ConnectionPending);
if (!(link_type & LinkConnected)) { if (!(link_type & LinkConnected)) {
return max; return max;
} }
printk(BIOS_DEBUG, "amdk8_scan_chain: link %d is connected\n", link); printk(BIOS_DEBUG, "amdk8_scan_chain: link %d is connected\n", link);
do { do {
link_type = pci_read_config32(dev, dev->link[link].cap + 0x18); link_type = pci_read_config32(dev, dev->link[link].cap + 0x18);
} while(!(link_type & InitComplete)); } while (!(link_type & InitComplete));
if (!(link_type & NonCoherent)) { if (!(link_type & NonCoherent)) {
return max; return max;
} }
@ -83,7 +85,7 @@ static unsigned int amdk8_scan_chain(struct device * dev, unsigned nodeid, unsig
* register in function 1. * register in function 1.
*/ */
free_reg = 0; free_reg = 0;
for(config_reg = 0xe0; config_reg <= 0xec; config_reg += 4) { for (config_reg = 0xe0; config_reg <= 0xec; config_reg += 4) {
u32 config; u32 config;
config = f1_read_config32(config_reg); config = f1_read_config32(config_reg);
if (!free_reg && ((config & 3) == 0)) { if (!free_reg && ((config & 3) == 0)) {
@ -112,13 +114,13 @@ static unsigned int amdk8_scan_chain(struct device * dev, unsigned nodeid, unsig
*/ */
#if SB_HT_CHAIN_ON_BUS0 > 0 #if SB_HT_CHAIN_ON_BUS0 > 0
// first chain will on bus 0 // first chain will on bus 0
if((nodeid == 0) && (sblink==link)) { // actually max is 0 here if ((nodeid == 0) && (sblink == link)) { // actually max is 0 here
min_bus = max; min_bus = max;
} }
#if SB_HT_CHAIN_ON_BUS0 > 1 #if SB_HT_CHAIN_ON_BUS0 > 1
// second chain will be on 0x40, third 0x80, forth 0xc0 // second chain will be on 0x40, third 0x80, forth 0xc0
else { else {
min_bus = ((max>>6) + 1) * 0x40; min_bus = ((max >> 6) + 1) * 0x40;
} }
max = min_bus; max = min_bus;
#else #else
@ -152,10 +154,9 @@ static unsigned int amdk8_scan_chain(struct device * dev, unsigned nodeid, unsig
pci_write_config32(dev, dev->link[link].cap + 0x14, busses); pci_write_config32(dev, dev->link[link].cap + 0x14, busses);
config_busses &= 0x000fc88; config_busses &= 0x000fc88;
config_busses |= config_busses |= (3 << 0) | /* rw enable, no device compare */
(3 << 0) | /* rw enable, no device compare */ ((nodeid & 7) << 4) |
(( nodeid & 7) << 4) | ((link & 3) << 8) |
(( link & 3 ) << 8) |
((dev->link[link].secondary) << 16) | ((dev->link[link].secondary) << 16) |
((dev->link[link].subordinate) << 24); ((dev->link[link].subordinate) << 24);
f1_write_config32(config_reg, config_busses); f1_write_config32(config_reg, config_busses);
@ -163,23 +164,25 @@ static unsigned int amdk8_scan_chain(struct device * dev, unsigned nodeid, unsig
/* Now we can scan all of the subordinate busses i.e. the /* Now we can scan all of the subordinate busses i.e. the
* chain on the hypertranport link * chain on the hypertranport link
*/ */
for(i=0;i<4;i++) { for (i = 0; i < 4; i++) {
ht_unitid_base[i] = 0x20; ht_unitid_base[i] = 0x20;
} }
if (min_bus == 0) if (min_bus == 0)
max_devfn = (0x17<<3) | 7; max_devfn = (0x17 << 3) | 7;
else else
max_devfn = (0x1f<<3) | 7; max_devfn = (0x1f << 3) | 7;
max = hypertransport_scan_chain(&dev->link[link], 0, max_devfn, max, ht_unitid_base, offset_unitid); max =
hypertransport_scan_chain(&dev->link[link], 0, max_devfn, max,
ht_unitid_base, offset_unitid);
/* We know the number of busses behind this bridge. Set the /* We know the number of busses behind this bridge. Set the
* subordinate bus number to it's real value * subordinate bus number to it's real value
*/ */
dev->link[link].subordinate = max; dev->link[link].subordinate = max;
busses = (busses & 0xff00ffff) | busses = (busses & 0xff00ffff) |
((unsigned int) (dev->link[link].subordinate) << 16); ((unsigned int)(dev->link[link].subordinate) << 16);
pci_write_config32(dev, dev->link[link].cap + 0x14, busses); pci_write_config32(dev, dev->link[link].cap + 0x14, busses);
config_busses = (config_busses & 0x00ffffff) | config_busses = (config_busses & 0x00ffffff) |
@ -190,9 +193,9 @@ static unsigned int amdk8_scan_chain(struct device * dev, unsigned nodeid, unsig
// config config_reg, and ht_unitid_base to update hcdn_reg; // config config_reg, and ht_unitid_base to update hcdn_reg;
int index; int index;
unsigned temp = 0; unsigned temp = 0;
index = (config_reg-0xe0) >> 2; index = (config_reg - 0xe0) >> 2;
for(i=0;i<4;i++) { for (i = 0; i < 4; i++) {
temp |= (ht_unitid_base[i] & 0xff) << (i*8); temp |= (ht_unitid_base[i] & 0xff) << (i * 8);
} }
sysconf.hcdn_reg[index] = temp; sysconf.hcdn_reg[index] = temp;
@ -203,7 +206,7 @@ static unsigned int amdk8_scan_chain(struct device * dev, unsigned nodeid, unsig
return max; return max;
} }
static unsigned int amdk8_scan_chains(struct device * dev, unsigned int max) static unsigned int amdk8_scan_chains(struct device *dev, unsigned int max)
{ {
unsigned nodeid; unsigned nodeid;
unsigned link; unsigned link;
@ -213,31 +216,35 @@ static unsigned int amdk8_scan_chains(struct device * dev, unsigned int max)
printk(BIOS_DEBUG, "amdk8_scan_chains\n"); printk(BIOS_DEBUG, "amdk8_scan_chains\n");
if(nodeid==0) { if (nodeid == 0) {
sblink = (pci_read_config32(dev, 0x64)>>8) & 3; sblink = (pci_read_config32(dev, 0x64) >> 8) & 3;
#if SB_HT_CHAIN_ON_BUS0 > 0 #if SB_HT_CHAIN_ON_BUS0 > 0
#if ((HT_CHAIN_UNITID_BASE != 1) || (HT_CHAIN_END_UNITID_BASE != 0x20)) #if ((HT_CHAIN_UNITID_BASE != 1) || (HT_CHAIN_END_UNITID_BASE != 0x20))
offset_unitid = 1; offset_unitid = 1;
#endif #endif
// do southbridge ht chain first, in case s2885 put southbridge chain (8131/8111) on link2, // do southbridge ht chain first, in case s2885 put southbridge chain (8131/8111) on link2,
// but put 8151 on link0 // but put 8151 on link0
max = amdk8_scan_chain(dev, nodeid, sblink, sblink, max, offset_unitid ); max =
amdk8_scan_chain(dev, nodeid, sblink, sblink, max,
offset_unitid);
#endif #endif
} }
for(link = 0; link < dev->links; link++) { for (link = 0; link < dev->links; link++) {
#if SB_HT_CHAIN_ON_BUS0 > 0 #if SB_HT_CHAIN_ON_BUS0 > 0
if( (nodeid == 0) && (sblink == link) ) continue; //already done if ((nodeid == 0) && (sblink == link))
continue; //already done
#endif #endif
offset_unitid = 0; offset_unitid = 0;
#if ((HT_CHAIN_UNITID_BASE != 1) || (HT_CHAIN_END_UNITID_BASE != 0x20)) #if ((HT_CHAIN_UNITID_BASE != 1) || (HT_CHAIN_END_UNITID_BASE != 0x20))
#if SB_HT_CHAIN_UNITID_OFFSET_ONLY == 1 #if SB_HT_CHAIN_UNITID_OFFSET_ONLY == 1
if((nodeid == 0) && (sblink == link)) if ((nodeid == 0) && (sblink == link))
#endif #endif
offset_unitid = 1; offset_unitid = 1;
#endif #endif
max = amdk8_scan_chain(dev, nodeid, link, sblink, max, offset_unitid); max = amdk8_scan_chain(dev, nodeid, link, sblink, max,
offset_unitid);
} }
return max; return max;
@ -253,20 +260,21 @@ static unsigned int amdk8_scan_chains(struct device * dev, unsigned int max)
* __f0 is initialized once in amdk8_read_resources * __f0 is initialized once in amdk8_read_resources
*/ */
static int reg_useable(unsigned reg, static int reg_useable(unsigned reg,
struct device * goal_dev, unsigned goal_nodeid, unsigned goal_link) struct device *goal_dev, unsigned goal_nodeid,
unsigned goal_link)
{ {
struct resource *res; struct resource *res;
unsigned nodeid, link=0; unsigned nodeid, link = 0;
int result; int result;
res = NULL; res = NULL;
/* Look for the resource that matches this register. */ /* Look for the resource that matches this register. */
for(nodeid = 0; !res && (nodeid < CONFIG_MAX_PHYSICAL_CPUS); nodeid++) { for (nodeid = 0; !res && (nodeid < CONFIG_MAX_PHYSICAL_CPUS); nodeid++) {
struct device * dev; struct device *dev;
dev = __f0_dev[nodeid]; dev = __f0_dev[nodeid];
if (! dev) if (!dev)
continue; continue;
for(link = 0; !res && (link < 3); link++) { for (link = 0; !res && (link < 3); link++) {
res = probe_resource(dev, 0x100 + (reg | link)); res = probe_resource(dev, 0x100 + (reg | link));
} }
} }
@ -276,9 +284,8 @@ static int reg_useable(unsigned reg,
if (res) { if (res) {
result = 0; result = 0;
/* If the resource is allocated to the link and node already */ /* If the resource is allocated to the link and node already */
if ( (goal_link == (link - 1)) && if ((goal_link == (link - 1)) &&
(goal_nodeid == (nodeid - 1)) && (goal_nodeid == (nodeid - 1)) && (res->flags <= 1)) {
(res->flags <= 1)) {
result = 1; result = 1;
} }
} }
@ -286,20 +293,20 @@ static int reg_useable(unsigned reg,
return result; return result;
} }
static struct resource *amdk8_find_iopair(struct device * dev, unsigned nodeid, unsigned link) static struct resource *amdk8_find_iopair(struct device *dev, unsigned nodeid,
unsigned link)
{ {
struct resource *resource; struct resource *resource;
unsigned free_reg, reg; unsigned free_reg, reg;
resource = NULL; resource = NULL;
free_reg = 0; free_reg = 0;
for(reg = 0xc0; reg <= 0xd8; reg += 0x8) { for (reg = 0xc0; reg <= 0xd8; reg += 0x8) {
int result; int result;
result = reg_useable(reg, dev, nodeid, link); result = reg_useable(reg, dev, nodeid, link);
if (result == 1) { if (result == 1) {
/* I have been allocated this one */ /* I have been allocated this one */
break; break;
} } else if (result > 1) {
else if (result > 1) {
/* I have a free register pair */ /* I have a free register pair */
free_reg = reg; free_reg = reg;
} }
@ -313,20 +320,20 @@ static struct resource *amdk8_find_iopair(struct device * dev, unsigned nodeid,
return resource; return resource;
} }
static struct resource *amdk8_find_mempair(struct device * dev, unsigned nodeid, unsigned link) static struct resource *amdk8_find_mempair(struct device *dev, unsigned nodeid,
unsigned link)
{ {
struct resource *resource; struct resource *resource;
unsigned free_reg, reg; unsigned free_reg, reg;
resource = NULL; resource = NULL;
free_reg = 0; free_reg = 0;
for(reg = 0x80; reg <= 0xb8; reg += 0x8) { for (reg = 0x80; reg <= 0xb8; reg += 0x8) {
int result; int result;
result = reg_useable(reg, dev, nodeid, link); result = reg_useable(reg, dev, nodeid, link);
if (result == 1) { if (result == 1) {
/* I have been allocated this one */ /* I have been allocated this one */
break; break;
} } else if (result > 1) {
else if (result > 1) {
/* I have a free register pair */ /* I have a free register pair */
free_reg = reg; free_reg = reg;
} }
@ -340,7 +347,8 @@ static struct resource *amdk8_find_mempair(struct device * dev, unsigned nodeid,
return resource; return resource;
} }
static void amdk8_link_read_bases(struct device * dev, unsigned nodeid, unsigned link) static void amdk8_link_read_bases(struct device *dev, unsigned nodeid,
unsigned link)
{ {
struct resource *resource; struct resource *resource;
@ -386,24 +394,26 @@ static void amdk8_link_read_bases(struct device * dev, unsigned nodeid, unsigned
} }
} }
static void amdk8_read_resources(struct device * dev) static void amdk8_read_resources(struct device *dev)
{ {
printk(BIOS_DEBUG, "amdk8_read_resources\n"); printk(BIOS_DEBUG, "amdk8_read_resources\n");
unsigned nodeid, link; unsigned nodeid, link;
nodeid = amdk8_nodeid(dev); nodeid = amdk8_nodeid(dev);
get_fx_devs(); /* Make sure __f0 is initialized*/ get_fx_devs(); /* Make sure __f0 is initialized */
for(link = 0; link < dev->links; link++) { for (link = 0; link < dev->links; link++) {
if (dev->link[link].children) { if (dev->link[link].children) {
printk(BIOS_DEBUG, "amdk8_read_resources link %d\n", link); printk(BIOS_DEBUG, "amdk8_read_resources link %d\n",
link);
amdk8_link_read_bases(dev, nodeid, link); amdk8_link_read_bases(dev, nodeid, link);
} }
} }
printk(BIOS_DEBUG, "amdk8_read_resources done\n"); printk(BIOS_DEBUG, "amdk8_read_resources done\n");
} }
static void amdk8_set_resource(struct device * dev, struct resource *resource, unsigned nodeid) static void amdk8_set_resource(struct device *dev, struct resource *resource,
unsigned nodeid)
{ {
resource_t rbase, rend; resource_t rbase, rend;
unsigned reg, link; unsigned reg, link;
@ -452,7 +462,8 @@ static void amdk8_set_resource(struct device * dev, struct resource *resource, u
limit |= (nodeid & 7); limit |= (nodeid & 7);
if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) { if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
printk(BIOS_SPEW, "%s, enabling legacy VGA IO forwarding for %s link %x\n", printk(BIOS_SPEW,
"%s, enabling legacy VGA IO forwarding for %s link %x\n",
__func__, dev_path(dev), link); __func__, dev_path(dev), link);
base |= PCI_IO_BASE_VGA_EN; base |= PCI_IO_BASE_VGA_EN;
} }
@ -462,12 +473,13 @@ static void amdk8_set_resource(struct device * dev, struct resource *resource, u
f1_write_config32(reg + 0x4, limit); f1_write_config32(reg + 0x4, limit);
f1_write_config32(reg, base); f1_write_config32(reg, base);
} } else if (resource->flags & IORESOURCE_MEM) {
else if (resource->flags & IORESOURCE_MEM) {
u32 base, limit; u32 base, limit;
compute_allocate_resource(&dev->link[link], resource, compute_allocate_resource(&dev->link[link], resource,
IORESOURCE_MEM | IORESOURCE_PREFETCH, IORESOURCE_MEM | IORESOURCE_PREFETCH,
resource->flags & (IORESOURCE_MEM | IORESOURCE_PREFETCH)); resource->
flags & (IORESOURCE_MEM |
IORESOURCE_PREFETCH));
base = f1_read_config32(reg); base = f1_read_config32(reg);
limit = f1_read_config32(reg + 0x4); limit = f1_read_config32(reg + 0x4);
base &= 0x000000f0; base &= 0x000000f0;
@ -481,8 +493,7 @@ static void amdk8_set_resource(struct device * dev, struct resource *resource, u
f1_write_config32(reg, base); f1_write_config32(reg, base);
} }
resource->flags |= IORESOURCE_STORED; resource->flags |= IORESOURCE_STORED;
sprintf(buf, " <node %d link %d>", sprintf(buf, " <node %d link %d>", nodeid, link);
nodeid, link);
report_resource_stored(dev, resource, buf); report_resource_stored(dev, resource, buf);
} }
@ -492,10 +503,10 @@ static void amdk8_set_resource(struct device * dev, struct resource *resource, u
* but it is too diffcult to deal with the resource allocation magic. * but it is too diffcult to deal with the resource allocation magic.
*/ */
#ifdef CONFIG_MULTIPLE_VGA_INIT #ifdef CONFIG_MULTIPLE_VGA_INIT
extern struct device * vga_pri; // the primary vga device, defined in device.c extern struct device *vga_pri; // the primary vga device, defined in device.c
#endif #endif
static void amdk8_create_vga_resource(struct device * dev, unsigned nodeid) static void amdk8_create_vga_resource(struct device *dev, unsigned nodeid)
{ {
struct resource *resource; struct resource *resource;
unsigned link; unsigned link;
@ -507,11 +518,16 @@ static void amdk8_create_vga_resource(struct device * dev, unsigned nodeid)
for (link = 0; link < dev->links; link++) { for (link = 0; link < dev->links; link++) {
if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) { if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
#ifdef CONFIG_MULTIPLE_VGA_INIT #ifdef CONFIG_MULTIPLE_VGA_INIT
printk(BIOS_DEBUG, "VGA: vga_pri bus num = %d dev->link[link] bus range [%d,%d]\n", vga_pri->bus->secondary, printk(BIOS_DEBUG,
dev->link[link].secondary,dev->link[link].subordinate); "VGA: vga_pri bus num = %d dev->link[link] bus range [%d,%d]\n",
vga_pri->bus->secondary,
dev->link[link].secondary,
dev->link[link].subordinate);
/* We need to make sure the vga_pri is under the link */ /* We need to make sure the vga_pri is under the link */
if((vga_pri->bus->secondary >= dev->link[link].secondary ) && if ((vga_pri->bus->secondary >=
(vga_pri->bus->secondary <= dev->link[link].subordinate ) dev->link[link].secondary)
&& (vga_pri->bus->secondary <=
dev->link[link].subordinate)
) )
#endif #endif
break; break;
@ -522,12 +538,14 @@ static void amdk8_create_vga_resource(struct device * dev, unsigned nodeid)
if (link == dev->links) if (link == dev->links)
return; return;
printk(BIOS_DEBUG, "VGA: %s (aka node %d) link %d has VGA device\n", dev_path(dev), nodeid, link); printk(BIOS_DEBUG, "VGA: %s (aka node %d) link %d has VGA device\n",
dev_path(dev), nodeid, link);
/* allocate a temp resrouce for legacy VGA buffer */ /* allocate a temp resrouce for legacy VGA buffer */
resource = amdk8_find_mempair(dev, nodeid, link); resource = amdk8_find_mempair(dev, nodeid, link);
if(!resource){ if (!resource) {
printk(BIOS_DEBUG, "VGA: Can not find free mmio reg for legacy VGA buffer\n"); printk(BIOS_DEBUG,
"VGA: Can not find free mmio reg for legacy VGA buffer\n");
return; return;
} }
resource->base = 0xa0000; resource->base = 0xa0000;
@ -551,7 +569,7 @@ static void amdk8_create_vga_resource(struct device * dev, unsigned nodeid)
resource->flags = 0; resource->flags = 0;
} }
static void amdk8_set_resources(struct device * dev) static void amdk8_set_resources(struct device *dev)
{ {
unsigned nodeid, link; unsigned nodeid, link;
int i; int i;
@ -563,11 +581,11 @@ static void amdk8_set_resources(struct device * dev)
amdk8_create_vga_resource(dev, nodeid); amdk8_create_vga_resource(dev, nodeid);
/* Set each resource we have found */ /* Set each resource we have found */
for(i = 0; i < dev->resources; i++) { for (i = 0; i < dev->resources; i++) {
amdk8_set_resource(dev, &dev->resource[i], nodeid); amdk8_set_resource(dev, &dev->resource[i], nodeid);
} }
for(link = 0; link < dev->links; link++) { for (link = 0; link < dev->links; link++) {
struct bus *bus; struct bus *bus;
bus = &dev->link[link]; bus = &dev->link[link];
if (bus->children) { if (bus->children) {
@ -576,7 +594,7 @@ static void amdk8_set_resources(struct device * dev)
} }
} }
static void amdk8_enable_resources(struct device * dev) static void amdk8_enable_resources(struct device *dev)
{ {
printk(BIOS_DEBUG, "amdk8_enable_resources\n"); printk(BIOS_DEBUG, "amdk8_enable_resources\n");
pci_dev_enable_resources(dev); pci_dev_enable_resources(dev);