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

Unify IO APIC address specification 

Some places still hardcoded the address instead of using IO_APIC_ADDR.

Change-Id: I3941c1ff62972ce56a5bc466eab7134f901773d3
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/677
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Patrick Georgi 2012-02-16 18:54:37 +01:00 committed by Stefan Reinauer
parent 5c1ff9284a
commit 2c2e78d845
11 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/x86/include/arch/ioapic.h
View File

@ -23,6 +23,7 @@
#define IO_APIC_ADDR 0xfec00000
#define IO_APIC_INTERRUPTS 24
#ifndef __ACPI__
#define ALL (0xff << 24)
#define NONE (0)
#define DISABLED (1 << 16)
@ -38,7 +39,6 @@
#define SMI (2 << 8)
#define INT (1 << 8)
#ifndef __ACPI__
void setup_ioapic(u32 ioapic_base, u8 ioapic_id);
void clear_ioapic(u32 ioapic_base);
#endif

2
src/mainboard/amd/torpedo/platform_cfg.h
View File

@ -137,7 +137,7 @@
* @section WatchDogTimerBase
*/
// #ifndef WATCHDOG_TIMER_BASE_ADDRESS
// #define WATCHDOG_TIMER_BASE_ADDRESS 0xFEC00000
// #define WATCHDOG_TIMER_BASE_ADDRESS IO_APIC_ADDR
// #endif
/**

2
src/mainboard/iwave/iWRainbowG6/mptable.c
View File

@ -34,7 +34,7 @@ void *smp_write_config_table(void *v)
smp_write_processors(mc);
mptable_write_buses(mc, NULL, &isa_bus);
smp_write_ioapic(mc, 2, 0x20, 0xfec00000);
smp_write_ioapic(mc, 2, 0x20, IO_APIC_ADDR);
{
device_t dev;
struct resource *res;

3
src/northbridge/intel/i945/acpi/hostbridge.asl
View File

@ -19,6 +19,7 @@
* MA 02110-1301 USA
*/
#include <arch/ioapic.h>
Name(_HID,EISAID("PNP0A08")) // PCIe
Name(_CID,EISAID("PNP0A03")) // PCI
@ -211,7 +212,7 @@ Method (_CRS, 0, Serialized)
DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
Cacheable, ReadWrite,
0x00000000, 0x00000000, 0xfebfffff, 0x00000000,
0xfec00000,,, PM01)
IO_APIC_ADDR,,, PM01)
// TPM Area (0xfed40000-0xfed44fff)
DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,

3
src/northbridge/intel/sch/acpi/hostbridge.asl
View File

@ -19,6 +19,7 @@
* MA 02110-1301 USA
*/
#include <arch/ioapic.h>
Name(_HID,EISAID("PNP0A08")) // PCIe
Name(_CID,EISAID("PNP0A03")) // PCI
@ -211,7 +212,7 @@ Method (_CRS, 0, Serialized)
DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
Cacheable, ReadWrite,
0x00000000, 0x00000000, 0xfebfffff, 0x00000000,
0xfec00000,,, PM01)
IO_APIC_ADDR,,, PM01)
// TPM Area (0xfed40000-0xfed44fff)
DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,

5
src/southbridge/amd/cimx/sb700/lpc.c
View File

@ -21,6 +21,7 @@
#include "lpc.h"
#include <bitops.h>
#include <arch/io.h>
#include <arch/ioapic.h>
#include <console/console.h> /* printk */
#include <cbmem.h>
@ -61,8 +62,8 @@ void lpc_read_resources(device_t dev)
res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE |
IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
res = new_resource(dev, 3); /* IOAPIC */
res->base = 0xfec00000;
res = new_resource(dev, 3);
res->base = IO_APIC_ADDR;
res->size = 0x00001000;
res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;

5
src/southbridge/amd/cimx/sb800/lpc.c
View File

@ -19,6 +19,7 @@
#include <console/console.h>
#include <device/pci.h>
#include <arch/ioapic.h>
#include "lpc.h"
@ -45,8 +46,8 @@ void lpc_read_resources(device_t dev)
res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE |
IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
res = new_resource(dev, 3); /* IOAPIC */
res->base = 0xfec00000;
res = new_resource(dev, 3);
res->base = IO_APIC_ADDR;
res->size = 0x00001000;
res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;

5
src/southbridge/amd/cimx/sb900/lpc.c
View File

@ -20,6 +20,7 @@
#include <device/pci.h>
#include "lpc.h"
#include <console/console.h> /* printk */
#include <arch/ioapic.h>
void lpc_read_resources(device_t dev)
@ -45,8 +46,8 @@ void lpc_read_resources(device_t dev)
res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE |
IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
res = new_resource(dev, 3); /* IOAPIC */
res->base = 0xfec00000;
res = new_resource(dev, 3);
res->base = IO_APIC_ADDR;
res->size = 0x00001000;
res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;

4
src/southbridge/amd/sb800/lpc.c
View File

@ -91,8 +91,8 @@ static void sb800_lpc_read_resources(device_t dev)
res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE |
IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
//res = new_resource(dev, 3); /* IOAPIC */
//res->base = 0xfec00000;
//res = new_resource(dev, 3);
//res->base = IO_APIC_ADDR;
//res->size = 0x00001000;
//res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;

8
src/southbridge/amd/sb800/sm.c
View File

@ -84,16 +84,14 @@
static void sm_init(device_t dev)
{
u8 byte;
u32 ioapic_base;
printk(BIOS_INFO, "sm_init().\n");
ioapic_base = 0xFEC00000;//pci_read_config32(dev, 0x74) & (0xffffffe0); /* some like mem resource, but does not have enable bit */
/* Don't rename APIC ID */
/* TODO: We should call setup_ioapic() here. But kernel hangs if cpu is K8.
* We need to check out why and change back. */
clear_ioapic(ioapic_base);
//setup_ioapic(ioapic_base, 0);
clear_ioapic(IO_APIC_ADDR);
//setup_ioapic(IO_APIC_ADDR, 0);
/* enable serial irq */
byte = pm_ioread(0x54);
@ -277,7 +275,7 @@ static void sb800_sm_read_resources(device_t dev)
/* apic */
res = new_resource(dev, 0x74);
res->base = 0xfec00000;
res->base = IO_APIC_ADDR;
res->size = 256 * 0x10;
res->limit = 0xFEFFFFFUL; /* res->base + res->size -1; */
res->align = 8;

5
src/southbridge/intel/sch/lpc.c
View File

@ -23,6 +23,7 @@
#include <device/pci.h>
#include <device/pci_ids.h>
#include <arch/io.h>
#include <arch/ioapic.h>
#include "chip.h"
/* SCH LPC defines */
@ -164,8 +165,8 @@ static void sch_lpc_read_resources(device_t dev)
res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE |
IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
res = new_resource(dev, 3); /* IOAPIC */
res->base = 0xfec00000;
res = new_resource(dev, 3);
res->base = IO_APIC_ADDR;
res->size = 0x00001000;
res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
}