1. Patchew
  2. QEMU
  3. View series

[PATCH] sabre: increase number of PCI bus IRQs from 32 to 64

Mark Cave-Ayland posted 1 patch 3 years, 6 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20201011081347.2146-1-mark.cave-ayland@ilande.co.uk
Maintainers: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
hw/pci-host/sabre.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] sabre: increase number of PCI bus IRQs from 32 to 64
Posted by Mark Cave-Ayland 3 years, 6 months ago 
The rework of the sabre IRQs in commit 6864fa3897 "sun4u: update PCI topology to
include simba PCI bridges" changed the IRQ routing so that both PCI and legacy
OBIO IRQs are routed through the sabre PCI host bridge to the CPU.

Unfortunately this commit failed to increase the number of PCI bus IRQs
accordingly meaning that access to the legacy IRQs OBIO (irqnum >= 0x20) would
overflow the PCI bus IRQ array causing strange failures running qemu-system-sparc64
in NetBSD.

Reported-by: Harold Gutch <logix@foobar.franken.de>
Fixes: https://bugs.launchpad.net/qemu/+bug/1838658
Fixes: 6864fa3897 ("sun4u: update PCI topology to include simba PCI bridges")
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/pci-host/sabre.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
index 5ac6283623..ffdba1d865 100644
--- a/hw/pci-host/sabre.c
+++ b/hw/pci-host/sabre.c
@@ -396,7 +396,7 @@ static void sabre_realize(DeviceState *dev, Error **errp)
                                      pci_sabre_set_irq, pci_sabre_map_irq, s,
                                      &s->pci_mmio,
                                      &s->pci_ioport,
-                                     0, 32, TYPE_PCI_BUS);
+                                     0, 0x40, TYPE_PCI_BUS);
 
     pci_create_simple(phb->bus, 0, TYPE_SABRE_PCI_DEVICE);
 
-- 
2.20.1
Re: [PATCH] sabre: increase number of PCI bus IRQs from 32 to 64
Posted by Mark Cave-Ayland 3 years, 6 months ago 
On 11/10/2020 09:13, Mark Cave-Ayland wrote:

> The rework of the sabre IRQs in commit 6864fa3897 "sun4u: update PCI topology to
> include simba PCI bridges" changed the IRQ routing so that both PCI and legacy
> OBIO IRQs are routed through the sabre PCI host bridge to the CPU.
> 
> Unfortunately this commit failed to increase the number of PCI bus IRQs
> accordingly meaning that access to the legacy IRQs OBIO (irqnum >= 0x20) would
> overflow the PCI bus IRQ array causing strange failures running qemu-system-sparc64
> in NetBSD.
> 
> Reported-by: Harold Gutch <logix@foobar.franken.de>
> Fixes: https://bugs.launchpad.net/qemu/+bug/1838658
> Fixes: 6864fa3897 ("sun4u: update PCI topology to include simba PCI bridges")
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
>   hw/pci-host/sabre.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
> index 5ac6283623..ffdba1d865 100644
> --- a/hw/pci-host/sabre.c
> +++ b/hw/pci-host/sabre.c
> @@ -396,7 +396,7 @@ static void sabre_realize(DeviceState *dev, Error **errp)
>                                        pci_sabre_set_irq, pci_sabre_map_irq, s,
>                                        &s->pci_mmio,
>                                        &s->pci_ioport,
> -                                     0, 32, TYPE_PCI_BUS);
> +                                     0, 0x40, TYPE_PCI_BUS);
>   
>       pci_create_simple(phb->bus, 0, TYPE_SABRE_PCI_DEVICE);

Applied to my qemu-sparc branch.


ATB,

