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

AMD hudson yangtze: Fix corruption of a global ramstage variable 

A late for loop may reference over the current array allocation
and corrupt an unrelated global variable. As a quick fix bumb the
size of the array allocation uniformly to 6.

We missed these boards for commit 9c7d73ca because the arrays
had been renamed.

Change-Id: Iff2f2a0090d9302576bc72195d2a3f6fa37ce29a
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3954
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-by: Bruce Griffith <Bruce.Griffith@se-eng.com>
This commit is contained in:
Kyösti Mälkki 2013-09-09 09:23:19 +03:00
parent 11b47801b2
commit 4f9bf7e2fb
15 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mainboard/amd/olivehill/get_bus_conf.c
View File

@ -30,7 +30,7 @@
* and acpi_tables busnum is default. * and acpi_tables busnum is default.
*/ */
u8 bus_isa; u8 bus_isa;
u8 bus_yangtze[3]; u8 bus_yangtze[6];
u32 apicid_yangtze; u32 apicid_yangtze;
/* /*
@ -100,9 +100,7 @@ void get_bus_conf(void)
sbdn_yangtze = 0; sbdn_yangtze = 0;
for (i = 0; i < 3; i++) { memset(bus_yangtze, 0, sizeof(bus_yangtze));
bus_yangtze[i] = 0;
}
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
bus_type[i] = 0; /* default ISA bus. */ bus_type[i] = 0; /* default ISA bus. */

2
src/mainboard/amd/olivehill/irq_tables.c
View File

@ -44,7 +44,7 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
} }
extern u8 bus_isa; extern u8 bus_isa;
extern u8 bus_yangtze[2]; extern u8 bus_yangtze[6];
extern unsigned long sbdn_yangtze; extern unsigned long sbdn_yangtze;
unsigned long write_pirq_routing_table(unsigned long addr) unsigned long write_pirq_routing_table(unsigned long addr)

2
src/mainboard/amd/olivehill/mptable.c
View File

@ -30,7 +30,7 @@
//-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1 //-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1
#define IO_APIC_ID CONFIG_MAX_CPUS #define IO_APIC_ID CONFIG_MAX_CPUS
extern u8 bus_yangtze[3]; extern u8 bus_yangtze[6];
extern u32 bus_type[256]; extern u32 bus_type[256];
extern u32 sbdn_yangtze; extern u32 sbdn_yangtze;

6
src/mainboard/amd/parmer/get_bus_conf.c
View File

@ -30,7 +30,7 @@
* and acpi_tables busnum is default. * and acpi_tables busnum is default.
*/ */
u8 bus_isa; u8 bus_isa;
u8 bus_hudson[3]; u8 bus_hudson[6];
u32 apicid_hudson; u32 apicid_hudson;
/* /*
@ -97,9 +97,7 @@ void get_bus_conf(void)
sbdn_hudson = 0; sbdn_hudson = 0;
for (i = 0; i < 3; i++) { memset(bus_hudson, 0, sizeof(bus_hudson));
bus_hudson[i] = 0;
}
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
bus_type[i] = 0; /* default ISA bus. */ bus_type[i] = 0; /* default ISA bus. */

2
src/mainboard/amd/parmer/irq_tables.c
View File

@ -44,7 +44,7 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
} }
extern u8 bus_isa; extern u8 bus_isa;
extern u8 bus_hudson[2]; extern u8 bus_hudson[6];
extern unsigned long sbdn_hudson; extern unsigned long sbdn_hudson;
unsigned long write_pirq_routing_table(unsigned long addr) unsigned long write_pirq_routing_table(unsigned long addr)

2
src/mainboard/amd/parmer/mptable.c
View File

@ -30,7 +30,7 @@
//-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1 //-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1
#define IO_APIC_ID CONFIG_MAX_CPUS #define IO_APIC_ID CONFIG_MAX_CPUS
extern u8 bus_hudson[3]; extern u8 bus_hudson[6];
extern u32 bus_type[256]; extern u32 bus_type[256];
extern u32 sbdn_hudson; extern u32 sbdn_hudson;

6
src/mainboard/amd/thatcher/get_bus_conf.c
View File

@ -30,7 +30,7 @@
* and acpi_tables busnum is default. * and acpi_tables busnum is default.
*/ */
u8 bus_isa; u8 bus_isa;
u8 bus_hudson[3]; u8 bus_hudson[6];
u32 apicid_hudson; u32 apicid_hudson;
/* /*
@ -97,9 +97,7 @@ void get_bus_conf(void)
sbdn_hudson = 0; sbdn_hudson = 0;
for (i = 0; i < 3; i++) { memset(bus_hudson, 0, sizeof(bus_hudson));
bus_hudson[i] = 0;
}
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
bus_type[i] = 0; /* default ISA bus. */ bus_type[i] = 0; /* default ISA bus. */

