[Qemu-devel] [PATCH] ACPI: Remove commented-out code from HPET._CRS

[Qemu-devel] [PATCH] ACPI: Remove commented-out code from HPET._CRS

[Gabriel L. Somlo]

IRQNoFlags on HPET._CRS crashes WinXP because it causes the HPET
to conflict with the system timer and/or the RTC. It only occurs
on Apple hardware, and even there it is exposed fully only when
OS X is detected (via _OSI). Recent OS X versions work on QEMU
without this statement, so at this time there is no need to find
a better way to conditionally include the statement. This patch
removes the commented out (and wrong, should have been {0, 8})
statement from HPET._CRS.

Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
---
 hw/i386/acpi-dsdt-hpet.dsl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/hw/i386/acpi-dsdt-hpet.dsl b/hw/i386/acpi-dsdt-hpet.dsl
index dfde174..44961b8 100644
--- a/hw/i386/acpi-dsdt-hpet.dsl
+++ b/hw/i386/acpi-dsdt-hpet.dsl
@@ -39,9 +39,6 @@ Scope(\_SB) {
             Return (0x0F)
         }
         Name(_CRS, ResourceTemplate() {
-#if 0       /* This makes WinXP BSOD for not yet figured reasons. */
-            IRQNoFlags() {2, 8}
-#endif
             Memory32Fixed(ReadOnly,
                 0xFED00000,         // Address Base
                 0x00000400,         // Address Length
-- 
1.8.1.4

Re: [Qemu-devel] [PATCH] ACPI: Remove commented-out code from HPET._CRS

[Igor Mammedov]

On Fri, 7 Feb 2014 10:30:40 -0500
"Gabriel L. Somlo" <gsomlo@gmail.com> wrote:

> IRQNoFlags on HPET._CRS crashes WinXP because it causes the HPET
> to conflict with the system timer and/or the RTC. It only occurs
> on Apple hardware, and even there it is exposed fully only when
> OS X is detected (via _OSI). Recent OS X versions work on QEMU
> without this statement, so at this time there is no need to find
> a better way to conditionally include the statement. This patch
> removes the commented out (and wrong, should have been {0, 8})
> statement from HPET._CRS.
> 
> Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
> ---
>  hw/i386/acpi-dsdt-hpet.dsl | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/hw/i386/acpi-dsdt-hpet.dsl b/hw/i386/acpi-dsdt-hpet.dsl
> index dfde174..44961b8 100644
> --- a/hw/i386/acpi-dsdt-hpet.dsl
> +++ b/hw/i386/acpi-dsdt-hpet.dsl
> @@ -39,9 +39,6 @@ Scope(\_SB) {
>              Return (0x0F)
>          }
>          Name(_CRS, ResourceTemplate() {
> -#if 0       /* This makes WinXP BSOD for not yet figured reasons. */
> -            IRQNoFlags() {2, 8}
> -#endif
>              Memory32Fixed(ReadOnly,
>                  0xFED00000,         // Address Base
>                  0x00000400,         // Address Length

Reviewed-By: Igor Mammedov <imammedo@redhat.com>

Re: [Qemu-devel] [PATCH] ACPI: Remove commented-out code from HPET._CRS

[Michael S. Tsirkin]

On Fri, Feb 07, 2014 at 10:30:40AM -0500, Gabriel L. Somlo wrote:
> IRQNoFlags on HPET._CRS crashes WinXP because it causes the HPET
> to conflict with the system timer and/or the RTC. It only occurs
> on Apple hardware, and even there it is exposed fully only when
> OS X is detected (via _OSI). Recent OS X versions work on QEMU
> without this statement, so at this time there is no need to find
> a better way to conditionally include the statement. This patch
> removes the commented out (and wrong, should have been {0, 8})
> statement from HPET._CRS.
> 
> Signed-off-by: Gabriel Somlo <somlo@cmu.edu>

Applied, thanks!

> ---
>  hw/i386/acpi-dsdt-hpet.dsl | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/hw/i386/acpi-dsdt-hpet.dsl b/hw/i386/acpi-dsdt-hpet.dsl
> index dfde174..44961b8 100644
> --- a/hw/i386/acpi-dsdt-hpet.dsl
> +++ b/hw/i386/acpi-dsdt-hpet.dsl
> @@ -39,9 +39,6 @@ Scope(\_SB) {
>              Return (0x0F)
>          }
>          Name(_CRS, ResourceTemplate() {
> -#if 0       /* This makes WinXP BSOD for not yet figured reasons. */
> -            IRQNoFlags() {2, 8}
> -#endif
>              Memory32Fixed(ReadOnly,
>                  0xFED00000,         // Address Base
>                  0x00000400,         // Address Length
> -- 
> 1.8.1.4