hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge

[PATCH] hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge

Posted by Thomas Huth 2 months, 1 week ago

The pci-bridge device is not usable on s390x, so introduce a Kconfig
switch that allows to disable it.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/pci-bridge/Kconfig     | 5 +++++
 hw/pci-bridge/meson.build | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig
index 67077366cc..449ec98643 100644
--- a/hw/pci-bridge/Kconfig
+++ b/hw/pci-bridge/Kconfig
@@ -1,3 +1,8 @@
+config PCI_BRIDGE
+    bool
+    default y if PCI_DEVICES
+    depends on PCI
+
 config PCIE_PORT
     bool
     default y if PCI_DEVICES
diff --git a/hw/pci-bridge/meson.build b/hw/pci-bridge/meson.build
index f2a60434dd..2e0eb0d233 100644
--- a/hw/pci-bridge/meson.build
+++ b/hw/pci-bridge/meson.build
@@ -1,5 +1,5 @@
 pci_ss = ss.source_set()
-pci_ss.add(files('pci_bridge_dev.c'))
+pci_ss.add(when: 'CONFIG_PCI_BRIDGE', if_true: files('pci_bridge_dev.c'))
 pci_ss.add(when: 'CONFIG_I82801B11', if_true: files('i82801b11.c'))
 pci_ss.add(when: 'CONFIG_IOH3420', if_true: files('ioh3420.c'))
 pci_ss.add(when: 'CONFIG_PCIE_PORT', if_true: files('pcie_root_port.c', 'gen_pcie_root_port.c'))
-- 
2.46.0

Re: [PATCH] hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge

Posted by Cédric Le Goater 2 months, 1 week ago

On 9/13/24 16:48, Thomas Huth wrote:
> The pci-bridge device is not usable on s390x, so introduce a Kconfig
> switch that allows to disable it.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   hw/pci-bridge/Kconfig     | 5 +++++
>   hw/pci-bridge/meson.build | 2 +-
>   2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig
> index 67077366cc..449ec98643 100644
> --- a/hw/pci-bridge/Kconfig
> +++ b/hw/pci-bridge/Kconfig
> @@ -1,3 +1,8 @@
> +config PCI_BRIDGE
> +    bool
> +    default y if PCI_DEVICES
> +    depends on PCI
> +
>   config PCIE_PORT
>       bool
>       default y if PCI_DEVICES
> diff --git a/hw/pci-bridge/meson.build b/hw/pci-bridge/meson.build
> index f2a60434dd..2e0eb0d233 100644
> --- a/hw/pci-bridge/meson.build
> +++ b/hw/pci-bridge/meson.build
> @@ -1,5 +1,5 @@
>   pci_ss = ss.source_set()
> -pci_ss.add(files('pci_bridge_dev.c'))
> +pci_ss.add(when: 'CONFIG_PCI_BRIDGE', if_true: files('pci_bridge_dev.c'))
>   pci_ss.add(when: 'CONFIG_I82801B11', if_true: files('i82801b11.c'))
>   pci_ss.add(when: 'CONFIG_IOH3420', if_true: files('ioh3420.c'))
>   pci_ss.add(when: 'CONFIG_PCIE_PORT', if_true: files('pcie_root_port.c', 'gen_pcie_root_port.c'))

Re: [PATCH] hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge

Posted by Philippe Mathieu-Daudé 2 months, 1 week ago

On 13/9/24 16:48, Thomas Huth wrote:
> The pci-bridge device is not usable on s390x, so introduce a Kconfig
> switch that allows to disable it.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   hw/pci-bridge/Kconfig     | 5 +++++
>   hw/pci-bridge/meson.build | 2 +-
>   2 files changed, 6 insertions(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>