2
src/mainboard/amd/thatcher/irq_tables.c
View File

@ -44,7 +44,7 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
} }
extern u8 bus_isa; extern u8 bus_isa;
extern u8 bus_hudson[2]; extern u8 bus_hudson[6];
extern unsigned long sbdn_hudson; extern unsigned long sbdn_hudson;
unsigned long write_pirq_routing_table(unsigned long addr) unsigned long write_pirq_routing_table(unsigned long addr)

2
src/mainboard/amd/thatcher/mptable.c
View File

@ -30,7 +30,7 @@
//-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1 //-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1
#define IO_APIC_ID CONFIG_MAX_CPUS #define IO_APIC_ID CONFIG_MAX_CPUS
extern u8 bus_hudson[3]; extern u8 bus_hudson[6];
extern u32 bus_type[256]; extern u32 bus_type[256];
extern u32 sbdn_hudson; extern u32 sbdn_hudson;

6
src/mainboard/asrock/imb-a180/get_bus_conf.c
View File

@ -30,7 +30,7 @@
* and acpi_tables busnum is default. * and acpi_tables busnum is default.
*/ */
u8 bus_isa; u8 bus_isa;
u8 bus_yangtze[3]; u8 bus_yangtze[6];
u32 apicid_yangtze; u32 apicid_yangtze;
/* /*
@ -100,9 +100,7 @@ void get_bus_conf(void)
sbdn_yangtze = 0; sbdn_yangtze = 0;
for (i = 0; i < 3; i++) { memset(bus_yangtze, 0, sizeof(bus_yangtze));
bus_yangtze[i] = 0;
}
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
bus_type[i] = 0; /* default ISA bus. */ bus_type[i] = 0; /* default ISA bus. */

2
src/mainboard/asrock/imb-a180/irq_tables.c
View File

@ -44,7 +44,7 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
} }
extern u8 bus_isa; extern u8 bus_isa;
extern u8 bus_yangtze[2]; extern u8 bus_yangtze[6];
extern unsigned long sbdn_yangtze; extern unsigned long sbdn_yangtze;
unsigned long write_pirq_routing_table(unsigned long addr) unsigned long write_pirq_routing_table(unsigned long addr)

2
src/mainboard/asrock/imb-a180/mptable.c
View File

@ -30,7 +30,7 @@
//-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1 //-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1
#define IO_APIC_ID CONFIG_MAX_CPUS #define IO_APIC_ID CONFIG_MAX_CPUS
extern u8 bus_yangtze[3]; extern u8 bus_yangtze[6];
extern u32 bus_type[256]; extern u32 bus_type[256];
extern u32 sbdn_yangtze; extern u32 sbdn_yangtze;

6
src/mainboard/asus/f2a85-m/get_bus_conf.c
View File

@ -30,7 +30,7 @@
* and acpi_tables busnum is default. * and acpi_tables busnum is default.
*/ */
u8 bus_isa; u8 bus_isa;
u8 bus_hudson[3]; u8 bus_hudson[6];
u32 apicid_hudson; u32 apicid_hudson;
/* /*
@ -97,9 +97,7 @@ void get_bus_conf(void)
sbdn_hudson = 0; sbdn_hudson = 0;
for (i = 0; i < 3; i++) { memset(bus_hudson, 0, sizeof(bus_hudson));
bus_hudson[i] = 0;
}
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
bus_type[i] = 0; /* default ISA bus. */ bus_type[i] = 0; /* default ISA bus. */

2
src/mainboard/asus/f2a85-m/irq_tables.c
View File

@ -44,7 +44,7 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
} }
extern u8 bus_isa; extern u8 bus_isa;
extern u8 bus_hudson[2]; extern u8 bus_hudson[6];
extern unsigned long sbdn_hudson; extern unsigned long sbdn_hudson;
unsigned long write_pirq_routing_table(unsigned long addr) unsigned long write_pirq_routing_table(unsigned long addr)

2
src/mainboard/asus/f2a85-m/mptable.c
View File

@ -31,7 +31,7 @@
//-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1 //-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1
#define IO_APIC_ID CONFIG_MAX_CPUS #define IO_APIC_ID CONFIG_MAX_CPUS
extern u8 bus_hudson[3]; extern u8 bus_hudson[6];
extern u32 bus_type[256]; extern u32 bus_type[256];
extern u32 sbdn_hudson; extern u32 sbdn_hudson;