[commit] r5286 - ...

Submitter	Stefan Reinauer
Date	2010-03-25 22:46:07
Message ID	<4BABE7AF.5000702@coresystems.de>
Download	mbox \| patch
Permalink	/patch/1159/
State	Superseded, archived
Headers	show Return-path: <coreboot-bounces+patchwork=coreboot.org@coreboot.org> Envelope-to: patchwork@coreboot.org Message-ID: <4BABE7AF.5000702@coresystems.de> Date: Thu, 25 Mar 2010 23:46:07 +0100 From: Stefan Reinauer <stepan@coresystems.de> Organization: coresystems GmbH User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.8) Gecko/20100227 Thunderbird/3.0.3 MIME-Version: 1.0 To: coreboot@coreboot.org References: <E1NuYf8-0002St-2o@ra.coresystems.de><4BAA9630.3080204@coresystems.de> <65261.84.105.60.153.1269476882.squirrel@gate.crashing.org> <7065DBE050B94AC48A3C676F9C8C2166@chimp><50049.84.105.60.153.1269553631.squirrel@gate.crashing.org> <4BABDC91.5020502@coresystems.de> <60EE4909D6FA4A388D2FA1522EB400AF@chimp> In-Reply-To: <60EE4909D6FA4A388D2FA1522EB400AF@chimp> Content-Type: multipart/mixed; boundary="------------010809030407060702020207" Subject: Re: [coreboot] [commit] r5286 - ... Precedence: list Sender: coreboot-bounces+patchwork=coreboot.org@coreboot.org Errors-To: coreboot-bounces+patchwork=coreboot.org@coreboot.org

Comments

Stefan Reinauer - 2010-03-25 22:46:07

On 3/25/10 11:07 PM, Myles Watson wrote:
>> @@ -273,8 +273,10 @@
>>      acpi_create_facs(facs);
>>
>>      dsdt = (acpi_header_t *) current;
>> -    current += AmlCode.length;
>> -    memcpy((void *) dsdt, &AmlCode, AmlCode.length);
>> +    memcpy((void *) dsdt, AmlCode, sizeof(acpi_header_t));
>> +    int len = dsdt->length;
>> +    current += len;
>> +    memcpy((void *) dsdt, AmlCode, len);
>>     
> Why not:
>   
>> +    current += dstd->length;
>> +    memcpy((void *) dsdt, AmlCode, dsdt->length);
>>     
> I don't think the extra variable adds anything.
>
> I'll ack that.
>   
This is not all boards yet, but I send them out so I can go to bed :-)
First round of ACPI fixes..

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>

Stefan Reinauer - 2010-03-27 09:02:31

On 3/25/10 11:46 PM, Stefan Reinauer wrote:
> On 3/25/10 11:07 PM, Myles Watson wrote:
>   
>>> @@ -273,8 +273,10 @@
>>>      acpi_create_facs(facs);
>>>
>>>      dsdt = (acpi_header_t *) current;
>>> -    current += AmlCode.length;
>>> -    memcpy((void *) dsdt, &AmlCode, AmlCode.length);
>>> +    memcpy((void *) dsdt, AmlCode, sizeof(acpi_header_t));
>>> +    int len = dsdt->length;
>>> +    current += len;
>>> +    memcpy((void *) dsdt, AmlCode, len);
>>>     
>>>       
>> Why not:
>>   
>>     
>>> +    current += dstd->length;
>>> +    memcpy((void *) dsdt, AmlCode, dsdt->length);
>>>     
>>>       
>> I don't think the extra variable adds anything.
>>
>> I'll ack that.
>>   
>>     
> This is not all boards yet, but I send them out so I can go to bed :-)
>   

ping

Myles Watson - 2010-03-30 16:00:23

>
>  I'll ack that.
>
>
>
>  This is not all boards yet, but I send them out so I can go to bed :-)
>
>
>
> ping
>

I think I missed your patch.  I sent one out for review, too.

Thanks,
Myles

Patch

Index: src/mainboard/technexion/tim5690/acpi_tables.c
===================================================================
--- src/mainboard/technexion/tim5690/acpi_tables.c	(revision 5299)
+++ src/mainboard/technexion/tim5690/acpi_tables.c	(working copy)
@@ -57,13 +57,13 @@ 
 }
 #endif
 
-extern const acpi_header_t AmlCode;
+extern unsigned char AmlCode[];
 
 #if CONFIG_ACPI_SSDTX_NUM >= 1
-extern const acpi_header_t AmlCode_ssdt2;
-extern const acpi_header_t AmlCode_ssdt3;
-extern const acpi_header_t AmlCode_ssdt4;
-extern const acpi_header_t AmlCode_ssdt5;
+extern unsigned char AmlCode_ssdt2[];
+extern unsigned char AmlCode_ssdt3[];
+extern unsigned char AmlCode_ssdt4[];
+extern unsigned char AmlCode_ssdt5[];
 #endif
 
 #define IO_APIC_ADDR	0xfec00000UL
