From patchwork Fri Aug 14 12:21:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 31398 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 0D02CB7B5C for ; Fri, 14 Aug 2009 22:44:58 +1000 (EST) Received: from localhost ([127.0.0.1]:40970 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mbw9E-0005Xs-RL for incoming@patchwork.ozlabs.org; Fri, 14 Aug 2009 08:44:44 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MbvnP-0007Jn-Hw for qemu-devel@nongnu.org; Fri, 14 Aug 2009 08:22:11 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MbvnK-0007Hb-OS for qemu-devel@nongnu.org; Fri, 14 Aug 2009 08:22:11 -0400 Received: from [199.232.76.173] (port=47018 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MbvnK-0007HY-Hp for qemu-devel@nongnu.org; Fri, 14 Aug 2009 08:22:06 -0400 Received: from mx2.redhat.com ([66.187.237.31]:41896) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MbvnK-0006Fo-1W for qemu-devel@nongnu.org; Fri, 14 Aug 2009 08:22:06 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7ECM5MB027032; Fri, 14 Aug 2009 08:22:05 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n7ECM4Gl026546; Fri, 14 Aug 2009 08:22:04 -0400 Received: from zweiblum.home.kraxel.org (vpn1-4-95.ams2.redhat.com [10.36.4.95]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with SMTP id n7ECLxH7006026; Fri, 14 Aug 2009 08:22:00 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 3C635700DA; Fri, 14 Aug 2009 14:21:58 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 14 Aug 2009 14:21:55 +0200 Message-Id: <1250252518-29300-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1250252518-29300-1-git-send-email-kraxel@redhat.com> References: <1250252518-29300-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Avi Kivity , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 3/6] kvm: bios: use extended interrupt descriptor for pci irqs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Avi Kivity this is necessary to allow freebsd to boot; freebsd chokes if a regular interrupt descriptor specifies an active high pic irq. Signed-off-by: Avi Kivity Signed-off-by: Gerd Hoffmann --- acpi-dsdt.dsl | 56 ++++++++++++++++++++++++-------------------------------- 1 files changed, 24 insertions(+), 32 deletions(-) diff --git a/acpi-dsdt.dsl b/acpi-dsdt.dsl index f7fda62..0bb5ca4 100644 --- a/acpi-dsdt.dsl +++ b/acpi-dsdt.dsl @@ -441,7 +441,7 @@ DefinitionBlock ( Name(_HID, EISAID("PNP0C0F")) // PCI interrupt link Name(_UID, 1) Name(_PRS, ResourceTemplate(){ - IRQ (Level, ActiveHigh, Shared) + Interrupt (, Level, ActiveHigh, Shared) { 5, 9, 10, 11 } }) Method (_STA, 0, NotSerialized) @@ -461,14 +461,14 @@ DefinitionBlock ( { Name (PRR0, ResourceTemplate () { - IRQ (Level, ActiveHigh, Shared) + Interrupt (, Level, ActiveHigh, Shared) {1} }) - CreateWordField (PRR0, 0x01, TMP) + CreateDWordField (PRR0, 0x05, TMP) Store (PRQ0, Local0) If (LLess (Local0, 0x80)) { - ShiftLeft (One, Local0, TMP) + Store (Local0, TMP) } Else { @@ -478,17 +478,15 @@ DefinitionBlock ( } Method (_SRS, 1, NotSerialized) { - CreateWordField (Arg0, 0x01, TMP) - FindSetRightBit (TMP, Local0) - Decrement (Local0) - Store (Local0, PRQ0) + CreateDWordField (Arg0, 0x05, TMP) + Store (TMP, PRQ0) } } Device(LNKB){ Name(_HID, EISAID("PNP0C0F")) // PCI interrupt link Name(_UID, 2) Name(_PRS, ResourceTemplate(){ - IRQ (Level, ActiveHigh, Shared) + Interrupt (, Level, ActiveHigh, Shared) { 5, 9, 10, 11 } }) Method (_STA, 0, NotSerialized) @@ -508,14 +506,14 @@ DefinitionBlock ( { Name (PRR0, ResourceTemplate () { - IRQ (Level, ActiveHigh, Shared) + Interrupt (, Level, ActiveHigh, Shared) {1} }) - CreateWordField (PRR0, 0x01, TMP) + CreateDWordField (PRR0, 0x05, TMP) Store (PRQ1, Local0) If (LLess (Local0, 0x80)) { - ShiftLeft (One, Local0, TMP) + Store (Local0, TMP) } Else { @@ -525,17 +523,15 @@ DefinitionBlock ( } Method (_SRS, 1, NotSerialized) { - CreateWordField (Arg0, 0x01, TMP) - FindSetRightBit (TMP, Local0) - Decrement (Local0) - Store (Local0, PRQ1) + CreateDWordField (Arg0, 0x05, TMP) + Store (TMP, PRQ1) } } Device(LNKC){ Name(_HID, EISAID("PNP0C0F")) // PCI interrupt link Name(_UID, 3) Name(_PRS, ResourceTemplate(){ - IRQ (Level, ActiveHigh, Shared) + Interrupt (, Level, ActiveHigh, Shared) { 5, 9, 10, 11 } }) Method (_STA, 0, NotSerialized) @@ -555,14 +551,14 @@ DefinitionBlock ( { Name (PRR0, ResourceTemplate () { - IRQ (Level, ActiveHigh, Shared) + Interrupt (, Level, ActiveHigh, Shared) {1} }) - CreateWordField (PRR0, 0x01, TMP) + CreateDWordField (PRR0, 0x05, TMP) Store (PRQ2, Local0) If (LLess (Local0, 0x80)) { - ShiftLeft (One, Local0, TMP) + Store (Local0, TMP) } Else { @@ -572,17 +568,15 @@ DefinitionBlock ( } Method (_SRS, 1, NotSerialized) { - CreateWordField (Arg0, 0x01, TMP) - FindSetRightBit (TMP, Local0) - Decrement (Local0) - Store (Local0, PRQ2) + CreateDWordField (Arg0, 0x05, TMP) + Store (TMP, PRQ2) } } Device(LNKD){ Name(_HID, EISAID("PNP0C0F")) // PCI interrupt link Name(_UID, 4) Name(_PRS, ResourceTemplate(){ - IRQ (Level, ActiveHigh, Shared) + Interrupt (, Level, ActiveHigh, Shared) { 5, 9, 10, 11 } }) Method (_STA, 0, NotSerialized) @@ -602,14 +596,14 @@ DefinitionBlock ( { Name (PRR0, ResourceTemplate () { - IRQ (Level, ActiveHigh, Shared) + Interrupt (, Level, ActiveHigh, Shared) {1} }) - CreateWordField (PRR0, 0x01, TMP) + CreateDWordField (PRR0, 0x05, TMP) Store (PRQ3, Local0) If (LLess (Local0, 0x80)) { - ShiftLeft (One, Local0, TMP) + Store (Local0, TMP) } Else { @@ -619,10 +613,8 @@ DefinitionBlock ( } Method (_SRS, 1, NotSerialized) { - CreateWordField (Arg0, 0x01, TMP) - FindSetRightBit (TMP, Local0) - Decrement (Local0) - Store (Local0, PRQ3) + CreateDWordField (Arg0, 0x05, TMP) + Store (TMP, PRQ3) } } }