From patchwork Tue Jan 12 09:10:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [PATCH] Seabios: Fix PkgLength calculation for the SSDT. Date: Mon, 11 Jan 2010 23:10:41 -0000 From: Magnus Christensson X-Patchwork-Id: 42698 Message-Id: <4B4C3C91.8090606@virtutech.com> To: Kevin O'Connor Cc: seabios@seabios.org, qemu-devel@nongnu.org, Gleb Natapov On 12/24/2009 01:29 AM, Kevin O'Connor wrote: > On Mon, Dec 14, 2009 at 10:25:14AM +0100, Magnus Christensson wrote: > >>>> --- a/src/acpi.c >>>> +++ b/src/acpi.c >>>> @@ -464,10 +464,12 @@ build_ssdt(void) >>>> // build processor scope header >>>> *(ssdt_ptr++) = 0x10; // ScopeOp >>>> if (cpu_length<= 0x3e) { >>>> + /* Handle 1-4 CPUs with one byte encoding */ >>>> *(ssdt_ptr++) = cpu_length + 1; >>>> } else { >>>> - *(ssdt_ptr++) = 0x7F; >>>> - *(ssdt_ptr++) = (cpu_length + 2)>> 6; >>>> + /* Handle 5-314 CPUs with two byte encoding */ >>>> + *(ssdt_ptr++) = 0x40 | ((cpu_length + 1)& 0xf); >>>> + *(ssdt_ptr++) = (cpu_length + 1)>> 4; >>>> >>>> >>> Should be cpu_length + 2 as far as I can tell. The current code is >>> definitely broken. >>> >>> >> Right. That should be cpu_length +2 in the else-part. >> > Can you resend the patch with the change? > Attached (sorry for the delay). M. >From 183a34ee3a218bf64cb440e456628d361af98bfc Mon Sep 17 00:00:00 2001 From: Magnus Christensson Date: Wed, 25 Nov 2009 16:26:58 +0100 Subject: [PATCH] Fix PkgLength calculation for the SSDT. Signed-off-by: Magnus Christensson --- src/acpi.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index f613b03..244536a 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -429,10 +429,12 @@ build_ssdt(void) // build processor scope header *(ssdt_ptr++) = 0x10; // ScopeOp if (cpu_length <= 0x3e) { + /* Handle 1-4 CPUs with one byte encoding */ *(ssdt_ptr++) = cpu_length + 1; } else { - *(ssdt_ptr++) = 0x7F; - *(ssdt_ptr++) = (cpu_length + 2) >> 6; + /* Handle 5-314 CPUs with two byte encoding */ + *(ssdt_ptr++) = 0x40 | ((cpu_length + 2) & 0xf); + *(ssdt_ptr++) = (cpu_length + 2) >> 4; } *(ssdt_ptr++) = '_'; // Name *(ssdt_ptr++) = 'P'; -- 1.6.2.5