After this has been brought up many times before, rename src/arch/i386 to

src/arch/x86. 

Signed-off-by: Stefan Reinauer <stepan@coreboot.org>
Acked-by: Patrick Georgi <patrick@georgi-clan.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6161 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 0 insertions, 383 deletions

diff --git a/src/arch/i386/boot/mpspec.c b/src/arch/i386/boot/mpspec.c
deleted file mode 100644
index 70bc5401fd..0000000000
--- a/src/arch/i386/boot/mpspec.c
+++ /dev/null
@@ -1,383 +0,0 @@
-#include <console/console.h>
-#include <device/path.h>
-#include <device/pci_ids.h>
-#include <cpu/cpu.h>
-#include <arch/smp/mpspec.h>
-#include <string.h>
-#include <arch/cpu.h>
-#include <cpu/x86/lapic.h>
-
-/* Initialize the specified "mc" struct with initial values. */
-void mptable_init(struct mp_config_table *mc, const char *productid,
-		  u32 lapic_addr)
-{
-	/* Error out if 'product_id' length doesn't match exactly. */
-	if (strlen(productid) != 12)
-		die("ERROR: 'productid' must be 12 bytes long!");
-
-	memset(mc, 0, sizeof(*mc));
-	memcpy(mc->mpc_signature, MPC_SIGNATURE, 4);
-	mc->mpc_length = sizeof(*mc);	/* Initially just the header size. */
-	mc->mpc_spec = 0x04;		/* MultiProcessor specification 1.4 */
-	mc->mpc_checksum = 0;		/* Not yet computed. */
-	memcpy(mc->mpc_oem, "COREBOOT", 8);
-	memcpy(mc->mpc_productid, productid, 12);
-	mc->mpc_oemptr = 0;
-	mc->mpc_oemsize = 0;
-	mc->mpc_entry_count = 0;	/* No entries yet... */
-	mc->mpc_lapic = lapic_addr;
-	mc->mpe_length = 0;
-	mc->mpe_checksum = 0;
-	mc->reserved = 0;
-}
-
-unsigned char smp_compute_checksum(void *v, int len)
-{
-	unsigned char *bytes;
-	unsigned char checksum;
-	int i;
-	bytes = v;
-	checksum = 0;
-	for(i = 0; i < len; i++) {
-		checksum -= bytes[i];
-	}
-	return checksum;
-}
-
-void *smp_write_floating_table(unsigned long addr)
-{
-	/* 16 byte align the table address */
-	addr = (addr + 0xf) & (~0xf);
-	return smp_write_floating_table_physaddr(addr, addr + SMP_FLOATING_TABLE_LEN);
-}
-
-void *smp_write_floating_table_physaddr(unsigned long addr, unsigned long mpf_physptr)
-{
-        struct intel_mp_floating *mf;
-        void *v;
-
-	v = (void *)addr;
-        mf = v;
-        mf->mpf_signature[0] = '_';
-        mf->mpf_signature[1] = 'M';
-        mf->mpf_signature[2] = 'P';
-        mf->mpf_signature[3] = '_';
-        mf->mpf_physptr = mpf_physptr;
-        mf->mpf_length = 1;
-        mf->mpf_specification = 4;
-        mf->mpf_checksum = 0;
-        mf->mpf_feature1 = 0;
-        mf->mpf_feature2 = 0;
-        mf->mpf_feature3 = 0;
-        mf->mpf_feature4 = 0;
-        mf->mpf_feature5 = 0;
-        mf->mpf_checksum = smp_compute_checksum(mf, mf->mpf_length*16);
-        return v;
-}
-
-void *smp_next_mpc_entry(struct mp_config_table *mc)
-{
-	void *v;
-	v = (void *)(((char *)mc) + mc->mpc_length);
-	return v;
-}
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
-{
-	mc->mpc_length += length;
-	mc->mpc_entry_count++;
-}
-
-void *smp_next_mpe_entry(struct mp_config_table *mc)
-{
-	void *v;
-	v = (void *)(((char *)mc) + mc->mpc_length + mc->mpe_length);
-	return v;
-}
-static void smp_add_mpe_entry(struct mp_config_table *mc, mpe_t mpe)
-{
-	mc->mpe_length += mpe->mpe_length;
-}
-
-void smp_write_processor(struct mp_config_table *mc,
-	unsigned char apicid, unsigned char apicver,
-	unsigned char cpuflag, unsigned int cpufeature,
-	unsigned int featureflag)
-{
-	struct mpc_config_processor *mpc;
-	mpc = smp_next_mpc_entry(mc);
-	memset(mpc, '\0', sizeof(*mpc));
-	mpc->mpc_type = MP_PROCESSOR;
-	mpc->mpc_apicid = apicid;
-	mpc->mpc_apicver = apicver;
-	mpc->mpc_cpuflag = cpuflag;
-	mpc->mpc_cpufeature = cpufeature;
-	mpc->mpc_featureflag = featureflag;
-	smp_add_mpc_entry(mc, sizeof(*mpc));
-}
-
-/* If we assume a symmetric processor configuration we can
- * get all of the information we need to write the processor
- * entry from the bootstrap processor.
- * Plus I don't think linux really even cares.
- * Having the proper apicid's in the table so the non-bootstrap
- *  processors can be woken up should be enough.
- */
-void smp_write_processors(struct mp_config_table *mc)
-{
-	int boot_apic_id;
-	unsigned apic_version;
-	unsigned cpu_features;
-	unsigned cpu_feature_flags;
-	struct cpuid_result result;
-	device_t cpu;
-
-	boot_apic_id = lapicid();
-	apic_version = lapic_read(LAPIC_LVR) & 0xff;
-	result = cpuid(1);
-	cpu_features = result.eax;
-	cpu_feature_flags = result.edx;
-	for(cpu = all_devices; cpu; cpu = cpu->next) {
-		unsigned long cpu_flag;
-		if ((cpu->path.type != DEVICE_PATH_APIC) ||
-			(cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER))
-		{
-			continue;
-		}
-		if (!cpu->enabled) {
-			continue;
-		}
-		cpu_flag = MPC_CPU_ENABLED;
-		if (boot_apic_id == cpu->path.apic.apic_id) {
-			cpu_flag = MPC_CPU_ENABLED | MPC_CPU_BOOTPROCESSOR;
-		}
-		smp_write_processor(mc,
-			cpu->path.apic.apic_id, apic_version,
-			cpu_flag, cpu_features, cpu_feature_flags
-		);
-	}
-}
-
-static void smp_write_bus(struct mp_config_table *mc,
-	unsigned char id, const char *bustype)
-{
-	struct mpc_config_bus *mpc;
-	mpc = smp_next_mpc_entry(mc);
-	memset(mpc, '\0', sizeof(*mpc));
-	mpc->mpc_type = MP_BUS;
-	mpc->mpc_busid = id;
-	memcpy(mpc->mpc_bustype, bustype, sizeof(mpc->mpc_bustype));
-	smp_add_mpc_entry(mc, sizeof(*mpc));
-}
-
-void smp_write_ioapic(struct mp_config_table *mc,
-	unsigned char id, unsigned char ver,
-	unsigned long apicaddr)
-{
-	struct mpc_config_ioapic *mpc;
-	mpc = smp_next_mpc_entry(mc);
-	memset(mpc, '\0', sizeof(*mpc));
-	mpc->mpc_type = MP_IOAPIC;
-	mpc->mpc_apicid = id;
-	mpc->mpc_apicver = ver;
-	mpc->mpc_flags = MPC_APIC_USABLE;
-	mpc->mpc_apicaddr = apicaddr;
-	smp_add_mpc_entry(mc, sizeof(*mpc));
-}
-
-void smp_write_intsrc(struct mp_config_table *mc,
-	unsigned char irqtype, unsigned short irqflag,
-	unsigned char srcbus, unsigned char srcbusirq,
-	unsigned char dstapic, unsigned char dstirq)
-{
-	struct mpc_config_intsrc *mpc;
-	mpc = smp_next_mpc_entry(mc);
-	memset(mpc, '\0', sizeof(*mpc));
-	mpc->mpc_type = MP_INTSRC;
-	mpc->mpc_irqtype = irqtype;
-	mpc->mpc_irqflag = irqflag;
-	mpc->mpc_srcbus = srcbus;
-	mpc->mpc_srcbusirq = srcbusirq;
-	mpc->mpc_dstapic = dstapic;
-	mpc->mpc_dstirq = dstirq;
-	smp_add_mpc_entry(mc, sizeof(*mpc));
-#ifdef DEBUG_MPTABLE
-	printk(BIOS_DEBUG, "add intsrc srcbus 0x%x srcbusirq 0x%x, dstapic 0x%x, dstirq 0x%x\n",
-				srcbus, srcbusirq, dstapic, dstirq);
-	hexdump(__func__, mpc, sizeof(*mpc));
-#endif
-}
-
-void smp_write_intsrc_pci_bridge(struct mp_config_table *mc,
-	unsigned char irqtype, unsigned short irqflag,
-	struct device *dev,
-	unsigned char dstapic, unsigned char *dstirq)
-{
-	struct device *child;
-
-	int i;
-	int srcbus;
-	int slot;
-
-	struct bus *link;
-	unsigned char dstirq_x[4];
-
-	for (link = dev->link_list; link; link = link->next) {
-
-		child = link->children;
-		srcbus = link->secondary;
-
-		while (child) {
-			if (child->path.type != DEVICE_PATH_PCI)
-				goto next;
-
-			slot = (child->path.pci.devfn >> 3);
-			/* round pins */
-			for (i = 0; i < 4; i++)
-				dstirq_x[i] = dstirq[(i + slot) % 4];
-
-			if ((child->class >> 16) != PCI_BASE_CLASS_BRIDGE) {
-				/* pci device */
-				printk(BIOS_DEBUG, "route irq: %s\n", dev_path(child));
-				for (i = 0; i < 4; i++)
-					smp_write_intsrc(mc, irqtype, irqflag, srcbus, (slot<<2)|i, dstapic, dstirq_x[i]);
-				goto next;
-			}
-
-			switch (child->class>>8) {
-			case PCI_CLASS_BRIDGE_PCI:
-			case PCI_CLASS_BRIDGE_PCMCIA:
-			case PCI_CLASS_BRIDGE_CARDBUS:
-				printk(BIOS_DEBUG, "route irq bridge: %s\n", dev_path(child));
-				smp_write_intsrc_pci_bridge(mc, irqtype, irqflag, child, dstapic, dstirq_x);
-			}
-
-		next:
-			child = child->sibling;
-		}
-
-	}
-}
-
-void smp_write_lintsrc(struct mp_config_table *mc,
-	unsigned char irqtype, unsigned short irqflag,
-	unsigned char srcbusid, unsigned char srcbusirq,
-	unsigned char destapic, unsigned char destapiclint)
-{
-	struct mpc_config_lintsrc *mpc;
-	mpc = smp_next_mpc_entry(mc);
-	memset(mpc, '\0', sizeof(*mpc));
-	mpc->mpc_type = MP_LINTSRC;
-	mpc->mpc_irqtype = irqtype;
-	mpc->mpc_irqflag = irqflag;
-	mpc->mpc_srcbusid = srcbusid;
-	mpc->mpc_srcbusirq = srcbusirq;
-	mpc->mpc_destapic = destapic;
-	mpc->mpc_destapiclint = destapiclint;
-	smp_add_mpc_entry(mc, sizeof(*mpc));
-}
-
-void smp_write_address_space(struct mp_config_table *mc,
-	unsigned char busid, unsigned char address_type,
-	unsigned int address_base_low, unsigned int address_base_high,
-	unsigned int address_length_low, unsigned int address_length_high)
-{
-	struct mp_exten_system_address_space *mpe;
-	mpe = smp_next_mpe_entry(mc);
-	memset(mpe, '\0', sizeof(*mpe));
-	mpe->mpe_type = MPE_SYSTEM_ADDRESS_SPACE;
-	mpe->mpe_length = sizeof(*mpe);
-	mpe->mpe_busid = busid;
-	mpe->mpe_address_type = address_type;
-	mpe->mpe_address_base_low  = address_base_low;
-	mpe->mpe_address_base_high = address_base_high;
-	mpe->mpe_address_length_low  = address_length_low;
-	mpe->mpe_address_length_high = address_length_high;
-	smp_add_mpe_entry(mc, (mpe_t)mpe);
-}
-
-
-void smp_write_bus_hierarchy(struct mp_config_table *mc,
-	unsigned char busid, unsigned char bus_info,
-	unsigned char parent_busid)
-{
-	struct mp_exten_bus_hierarchy *mpe;
-	mpe = smp_next_mpe_entry(mc);
-	memset(mpe, '\0', sizeof(*mpe));
-	mpe->mpe_type = MPE_BUS_HIERARCHY;
-	mpe->mpe_length = sizeof(*mpe);
-	mpe->mpe_busid = busid;
-	mpe->mpe_bus_info = bus_info;
-	mpe->mpe_parent_busid = parent_busid;
-	smp_add_mpe_entry(mc, (mpe_t)mpe);
-}
-
-void smp_write_compatibility_address_space(struct mp_config_table *mc,
-	unsigned char busid, unsigned char address_modifier,
-	unsigned int range_list)
-{
-	struct mp_exten_compatibility_address_space *mpe;
-	mpe = smp_next_mpe_entry(mc);
-	memset(mpe, '\0', sizeof(*mpe));
-	mpe->mpe_type = MPE_COMPATIBILITY_ADDRESS_SPACE;
-	mpe->mpe_length = sizeof(*mpe);
-	mpe->mpe_busid = busid;
-	mpe->mpe_address_modifier = address_modifier;
-	mpe->mpe_range_list = range_list;
-	smp_add_mpe_entry(mc, (mpe_t)mpe);
-}
-
-void mptable_add_isa_interrupts(struct mp_config_table *mc, unsigned long bus_isa, unsigned long apicid, int external_int2)
-{
-/*I/O Ints:                   Type         Trigger            Polarity         Bus ID   IRQ  APIC ID   PIN# */
-	smp_write_intsrc(mc, external_int2?mp_INT:mp_ExtINT,
-	                             MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0x0, apicid, 0x0);
-	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0x1, apicid, 0x1);
-	smp_write_intsrc(mc, external_int2?mp_ExtINT:mp_INT,
-	                             MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0x0, apicid, 0x2);
-	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0x3, apicid, 0x3);
-	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0x4, apicid, 0x4);
-	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0x6, apicid, 0x6);
-	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0x7, apicid, 0x7);
-	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0x8, apicid, 0x8);
-	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0x9, apicid, 0x9);
-	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0xa, apicid, 0xa);
-	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0xb, apicid, 0xb);
-	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0xc, apicid, 0xc);
-	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0xd, apicid, 0xd);
-	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0xe, apicid, 0xe);
-	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0xf, apicid, 0xf);
-}
-
-void mptable_write_buses(struct mp_config_table *mc, int *max_pci_bus, int *isa_bus) {
-	int dummy, i, highest;
-	char buses[256];
-	struct device *dev;
-
-	if (!max_pci_bus) max_pci_bus = &dummy;
-	if (!isa_bus) isa_bus = &dummy;
-
-	*max_pci_bus = 0;
-	highest = 0;
-	memset(buses, 0, sizeof(buses));
-
-	for (dev = all_devices; dev; dev = dev->next) {
-		struct bus *bus;
-		for (bus = dev->link_list; bus; bus = bus->next) {
-			if (bus->secondary > 255) {
-				printk(BIOS_ERR, "A bus claims to have a bus ID > 255?!? Aborting");
-				return;
-			}
-			buses[bus->secondary] = 1;
-			if (highest < bus->secondary) highest = bus->secondary;
-		}
-	}
-	for (i=0; i <= highest; i++) {
-		if (buses[i]) {
-			smp_write_bus(mc, i, "PCI   ");
-			*max_pci_bus = i;
-		}
-	}
-	*isa_bus = *max_pci_bus + 1;
-	smp_write_bus(mc, *isa_bus, "ISA   ");
-}
-