From: Gerd Hoffmann <kraxel@redhat.com>
To: Avi Kivity <avi@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] virtio-blk/qdev failure in the current git tree
Date: Thu, 13 Aug 2009 14:07:33 +0200 [thread overview]
Message-ID: <4A840205.1030806@redhat.com> (raw)
In-Reply-To: <4A83D613.5070408@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 788 bytes --]
On 08/13/09 11:00, Avi Kivity wrote:
> On 08/13/2009 01:01 AM, Anthony Liguori wrote:
>> Christoph Hellwig wrote:
>>> On Wed, Aug 12, 2009 at 01:00:59PM +0300, Avi Kivity wrote:
>>>>> Looks like a irq routing issue ...
>>>> What about qemu-kvm.git (and its bios)? There was a lot of irq
>>>> routing work there, maybe not all of it made it into qemu.git.
>>>
>>> Yeah, qemu-kvm works just fine. The amount of irq routing trouble I see
>>> with virtio and upstream qemu is getting really annoying :P
>>
>> Where were the irq routing trouble fixes in qemu-kvm? Was it fixes in
>> the BIOS?
>>
>
> I think so, but not 100% sure.
Diffing acpi-dsdt.dsl gives a number of irq related differences which
look like we wanna have them in upstream qemu.
Complete diff attached.
cheers,
Gerd
[-- Attachment #2: fix --]
[-- Type: text/plain, Size: 7729 bytes --]
--- ./acpi-dsdt.dsl 2009-08-13 13:43:04.000000000 +0200
+++ /home/kraxel/tmp/kvm/kvm/bios/acpi-dsdt.dsl 2009-08-12 12:12:22.000000000 +0200
@@ -47,6 +47,7 @@ DefinitionBlock (
section 6.2.8.1 */
/* Note: we provide the same info as the PCI routing
table of the Bochs BIOS */
+
#define prt_slot(nr, lnk0, lnk1, lnk2, lnk3) \
Package() { nr##ffff, 0, lnk0, 0 }, \
Package() { nr##ffff, 1, lnk1, 0 }, \
@@ -57,6 +58,7 @@ DefinitionBlock (
#define prt_slot1(nr) prt_slot(nr, LNKA, LNKB, LNKC, LNKD)
#define prt_slot2(nr) prt_slot(nr, LNKB, LNKC, LNKD, LNKA)
#define prt_slot3(nr) prt_slot(nr, LNKC, LNKD, LNKA, LNKB)
+
prt_slot0(0x0000),
prt_slot1(0x0001),
prt_slot2(0x0002),
@@ -441,8 +443,8 @@ DefinitionBlock (
Name(_HID, EISAID("PNP0C0F")) // PCI interrupt link
Name(_UID, 1)
Name(_PRS, ResourceTemplate(){
- IRQ (Level, ActiveLow, Shared)
- {3,4,5,6,7,9,10,11,12}
+ Interrupt (, Level, ActiveHigh, Shared)
+ { 5, 10, 11 }
})
Method (_STA, 0, NotSerialized)
{
@@ -461,14 +463,14 @@ DefinitionBlock (
{
Name (PRR0, ResourceTemplate ()
{
- IRQ (Level, ActiveLow, 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,18 +480,16 @@ 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, ActiveLow, Shared)
- {3,4,5,6,7,9,10,11,12}
+ Interrupt (, Level, ActiveHigh, Shared)
+ { 5, 10, 11 }
})
Method (_STA, 0, NotSerialized)
{
@@ -508,14 +508,14 @@ DefinitionBlock (
{
Name (PRR0, ResourceTemplate ()
{
- IRQ (Level, ActiveLow, 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,18 +525,16 @@ 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, ActiveLow, Shared)
- {3,4,5,6,7,9,10,11,12}
+ Interrupt (, Level, ActiveHigh, Shared)
+ { 5, 10, 11 }
})
Method (_STA, 0, NotSerialized)
{
@@ -555,14 +553,14 @@ DefinitionBlock (
{
Name (PRR0, ResourceTemplate ()
{
- IRQ (Level, ActiveLow, 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,18 +570,16 @@ 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, ActiveLow, Shared)
- {3,4,5,6,7,9,10,11,12}
+ Interrupt (, Level, ActiveHigh, Shared)
+ { 5, 10, 11 }
})
Method (_STA, 0, NotSerialized)
{
@@ -602,14 +598,14 @@ DefinitionBlock (
{
Name (PRR0, ResourceTemplate ()
{
- IRQ (Level, ActiveLow, 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 +615,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)
}
}
}
@@ -703,11 +697,13 @@ DefinitionBlock (
gen_pci_hotplug(31)
Return (0x01)
-
- }
- Method(_L02) {
- Return(0x01)
}
+
+ /*
+ * Method _02 will be provided by the SSDT as it needs to call
+ * into the Processor methods (_PR.PRSC()).
+ */
+
Method(_L03) {
Return(0x01)
}
@@ -748,5 +744,4 @@ DefinitionBlock (
Return(0x01)
}
}
-
}
next prev parent reply other threads:[~2009-08-13 12:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-10 23:56 [Qemu-devel] virtio-blk/qdev failure in the current git tree Christoph Hellwig
2009-08-11 0:29 ` Anthony Liguori
2009-08-11 16:13 ` Christoph Hellwig
2009-08-11 16:36 ` Christoph Hellwig
2009-08-11 18:45 ` Anthony Liguori
2009-08-11 19:28 ` Gerd Hoffmann
2009-08-12 9:26 ` Gerd Hoffmann
2009-08-12 10:00 ` Avi Kivity
2009-08-12 10:19 ` Gerd Hoffmann
2009-08-12 10:40 ` Gerd Hoffmann
2009-08-12 10:51 ` Avi Kivity
2009-08-12 11:45 ` Reimar Döffinger
2009-08-12 21:50 ` Christoph Hellwig
2009-08-12 22:01 ` Anthony Liguori
2009-08-13 9:00 ` Avi Kivity
2009-08-13 12:07 ` Gerd Hoffmann [this message]
2009-08-13 12:47 ` Gerd Hoffmann
2009-08-13 13:15 ` Anthony Liguori
2009-08-13 13:38 ` Gerd Hoffmann
2009-08-12 10:08 ` Gerd Hoffmann
2009-08-12 21:54 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A840205.1030806@redhat.com \
--to=kraxel@redhat.com \
--cc=avi@redhat.com \
--cc=hch@lst.de \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).