X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmainboard%2Famd%2Fmahogany_fam10%2Fmptable.c;h=b1a658be4135018a7b873d042364c60107288a84;hb=cda56b00f656140a4719b5282c9f16f087e2a4b1;hp=a0b47c5aa8b9e4996c6675cece34abb7ff973cdf;hpb=55dc223ccd0bb2a34ec46f36b36b658ecd677c2f;p=coreboot.git

diff --git a/src/mainboard/amd/mahogany_fam10/mptable.c b/src/mainboard/amd/mahogany_fam10/mptable.c
index a0b47c5aa..b1a658be4 100644
--- a/src/mainboard/amd/mahogany_fam10/mptable.c
+++ b/src/mainboard/amd/mahogany_fam10/mptable.c
@@ -25,35 +25,28 @@
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
-extern u8 bus_isa;
 extern u8 bus_rs780[11];
 extern u8 bus_sb700[2];
 
 extern u32 apicid_sb700;
 
-extern u32 bus_type[256];
 extern u32 sbdn_rs780;
 extern u32 sbdn_sb700;
 
 static void *smp_write_config_table(void *v)
 {
 	struct mp_config_table *mc;
-	int j;
+	int bus_isa;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "MAHOGANY    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 
 	get_bus_conf();
 
-	/* Bus:         Bus ID  Type */
-	/* define bus and isa numbers */
-	for (j = 0; j < bus_isa; j++) {
-		smp_write_bus(mc, j, (char *)"PCI   ");
-	}
-	smp_write_bus(mc, bus_isa, (char *)"ISA   ");
+	mptable_write_buses(mc, NULL, &bus_isa);
 
 	/* I/O APICs:   APIC ID Version State   Address */
 	{
@@ -100,7 +93,7 @@ static void *smp_write_config_table(void *v)
 
 	/* I/O Ints:    Type    Polarity    Trigger     Bus ID   IRQ    APIC ID PIN# */
 #define IO_LOCAL_INT(type, intr, apicid, pin) \
-	smp_write_intsrc(mc, (type), MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH, bus_isa, (intr), (apicid), (pin));
+	smp_write_lintsrc(mc, (type), MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH, bus_isa, (intr), (apicid), (pin));
 
 	mptable_add_isa_interrupts(mc, bus_isa, apicid_sb700, 0);
 
@@ -114,8 +107,30 @@ static void *smp_write_config_table(void *v)
 #define PCI_INT(bus, dev, fn, pin)
 #endif
 
+	/* changes added to match acpi tables */
+	PCI_INT(0x0, 0x02, 0x0, 0x12);
+	PCI_INT(0x0, 0x03, 0x0, 0x13);
+	PCI_INT(0x0, 0x04, 0x0, 0x10);
+	PCI_INT(0x0, 0x09, 0x0, 0x11);
+	PCI_INT(0x0, 0x0A, 0x0, 0x12);
+	PCI_INT(0x0, 0x12, 0x2, 0x12);
+	PCI_INT(0x0, 0x12, 0x3, 0x13);
+	PCI_INT(0x0, 0x13, 0x2, 0x10);
+	PCI_INT(0x0, 0x13, 0x2, 0x11);
+	PCI_INT(0x0, 0x14, 0x1, 0x11);
+	PCI_INT(0x0, 0x14, 0x3, 0x13);
+	PCI_INT(0x1, 0x05, 0x2, 0x10);
+	PCI_INT(0x1, 0x05, 0x3, 0x11);
+	PCI_INT(0x2, 0x00, 0x0, 0x12);
+	PCI_INT(0x2, 0x00, 0x1, 0x13);
+	PCI_INT(0x2, 0x00, 0x2, 0x10);
+	PCI_INT(0x2, 0x00, 0x3, 0x11);
+
+	/*  RS780 PCI to PCI bridge (PCIE port 4) */
+	PCI_INT(0x0, 0x09, 0x0, 0x11);
+
 	/* usb */
-	PCI_INT(0x0, 0x12, 0x0, 0x10); /* USB */
+	PCI_INT(0x0, 0x12, 0x0, 0x10);	/* USB */
 	PCI_INT(0x0, 0x12, 0x1, 0x11);
 	PCI_INT(0x0, 0x13, 0x0, 0x12);
 	PCI_INT(0x0, 0x13, 0x1, 0x13);
@@ -125,22 +140,25 @@ static void *smp_write_config_table(void *v)
 	PCI_INT(0x0, 0x11, 0x0, 0x16);
 
 	/* HD Audio: b0:d20:f1:reg63 should be 0. */
-	/* PCI_INT(0x0, 0x14, 0x2, 0x12); */
+	PCI_INT(0x0, 0x14, 0x2, 0x12);
 
 	/* on board NIC & Slot PCIE.  */
 	/* PCI_INT(bus_rs780[0x1], 0x5, 0x0, 0x12); */
-/* 	PCI_INT(bus_rs780[0x1], 0x5, 0x1, 0x13); */
-	PCI_INT(bus_rs780[0x2], 0x0, 0x0, 0x12); /* Dev 2, external GFX */
+	/* PCI_INT(bus_rs780[0x1], 0x5, 0x1, 0x13); */
+	PCI_INT(0x1, 0x5, 0x0, 0x12);	/* VGA */
+	PCI_INT(0x1, 0x5, 0x1, 0x13);	/* Audio */
+	/* PCI_INT(bus_rs780[0x2], 0x0, 0x0, 0x12); *//* Dev 2, external GFX */
 	/* PCI_INT(bus_rs780[0x3], 0x0, 0x0, 0x13); */
-	PCI_INT(bus_rs780[0x4], 0x0, 0x0, 0x10);
+	/* PCI_INT(bus_rs780[0x4], 0x0, 0x0, 0x10); */
 	/* configuration B doesnt need dev 5,6,7 */
 	/*
 	 * PCI_INT(bus_rs780[0x5], 0x0, 0x0, 0x11);
 	 * PCI_INT(bus_rs780[0x6], 0x0, 0x0, 0x12);
 	 * PCI_INT(bus_rs780[0x7], 0x0, 0x0, 0x13);
 	 */
-	PCI_INT(bus_rs780[0x9], 0x0, 0x0, 0x11);
-	PCI_INT(bus_rs780[0xA], 0x0, 0x0, 0x12); /* NIC */
+	/* PCI_INT(bus_rs780[0x9], 0x0, 0x0, 0x11); */
+	PCI_INT(0x3, 0x0, 0x0, 0x11);	/* NIC */
+	/* PCI_INT(bus_rs780[0xA], 0x0, 0x0, 0x12);  NIC */
 
 	/* PCI slots */
 	/* PCI_SLOT 0. */
@@ -167,17 +185,12 @@ static void *smp_write_config_table(void *v)
 	/* There is no extension information... */
 
 	/* Compute the checksums */
-	mc->mpe_checksum =
-	    smp_compute_checksum(smp_next_mpc_entry(mc), mc->mpe_length);
-	mc->mpc_checksum = smp_compute_checksum(mc, mc->mpc_length);
-	printk(BIOS_DEBUG, "Wrote the mp table end at: %p - %p\n",
-		     mc, smp_next_mpe_entry(mc));
-	return smp_next_mpe_entry(mc);
+	return mptable_finalize(mc);
 }
 
 unsigned long write_smp_table(unsigned long addr)
 {
 	void *v;
-	v = smp_write_floating_table(addr);
+	v = smp_write_floating_table(addr, 0);
 	return (unsigned long)smp_write_config_table(v);
 }