qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, qemu-s390x@nongnu.org,
	"Thomas Huth" <thuth@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	qemu-riscv@nongnu.org,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	qemu-arm@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH-for-10.0 v2 06/13] hw/pci: Propagate bar_at_addr_0_refused to pci_root_bus_init()
Date: Tue, 26 Nov 2024 12:22:05 +0100	[thread overview]
Message-ID: <20241126112212.64524-7-philmd@linaro.org> (raw)
In-Reply-To: <20241126112212.64524-1-philmd@linaro.org>

Have pci_root_bus_init() callers set the
'bar_at_addr_0_refused' argument. No logical change.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/pci/pci.h    | 3 ++-
 hw/pci-host/raven.c     | 2 +-
 hw/pci-host/versatile.c | 2 +-
 hw/pci/pci.c            | 5 +++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 135695c5511..b499846083f 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -284,7 +284,8 @@ bool pci_bus_is_express(const PCIBus *bus);
 void pci_root_bus_init(PCIBus *bus, size_t bus_size, DeviceState *parent,
                        const char *name,
                        MemoryRegion *mem, MemoryRegion *io,
-                       uint8_t devfn_min, const char *typename);
+                       uint8_t devfn_min, const char *typename,
+                       bool bar_at_addr_0_refused);
 PCIBus *pci_root_bus_new(DeviceState *parent, const char *name,
                          MemoryRegion *mem, MemoryRegion *io,
                          uint8_t devfn_min, const char *typename);
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
index a7dfddd69ea..d5087af5ec6 100644
--- a/hw/pci-host/raven.c
+++ b/hw/pci-host/raven.c
@@ -313,7 +313,7 @@ static void raven_pcihost_initfn(Object *obj)
                                         &s->pci_io_non_contiguous, 1);
     memory_region_add_subregion(address_space_mem, 0xc0000000, &s->pci_memory);
     pci_root_bus_init(&s->pci_bus, sizeof(s->pci_bus), DEVICE(obj), NULL,
-                      &s->pci_memory, &s->pci_io, 0, TYPE_PCI_BUS);
+                      &s->pci_memory, &s->pci_io, 0, TYPE_PCI_BUS, true);
 
     /* Bus master address space */
     memory_region_init(&s->bm, obj, "bm-raven", 4 * GiB);
diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index d257acee172..f82262f8d1e 100644
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -407,7 +407,7 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp)
 
     pci_root_bus_init(&s->pci_bus, sizeof(s->pci_bus), dev, "pci",
                       &s->pci_mem_space, &s->pci_io_space,
-                      PCI_DEVFN(11, 0), TYPE_PCI_BUS);
+                      PCI_DEVFN(11, 0), TYPE_PCI_BUS, true);
     h->bus = &s->pci_bus;
 
     object_initialize(&s->pci_dev, sizeof(s->pci_dev), TYPE_VERSATILE_PCI_HOST);
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 8eacb8f82fc..f7158fb9573 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -561,11 +561,12 @@ bool pci_bus_is_express(const PCIBus *bus)
 void pci_root_bus_init(PCIBus *bus, size_t bus_size, DeviceState *parent,
                        const char *name,
                        MemoryRegion *mem, MemoryRegion *io,
-                       uint8_t devfn_min, const char *typename)
+                       uint8_t devfn_min, const char *typename,
+                       bool bar_at_addr_0_refused)
 {
     qbus_init(bus, bus_size, typename, parent, name);
     pci_root_bus_internal_init(bus, parent, mem, io, devfn_min,
-                               true);
+                               bar_at_addr_0_refused);
 }
 
 PCIBus *pci_root_bus_new(DeviceState *parent, const char *name,
-- 
2.45.2



  parent reply	other threads:[~2024-11-26 11:25 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-26 11:21 [PATCH-for-10.0 v2 00/13] hw/boards: Remove legacy MachineClass::pci_allow_0_address flag Philippe Mathieu-Daudé
2024-11-26 11:22 ` [PATCH-for-10.0 v2 01/13] hw/pci: Do not declare PCIBus::flags mask as enum Philippe Mathieu-Daudé
2024-11-27  9:37   ` Philippe Mathieu-Daudé
2024-12-04  6:49     ` Thomas Huth
2024-11-26 11:22 ` [PATCH-for-10.0 v2 02/13] hw/pci-bridge: Initialize bridge with parent bus flags Philippe Mathieu-Daudé
2024-11-26 11:22 ` [PATCH-for-10.0 v2 03/13] hw/pci: Factor machine_refuses_bar_at_addr_0() helper out Philippe Mathieu-Daudé
2024-11-26 11:22 ` [PATCH-for-10.0 v2 04/13] hw/pci: Introduce PCIBusFlag::PCI_BUS_BAR_AT_ADDR0_REFUSED Philippe Mathieu-Daudé
2024-11-26 11:22 ` [PATCH-for-10.0 v2 05/13] hw/pci: Propagate bar_at_addr_0_refused to pci_root_bus_internal_init() Philippe Mathieu-Daudé
2024-12-05 16:44   ` Peter Maydell
2024-12-05 21:24     ` Philippe Mathieu-Daudé
2024-11-26 11:22 ` Philippe Mathieu-Daudé [this message]
2024-11-26 11:22 ` [PATCH-for-10.0 v2 07/13] hw/pci: Propagate bar_at_addr_0_refused to pci_root_bus_new() Philippe Mathieu-Daudé
2024-11-26 11:22 ` [PATCH-for-10.0 v2 08/13] hw/pci: Propagate bar_at_addr_0_refused to pci_register_root_bus() Philippe Mathieu-Daudé
2024-11-26 11:22 ` [PATCH-for-10.0 v2 09/13] hw/ppc/spapr: Create host bridge setting bar_at_addr_0_refused=false Philippe Mathieu-Daudé
2024-11-26 11:22 ` [PATCH-for-10.0 v2 10/13] hw/pci-host/gpex: Expose 'refuse-bar-at-addr-0' property Philippe Mathieu-Daudé
2024-12-05 16:47   ` Peter Maydell
2024-12-05 21:25     ` Philippe Mathieu-Daudé
2024-11-26 11:22 ` [PATCH-for-10.0 v2 11/13] hw/arm/virt: Create GPEX host bridge without refuse-bar-at-addr-0 Philippe Mathieu-Daudé
2024-11-26 11:22 ` [PATCH-for-10.0 v2 12/13] hw/riscv/virt: " Philippe Mathieu-Daudé
2024-11-26 11:22 ` [PATCH-for-10.0 v2 13/13] hw/pci/pci: Remove legacy MachineClass::pci_allow_0_address flag Philippe Mathieu-Daudé

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=20241126112212.64524-7-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=thuth@redhat.com \
    /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).