latest agami/aruma changes. Compiles but won't boot yet

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

1 files changed, 59 insertions, 51 deletions

diff --git a/src/mainboard/agami/aruma/fadt.c b/src/mainboard/agami/aruma/fadt.c
index 934195690c..9df0197ccf 100644
--- a/src/mainboard/agami/aruma/fadt.c
+++ b/src/mainboard/agami/aruma/fadt.c
@@ -4,64 +4,71 @@
  */
 
 #include <string.h>
+#include <console/console.h>
 #include <arch/acpi.h>
 
-void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs,void *dsdt){
-	acpi_header_t *header=&(fadt->header);
+extern unsigned pm_base;	/* pm_base should be set in sb acpi */
+
+void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
+{
+
+	acpi_header_t *header = &(fadt->header);
+
+	printk_debug("pm_base: 0x%04x\n", pm_base);
 
 	/* Prepare the header */
-	memset((void *)fadt,0,sizeof(acpi_fadt_t));
-	memcpy(header->signature,"FACP",4);
+	memset((void *) fadt, 0, sizeof(acpi_fadt_t));
+	memcpy(header->signature, "FACP", 4);
 	header->length = 244;
 	header->revision = 1;
-	memcpy(header->oem_id,OEM_ID,6);
-	memcpy(header->oem_table_id,"LXBACPI ",8);
-	memcpy(header->asl_compiler_id,ASLC,4);
-	header->asl_compiler_revision=0;
-
-	fadt->firmware_ctrl=(unsigned long)facs;
-	fadt->dsdt= dsdt;
-	fadt->res1=0x0;
+	memcpy(header->oem_id, OEM_ID, 6);
+	memcpy(header->oem_table_id, "LXBACPI ", 8);
+	memcpy(header->asl_compiler_id, ASLC, 4);
+	header->asl_compiler_revision = 0;
+
+	fadt->firmware_ctrl = (u32) facs;
+	fadt->dsdt = (u32) dsdt;
+	fadt->res1 = 0x0;
 	// 3=Workstation,4=Enterprise Server, 7=Performance Server
-	fadt->preferred_pm_profile=0x03;
-	fadt->sci_int=9;
+	fadt->preferred_pm_profile = 0x03;
+	fadt->sci_int = 9;
 	// disable system management mode by setting to 0: 
-	fadt->smi_cmd = 0x502f;
-	fadt->acpi_enable = 0xe1;
-	fadt->acpi_disable = 0x1e;
+	fadt->smi_cmd = 0;	//pm_base+0x2f;
+	fadt->acpi_enable = 0xf0;
+	fadt->acpi_disable = 0xf1;
 	fadt->s4bios_req = 0x0;
 	fadt->pstate_cnt = 0xe2;
 
-	fadt->pm1a_evt_blk = 0x5000;
+	fadt->pm1a_evt_blk = pm_base;
 	fadt->pm1b_evt_blk = 0x0000;
-	fadt->pm1a_cnt_blk = 0x5004;
+	fadt->pm1a_cnt_blk = pm_base + 0x04;
 	fadt->pm1b_cnt_blk = 0x0000;
-	fadt->pm2_cnt_blk  = 0x0000;
-	fadt->pm_tmr_blk   = 0x5008;
-	fadt->gpe0_blk     = 0x5020;
-	fadt->gpe1_blk     = 0x50b0;
-
-	fadt->pm1_evt_len  =  4;
-	fadt->pm1_cnt_len  =  2;
-	fadt->pm2_cnt_len  =  0;
-	fadt->pm_tmr_len   =  4;
-	fadt->gpe0_blk_len =  4;
-	fadt->gpe1_blk_len =  8;
-	fadt->gpe1_base    = 16;
-	
-	fadt->cst_cnt    = 0xe3;
-	fadt->p_lvl2_lat =  101;
+	fadt->pm2_cnt_blk = 0x0000;
+	fadt->pm_tmr_blk = pm_base + 0x08;
+	fadt->gpe0_blk = pm_base + 0x20;
+	fadt->gpe1_blk = pm_base + 0xb0;
+
+	fadt->pm1_evt_len = 4;
+	fadt->pm1_cnt_len = 2;
+	fadt->pm2_cnt_len = 0;
+	fadt->pm_tmr_len = 4;
+	fadt->gpe0_blk_len = 4;
+	fadt->gpe1_blk_len = 8;
+	fadt->gpe1_base = 16;
+
+	fadt->cst_cnt = 0xe3;
+	fadt->p_lvl2_lat = 101;
 	fadt->p_lvl3_lat = 1001;
-	fadt->flush_size = 1024;
-	fadt->flush_stride = 16;
+	fadt->flush_size = 0;
+	fadt->flush_stride = 0;
 	fadt->duty_offset = 1;
 	fadt->duty_width = 3;
-	fadt->day_alrm = 0; // 0x7d these have to be
-	fadt->mon_alrm = 0; // 0x7e added to cmos.layout
-	fadt->century =  0; // 0x7f to make rtc alrm work
-	fadt->iapc_boot_arch = 0x3; // See table 5-11
-	fadt->flags = 0xa5;
-	
+	fadt->day_alrm = 0;	// 0x7d these have to be
+	fadt->mon_alrm = 0;	// 0x7e added to cmos.layout
+	fadt->century = 0;	// 0x7f to make rtc alrm work
+	fadt->iapc_boot_arch = 0x3;	// See table 5-11
+	fadt->flags = 0x25;
+
 	fadt->res2 = 0;
 
 	fadt->reset_reg.space_id = 1;
@@ -71,17 +78,17 @@ void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs,void *dsdt){
 	fadt->reset_reg.addrl = 0xcf9;
 	fadt->reset_reg.addrh = 0x0;
 
-	fadt->reset_value = 0x06;
-	fadt->x_firmware_ctl_l = facs;
+	fadt->reset_value = 6;
+	fadt->x_firmware_ctl_l = (u32) facs;
 	fadt->x_firmware_ctl_h = 0;
-	fadt->x_dsdt_l = dsdt;
+	fadt->x_dsdt_l = (u32) dsdt;
 	fadt->x_dsdt_h = 0;
 
 	fadt->x_pm1a_evt_blk.space_id = 1;
 	fadt->x_pm1a_evt_blk.bit_width = 32;
 	fadt->x_pm1a_evt_blk.bit_offset = 0;
 	fadt->x_pm1a_evt_blk.resv = 0;
-	fadt->x_pm1a_evt_blk.addrl = 0x5000;
+	fadt->x_pm1a_evt_blk.addrl = pm_base;
 	fadt->x_pm1a_evt_blk.addrh = 0x0;
 
 	fadt->x_pm1b_evt_blk.space_id = 1;
@@ -96,7 +103,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs,void *dsdt){
 	fadt->x_pm1a_cnt_blk.bit_width = 16;
 	fadt->x_pm1a_cnt_blk.bit_offset = 0;
 	fadt->x_pm1a_cnt_blk.resv = 0;
-	fadt->x_pm1a_cnt_blk.addrl = 0x5004;
+	fadt->x_pm1a_cnt_blk.addrl = pm_base + 4;
 	fadt->x_pm1a_cnt_blk.addrh = 0x0;
 
 	fadt->x_pm1b_cnt_blk.space_id = 1;
@@ -119,7 +126,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs,void *dsdt){
 	fadt->x_pm_tmr_blk.bit_width = 32;
 	fadt->x_pm_tmr_blk.bit_offset = 0;
 	fadt->x_pm_tmr_blk.resv = 0;
-	fadt->x_pm_tmr_blk.addrl = 0x5008;
+	fadt->x_pm_tmr_blk.addrl = pm_base + 0x08;
 	fadt->x_pm_tmr_blk.addrh = 0x0;
 
 
@@ -127,7 +134,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs,void *dsdt){
 	fadt->x_gpe0_blk.bit_width = 32;
 	fadt->x_gpe0_blk.bit_offset = 0;
 	fadt->x_gpe0_blk.resv = 0;
-	fadt->x_gpe0_blk.addrl = 0x5020;
+	fadt->x_gpe0_blk.addrl = pm_base + 0x20;
 	fadt->x_gpe0_blk.addrh = 0x0;
 
 
@@ -135,9 +142,10 @@ void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs,void *dsdt){
 	fadt->x_gpe1_blk.bit_width = 64;
 	fadt->x_gpe1_blk.bit_offset = 16;
 	fadt->x_gpe1_blk.resv = 0;
-	fadt->x_gpe1_blk.addrl = 0x50b0;
+	fadt->x_gpe1_blk.addrl = pm_base + 0xb0;
 	fadt->x_gpe1_blk.addrh = 0x0;
 
-	header->checksum = acpi_checksum((void *)fadt, sizeof(acpi_fadt_t));
+	header->checksum =
+	    acpi_checksum((void *) fadt, sizeof(acpi_fadt_t));
 
 }