pci: fix PCI resource reserve capability on BE

[PATCH] pci: fix PCI resource reserve capability on BE

Posted by Michael S. Tsirkin 2 years, 6 months ago

PCI resource reserve capability should use LE format as all other PCI
things. If we don't then seabios won't boot:

=== PCI new allocation pass #1 ===
PCI: check devices
PCI: QEMU resource reserve cap: size 10000000000000 type io
PCI: secondary bus 1 size 10000000000000 type io
PCI: secondary bus 1 size 00200000 type mem
PCI: secondary bus 1 size 00200000 type prefmem
=== PCI new allocation pass #2 ===
PCI: out of I/O address space

This became more important since we started reserving IO by default,
previously no one noticed.

Fixes: e2a6290aab ("hw/pcie-root-port: Fix hotplug for PCI devices requiring IO")
Cc: marcel.apfelbaum@gmail.com
Fixes: 226263fb5c ("hw/pci: add QEMU-specific PCI capability to the Generic PCI Express Root Port")
Cc: zuban32s@gmail.com
Fixes: 6755e618d0 ("hw/pci: add PCI resource reserve capability to legacy PCI bridge")
Cc: jing2.liu@linux.intel.com
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/pci/pci_bridge.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index d1f902ee86..da34c8ebcd 100644
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -448,11 +448,11 @@ int pci_bridge_qemu_reserve_cap_init(PCIDevice *dev, int cap_offset,
     PCIBridgeQemuCap cap = {
             .len = cap_len,
             .type = REDHAT_PCI_CAP_RESOURCE_RESERVE,
-            .bus_res = res_reserve.bus,
-            .io = res_reserve.io,
-            .mem = res_reserve.mem_non_pref,
-            .mem_pref_32 = res_reserve.mem_pref_32,
-            .mem_pref_64 = res_reserve.mem_pref_64
+            .bus_res = cpu_to_le32(res_reserve.bus),
+            .io = cpu_to_le64(res_reserve.io),
+            .mem = cpu_to_le32(res_reserve.mem_non_pref),
+            .mem_pref_32 = cpu_to_le32(res_reserve.mem_pref_32),
+            .mem_pref_64 = cpu_to_le64(res_reserve.mem_pref_64)
     };
 
     int offset = pci_add_capability(dev, PCI_CAP_ID_VNDR,
-- 
MST

Re: [PATCH] pci: fix PCI resource reserve capability on BE

Posted by Thomas Huth 2 years, 5 months ago

On 20/10/2021 11.54, Michael S. Tsirkin wrote:
> PCI resource reserve capability should use LE format as all other PCI
> things. If we don't then seabios won't boot:
> 
> === PCI new allocation pass #1 ===
> PCI: check devices
> PCI: QEMU resource reserve cap: size 10000000000000 type io
> PCI: secondary bus 1 size 10000000000000 type io
> PCI: secondary bus 1 size 00200000 type mem
> PCI: secondary bus 1 size 00200000 type prefmem
> === PCI new allocation pass #2 ===
> PCI: out of I/O address space
> 
> This became more important since we started reserving IO by default,
> previously no one noticed.
> 
> Fixes: e2a6290aab ("hw/pcie-root-port: Fix hotplug for PCI devices requiring IO")
> Cc: marcel.apfelbaum@gmail.com
> Fixes: 226263fb5c ("hw/pci: add QEMU-specific PCI capability to the Generic PCI Express Root Port")
> Cc: zuban32s@gmail.com
> Fixes: 6755e618d0 ("hw/pci: add PCI resource reserve capability to legacy PCI bridge")
> Cc: jing2.liu@linux.intel.com
> Tested-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>   hw/pci/pci_bridge.c | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
> index d1f902ee86..da34c8ebcd 100644
> --- a/hw/pci/pci_bridge.c
> +++ b/hw/pci/pci_bridge.c
> @@ -448,11 +448,11 @@ int pci_bridge_qemu_reserve_cap_init(PCIDevice *dev, int cap_offset,
>       PCIBridgeQemuCap cap = {
>               .len = cap_len,
>               .type = REDHAT_PCI_CAP_RESOURCE_RESERVE,
> -            .bus_res = res_reserve.bus,
> -            .io = res_reserve.io,
> -            .mem = res_reserve.mem_non_pref,
> -            .mem_pref_32 = res_reserve.mem_pref_32,
> -            .mem_pref_64 = res_reserve.mem_pref_64
> +            .bus_res = cpu_to_le32(res_reserve.bus),
> +            .io = cpu_to_le64(res_reserve.io),
> +            .mem = cpu_to_le32(res_reserve.mem_non_pref),
> +            .mem_pref_32 = cpu_to_le32(res_reserve.mem_pref_32),
> +            .mem_pref_64 = cpu_to_le64(res_reserve.mem_pref_64)
>       };
>   
>       int offset = pci_add_capability(dev, PCI_CAP_ID_VNDR,

Cc: qemu-stable (in case MichaelR is planning a 6.1.1, too)

  Thomas

Re: [PATCH] pci: fix PCI resource reserve capability on BE

Posted by Philippe Mathieu-Daudé 2 years, 6 months ago

On 10/20/21 11:54, Michael S. Tsirkin wrote:
> PCI resource reserve capability should use LE format as all other PCI
> things. If we don't then seabios won't boot:
> 
> === PCI new allocation pass #1 ===
> PCI: check devices
> PCI: QEMU resource reserve cap: size 10000000000000 type io
> PCI: secondary bus 1 size 10000000000000 type io
> PCI: secondary bus 1 size 00200000 type mem
> PCI: secondary bus 1 size 00200000 type prefmem
> === PCI new allocation pass #2 ===
> PCI: out of I/O address space
> 
> This became more important since we started reserving IO by default,
> previously no one noticed.
> 
> Fixes: e2a6290aab ("hw/pcie-root-port: Fix hotplug for PCI devices requiring IO")
> Cc: marcel.apfelbaum@gmail.com
> Fixes: 226263fb5c ("hw/pci: add QEMU-specific PCI capability to the Generic PCI Express Root Port")
> Cc: zuban32s@gmail.com
> Fixes: 6755e618d0 ("hw/pci: add PCI resource reserve capability to legacy PCI bridge")
> Cc: jing2.liu@linux.intel.com
> Tested-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  hw/pci/pci_bridge.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>