@@ -219,25 +219,25 @@ 
 		ssdtx = (acpi_header_t *) current;
 		switch (sysconf.hcid[i]) {
 		case 1:	/* 8132 */
-			p = &AmlCode_ssdt2;
+			p = AmlCode_ssdt2;
 			break;
 		case 2:	/* 8151 */
-			p = &AmlCode_ssdt3;
+			p = AmlCode_ssdt3;
 			break;
 		case 3:	/* 8131 */
-			p = &AmlCode_ssdt4;
+			p = AmlCode_ssdt4;
 			break;
 		default:
 			/* HTX no io apic */
-			p = &AmlCode_ssdt5;
+			p = AmlCode_ssdt5;
 			break;
 		}
-		current += ((acpi_header_t *) p)->length;
-		memcpy((void *)ssdtx, (void *)p, ((acpi_header_t *) p)->length);
+		memcpy((void *)ssdtx, (void *)p, sizeof(acpi_header_t));
+		current += ssdtx->length;
+		memcpy((void *)ssdtx, (void *)p, ssdtx->length);
 		update_ssdtx((void *)ssdtx, i);
 		ssdtx->checksum = 0;
-		ssdtx->checksum =
-		    acpi_checksum((u8 *)ssdtx, ssdtx->length);
+		ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length);
 		acpi_add_table(rsdp, ssdtx);
 	}
 #endif
@@ -251,9 +251,11 @@ 
 	/* DSDT */
 	printk(BIOS_DEBUG, "ACPI:    * DSDT\n");
 	dsdt = (acpi_header_t *) current;
-	memcpy((void *)dsdt, &AmlCode, AmlCode.length);
 	current += dsdt->length;
+	memcpy((void *)dsdt, (void *)AmlCode, sizeof(acpi_header_t))
 	printk(BIOS_DEBUG, "ACPI:    * DSDT @ %p Length %x\n", dsdt, dsdt->length);
+	memcpy((void *)dsdt, (void *)AmlCode, dsdt->length)
+
 	/* FADT */
 	printk(BIOS_DEBUG, "ACPI:    * FADT\n");
 	fadt = (acpi_fadt_t *) current;
Index: src/mainboard/intel/d945gclf/acpi_tables.c
===================================================================
--- src/mainboard/intel/d945gclf/acpi_tables.c	(revision 5299)
+++ src/mainboard/intel/d945gclf/acpi_tables.c	(working copy)
@@ -31,7 +31,7 @@ 
 
 #define OLD_ACPI 0
 
-extern const acpi_header_t AmlCode;
+extern unsigned char AmlCode[];
 #if CONFIG_HAVE_ACPI_SLIC
 unsigned long acpi_create_slic(unsigned long current);
 #endif
@@ -273,8 +273,9 @@ 
 	acpi_create_facs(facs);
 
 	dsdt = (acpi_header_t *) current;
