Menu
▾
▴
bochs-developers
|
From: Michael H. <pu...@ha...> - 2007-10-31 00:08:39
|
Hello
The patch below fixes the PCI IRQ routing as defined by the ACPI DSDT.
A local variable had the wrong name. Please apply this patch to the CVS
repository.
bios/acpi-dsdt.hex needs to rebuilt using the iasl compiler, too. In
case you don't know how to call it, just look in bios/Makefile.
Thanks,
Michael
---
Index: bios/acpi-dsdt.dsl
===================================================================
RCS file: /cvsroot/bochs/bochs/bios/acpi-dsdt.dsl,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 acpi-dsdt.dsl
--- bios/acpi-dsdt.dsl 28 Sep 2006 18:56:20 -0000 1.1
+++ bios/acpi-dsdt.dsl 30 Oct 2007 23:52:22 -0000
@@ -369,7 +369,7 @@ DefinitionBlock (
Method (_STA, 0, NotSerialized)
{
Store (0x0B, Local0)
- If (And (0x80, PRQ0, Local1))
+ If (And (0x80, PRQ0, Local0))
{
Store (0x09, Local0)
}
@@ -416,7 +416,7 @@ DefinitionBlock (
Method (_STA, 0, NotSerialized)
{
Store (0x0B, Local0)
- If (And (0x80, PRQ1, Local1))
+ If (And (0x80, PRQ1, Local0))
{
Store (0x09, Local0)
}
@@ -463,7 +463,7 @@ DefinitionBlock (
Method (_STA, 0, NotSerialized)
{
Store (0x0B, Local0)
- If (And (0x80, PRQ2, Local1))
+ If (And (0x80, PRQ2, Local0))
{
Store (0x09, Local0)
}
@@ -510,7 +510,7 @@ DefinitionBlock (
Method (_STA, 0, NotSerialized)
{
Store (0x0B, Local0)
- If (And (0x80, PRQ3, Local1))
+ If (And (0x80, PRQ3, Local0))
{
Store (0x09, Local0)
}
|
|
From: Stanislav <st...@fi...> - 2007-10-31 13:09:34
|
Could you compile .hex file vs current BIOS and add it to the patch as well?
Also I added your patch to #SF tracker, somebody should review it, hopefully
Volker could do it soon.
Thanks,
Stanislav
-----Original Message-----
From: boc...@li...
[mailto:boc...@li...] On Behalf Of Michael
Hanselmann
Sent: Wednesday, October 31, 2007 2:09 AM
To: boc...@li...
Subject: [Bochs-developers] [PATCH] Fix PCI IRQ routing in ACPI DSDT
Hello
The patch below fixes the PCI IRQ routing as defined by the ACPI DSDT.
A local variable had the wrong name. Please apply this patch to the CVS
repository.
bios/acpi-dsdt.hex needs to rebuilt using the iasl compiler, too. In
case you don't know how to call it, just look in bios/Makefile.
Thanks,
Michael
---
Index: bios/acpi-dsdt.dsl
===================================================================
RCS file: /cvsroot/bochs/bochs/bios/acpi-dsdt.dsl,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 acpi-dsdt.dsl
--- bios/acpi-dsdt.dsl 28 Sep 2006 18:56:20 -0000 1.1
+++ bios/acpi-dsdt.dsl 30 Oct 2007 23:52:22 -0000
@@ -369,7 +369,7 @@ DefinitionBlock (
Method (_STA, 0, NotSerialized)
{
Store (0x0B, Local0)
- If (And (0x80, PRQ0, Local1))
+ If (And (0x80, PRQ0, Local0))
{
Store (0x09, Local0)
}
@@ -416,7 +416,7 @@ DefinitionBlock (
Method (_STA, 0, NotSerialized)
{
Store (0x0B, Local0)
- If (And (0x80, PRQ1, Local1))
+ If (And (0x80, PRQ1, Local0))
{
Store (0x09, Local0)
}
@@ -463,7 +463,7 @@ DefinitionBlock (
Method (_STA, 0, NotSerialized)
{
Store (0x0B, Local0)
- If (And (0x80, PRQ2, Local1))
+ If (And (0x80, PRQ2, Local0))
{
Store (0x09, Local0)
}
@@ -510,7 +510,7 @@ DefinitionBlock (
Method (_STA, 0, NotSerialized)
{
Store (0x0B, Local0)
- If (And (0x80, PRQ3, Local1))
+ If (And (0x80, PRQ3, Local0))
{
Store (0x09, Local0)
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
bochs-developers mailing list
boc...@li...
https://lists.sourceforge.net/lists/listinfo/bochs-developers
|
|
From: Michael H. <pu...@ha...> - 2007-10-31 18:10:07
|
Hello Stanislav
On Wed, Oct 31, 2007 at 03:09:27PM +0200, Stanislav wrote:
> Could you compile .hex file vs current BIOS and add it to the patch as well?
Sure, see the patch below.
> Also I added your patch to #SF tracker, somebody should review it, hopefully
> Volker could do it soon.
I don't have a Sourceforge account. If you really want to, please upload
this second patch, too. However, the patches on there are whitespace
mangled and thus useless.
(CCing Igor who wanted the patch, too. Igor: this hex file is without
the modifications needed for qemu.)
Greets,
Michael
---
Index: bios/acpi-dsdt.dsl
===================================================================
RCS file: /cvsroot/bochs/bochs/bios/acpi-dsdt.dsl,v
retrieving revision 1.1
diff -u -r1.1 acpi-dsdt.dsl
--- bios/acpi-dsdt.dsl 28 Sep 2006 18:56:20 -0000 1.1
+++ bios/acpi-dsdt.dsl 31 Oct 2007 18:05:38 -0000
@@ -369,7 +369,7 @@
Method (_STA, 0, NotSerialized)
{
Store (0x0B, Local0)
- If (And (0x80, PRQ0, Local1))
+ If (And (0x80, PRQ0, Local0))
{
Store (0x09, Local0)
}
@@ -416,7 +416,7 @@
Method (_STA, 0, NotSerialized)
{
Store (0x0B, Local0)
- If (And (0x80, PRQ1, Local1))
+ If (And (0x80, PRQ1, Local0))
{
Store (0x09, Local0)
}
@@ -463,7 +463,7 @@
Method (_STA, 0, NotSerialized)
{
Store (0x0B, Local0)
- If (And (0x80, PRQ2, Local1))
+ If (And (0x80, PRQ2, Local0))
{
Store (0x09, Local0)
}
@@ -510,7 +510,7 @@
Method (_STA, 0, NotSerialized)
{
Store (0x0B, Local0)
- If (And (0x80, PRQ3, Local1))
+ If (And (0x80, PRQ3, Local0))
{
Store (0x09, Local0)
}
Index: bios/acpi-dsdt.hex
===================================================================
RCS file: /cvsroot/bochs/bochs/bios/acpi-dsdt.hex,v
retrieving revision 1.1
diff -u -r1.1 acpi-dsdt.hex
--- bios/acpi-dsdt.hex 28 Sep 2006 18:56:20 -0000 1.1
+++ bios/acpi-dsdt.hex 31 Oct 2007 18:05:38 -0000
@@ -1,11 +1,11 @@
/*
*
* Intel ACPI Component Architecture
- * ASL Optimizing Compiler version 20060912 [Sep 28 2006]
+ * ASL Optimizing Compiler version 20061109 [May 16 2007]
* Copyright (C) 2000 - 2006 Intel Corporation
* Supports ACPI Specification Revision 3.0a
*
- * Compilation of "acpi-dsdt.dsl" - Thu Sep 28 19:55:07 2006
+ * Compilation of "acpi-dsdt.dsl" - Wed Oct 31 19:02:22 2007
*
* C source code output
*
@@ -13,10 +13,10 @@
unsigned char AmlCode[] =
{
0x44,0x53,0x44,0x54,0x32,0x08,0x00,0x00, /* 00000000 "DSDT2..." */
- 0x01,0x0E,0x42,0x58,0x50,0x43,0x00,0x00, /* 00000008 "..BXPC.." */
+ 0x01,0x13,0x42,0x58,0x50,0x43,0x00,0x00, /* 00000008 "..BXPC.." */
0x42,0x58,0x44,0x53,0x44,0x54,0x00,0x00, /* 00000010 "BXDSDT.." */
0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */
- 0x12,0x09,0x06,0x20,0x10,0x4F,0x04,0x5C, /* 00000020 "... .O.\" */
+ 0x09,0x11,0x06,0x20,0x10,0x4F,0x04,0x5C, /* 00000020 "... .O.\" */
0x00,0x5B,0x80,0x43,0x4D,0x53,0x5F,0x01, /* 00000028 ".[.CMS_." */
0x0A,0x70,0x0A,0x02,0x5B,0x81,0x10,0x43, /* 00000030 ".p..[..C" */
0x4D,0x53,0x5F,0x01,0x43,0x4D,0x53,0x49, /* 00000038 "MS_.CMSI" */
@@ -191,7 +191,7 @@
0x11,0x09,0x0A,0x06,0x23,0xF8,0x1E,0x18, /* 00000580 "....#..." */
0x79,0x00,0x14,0x1A,0x5F,0x53,0x54,0x41, /* 00000588 "y..._STA" */
0x00,0x70,0x0A,0x0B,0x60,0xA0,0x0D,0x7B, /* 00000590 ".p..`..{" */
- 0x0A,0x80,0x50,0x52,0x51,0x30,0x61,0x70, /* 00000598 "..PRQ0ap" */
+ 0x0A,0x80,0x50,0x52,0x51,0x30,0x60,0x70, /* 00000598 "..PRQ0`p" */
0x0A,0x09,0x60,0xA4,0x60,0x14,0x11,0x5F, /* 000005A0 "..`.`.._" */
0x44,0x49,0x53,0x00,0x7D,0x50,0x52,0x51, /* 000005A8 "DIS.}PRQ" */
0x30,0x0A,0x80,0x50,0x52,0x51,0x30,0x14, /* 000005B0 "0..PRQ0." */
@@ -213,7 +213,7 @@
0x53,0x11,0x09,0x0A,0x06,0x23,0xF8,0x1E, /* 00000630 "S....#.." */
0x18,0x79,0x00,0x14,0x1A,0x5F,0x53,0x54, /* 00000638 ".y..._ST" */
0x41,0x00,0x70,0x0A,0x0B,0x60,0xA0,0x0D, /* 00000640 "A.p..`.." */
- 0x7B,0x0A,0x80,0x50,0x52,0x51,0x31,0x61, /* 00000648 "{..PRQ1a" */
+ 0x7B,0x0A,0x80,0x50,0x52,0x51,0x31,0x60, /* 00000648 "{..PRQ1`" */
0x70,0x0A,0x09,0x60,0xA4,0x60,0x14,0x11, /* 00000650 "p..`.`.." */
0x5F,0x44,0x49,0x53,0x00,0x7D,0x50,0x52, /* 00000658 "_DIS.}PR" */
0x51,0x31,0x0A,0x80,0x50,0x52,0x51,0x31, /* 00000660 "Q1..PRQ1" */
@@ -236,7 +236,7 @@
0x1E,0x18,0x79,0x00,0x14,0x1A,0x5F,0x53, /* 000006E8 "..y..._S" */
0x54,0x41,0x00,0x70,0x0A,0x0B,0x60,0xA0, /* 000006F0 "TA.p..`." */
0x0D,0x7B,0x0A,0x80,0x50,0x52,0x51,0x32, /* 000006F8 ".{..PRQ2" */
- 0x61,0x70,0x0A,0x09,0x60,0xA4,0x60,0x14, /* 00000700 "ap..`.`." */
+ 0x60,0x70,0x0A,0x09,0x60,0xA4,0x60,0x14, /* 00000700 "`p..`.`." */
0x11,0x5F,0x44,0x49,0x53,0x00,0x7D,0x50, /* 00000708 "._DIS.}P" */
0x52,0x51,0x32,0x0A,0x80,0x50,0x52,0x51, /* 00000710 "RQ2..PRQ" */
0x32,0x14,0x3F,0x5F,0x43,0x52,0x53,0x00, /* 00000718 "2.?_CRS." */
@@ -258,7 +258,7 @@
0xF8,0x1E,0x18,0x79,0x00,0x14,0x1A,0x5F, /* 00000798 "...y..._" */
0x53,0x54,0x41,0x00,0x70,0x0A,0x0B,0x60, /* 000007A0 "STA.p..`" */
0xA0,0x0D,0x7B,0x0A,0x80,0x50,0x52,0x51, /* 000007A8 "..{..PRQ" */
- 0x33,0x61,0x70,0x0A,0x09,0x60,0xA4,0x60, /* 000007B0 "3ap..`.`" */
+ 0x33,0x60,0x70,0x0A,0x09,0x60,0xA4,0x60, /* 000007B0 "3`p..`.`" */
0x14,0x11,0x5F,0x44,0x49,0x53,0x00,0x7D, /* 000007B8 ".._DIS.}" */
0x50,0x52,0x51,0x33,0x0A,0x80,0x50,0x52, /* 000007C0 "PRQ3..PR" */
0x51,0x33,0x14,0x3F,0x5F,0x43,0x52,0x53, /* 000007C8 "Q3.?_CRS" */
|
|
From: Michael H. <pu...@ha...> - 2007-10-31 18:23:08
|
Hello again
On Wed, Oct 31, 2007 at 07:10:05PM +0100, Michael Hanselmann wrote:
> --- bios/acpi-dsdt.dsl 28 Sep 2006 18:56:20 -0000 1.1
> +++ bios/acpi-dsdt.dsl 31 Oct 2007 18:05:38 -0000
> @@ -369,7 +369,7 @@
> Method (_STA, 0, NotSerialized)
> {
> Store (0x0B, Local0)
> - If (And (0x80, PRQ0, Local1))
> + If (And (0x80, PRQ0, Local0))
> {
> Store (0x09, Local0)
> }
Avi Kivity pointed out that this code doesn't return the correct values.
Please do not apply the patch yet. I'll work on it again.
Thanks,
Michael
--
http://hansmi.ch/
|
Thanks for helping keep SourceForge clean.
X