Mark.
Re: [PATCH] sabre: increase number of PCI bus IRQs from 32 to 64
Posted by Philippe Mathieu-Daudé 3 years, 6 months ago 
On 10/21/20 11:27 AM, Mark Cave-Ayland wrote:
> On 11/10/2020 09:13, Mark Cave-Ayland wrote:
> 
>> The rework of the sabre IRQs in commit 6864fa3897 "sun4u: update PCI 
>> topology to
>> include simba PCI bridges" changed the IRQ routing so that both PCI 
>> and legacy
>> OBIO IRQs are routed through the sabre PCI host bridge to the CPU.
>>
>> Unfortunately this commit failed to increase the number of PCI bus IRQs
>> accordingly meaning that access to the legacy IRQs OBIO (irqnum >= 
>> 0x20) would
>> overflow the PCI bus IRQ array causing strange failures running 
>> qemu-system-sparc64
>> in NetBSD.
>>
>> Reported-by: Harold Gutch <logix@foobar.franken.de>
>> Fixes: https://bugs.launchpad.net/qemu/+bug/1838658
>> Fixes: 6864fa3897 ("sun4u: update PCI topology to include simba PCI 
>> bridges")
>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>> ---
>>   hw/pci-host/sabre.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
>> index 5ac6283623..ffdba1d865 100644
>> --- a/hw/pci-host/sabre.c
>> +++ b/hw/pci-host/sabre.c
>> @@ -396,7 +396,7 @@ static void sabre_realize(DeviceState *dev, Error 
>> **errp)
>>                                        pci_sabre_set_irq, 
>> pci_sabre_map_irq, s,
>>                                        &s->pci_mmio,
>>                                        &s->pci_ioport,
>> -                                     0, 32, TYPE_PCI_BUS);
>> +                                     0, 0x40, TYPE_PCI_BUS);
>>       pci_create_simple(phb->bus, 0, TYPE_SABRE_PCI_DEVICE);
> 
> Applied to my qemu-sparc branch.

FWIW I spent some time looking at this, and your patch is indeed
the simplest fix in the current state of this model.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> 
> 
> ATB,
> 
> Mark.
>
Re: [PATCH] sabre: increase number of PCI bus IRQs from 32 to 64
Posted by Mark Cave-Ayland 3 years, 6 months ago 
On 24/10/2020 21:41, Philippe Mathieu-Daudé wrote:

> On 10/21/20 11:27 AM, Mark Cave-Ayland wrote:
>> On 11/10/2020 09:13, Mark Cave-Ayland wrote:
>>
>>> The rework of the sabre IRQs in commit 6864fa3897 "sun4u: update PCI topology to
>>> include simba PCI bridges" changed the IRQ routing so that both PCI and legacy
>>> OBIO IRQs are routed through the sabre PCI host bridge to the CPU.
>>>
>>> Unfortunately this commit failed to increase the number of PCI bus IRQs
>>> accordingly meaning that access to the legacy IRQs OBIO (irqnum >= 0x20) would
>>> overflow the PCI bus IRQ array causing strange failures running qemu-system-sparc64
>>> in NetBSD.
>>>
>>> Reported-by: Harold Gutch <logix@foobar.franken.de>
>>> Fixes: https://bugs.launchpad.net/qemu/+bug/1838658
>>> Fixes: 6864fa3897 ("sun4u: update PCI topology to include simba PCI bridges")
>>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>>> ---
>>>   hw/pci-host/sabre.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
>>> index 5ac6283623..ffdba1d865 100644
>>> --- a/hw/pci-host/sabre.c
>>> +++ b/hw/pci-host/sabre.c
>>> @@ -396,7 +396,7 @@ static void sabre_realize(DeviceState *dev, Error **errp)
>>>                                        pci_sabre_set_irq, pci_sabre_map_irq, s,
>>>                                        &s->pci_mmio,
>>>                                        &s->pci_ioport,
>>> -                                     0, 32, TYPE_PCI_BUS);
>>> +                                     0, 0x40, TYPE_PCI_BUS);
>>>       pci_create_simple(phb->bus, 0, TYPE_SABRE_PCI_DEVICE);
>>
>> Applied to my qemu-sparc branch.
> 
> FWIW I spent some time looking at this, and your patch is indeed
> the simplest fix in the current state of this model.
> 
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Thanks! I'll add the tag to my pending PR.


ATB,

Mark.

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.