northbridge/amd/agesa: Improve code formatting
Change-Id: If700dc5fa9ae33649993557f71db0fe1eb76204b Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/16634 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
parent
9309552068
commit
1d8daa66ee
|
@ -54,7 +54,7 @@ AGESA_STATUS common_ReadCbfsSpd (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
|
|||
memcpy((char*)info->Buffer, spd_file, spd_file_length);
|
||||
|
||||
u16 crc = spd_ddr3_calc_crc(info->Buffer, spd_file_length);
|
||||
if (crc == 0){
|
||||
if (crc == 0) {
|
||||
printk(BIOS_EMERG, "Error: Unable to calculate CRC on SPD\n");
|
||||
return AGESA_UNSUPPORTED;
|
||||
}
|
||||
|
|
|
@ -87,8 +87,8 @@
|
|||
#endif
|
||||
|
||||
#ifdef __PRE_RAM__
|
||||
#if NODE_NUMS==64
|
||||
#define NODE_PCI(x, fn) ((x<32)?(PCI_DEV(CONFIG_CBB,(CONFIG_CDB+x),fn)):(PCI_DEV((CONFIG_CBB-1),(CONFIG_CDB+x-32),fn)))
|
||||
#if NODE_NUMS == 64
|
||||
#define NODE_PCI(x, fn) ((x < 32)?(PCI_DEV(CONFIG_CBB,(CONFIG_CDB+x),fn)):(PCI_DEV((CONFIG_CBB-1),(CONFIG_CDB+x-32),fn)))
|
||||
#else
|
||||
#define NODE_PCI(x, fn) PCI_DEV(CONFIG_CBB,(CONFIG_CDB+x),fn)
|
||||
#endif
|
||||
|
|
|
@ -100,7 +100,7 @@ static u32 get_io_addr_index(u32 nodeid, u32 linkn)
|
|||
{
|
||||
u32 index;
|
||||
|
||||
for (index=0; index<256; index++) {
|
||||
for (index = 0; index < 256; index++) {
|
||||
if ((sysconf.conf_io_addrx[index+4] == 0)) {
|
||||
sysconf.conf_io_addr[index+4] = (nodeid & 0x3f) ;
|
||||
sysconf.conf_io_addrx[index+4] = 1 | ((linkn & 0x7)<<4);
|
||||
|
@ -116,7 +116,7 @@ static u32 get_mmio_addr_index(u32 nodeid, u32 linkn)
|
|||
{
|
||||
u32 index;
|
||||
|
||||
for (index=0; index<64; index++) {
|
||||
for (index = 0; index < 64; index++) {
|
||||
if (sysconf.conf_mmio_addrx[index+8] == 0) {
|
||||
sysconf.conf_mmio_addr[index+8] = (nodeid & 0x3f) ;
|
||||
sysconf.conf_mmio_addrx[index+8] = 1 | ((linkn & 0x7)<<4);
|
||||
|
@ -167,10 +167,10 @@ static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,
|
|||
|
||||
/* io range allocation */
|
||||
tempreg = (nodeid&0xf) | ((nodeid & 0x30)<<(8-4)) | (linkn<<4) | ((io_max&0xf0)<<(12-4)); //limit
|
||||
for (i=0; i<sysconf.nodes; i++)
|
||||
for (i = 0; i < sysconf.nodes; i++)
|
||||
pci_write_config32(__f1_dev[i], reg+4, tempreg);
|
||||
|
||||
tempreg = 3 /*| ( 3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
tempreg = 3 /*| (3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
#if 0
|
||||
// FIXME: can we use VGA reg instead?
|
||||
if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
|
||||
|
@ -182,7 +182,7 @@ static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,
|
|||
tempreg |= PCI_IO_BASE_NO_ISA;
|
||||
}
|
||||
#endif
|
||||
for (i=0; i<sysconf.nodes; i++)
|
||||
for (i = 0; i < sysconf.nodes; i++)
|
||||
pci_write_config32(__f1_dev[i], reg, tempreg);
|
||||
}
|
||||
|
||||
|
@ -193,10 +193,10 @@ static void set_mmio_addr_reg(u32 nodeid, u32 linkn, u32 reg, u32 index, u32 mmi
|
|||
|
||||
/* io range allocation */
|
||||
tempreg = (nodeid&0xf) | (linkn<<4) | (mmio_max&0xffffff00); //limit
|
||||
for (i=0; i<nodes; i++)
|
||||
for (i = 0; i < nodes; i++)
|
||||
pci_write_config32(__f1_dev[i], reg+4, tempreg);
|
||||
tempreg = 3 | (nodeid & 0x30) | (mmio_min&0xffffff00);
|
||||
for (i=0; i<sysconf.nodes; i++)
|
||||
for (i = 0; i < sysconf.nodes; i++)
|
||||
pci_write_config32(__f1_dev[i], reg, tempreg);
|
||||
}
|
||||
|
||||
|
@ -218,7 +218,7 @@ static unsigned int read_nb_cfg_54(void)
|
|||
{
|
||||
msr_t msr;
|
||||
msr = rdmsr(NB_CFG_MSR);
|
||||
return (( msr.hi >> (54-32)) & 1);
|
||||
return ((msr.hi >> (54-32)) & 1);
|
||||
}
|
||||
|
||||
static void get_fx_devs(void)
|
||||
|
@ -505,9 +505,8 @@ static void amdfam10_create_vga_resource(device_t dev, unsigned nodeid)
|
|||
printk(BIOS_DEBUG, "VGA: vga_pri bus num = %d bus range [%d,%d]\n", vga_pri->bus->secondary,
|
||||
link->secondary,link->subordinate);
|
||||
/* We need to make sure the vga_pri is under the link */
|
||||
if ((vga_pri->bus->secondary >= link->secondary ) &&
|
||||
(vga_pri->bus->secondary <= link->subordinate )
|
||||
)
|
||||
if ((vga_pri->bus->secondary >= link->secondary) &&
|
||||
(vga_pri->bus->secondary <= link->subordinate))
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
@ -609,7 +608,7 @@ static void amdfam10_domain_read_resources(device_t dev)
|
|||
if ((base & 3) != 0) {
|
||||
unsigned nodeid, reg_link;
|
||||
device_t reg_dev;
|
||||
if (reg<0xc0) { // mmio
|
||||
if (reg < 0xc0) { // mmio
|
||||
nodeid = (limit & 0xf) + (base&0x30);
|
||||
} else { // io
|
||||
nodeid = (limit & 0xf) + ((base>>4)&0x30);
|
||||
|
@ -685,7 +684,7 @@ static struct hw_mem_hole_info get_hw_mem_hole_info(void)
|
|||
*/
|
||||
if (mem_hole.node_id == -1) {
|
||||
resource_t limitk_pri = 0;
|
||||
for (i=0; i<sysconf.nodes; i++) {
|
||||
for (i = 0; i < sysconf.nodes; i++) {
|
||||
dram_base_mask_t d;
|
||||
resource_t base_k, limit_k;
|
||||
d = get_dram_base_mask(i);
|
||||
|
@ -775,11 +774,11 @@ static void amdfam10_domain_set_resources(device_t dev)
|
|||
//printk(BIOS_DEBUG, "node %d : mmio_basek=%08lx, basek=%08llx, limitk=%08llx\n", i, mmio_basek, basek, limitk);
|
||||
|
||||
/* split the region to accommodate pci memory space */
|
||||
if ((basek < 4*1024*1024 ) && (limitk > mmio_basek)) {
|
||||
if ((basek < 4*1024*1024) && (limitk > mmio_basek)) {
|
||||
if (basek <= mmio_basek) {
|
||||
unsigned pre_sizek;
|
||||
pre_sizek = mmio_basek - basek;
|
||||
if (pre_sizek>0) {
|
||||
if (pre_sizek > 0) {
|
||||
ram_resource(dev, (idx | i), basek, pre_sizek);
|
||||
idx += 0x10;
|
||||
sizek -= pre_sizek;
|
||||
|
@ -877,7 +876,7 @@ static void sysconf_init(device_t dev) // first node
|
|||
|
||||
unsigned ht_c_index;
|
||||
|
||||
for (ht_c_index=0; ht_c_index<32; ht_c_index++) {
|
||||
for (ht_c_index = 0; ht_c_index < 32; ht_c_index++) {
|
||||
sysconf.ht_c_conf_bus[ht_c_index] = 0;
|
||||
}
|
||||
|
||||
|
@ -1004,7 +1003,7 @@ static void cpu_bus_scan(device_t dev)
|
|||
nodes = sysconf.nodes;
|
||||
|
||||
#if CONFIG_CBB && (NODE_NUMS > 32)
|
||||
if (nodes>32) { // need to put node 32 to node 63 to bus 0xfe
|
||||
if (nodes > 32) { // need to put node 32 to node 63 to bus 0xfe
|
||||
if (pci_domain->link_list && !pci_domain->link_list->next) {
|
||||
struct bus *new_link = new_link(pci_domain);
|
||||
pci_domain->link_list->next = new_link;
|
||||
|
@ -1027,7 +1026,7 @@ static void cpu_bus_scan(device_t dev)
|
|||
devn = CONFIG_CDB+i;
|
||||
pbus = dev_mc->bus;
|
||||
#if CONFIG_CBB && (NODE_NUMS > 32)
|
||||
if (i>=32) {
|
||||
if (i >= 32) {
|
||||
busn--;
|
||||
devn-=32;
|
||||
pbus = pci_domain->link_list->next);
|
||||
|
@ -1072,7 +1071,7 @@ static void cpu_bus_scan(device_t dev)
|
|||
jj = cores_found;
|
||||
}
|
||||
|
||||
for (j = 0; j <=jj; j++ ) {
|
||||
for (j = 0; j <=jj; j++) {
|
||||
extern CONST OPTIONS_CONFIG_TOPOLOGY ROMDATA TopologyConfiguration;
|
||||
u32 modules = TopologyConfiguration.PlatformNumberOfModules;
|
||||
u32 lapicid_start = 0;
|
||||
|
|
|
@ -54,12 +54,12 @@ static void set_ht_c_io_addr_reg(u32 nodeid, u32 linkn, u32 ht_c_index,
|
|||
|
||||
/* io range allocation */
|
||||
tempreg = (nodeid&0xf) | ((nodeid & 0x30)<<(8-4)) | (linkn<<4) | ((io_max&0xf0)<<(12-4)); //limit
|
||||
for (i=0; i<nodes; i++) {
|
||||
for (i = 0; i < nodes; i++) {
|
||||
dev = NODE_PCI(i, 1);
|
||||
pci_write_config32(dev, 0xC4 + ht_c_index * 8, tempreg);
|
||||
}
|
||||
tempreg = 3 /*| ( 3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
for (i=0; i<nodes; i++){
|
||||
tempreg = 3 /*| (3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
for (i = 0; i < nodes; i++) {
|
||||
dev = NODE_PCI(i, 1);
|
||||
pci_write_config32(dev, 0xC0 + ht_c_index * 8, tempreg);
|
||||
}
|
||||
|
@ -73,7 +73,7 @@ static void clear_ht_c_io_addr_reg(u32 nodeid, u32 linkn, u32 ht_c_index,
|
|||
device_t dev;
|
||||
|
||||
/* io range allocation */
|
||||
for (i=0; i<nodes; i++) {
|
||||
for (i = 0; i < nodes; i++) {
|
||||
dev = NODE_PCI(i, 1);
|
||||
pci_write_config32(dev, 0xC4 + ht_c_index * 8, 0);
|
||||
pci_write_config32(dev, 0xC0 + ht_c_index * 8, 0);
|
||||
|
@ -87,7 +87,7 @@ static u32 get_io_addr_index(u32 nodeid, u32 linkn)
|
|||
#if 0
|
||||
u32 index;
|
||||
|
||||
for (index=0; index<256; index++) {
|
||||
for (index = 0; index < 256; index++) {
|
||||
if (sysconf.conf_io_addrx[index+4] == 0) {
|
||||
sysconf.conf_io_addr[index+4] = (nodeid & 0x3f) ;
|
||||
sysconf.conf_io_addrx[index+4] = 1 | ((linkn & 0x7)<<4);
|
||||
|
@ -103,7 +103,7 @@ static u32 get_mmio_addr_index(u32 nodeid, u32 linkn)
|
|||
#if 0
|
||||
u32 index;
|
||||
|
||||
for (index=0; index<64; index++) {
|
||||
for (index = 0; index < 64; index++) {
|
||||
if (sysconf.conf_mmio_addrx[index+8] == 0) {
|
||||
sysconf.conf_mmio_addr[index+8] = (nodeid & 0x3f) ;
|
||||
sysconf.conf_mmio_addrx[index+8] = 1 | ((linkn & 0x7)<<4);
|
||||
|
@ -124,7 +124,7 @@ static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,
|
|||
tempreg = (nodeid&0xf) | ((nodeid & 0x30)<<(8-4)) | (linkn<<4) | ((io_max&0xf0)<<(12-4)); //limit
|
||||
pci_write_config32(__f1_dev[0], reg+4, tempreg);
|
||||
|
||||
tempreg = 3 /*| ( 3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
tempreg = 3 /*| (3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
#if 0
|
||||
// FIXME: can we use VGA reg instead?
|
||||
if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
|
||||
|
|
|
@ -41,7 +41,7 @@ static device_t __f0_dev[FX_DEVS];
|
|||
static device_t __f1_dev[FX_DEVS];
|
||||
static device_t __f2_dev[FX_DEVS];
|
||||
static device_t __f4_dev[FX_DEVS];
|
||||
static unsigned fx_devs=0;
|
||||
static unsigned fx_devs = 0;
|
||||
|
||||
static device_t get_node_pci(u32 nodeid, u32 fn)
|
||||
{
|
||||
|
@ -136,10 +136,10 @@ static int reg_useable(unsigned reg, device_t goal_dev, unsigned goal_nodeid,
|
|||
result = 2;
|
||||
if (res) {
|
||||
result = 0;
|
||||
if ( (goal_link == (link - 1)) &&
|
||||
(goal_nodeid == (nodeid - 1)) &&
|
||||
(res->flags <= 1)) {
|
||||
result = 1;
|
||||
if ((goal_link == (link - 1)) &&
|
||||
(goal_nodeid == (nodeid - 1)) &&
|
||||
(res->flags <= 1)) {
|
||||
result = 1;
|
||||
}
|
||||
}
|
||||
printk(BIOS_DEBUG, "Fam12h - northbridge.c - %s - End.\n",__func__);
|
||||
|
@ -397,10 +397,10 @@ printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__);
|
|||
printk(BIOS_DEBUG, "VGA: vga_pri bus num = %d bus range [%d,%d]\n", vga_pri->bus->secondary,
|
||||
link->secondary,link->subordinate);
|
||||
/* We need to make sure the vga_pri is under the link */
|
||||
if ((vga_pri->bus->secondary >= link->secondary ) &&
|
||||
(vga_pri->bus->secondary <= link->subordinate ))
|
||||
if ((vga_pri->bus->secondary >= link->secondary) &&
|
||||
(vga_pri->bus->secondary <= link->subordinate))
|
||||
#endif
|
||||
break; // XXX this break looks questionable
|
||||
break; // XXX this break looks questionable
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -485,7 +485,7 @@ static void domain_read_resources(device_t dev)
|
|||
if ((base & 3) != 0) {
|
||||
unsigned nodeid, reg_link;
|
||||
device_t reg_dev;
|
||||
if (reg<0xc0) { // mmio
|
||||
if (reg < 0xc0) { // mmio
|
||||
nodeid = (limit & 0xf) + (base&0x30);
|
||||
} else { // io
|
||||
nodeid = (limit & 0xf) + ((base>>4)&0x30);
|
||||
|
@ -604,11 +604,11 @@ static void domain_set_resources(device_t dev)
|
|||
mmio_basek, basek, limitk);
|
||||
|
||||
/* split the region to accommodate pci memory space */
|
||||
if ( (basek < 4*1024*1024 ) && (limitk > mmio_basek) ) {
|
||||
if ((basek < 4*1024*1024) && (limitk > mmio_basek)) {
|
||||
if (basek <= mmio_basek) {
|
||||
unsigned pre_sizek;
|
||||
pre_sizek = mmio_basek - basek;
|
||||
if (pre_sizek>0) {
|
||||
if (pre_sizek > 0) {
|
||||
ram_resource(dev, idx, basek, pre_sizek);
|
||||
idx += 0x10;
|
||||
sizek -= pre_sizek;
|
||||
|
|
|
@ -30,7 +30,7 @@ Device(AGPB) {
|
|||
Name(_ADR, 0x00010000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APR1) } /* APIC mode */
|
||||
If(PMOD) { Return(APR1) } /* APIC mode */
|
||||
Return (PR1) /* PIC Mode */
|
||||
}
|
||||
} /* end AGPB */
|
||||
|
@ -40,7 +40,7 @@ Device(HDMI) {
|
|||
Name(_ADR, 0x00010001)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APR1) } /* APIC mode */
|
||||
If(PMOD) { Return(APR1) } /* APIC mode */
|
||||
Return (PR1) /* PIC Mode */
|
||||
}
|
||||
} /* end HDMI */
|
||||
|
@ -52,7 +52,7 @@ Device(PBR4) {
|
|||
Name(_ADR, 0x00040000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS4) } /* APIC mode */
|
||||
If(PMOD) { Return(APS4) } /* APIC mode */
|
||||
Return (PS4) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR4 */
|
||||
|
@ -62,7 +62,7 @@ Device(PBR5) {
|
|||
Name(_ADR, 0x00050000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS5) } /* APIC mode */
|
||||
If(PMOD) { Return(APS5) } /* APIC mode */
|
||||
Return (PS5) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR5 */
|
||||
|
@ -72,7 +72,7 @@ Device(PBR6) {
|
|||
Name(_ADR, 0x00060000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS6) } /* APIC mode */
|
||||
If(PMOD) { Return(APS6) } /* APIC mode */
|
||||
Return (PS6) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR6 */
|
||||
|
@ -82,7 +82,7 @@ Device(PBR7) {
|
|||
Name(_ADR, 0x00070000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS7) } /* APIC mode */
|
||||
If(PMOD) { Return(APS7) } /* APIC mode */
|
||||
Return (PS7) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR7 */
|
||||
|
@ -91,7 +91,7 @@ Device(PE20) {
|
|||
Name(_ADR, 0x00150000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APE0) } /* APIC mode */
|
||||
If(PMOD) { Return(APE0) } /* APIC mode */
|
||||
Return (PE0) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PE20 */
|
||||
|
@ -100,7 +100,7 @@ Device(PE21) {
|
|||
Name(_ADR, 0x00150001)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APE1) } /* APIC mode */
|
||||
If(PMOD) { Return(APE1) } /* APIC mode */
|
||||
Return (PE1) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PE21 */
|
||||
|
@ -109,7 +109,7 @@ Device(PE22) {
|
|||
Name(_ADR, 0x00150002)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APE2) } /* APIC mode */
|
||||
If(PMOD) { Return(APE2) } /* APIC mode */
|
||||
Return (APE2) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PE22 */
|
||||
|
@ -118,7 +118,7 @@ Device(PE23) {
|
|||
Name(_ADR, 0x00150003)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APE3) } /* APIC mode */
|
||||
If(PMOD) { Return(APE3) } /* APIC mode */
|
||||
Return (PE3) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PE23 */
|
||||
|
|
|
@ -54,12 +54,12 @@ static void set_ht_c_io_addr_reg(u32 nodeid, u32 linkn, u32 ht_c_index,
|
|||
|
||||
/* io range allocation */
|
||||
tempreg = (nodeid&0xf) | ((nodeid & 0x30)<<(8-4)) | (linkn<<4) | ((io_max&0xf0)<<(12-4)); //limit
|
||||
for (i=0; i<nodes; i++) {
|
||||
for (i = 0; i < nodes; i++) {
|
||||
dev = NODE_PCI(i, 1);
|
||||
pci_write_config32(dev, 0xC4 + ht_c_index * 8, tempreg);
|
||||
}
|
||||
tempreg = 3 /*| ( 3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
for (i=0; i<nodes; i++){
|
||||
tempreg = 3 /*| (3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
for (i = 0; i < nodes; i++) {
|
||||
dev = NODE_PCI(i, 1);
|
||||
pci_write_config32(dev, 0xC0 + ht_c_index * 8, tempreg);
|
||||
}
|
||||
|
@ -73,7 +73,7 @@ static void clear_ht_c_io_addr_reg(u32 nodeid, u32 linkn, u32 ht_c_index,
|
|||
device_t dev;
|
||||
|
||||
/* io range allocation */
|
||||
for (i=0; i<nodes; i++) {
|
||||
for (i = 0; i < nodes; i++) {
|
||||
dev = NODE_PCI(i, 1);
|
||||
pci_write_config32(dev, 0xC4 + ht_c_index * 8, 0);
|
||||
pci_write_config32(dev, 0xC0 + ht_c_index * 8, 0);
|
||||
|
@ -87,7 +87,7 @@ static u32 get_io_addr_index(u32 nodeid, u32 linkn)
|
|||
#if 0
|
||||
u32 index;
|
||||
|
||||
for (index=0; index<256; index++) {
|
||||
for (index = 0; index < 256; index++) {
|
||||
if (sysconf.conf_io_addrx[index+4] == 0) {
|
||||
sysconf.conf_io_addr[index+4] = (nodeid & 0x3f) ;
|
||||
sysconf.conf_io_addrx[index+4] = 1 | ((linkn & 0x7)<<4);
|
||||
|
@ -103,7 +103,7 @@ static u32 get_mmio_addr_index(u32 nodeid, u32 linkn)
|
|||
#if 0
|
||||
u32 index;
|
||||
|
||||
for (index=0; index<64; index++) {
|
||||
for (index = 0; index < 64; index++) {
|
||||
if (sysconf.conf_mmio_addrx[index+8] == 0) {
|
||||
sysconf.conf_mmio_addr[index+8] = (nodeid & 0x3f) ;
|
||||
sysconf.conf_mmio_addrx[index+8] = 1 | ((linkn & 0x7)<<4);
|
||||
|
@ -124,7 +124,7 @@ static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,
|
|||
tempreg = (nodeid&0xf) | ((nodeid & 0x30)<<(8-4)) | (linkn<<4) | ((io_max&0xf0)<<(12-4)); //limit
|
||||
pci_write_config32(__f1_dev[0], reg+4, tempreg);
|
||||
|
||||
tempreg = 3 /*| ( 3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
tempreg = 3 /*| (3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
#if 0
|
||||
// FIXME: can we use VGA reg instead?
|
||||
if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
|
||||
|
@ -158,7 +158,7 @@ static void set_mmio_addr_reg(u32 nodeid, u32 linkn, u32 reg, u32 index, u32 mmi
|
|||
********************************************************************/
|
||||
u32 map_oprom_vendev(u32 vendev)
|
||||
{
|
||||
u32 new_vendev=vendev;
|
||||
u32 new_vendev = vendev;
|
||||
|
||||
switch(vendev) {
|
||||
case 0x10029809:
|
||||
|
@ -168,7 +168,7 @@ u32 map_oprom_vendev(u32 vendev)
|
|||
case 0x10029805:
|
||||
case 0x10029804:
|
||||
case 0x10029803:
|
||||
new_vendev=0x10029802;
|
||||
new_vendev = 0x10029802;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -80,9 +80,9 @@ static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,
|
|||
u32 tempreg;
|
||||
/* io range allocation */
|
||||
tempreg = (nodeid&0xf) | ((nodeid & 0x30)<<(8-4)) | (linkn<<4) | ((io_max&0xf0)<<(12-4)); //limit
|
||||
for (i=0; i<node_nums; i++)
|
||||
for (i = 0; i < node_nums; i++)
|
||||
pci_write_config32(__f1_dev[i], reg+4, tempreg);
|
||||
tempreg = 3 /*| ( 3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
tempreg = 3 /*| (3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
#if 0
|
||||
// FIXME: can we use VGA reg instead?
|
||||
if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
|
||||
|
@ -94,7 +94,7 @@ static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,
|
|||
tempreg |= PCI_IO_BASE_NO_ISA;
|
||||
}
|
||||
#endif
|
||||
for (i=0; i<node_nums; i++)
|
||||
for (i = 0; i < node_nums; i++)
|
||||
pci_write_config32(__f1_dev[i], reg, tempreg);
|
||||
}
|
||||
|
||||
|
@ -104,10 +104,10 @@ static void set_mmio_addr_reg(u32 nodeid, u32 linkn, u32 reg, u32 index, u32 mmi
|
|||
u32 tempreg;
|
||||
/* io range allocation */
|
||||
tempreg = (nodeid&0xf) | (linkn<<4) | (mmio_max&0xffffff00); //limit
|
||||
for (i=0; i<nodes; i++)
|
||||
for (i = 0; i < nodes; i++)
|
||||
pci_write_config32(__f1_dev[i], reg+4, tempreg);
|
||||
tempreg = 3 | (nodeid & 0x30) | (mmio_min&0xffffff00);
|
||||
for (i=0; i<node_nums; i++)
|
||||
for (i = 0; i < node_nums; i++)
|
||||
pci_write_config32(__f1_dev[i], reg, tempreg);
|
||||
}
|
||||
|
||||
|
@ -138,7 +138,7 @@ static void get_fx_devs(void)
|
|||
if (__f1_dev[0] == NULL || __f0_dev[0] == NULL || fx_devs == 0) {
|
||||
die("Cannot find 0:0x18.[0|1]\n");
|
||||
}
|
||||
printk(BIOS_DEBUG, "fx_devs=0x%x\n", fx_devs);
|
||||
printk(BIOS_DEBUG, "fx_devs = 0x%x\n", fx_devs);
|
||||
}
|
||||
|
||||
static u32 f1_read_config32(unsigned reg)
|
||||
|
@ -410,9 +410,8 @@ static void create_vga_resource(device_t dev, unsigned nodeid)
|
|||
printk(BIOS_DEBUG, "VGA: vga_pri bus num = %d bus range [%d,%d]\n", vga_pri->bus->secondary,
|
||||
link->secondary,link->subordinate);
|
||||
/* We need to make sure the vga_pri is under the link */
|
||||
if ((vga_pri->bus->secondary >= link->secondary ) &&
|
||||
(vga_pri->bus->secondary <= link->subordinate )
|
||||
)
|
||||
if ((vga_pri->bus->secondary >= link->secondary) &&
|
||||
(vga_pri->bus->secondary <= link->subordinate))
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
@ -636,7 +635,7 @@ static void domain_read_resources(device_t dev)
|
|||
if ((base & 3) != 0) {
|
||||
unsigned nodeid, reg_link;
|
||||
device_t reg_dev;
|
||||
if (reg<0xc0) { // mmio
|
||||
if (reg < 0xc0) { // mmio
|
||||
nodeid = (limit & 0xf) + (base&0x30);
|
||||
} else { // io
|
||||
nodeid = (limit & 0xf) + ((base>>4)&0x30);
|
||||
|
@ -703,7 +702,7 @@ static struct hw_mem_hole_info get_hw_mem_hole_info(void)
|
|||
*/
|
||||
if (mem_hole.node_id == -1) {
|
||||
resource_t limitk_pri = 0;
|
||||
for (i=0; i<node_nums; i++) {
|
||||
for (i = 0; i < node_nums; i++) {
|
||||
dram_base_mask_t d;
|
||||
resource_t base_k, limit_k;
|
||||
d = get_dram_base_mask(i);
|
||||
|
@ -824,11 +823,11 @@ static void domain_set_resources(device_t dev)
|
|||
//printk(BIOS_DEBUG, "node %d : mmio_basek=%08lx, basek=%08llx, limitk=%08llx\n", i, mmio_basek, basek, limitk);
|
||||
|
||||
/* split the region to accommodate pci memory space */
|
||||
if ((basek < 4*1024*1024 ) && (limitk > mmio_basek)) {
|
||||
if ((basek < 4*1024*1024) && (limitk > mmio_basek)) {
|
||||
if (basek <= mmio_basek) {
|
||||
unsigned pre_sizek;
|
||||
pre_sizek = mmio_basek - basek;
|
||||
if (pre_sizek>0) {
|
||||
if (pre_sizek > 0) {
|
||||
ram_resource(dev, (idx | i), basek, pre_sizek);
|
||||
idx += 0x10;
|
||||
sizek -= pre_sizek;
|
||||
|
@ -984,7 +983,7 @@ static void cpu_bus_scan(device_t dev)
|
|||
}
|
||||
sysconf_init(dev_mc);
|
||||
#if CONFIG_CBB && (MAX_NODE_NUMS > 32)
|
||||
if (node_nums>32) { // need to put node 32 to node 63 to bus 0xfe
|
||||
if (node_nums > 32) { // need to put node 32 to node 63 to bus 0xfe
|
||||
if (pci_domain->link_list && !pci_domain->link_list->next) {
|
||||
struct bus *new_link = new_link(pci_domain);
|
||||
pci_domain->link_list->next = new_link;
|
||||
|
@ -1062,10 +1061,10 @@ static void cpu_bus_scan(device_t dev)
|
|||
siblings = 0; //default one core
|
||||
}
|
||||
int enable_node = cdb_dev && cdb_dev->enabled;
|
||||
printk(BIOS_SPEW, "%s family%xh, core_max=0x%x, core_nums=0x%x, siblings=0x%x\n",
|
||||
printk(BIOS_SPEW, "%s family%xh, core_max = 0x%x, core_nums = 0x%x, siblings = 0x%x\n",
|
||||
dev_path(cdb_dev), 0x0f + family, core_max, core_nums, siblings);
|
||||
|
||||
for (j = 0; j <= siblings; j++ ) {
|
||||
for (j = 0; j <= siblings; j++) {
|
||||
u32 lapicid_start = 0;
|
||||
|
||||
/*
|
||||
|
@ -1087,14 +1086,14 @@ static void cpu_bus_scan(device_t dev)
|
|||
if ((node_nums * core_max) + plat_num_io_apics >= 0x10) {
|
||||
lapicid_start = (plat_num_io_apics - 1) / core_max;
|
||||
lapicid_start = (lapicid_start + 1) * core_max;
|
||||
printk(BIOS_SPEW, "lpaicid_start=0x%x ", lapicid_start);
|
||||
printk(BIOS_SPEW, "lpaicid_start = 0x%x ", lapicid_start);
|
||||
}
|
||||
#if CONFIG_CPU_AMD_SOCKET_G34
|
||||
u32 apic_id = (i / 2 * core_max) + j + lapicid_start + (i % 2 ? siblings + 1 : 0);
|
||||
#else
|
||||
u32 apic_id = (i * core_max) + j + lapicid_start;
|
||||
#endif
|
||||
printk(BIOS_SPEW, "node 0x%x core 0x%x apicid=0x%x\n",
|
||||
printk(BIOS_SPEW, "node 0x%x core 0x%x apicid = 0x%x\n",
|
||||
i, j, apic_id);
|
||||
|
||||
device_t cpu = add_cpu_device(cpu_bus, apic_id, enable_node);
|
||||
|
|
|
@ -50,7 +50,7 @@ Device(PBR2) {
|
|||
Name(_ADR, 0x00020000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS2) } /* APIC mode */
|
||||
If(PMOD) { Return(APS2) } /* APIC mode */
|
||||
Return (PS2) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR2 */
|
||||
|
@ -60,7 +60,7 @@ Device(PBR4) {
|
|||
Name(_ADR, 0x00040000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS4) } /* APIC mode */
|
||||
If(PMOD) { Return(APS4) } /* APIC mode */
|
||||
Return (PS4) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR4 */
|
||||
|
@ -70,7 +70,7 @@ Device(PBR5) {
|
|||
Name(_ADR, 0x00050000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS5) } /* APIC mode */
|
||||
If(PMOD) { Return(APS5) } /* APIC mode */
|
||||
Return (PS5) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR5 */
|
||||
|
@ -80,7 +80,7 @@ Device(PBR6) {
|
|||
Name(_ADR, 0x00060000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS6) } /* APIC mode */
|
||||
If(PMOD) { Return(APS6) } /* APIC mode */
|
||||
Return (PS6) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR6 */
|
||||
|
@ -90,7 +90,7 @@ Device(PBR7) {
|
|||
Name(_ADR, 0x00070000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS7) } /* APIC mode */
|
||||
If(PMOD) { Return(APS7) } /* APIC mode */
|
||||
Return (PS7) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR7 */
|
||||
|
|
|
@ -80,9 +80,9 @@ static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,
|
|||
u32 tempreg;
|
||||
/* io range allocation */
|
||||
tempreg = (nodeid&0xf) | ((nodeid & 0x30)<<(8-4)) | (linkn<<4) | ((io_max&0xf0)<<(12-4)); //limit
|
||||
for (i=0; i<node_nums; i++)
|
||||
for (i = 0; i < node_nums; i++)
|
||||
pci_write_config32(__f1_dev[i], reg+4, tempreg);
|
||||
tempreg = 3 /*| ( 3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
tempreg = 3 /*| (3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
#if 0
|
||||
// FIXME: can we use VGA reg instead?
|
||||
if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
|
||||
|
@ -94,7 +94,7 @@ static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,
|
|||
tempreg |= PCI_IO_BASE_NO_ISA;
|
||||
}
|
||||
#endif
|
||||
for (i=0; i<node_nums; i++)
|
||||
for (i = 0; i < node_nums; i++)
|
||||
pci_write_config32(__f1_dev[i], reg, tempreg);
|
||||
}
|
||||
|
||||
|
@ -104,10 +104,10 @@ static void set_mmio_addr_reg(u32 nodeid, u32 linkn, u32 reg, u32 index, u32 mmi
|
|||
u32 tempreg;
|
||||
/* io range allocation */
|
||||
tempreg = (nodeid&0xf) | (linkn<<4) | (mmio_max&0xffffff00); //limit
|
||||
for (i=0; i<nodes; i++)
|
||||
for (i = 0; i < nodes; i++)
|
||||
pci_write_config32(__f1_dev[i], reg+4, tempreg);
|
||||
tempreg = 3 | (nodeid & 0x30) | (mmio_min&0xffffff00);
|
||||
for (i=0; i<node_nums; i++)
|
||||
for (i = 0; i < node_nums; i++)
|
||||
pci_write_config32(__f1_dev[i], reg, tempreg);
|
||||
}
|
||||
|
||||
|
@ -410,9 +410,8 @@ static void create_vga_resource(struct device *dev, unsigned nodeid)
|
|||
printk(BIOS_DEBUG, "VGA: vga_pri bus num = %d bus range [%d,%d]\n", vga_pri->bus->secondary,
|
||||
link->secondary,link->subordinate);
|
||||
/* We need to make sure the vga_pri is under the link */
|
||||
if ((vga_pri->bus->secondary >= link->secondary ) &&
|
||||
(vga_pri->bus->secondary <= link->subordinate )
|
||||
)
|
||||
if ((vga_pri->bus->secondary >= link->secondary) &&
|
||||
(vga_pri->bus->secondary <= link->subordinate))
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
@ -630,7 +629,7 @@ static void domain_read_resources(struct device *dev)
|
|||
if ((base & 3) != 0) {
|
||||
unsigned nodeid, reg_link;
|
||||
device_t reg_dev;
|
||||
if (reg<0xc0) { // mmio
|
||||
if (reg < 0xc0) { // mmio
|
||||
nodeid = (limit & 0xf) + (base&0x30);
|
||||
} else { // io
|
||||
nodeid = (limit & 0xf) + ((base>>4)&0x30);
|
||||
|
@ -697,7 +696,7 @@ static struct hw_mem_hole_info get_hw_mem_hole_info(void)
|
|||
*/
|
||||
if (mem_hole.node_id == -1) {
|
||||
resource_t limitk_pri = 0;
|
||||
for (i=0; i<node_nums; i++) {
|
||||
for (i = 0; i < node_nums; i++) {
|
||||
dram_base_mask_t d;
|
||||
resource_t base_k, limit_k;
|
||||
d = get_dram_base_mask(i);
|
||||
|
@ -818,11 +817,11 @@ static void domain_set_resources(struct device *dev)
|
|||
//printk(BIOS_DEBUG, "node %d : mmio_basek=%08lx, basek=%08llx, limitk=%08llx\n", i, mmio_basek, basek, limitk);
|
||||
|
||||
/* split the region to accommodate pci memory space */
|
||||
if ((basek < 4*1024*1024 ) && (limitk > mmio_basek)) {
|
||||
if ((basek < 4*1024*1024) && (limitk > mmio_basek)) {
|
||||
if (basek <= mmio_basek) {
|
||||
unsigned pre_sizek;
|
||||
pre_sizek = mmio_basek - basek;
|
||||
if (pre_sizek>0) {
|
||||
if (pre_sizek > 0) {
|
||||
ram_resource(dev, (idx | i), basek, pre_sizek);
|
||||
idx += 0x10;
|
||||
sizek -= pre_sizek;
|
||||
|
@ -972,7 +971,7 @@ static void cpu_bus_scan(device_t dev)
|
|||
}
|
||||
sysconf_init(dev_mc);
|
||||
#if CONFIG_CBB && (MAX_NODE_NUMS > 32)
|
||||
if (node_nums>32) { // need to put node 32 to node 63 to bus 0xfe
|
||||
if (node_nums > 32) { // need to put node 32 to node 63 to bus 0xfe
|
||||
if (pci_domain->link_list && !pci_domain->link_list->next) {
|
||||
struct bus *new_link = new_link(pci_domain);
|
||||
pci_domain->link_list->next = new_link;
|
||||
|
@ -1053,7 +1052,7 @@ static void cpu_bus_scan(device_t dev)
|
|||
printk(BIOS_SPEW, "%s family%xh, core_max=0x%x, core_nums=0x%x, siblings=0x%x\n",
|
||||
dev_path(cdb_dev), 0x0f + family, core_max, core_nums, siblings);
|
||||
|
||||
for (j = 0; j <= siblings; j++ ) {
|
||||
for (j = 0; j <= siblings; j++) {
|
||||
extern CONST OPTIONS_CONFIG_TOPOLOGY ROMDATA TopologyConfiguration;
|
||||
u32 modules = TopologyConfiguration.PlatformNumberOfModules;
|
||||
u32 lapicid_start = 0;
|
||||
|
|
|
@ -50,7 +50,7 @@ Device(PBR2) {
|
|||
Name(_ADR, 0x00020000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS2) } /* APIC mode */
|
||||
If(PMOD) { Return(APS2) } /* APIC mode */
|
||||
Return (PS2) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR2 */
|
||||
|
@ -60,7 +60,7 @@ Device(PBR4) {
|
|||
Name(_ADR, 0x00040000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS4) } /* APIC mode */
|
||||
If(PMOD) { Return(APS4) } /* APIC mode */
|
||||
Return (PS4) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR4 */
|
||||
|
@ -70,7 +70,7 @@ Device(PBR5) {
|
|||
Name(_ADR, 0x00050000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS5) } /* APIC mode */
|
||||
If(PMOD) { Return(APS5) } /* APIC mode */
|
||||
Return (PS5) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR5 */
|
||||
|
@ -80,7 +80,7 @@ Device(PBR6) {
|
|||
Name(_ADR, 0x00060000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS6) } /* APIC mode */
|
||||
If(PMOD) { Return(APS6) } /* APIC mode */
|
||||
Return (PS6) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR6 */
|
||||
|
@ -90,7 +90,7 @@ Device(PBR7) {
|
|||
Name(_ADR, 0x00070000)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS7) } /* APIC mode */
|
||||
If(PMOD) { Return(APS7) } /* APIC mode */
|
||||
Return (PS7) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR7 */
|
||||
|
|
|
@ -79,9 +79,9 @@ static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,
|
|||
u32 tempreg;
|
||||
/* io range allocation */
|
||||
tempreg = (nodeid&0xf) | ((nodeid & 0x30)<<(8-4)) | (linkn<<4) | ((io_max&0xf0)<<(12-4)); //limit
|
||||
for (i=0; i<node_nums; i++)
|
||||
for (i = 0; i < node_nums; i++)
|
||||
pci_write_config32(__f1_dev[i], reg+4, tempreg);
|
||||
tempreg = 3 /*| ( 3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
tempreg = 3 /*| (3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
#if 0
|
||||
// FIXME: can we use VGA reg instead?
|
||||
if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
|
||||
|
@ -93,7 +93,7 @@ static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,
|
|||
tempreg |= PCI_IO_BASE_NO_ISA;
|
||||
}
|
||||
#endif
|
||||
for (i=0; i<node_nums; i++)
|
||||
for (i = 0; i < node_nums; i++)
|
||||
pci_write_config32(__f1_dev[i], reg, tempreg);
|
||||
}
|
||||
|
||||
|
@ -103,10 +103,10 @@ static void set_mmio_addr_reg(u32 nodeid, u32 linkn, u32 reg, u32 index, u32 mmi
|
|||
u32 tempreg;
|
||||
/* io range allocation */
|
||||
tempreg = (nodeid&0xf) | (linkn<<4) | (mmio_max&0xffffff00); //limit
|
||||
for (i=0; i<nodes; i++)
|
||||
for (i = 0; i < nodes; i++)
|
||||
pci_write_config32(__f1_dev[i], reg+4, tempreg);
|
||||
tempreg = 3 | (nodeid & 0x30) | (mmio_min&0xffffff00);
|
||||
for (i=0; i<node_nums; i++)
|
||||
for (i = 0; i < node_nums; i++)
|
||||
pci_write_config32(__f1_dev[i], reg, tempreg);
|
||||
}
|
||||
|
||||
|
@ -409,9 +409,8 @@ static void create_vga_resource(device_t dev, unsigned nodeid)
|
|||
printk(BIOS_DEBUG, "VGA: vga_pri bus num = %d bus range [%d,%d]\n", vga_pri->bus->secondary,
|
||||
link->secondary,link->subordinate);
|
||||
/* We need to make sure the vga_pri is under the link */
|
||||
if ((vga_pri->bus->secondary >= link->secondary ) &&
|
||||
(vga_pri->bus->secondary <= link->subordinate )
|
||||
)
|
||||
if ((vga_pri->bus->secondary >= link->secondary) &&
|
||||
(vga_pri->bus->secondary <= link->subordinate))
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
@ -629,7 +628,7 @@ static void domain_read_resources(device_t dev)
|
|||
if ((base & 3) != 0) {
|
||||
unsigned nodeid, reg_link;
|
||||
device_t reg_dev;
|
||||
if (reg<0xc0) { // mmio
|
||||
if (reg < 0xc0) { // mmio
|
||||
nodeid = (limit & 0xf) + (base&0x30);
|
||||
} else { // io
|
||||
nodeid = (limit & 0xf) + ((base>>4)&0x30);
|
||||
|
@ -696,7 +695,7 @@ static struct hw_mem_hole_info get_hw_mem_hole_info(void)
|
|||
*/
|
||||
if (mem_hole.node_id == -1) {
|
||||
resource_t limitk_pri = 0;
|
||||
for (i=0; i<node_nums; i++) {
|
||||
for (i = 0; i < node_nums; i++) {
|
||||
dram_base_mask_t d;
|
||||
resource_t base_k, limit_k;
|
||||
d = get_dram_base_mask(i);
|
||||
|
@ -817,11 +816,11 @@ static void domain_set_resources(device_t dev)
|
|||
//printk(BIOS_DEBUG, "node %d : mmio_basek=%08lx, basek=%08llx, limitk=%08llx\n", i, mmio_basek, basek, limitk);
|
||||
|
||||
/* split the region to accommodate pci memory space */
|
||||
if ((basek < 4*1024*1024 ) && (limitk > mmio_basek)) {
|
||||
if ((basek < 4*1024*1024) && (limitk > mmio_basek)) {
|
||||
if (basek <= mmio_basek) {
|
||||
unsigned pre_sizek;
|
||||
pre_sizek = mmio_basek - basek;
|
||||
if (pre_sizek>0) {
|
||||
if (pre_sizek > 0) {
|
||||
ram_resource(dev, (idx | i), basek, pre_sizek);
|
||||
idx += 0x10;
|
||||
sizek -= pre_sizek;
|
||||
|
@ -971,7 +970,7 @@ static void cpu_bus_scan(device_t dev)
|
|||
}
|
||||
sysconf_init(dev_mc);
|
||||
#if CONFIG_CBB && (MAX_NODE_NUMS > 32)
|
||||
if (node_nums>32) { // need to put node 32 to node 63 to bus 0xfe
|
||||
if (node_nums > 32) { // need to put node 32 to node 63 to bus 0xfe
|
||||
if (pci_domain->link_list && !pci_domain->link_list->next) {
|
||||
struct bus *new_link = new_link(pci_domain);
|
||||
pci_domain->link_list->next = new_link;
|
||||
|
@ -1052,7 +1051,7 @@ static void cpu_bus_scan(device_t dev)
|
|||
printk(BIOS_SPEW, "%s family%xh, core_max=0x%x, core_nums=0x%x, siblings=0x%x\n",
|
||||
dev_path(cdb_dev), 0x0f + family, core_max, core_nums, siblings);
|
||||
|
||||
for (j = 0; j <= siblings; j++ ) {
|
||||
for (j = 0; j <= siblings; j++) {
|
||||
extern CONST OPTIONS_CONFIG_TOPOLOGY ROMDATA TopologyConfiguration;
|
||||
u32 modules = TopologyConfiguration.PlatformNumberOfModules;
|
||||
u32 lapicid_start = 0;
|
||||
|
|
|
@ -50,7 +50,7 @@ Device(PBR4) {
|
|||
Name(_ADR, 0x00020001)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS4) } /* APIC mode */
|
||||
If(PMOD) { Return(APS4) } /* APIC mode */
|
||||
Return (PS4) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR4 */
|
||||
|
@ -60,7 +60,7 @@ Device(PBR5) {
|
|||
Name(_ADR, 0x00020002)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS5) } /* APIC mode */
|
||||
If(PMOD) { Return(APS5) } /* APIC mode */
|
||||
Return (PS5) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR5 */
|
||||
|
@ -70,7 +70,7 @@ Device(PBR6) {
|
|||
Name(_ADR, 0x00020003)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS6) } /* APIC mode */
|
||||
If(PMOD) { Return(APS6) } /* APIC mode */
|
||||
Return (PS6) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR6 */
|
||||
|
@ -80,7 +80,7 @@ Device(PBR7) {
|
|||
Name(_ADR, 0x00020004)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS7) } /* APIC mode */
|
||||
If(PMOD) { Return(APS7) } /* APIC mode */
|
||||
Return (PS7) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR7 */
|
||||
|
@ -90,7 +90,7 @@ Device(PBR8) {
|
|||
Name(_ADR, 0x00020005)
|
||||
Name(_PRW, Package() {0x18, 4})
|
||||
Method(_PRT,0) {
|
||||
If(PMOD){ Return(APS8) } /* APIC mode */
|
||||
If(PMOD) { Return(APS8) } /* APIC mode */
|
||||
Return (PS8) /* PIC Mode */
|
||||
} /* end _PRT */
|
||||
} /* end PBR8 */
|
||||
|
|
|
@ -79,9 +79,9 @@ static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,
|
|||
u32 tempreg;
|
||||
/* io range allocation */
|
||||
tempreg = (nodeid&0xf) | ((nodeid & 0x30)<<(8-4)) | (linkn<<4) | ((io_max&0xf0)<<(12-4)); //limit
|
||||
for (i=0; i<node_nums; i++)
|
||||
for (i = 0; i < node_nums; i++)
|
||||
pci_write_config32(__f1_dev[i], reg+4, tempreg);
|
||||
tempreg = 3 /*| ( 3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
tempreg = 3 /*| (3<<4)*/ | ((io_min&0xf0)<<(12-4)); //base :ISA and VGA ?
|
||||
#if 0
|
||||
// FIXME: can we use VGA reg instead?
|
||||
if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
|
||||
|
@ -93,7 +93,7 @@ static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,
|
|||
tempreg |= PCI_IO_BASE_NO_ISA;
|
||||
}
|
||||
#endif
|
||||
for (i=0; i<node_nums; i++)
|
||||
for (i = 0; i < node_nums; i++)
|
||||
pci_write_config32(__f1_dev[i], reg, tempreg);
|
||||
}
|
||||
|
||||
|
@ -103,10 +103,10 @@ static void set_mmio_addr_reg(u32 nodeid, u32 linkn, u32 reg, u32 index, u32 mmi
|
|||
u32 tempreg;
|
||||
/* io range allocation */
|
||||
tempreg = (nodeid&0xf) | (linkn<<4) | (mmio_max&0xffffff00); //limit
|
||||
for (i=0; i<nodes; i++)
|
||||
for (i = 0; i < nodes; i++)
|
||||
pci_write_config32(__f1_dev[i], reg+4, tempreg);
|
||||
tempreg = 3 | (nodeid & 0x30) | (mmio_min&0xffffff00);
|
||||
for (i=0; i<node_nums; i++)
|
||||
for (i = 0; i < node_nums; i++)
|
||||
pci_write_config32(__f1_dev[i], reg, tempreg);
|
||||
}
|
||||
|
||||
|
@ -409,9 +409,8 @@ static void create_vga_resource(device_t dev, unsigned nodeid)
|
|||
printk(BIOS_DEBUG, "VGA: vga_pri bus num = %d bus range [%d,%d]\n", vga_pri->bus->secondary,
|
||||
link->secondary,link->subordinate);
|
||||
/* We need to make sure the vga_pri is under the link */
|
||||
if ((vga_pri->bus->secondary >= link->secondary ) &&
|
||||
(vga_pri->bus->secondary <= link->subordinate )
|
||||
)
|
||||
if ((vga_pri->bus->secondary >= link->secondary) &&
|
||||
(vga_pri->bus->secondary <= link->subordinate))
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
@ -644,7 +643,7 @@ static void domain_read_resources(device_t dev)
|
|||
if ((base & 3) != 0) {
|
||||
unsigned nodeid, reg_link;
|
||||
device_t reg_dev;
|
||||
if (reg<0xc0) { // mmio
|
||||
if (reg < 0xc0) { // mmio
|
||||
nodeid = (limit & 0xf) + (base&0x30);
|
||||
} else { // io
|
||||
nodeid = (limit & 0xf) + ((base>>4)&0x30);
|
||||
|
@ -711,7 +710,7 @@ static struct hw_mem_hole_info get_hw_mem_hole_info(void)
|
|||
*/
|
||||
if (mem_hole.node_id == -1) {
|
||||
resource_t limitk_pri = 0;
|
||||
for (i=0; i<node_nums; i++) {
|
||||
for (i = 0; i < node_nums; i++) {
|
||||
dram_base_mask_t d;
|
||||
resource_t base_k, limit_k;
|
||||
d = get_dram_base_mask(i);
|
||||
|
@ -834,11 +833,11 @@ static void domain_set_resources(device_t dev)
|
|||
//printk(BIOS_DEBUG, "node %d : mmio_basek=%08lx, basek=%08llx, limitk=%08llx\n", i, mmio_basek, basek, limitk);
|
||||
|
||||
/* split the region to accommodate pci memory space */
|
||||
if ((basek < 4*1024*1024 ) && (limitk > mmio_basek)) {
|
||||
if ((basek < 4*1024*1024) && (limitk > mmio_basek)) {
|
||||
if (basek <= mmio_basek) {
|
||||
unsigned pre_sizek;
|
||||
pre_sizek = mmio_basek - basek;
|
||||
if (pre_sizek>0) {
|
||||
if (pre_sizek > 0) {
|
||||
ram_resource(dev, (idx | i), basek, pre_sizek);
|
||||
idx += 0x10;
|
||||
sizek -= pre_sizek;
|
||||
|
@ -988,7 +987,7 @@ static void cpu_bus_scan(device_t dev)
|
|||
}
|
||||
sysconf_init(dev_mc);
|
||||
#if CONFIG_CBB && (MAX_NODE_NUMS > 32)
|
||||
if (node_nums>32) { // need to put node 32 to node 63 to bus 0xfe
|
||||
if (node_nums > 32) { // need to put node 32 to node 63 to bus 0xfe
|
||||
if (pci_domain->link_list && !pci_domain->link_list->next) {
|
||||
struct bus *new_link = new_link(pci_domain);
|
||||
pci_domain->link_list->next = new_link;
|
||||
|
@ -1069,7 +1068,7 @@ static void cpu_bus_scan(device_t dev)
|
|||
printk(BIOS_SPEW, "%s family%xh, core_max=0x%x, core_nums=0x%x, siblings=0x%x\n",
|
||||
dev_path(cdb_dev), 0x0f + family, core_max, core_nums, siblings);
|
||||
|
||||
for (j = 0; j <= siblings; j++ ) {
|
||||
for (j = 0; j <= siblings; j++) {
|
||||
extern CONST OPTIONS_CONFIG_TOPOLOGY ROMDATA TopologyConfiguration;
|
||||
u32 modules = TopologyConfiguration.PlatformNumberOfModules;
|
||||
u32 lapicid_start = 0;
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <AGESA.h>
|
||||
|
||||
typedef enum {
|
||||
S3DataTypeNonVolatile=0, ///< NonVolatile Data Type
|
||||
S3DataTypeNonVolatile = 0, ///< NonVolatile Data Type
|
||||
S3DataTypeMTRR ///< MTRR storage
|
||||
} S3_DATA_TYPE;
|
||||
|
||||
|
|
Loading…
Reference in New Issue