-	current += AmlCode.length;
-	memcpy((void *) dsdt, &AmlCode, AmlCode.length);
+	memcpy((void *) dsdt, AmlCode, sizeof(acpi_header_t));
+	current += dsdt->length;
+	memcpy((void *) dsdt, AmlCode, dsdt->length);
 
 #if OLD_ACPI
 	for (i=0; i < dsdt->length; i++) {
Index: src/mainboard/intel/eagleheights/acpi_tables.c
===================================================================
--- src/mainboard/intel/eagleheights/acpi_tables.c	(revision 5299)
+++ src/mainboard/intel/eagleheights/acpi_tables.c	(working copy)
@@ -28,7 +28,7 @@ 
 #include <device/pci_ids.h>
 #include "ioapic.h"
 
-extern const acpi_header_t AmlCode;
+extern unsigned char AmlCode[];
 
 unsigned long acpi_fill_mcfg(unsigned long current)
 {
@@ -206,12 +206,12 @@ 
 	acpi_create_facs(facs);
 
 	dsdt = (acpi_header_t *) current;
-	current += AmlCode.length;
-	ALIGN_CURRENT;
-	memcpy((void *) dsdt, &AmlCode, AmlCode.length);
-
+	memcpy((void *) dsdt, (void *) AmlCode, sizeof(acpi_header_t));
 	printk(BIOS_DEBUG, "ACPI:     * DSDT @ %p Length %x\n", dsdt,
 		     dsdt->length);
+	memcpy((void *) dsdt, (void *) AmlCode, dsdt->length);
+	current += dsdt->length;
+	ALIGN_CURRENT;
 
 	printk(BIOS_DEBUG, "ACPI:     * FADT\n");
 	fadt = (acpi_fadt_t *) current;
Index: src/mainboard/asus/a8v-e_se/acpi_tables.c
===================================================================
--- src/mainboard/asus/a8v-e_se/acpi_tables.c	(revision 5299)
+++ src/mainboard/asus/a8v-e_se/acpi_tables.c	(working copy)
@@ -31,7 +31,7 @@ 
 #include <../../../southbridge/via/vt8237r/vt8237r.h>
 #include <../../../southbridge/via/k8t890/k8t890.h>
 
-extern const acpi_header_t AmlCode;
+extern unsigned char AmlCode[];
 
 unsigned long acpi_fill_mcfg(unsigned long current)
 {
@@ -118,8 +118,9 @@ 
 	acpi_create_facs(facs);
 
 	dsdt = (acpi_header_t *) current;
-	current += AmlCode.length;
-	memcpy((void *) dsdt, &AmlCode, AmlCode.length);
+	memcpy((void *) dsdt, (void *) AmlCode, sizeof(acpi_header_t));
+	current += dsdt->length;
+	memcpy((void *) dsdt, (void *) AmlCode, dsdt->length);
 	dsdt->checksum = 0;	/* Don't trust iasl to get this right. */
 	dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
 	printk(BIOS_DEBUG, "ACPI:     * DSDT @ %p Length %x\n", dsdt,
Index: src/mainboard/asus/m2v-mx_se/acpi_tables.c
===================================================================
--- src/mainboard/asus/m2v-mx_se/acpi_tables.c	(revision 5299)
+++ src/mainboard/asus/m2v-mx_se/acpi_tables.c	(working copy)
@@ -33,7 +33,7 @@ 
 #include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
 #include <cpu/amd/model_fxx_powernow.h>
 
-extern const acpi_header_t AmlCode;
+extern unsigned char AmlCode[];
 
 unsigned long acpi_fill_mcfg(unsigned long current)
 {
@@ -133,8 +133,9 @@ 
 	acpi_create_facs(facs);
 
 	dsdt = (acpi_header_t *) current;
-	current += AmlCode.length;
-	memcpy((void *) dsdt, &AmlCode, AmlCode.length);
+	memcpy((void *) dsdt, (void *) AmlCode, sizeof(acpi_header_t));
+	current += dsdt->length;
+	memcpy((void *) dsdt, (void *) AmlCode, dsdt->length);
 	dsdt->checksum = 0;	/* Don't trust iasl to get this right. */
 	dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
 	printk(BIOS_DEBUG, "ACPI:     * DSDT @ %p Length %x\n", dsdt,
Index: src/northbridge/amd/amdfam10/amdfam10_acpi.c
===================================================================
--- src/northbridge/amd/amdfam10/amdfam10_acpi.c	(revision 5299)
+++ src/northbridge/amd/amdfam10/amdfam10_acpi.c	(working copy)
@@ -305,11 +305,11 @@ 
 	}
 }
 
-extern const acpi_header_t AmlCode_sspr5;
-extern const acpi_header_t AmlCode_sspr4;
-extern const acpi_header_t AmlCode_sspr3;
-extern const acpi_header_t AmlCode_sspr2;
-extern const acpi_header_t AmlCode_sspr1;
+extern unsigned char AmlCode_sspr5[];
+extern unsigned char AmlCode_sspr4[];
+extern unsigned char AmlCode_sspr3[];
+extern unsigned char AmlCode_sspr2[];
+extern unsigned char AmlCode_sspr1[];
 
 /* fixme: find one good way for different p_state_num */
 unsigned long acpi_add_ssdt_pstates(acpi_rsdp_t *rsdp, unsigned long current)
@@ -321,13 +321,13 @@ 
 
 	if(!sysconf.p_state_num) return current;
 
-	acpi_header_t *AmlCode_sspr;
+	unsigned char *AmlCode_sspr;
 	switch(sysconf.p_state_num) {
-		case 1: AmlCode_sspr = &AmlCode_sspr1; break;
-		case 2: AmlCode_sspr = &AmlCode_sspr2; break;
-		case 3: AmlCode_sspr = &AmlCode_sspr3; break;
-		case 4: AmlCode_sspr = &AmlCode_sspr4; break;
-		default: AmlCode_sspr = &AmlCode_sspr5; break;
+		case 1: AmlCode_sspr = AmlCode_sspr1; break;
+		case 2: AmlCode_sspr = AmlCode_sspr2; break;
+		case 3: AmlCode_sspr = AmlCode_sspr3; break;
+		case 4: AmlCode_sspr = AmlCode_sspr4; break;
+		default: AmlCode_sspr = AmlCode_sspr5; break;
 	}
 
 	for(cpu = all_devices; cpu; cpu = cpu->next) {
@@ -342,8 +342,9 @@ 
 
 		current	  = ( current + 0x0f) & -0x10;
 		ssdt = (acpi_header_t *)current;
-		current += AmlCode_sspr->length;
-		memcpy((void *)ssdt, AmlCode_sspr, AmlCode_sspr->length);
+		memcpy((void *)ssdt, (void *)AmlCode_sspr, sizeof(acpi_header_t));
+		current += ssdt->length;
+		memcpy((void *)ssdt, (void *)AmlCode_sspr, ssdt->length);
 		update_sspr((void*)ssdt,cpu->path.apic.node_id, cpu_index);
 		/* recalculate checksum */
 		ssdt->checksum = 0;

Patchwork [commit] r5286 - ...

Comments

Patch