mirror of
https://github.com/fail0verflow/switch-coreboot.git
synced 2025-05-04 01:39:18 -04:00
This patch fixes white space in northbridge/amd/pci with the help of indent.
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:
parent
4e9c6f3669
commit
f75b0fe103
1 changed files with 242 additions and 224 deletions
|
@ -53,7 +53,9 @@ 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;
|
||||||
|
@ -152,8 +154,7 @@ 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) |
|
||||||
|
@ -172,7 +173,9 @@ static unsigned int amdk8_scan_chain(struct device * dev, unsigned nodeid, unsig
|
||||||
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
|
||||||
|
@ -221,13 +224,16 @@ static unsigned int amdk8_scan_chains(struct device * dev, unsigned int max)
|
||||||
#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))
|
||||||
|
@ -237,7 +243,8 @@ static unsigned int amdk8_scan_chains(struct device * dev, unsigned int max)
|
||||||
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,7 +260,8 @@ 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;
|
||||||
|
@ -277,8 +285,7 @@ static int reg_useable(unsigned reg,
|
||||||
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,7 +293,8 @@ 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;
|
||||||
|
@ -298,8 +306,7 @@ static struct resource *amdk8_find_iopair(struct device * dev, unsigned nodeid,
|
||||||
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,7 +320,8 @@ 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;
|
||||||
|
@ -325,8 +333,7 @@ static struct resource *amdk8_find_mempair(struct device * dev, unsigned nodeid,
|
||||||
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;
|
||||||
|
|
||||||
|
@ -396,14 +404,16 @@ static void amdk8_read_resources(struct device * dev)
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
|
Loading…
Add table
Reference in a new issue