[PATCH v2 00/12] hw: Various Kconfig fixes

[PATCH v2 00/12] hw: Various Kconfig fixes

[Philippe Mathieu-Daudé]

Various Kconfig fixes when building stand-alone machine binaries.

Since v1:
- Fixed Pegasos2 machine
- Removed SEMIHOSTING related patches (will repost them later)

Philippe Mathieu-Daudé (12):
  hw/mem/nvdimm: Use Kconfig 'imply' instead of 'depends on'
  hw/ide/Kconfig: Add missing dependency PCI -> IDE_QDEV
  hw/arm/Kconfig: Add missing dependency NPCM7XX -> SMBUS
  hw/arm/Kconfig: Remove unused DS1338 symbol from i.MX25 PDK Board
  hw/arm/Kconfig: Add missing SDHCI symbol to FSL_IMX25
  hw/riscv/Kconfig: Add missing dependency MICROCHIP_PFSOC -> SERIAL
  hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines
  hw/ppc/Kconfig: Add missing dependency E500 -> DS1338 RTC
  hw/pci-host/Kconfig: Add missing dependency MV64361 -> I8259
  hw/isa/vt82c686: Add missing Kconfig dependencies (build error)
  hw/isa/vt82c686: Add missing Kconfig dependency (runtime error)
  hw/ppc/Kconfig: Add dependency PEGASOS2 -> ATI_VGA

 default-configs/devices/ppc-softmmu.mak   | 1 -
 default-configs/devices/ppc64-softmmu.mak | 1 -
 hw/arm/Kconfig                            | 4 +++-
 hw/char/Kconfig                           | 1 +
 hw/i386/Kconfig                           | 1 +
 hw/ide/Kconfig                            | 2 +-
 hw/isa/Kconfig                            | 4 ++++
 hw/mem/Kconfig                            | 2 --
 hw/pci-host/Kconfig                       | 1 +
 hw/ppc/Kconfig                            | 3 +++
 hw/riscv/Kconfig                          | 5 +++++
 hw/riscv/meson.build                      | 2 +-
 12 files changed, 20 insertions(+), 7 deletions(-)

-- 
2.26.3

[PATCH v2 01/12] hw/mem/nvdimm: Use Kconfig 'imply' instead of 'depends on'

[Philippe Mathieu-Daudé]

Per the kconfig.rst:

  A device should be listed [...] ``imply`` if (depending on
  the QEMU command line) the board may or  may not be started
  without it.

This is the case with the NVDIMM device (it is certainly possible
to start a machine without NVDIMM) , so use the 'imply' weak
reverse dependency to select the symbol.

Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 default-configs/devices/ppc64-softmmu.mak | 1 -
 hw/arm/Kconfig                            | 1 +
 hw/i386/Kconfig                           | 1 +
 hw/mem/Kconfig                            | 2 --
 hw/ppc/Kconfig                            | 1 +
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/default-configs/devices/ppc64-softmmu.mak b/default-configs/devices/ppc64-softmmu.mak
index ae0841fa3a1..cca52665d90 100644
--- a/default-configs/devices/ppc64-softmmu.mak
+++ b/default-configs/devices/ppc64-softmmu.mak
@@ -8,4 +8,3 @@ CONFIG_POWERNV=y
 
 # For pSeries
 CONFIG_PSERIES=y
-CONFIG_NVDIMM=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index b887f6a5b17..67723d9ea6a 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -6,6 +6,7 @@ config ARM_VIRT
     imply VFIO_PLATFORM
     imply VFIO_XGMAC
     imply TPM_TIS_SYSBUS
+    imply NVDIMM
     select ARM_GIC
     select ACPI
     select ARM_SMMUV3
diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index 7f91f30877f..66838fa397b 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -23,6 +23,7 @@ config PC
     imply TPM_TIS_ISA
     imply VGA_PCI
     imply VIRTIO_VGA
+    imply NVDIMM
     select FDC
     select I8259
     select I8254
diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig
index a0ef2cf648e..8b19fdc49f1 100644
--- a/hw/mem/Kconfig
+++ b/hw/mem/Kconfig
@@ -7,6 +7,4 @@ config MEM_DEVICE
 
 config NVDIMM
     bool
-    default y
-    depends on (PC || PSERIES || ARM_VIRT)
     select MEM_DEVICE
diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index e51e0e5e5ac..66e0b15d9ef 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -3,6 +3,7 @@ config PSERIES
     imply PCI_DEVICES
     imply TEST_DEVICES
     imply VIRTIO_VGA
+    imply NVDIMM
     select DIMM
     select PCI
     select SPAPR_VSCSI
-- 
2.26.3

Re: [PATCH v2 01/12] hw/mem/nvdimm: Use Kconfig 'imply' instead of 'depends on'

[Bin Meng]

On Sun, May 16, 2021 at 1:37 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> Per the kconfig.rst:
>
>   A device should be listed [...] ``imply`` if (depending on
>   the QEMU command line) the board may or  may not be started
>   without it.
>
> This is the case with the NVDIMM device (it is certainly possible
> to start a machine without NVDIMM) , so use the 'imply' weak
> reverse dependency to select the symbol.
>
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> Acked-by: David Gibson <david@gibson.dropbear.id.au>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  default-configs/devices/ppc64-softmmu.mak | 1 -
>  hw/arm/Kconfig                            | 1 +
>  hw/i386/Kconfig                           | 1 +
>  hw/mem/Kconfig                            | 2 --
>  hw/ppc/Kconfig                            | 1 +
>  5 files changed, 3 insertions(+), 3 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

[PATCH v2 02/12] hw/ide/Kconfig: Add missing dependency PCI -> IDE_QDEV

[Philippe Mathieu-Daudé]

The pci_ide_create_devs() function is declared i hw/ide/qdev.c:

 $ git grep ide_create_drive
 hw/ide/pci.c:491:            ide_create_drive(d->bus + bus[i], unit[i], hd_table[i]);
 hw/ide/qdev.c:127:IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive)
 include/hw/ide/internal.h:653:IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive);

Fix the correct symbol dependency to avoid build failure when
deselecting some machines:

  /usr/bin/ld: libcommon.fa.p/hw_ide_pci.c.o: in function `pci_ide_create_devs':
  hw/ide/pci.c:491: undefined reference to `ide_create_drive'

Fixes: 8f01b41e109 ("ide: express dependencies with Kconfig")
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/ide/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
index 8e2c8934549..dd85fa3619f 100644
--- a/hw/ide/Kconfig
+++ b/hw/ide/Kconfig
@@ -8,7 +8,7 @@ config IDE_QDEV
 config IDE_PCI
     bool
     depends on PCI
-    select IDE_CORE
+    select IDE_QDEV
 
 config IDE_ISA
     bool
-- 
2.26.3

Re: [PATCH v2 02/12] hw/ide/Kconfig: Add missing dependency PCI -> IDE_QDEV

[John Snow]

On 5/15/21 1:37 PM, Philippe Mathieu-Daudé wrote:
> The pci_ide_create_devs() function is declared i hw/ide/qdev.c:
> 
>   $ git grep ide_create_drive
>   hw/ide/pci.c:491:            ide_create_drive(d->bus + bus[i], unit[i], hd_table[i]);
>   hw/ide/qdev.c:127:IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive)
>   include/hw/ide/internal.h:653:IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive);
> 
> Fix the correct symbol dependency to avoid build failure when
> deselecting some machines:
> 
>    /usr/bin/ld: libcommon.fa.p/hw_ide_pci.c.o: in function `pci_ide_create_devs':
>    hw/ide/pci.c:491: undefined reference to `ide_create_drive'
> 
> Fixes: 8f01b41e109 ("ide: express dependencies with Kconfig")
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Acked-by: John Snow <jsnow@redhat.com>

> ---
>   hw/ide/Kconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
> index 8e2c8934549..dd85fa3619f 100644
> --- a/hw/ide/Kconfig
> +++ b/hw/ide/Kconfig
> @@ -8,7 +8,7 @@ config IDE_QDEV
>   config IDE_PCI
>       bool
>       depends on PCI
> -    select IDE_CORE
> +    select IDE_QDEV
>   
>   config IDE_ISA
>       bool
> 

[PATCH v2 03/12] hw/arm/Kconfig: Add missing dependency NPCM7XX -> SMBUS

[Philippe Mathieu-Daudé]

The TYPE_NPCM7XX_SMBUS device model exposes an SMBus, but
this isn't advertised with proper Kconfig symbol, leading
to an early build failure when building NPCM7XX machines
standalone:

  The following clauses were found for AT24C

      config AT24C depends on I2C
      select AT24C if NPCM7XX

Fix by adding SMBUS to NPCM7XX.

Fixes: 94e77879395 ("hw/i2c: Implement NPCM7XX SMBus Module Single Mode")
Reviewed-by: Hao Wu <wuhaotsh@google.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/arm/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 67723d9ea6a..85c6a1a088c 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -373,6 +373,7 @@ config NPCM7XX
     bool
     select A9MPCORE
     select ARM_GIC
+    select SMBUS
     select AT24C  # EEPROM
     select PL310  # cache controller
     select SERIAL
-- 
2.26.3

[PATCH v2 04/12] hw/arm/Kconfig: Remove unused DS1338 symbol from i.MX25 PDK Board

[Philippe Mathieu-Daudé]

In commit c4f00daa5b3 ("imx25-pdk: create ds1338 for qtest inside
the test") we removed the DS1338 device from the i.MX25 machine
but forgot to remove it in the machine Kconfig definitions, do
it now.

Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/arm/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 85c6a1a088c..5827c092b28 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -386,7 +386,6 @@ config FSL_IMX25
     select IMX_FEC
     select IMX_I2C
     select WDT_IMX2
-    select DS1338
 
 config FSL_IMX31
     bool
-- 
2.26.3

[PATCH v2 05/12] hw/arm/Kconfig: Add missing SDHCI symbol to FSL_IMX25

[Philippe Mathieu-Daudé]

Commit bfae1772c43 ("hw/arm/fsl-imx25: Wire up eSDHC controllers")
added a dependency on the TYPE_IMX_USDHC model, but forgot to add
the Kconfig selector. Fix that to solve when built stand-alone:

  $ qemu-system-arm -M imx25-pdk
  qemu-system-arm: missing object type 'imx-usdhc'
  Aborted (core dumped)

Fixes: bfae1772c43 ("hw/arm/fsl-imx25: Wire up eSDHC controllers")
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Guenter Roeck <linux@roeck-us.net>
---
 hw/arm/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 5827c092b28..6bb34926bb5 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -386,6 +386,7 @@ config FSL_IMX25
     select IMX_FEC
     select IMX_I2C
     select WDT_IMX2
+    select SDHCI
 
 config FSL_IMX31
     bool
-- 
2.26.3

[PATCH v2 06/12] hw/riscv/Kconfig: Add missing dependency MICROCHIP_PFSOC -> SERIAL

[Philippe Mathieu-Daudé]

Commit a8fb0a500a6 ("hw/char: Add Microchip PolarFire SoC MMUART
emulation") added a dependency on the SERIAL model, but forgot to
add the Kconfig selector.
Add the dependency to the MCHP_PFSOC_MMUART symbol to fix when
building the MICROCHIP_PFSOC machine stand-alone:

  /usr/bin/ld: libcommon.fa.p/hw_char_mchp_pfsoc_mmuart.c.o: in function `mchp_pfsoc_mmuart_create':
  hw/char/mchp_pfsoc_mmuart.c:79: undefined reference to `serial_mm_init'

Fixes: a8fb0a500a6 ("hw/char: Add Microchip PolarFire SoC MMUART emulation")
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Bin Meng <bin.meng@windriver.com>
Cc: Alistair Francis <alistair.francis@wdc.com>
---
 hw/char/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/char/Kconfig b/hw/char/Kconfig
index 4cf36ac637b..2e4f620b13e 100644
--- a/hw/char/Kconfig
+++ b/hw/char/Kconfig
@@ -61,6 +61,7 @@ config AVR_USART
 
 config MCHP_PFSOC_MMUART
     bool
+    select SERIAL
 
 config SIFIVE_UART
     bool
-- 
2.26.3

Re: [PATCH v2 06/12] hw/riscv/Kconfig: Add missing dependency MICROCHIP_PFSOC -> SERIAL

[Alistair Francis]

On Sun, May 16, 2021 at 3:44 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> Commit a8fb0a500a6 ("hw/char: Add Microchip PolarFire SoC MMUART
> emulation") added a dependency on the SERIAL model, but forgot to
> add the Kconfig selector.
> Add the dependency to the MCHP_PFSOC_MMUART symbol to fix when
> building the MICROCHIP_PFSOC machine stand-alone:
>
>   /usr/bin/ld: libcommon.fa.p/hw_char_mchp_pfsoc_mmuart.c.o: in function `mchp_pfsoc_mmuart_create':
>   hw/char/mchp_pfsoc_mmuart.c:79: undefined reference to `serial_mm_init'
>
> Fixes: a8fb0a500a6 ("hw/char: Add Microchip PolarFire SoC MMUART emulation")
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
> Cc: Bin Meng <bin.meng@windriver.com>
> Cc: Alistair Francis <alistair.francis@wdc.com>
> ---
>  hw/char/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/hw/char/Kconfig b/hw/char/Kconfig
> index 4cf36ac637b..2e4f620b13e 100644
> --- a/hw/char/Kconfig
> +++ b/hw/char/Kconfig
> @@ -61,6 +61,7 @@ config AVR_USART
>
>  config MCHP_PFSOC_MMUART
>      bool
> +    select SERIAL
>
>  config SIFIVE_UART
>      bool
> --
> 2.26.3
>
>

Re: [PATCH v2 06/12] hw/riscv/Kconfig: Add missing dependency MICROCHIP_PFSOC -> SERIAL

[Bin Meng]

On Sun, May 16, 2021 at 1:44 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> Commit a8fb0a500a6 ("hw/char: Add Microchip PolarFire SoC MMUART
> emulation") added a dependency on the SERIAL model, but forgot to
> add the Kconfig selector.
> Add the dependency to the MCHP_PFSOC_MMUART symbol to fix when
> building the MICROCHIP_PFSOC machine stand-alone:
>
>   /usr/bin/ld: libcommon.fa.p/hw_char_mchp_pfsoc_mmuart.c.o: in function `mchp_pfsoc_mmuart_create':
>   hw/char/mchp_pfsoc_mmuart.c:79: undefined reference to `serial_mm_init'
>
> Fixes: a8fb0a500a6 ("hw/char: Add Microchip PolarFire SoC MMUART emulation")
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Bin Meng <bin.meng@windriver.com>
> Cc: Alistair Francis <alistair.francis@wdc.com>
> ---
>  hw/char/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

[PATCH v2 07/12] hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines

[Philippe Mathieu-Daudé]

Only the Virt and Spike machines use NUMA. Add a RISCV_NUMA Kconfig
symbol and only have these machines select it. Adapt the Meson file
to only built it if required.

Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/riscv/Kconfig     | 5 +++++
 hw/riscv/meson.build | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
index 86957ec7b06..0590f443fdf 100644
--- a/hw/riscv/Kconfig
+++ b/hw/riscv/Kconfig
@@ -1,3 +1,6 @@
+config RISCV_NUMA
+    bool
+
 config IBEX
     bool
 
@@ -34,6 +37,7 @@ config RISCV_VIRT
     imply PCI_DEVICES
     imply VIRTIO_VGA
     imply TEST_DEVICES
+    select RISCV_NUMA
     select GOLDFISH_RTC
     select MSI_NONBROKEN
     select PCI
@@ -74,6 +78,7 @@ config SIFIVE_U
 
 config SPIKE
     bool
+    select RISCV_NUMA
     select HTIF
     select MSI_NONBROKEN
     select SIFIVE_CLINT
diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build
index a97454661c0..ab6cae57eae 100644
--- a/hw/riscv/meson.build
+++ b/hw/riscv/meson.build
@@ -1,6 +1,6 @@
 riscv_ss = ss.source_set()
 riscv_ss.add(files('boot.c'), fdt)
-riscv_ss.add(files('numa.c'))
+riscv_ss.add(when: 'CONFIG_RISCV_NUMA', if_true: files('numa.c'))
 riscv_ss.add(files('riscv_hart.c'))
 riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c'))
 riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c'))
-- 
2.26.3

Re: [PATCH v2 07/12] hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines

[Alistair Francis]

On Sun, May 16, 2021 at 3:47 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> Only the Virt and Spike machines use NUMA. Add a RISCV_NUMA Kconfig
> symbol and only have these machines select it. Adapt the Meson file
> to only built it if required.
>
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  hw/riscv/Kconfig     | 5 +++++
>  hw/riscv/meson.build | 2 +-
>  2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
> index 86957ec7b06..0590f443fdf 100644
> --- a/hw/riscv/Kconfig
> +++ b/hw/riscv/Kconfig
> @@ -1,3 +1,6 @@
> +config RISCV_NUMA
> +    bool
> +
>  config IBEX
>      bool
>
> @@ -34,6 +37,7 @@ config RISCV_VIRT
>      imply PCI_DEVICES
>      imply VIRTIO_VGA
>      imply TEST_DEVICES
> +    select RISCV_NUMA
>      select GOLDFISH_RTC
>      select MSI_NONBROKEN
>      select PCI
> @@ -74,6 +78,7 @@ config SIFIVE_U
>
>  config SPIKE
>      bool
> +    select RISCV_NUMA
>      select HTIF
>      select MSI_NONBROKEN
>      select SIFIVE_CLINT
> diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build
> index a97454661c0..ab6cae57eae 100644
> --- a/hw/riscv/meson.build
> +++ b/hw/riscv/meson.build
> @@ -1,6 +1,6 @@
>  riscv_ss = ss.source_set()
>  riscv_ss.add(files('boot.c'), fdt)
> -riscv_ss.add(files('numa.c'))
> +riscv_ss.add(when: 'CONFIG_RISCV_NUMA', if_true: files('numa.c'))
>  riscv_ss.add(files('riscv_hart.c'))
>  riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c'))
>  riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c'))
> --
> 2.26.3
>
>

[PATCH v2 08/12] hw/ppc/Kconfig: Add missing dependency E500 -> DS1338 RTC

[Philippe Mathieu-Daudé]

Commit 7abb479c7ab ("PPC: E500: Add FSL I2C controller and integrate
RTC with it") added a global dependency on the DS1338 model, instead
of a machine one (via Kconfig). This gives trouble when building
standalone machines not exposing I2C bus:

  The following clauses were found for DS1338

      CONFIG_DS1338=y
      config DS1338 depends on I2C

Fix by selecting the DS1338 symbol in the single machine requiring
it, the E500.

Fixes: 7abb479c7ab ("PPC: E500: Add FSL I2C controller and integrate RTC with it")
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 default-configs/devices/ppc-softmmu.mak | 1 -
 hw/ppc/Kconfig                          | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/default-configs/devices/ppc-softmmu.mak b/default-configs/devices/ppc-softmmu.mak
index c2d41198cde..5a7f99d1e45 100644
--- a/default-configs/devices/ppc-softmmu.mak
+++ b/default-configs/devices/ppc-softmmu.mak
@@ -1,7 +1,6 @@
 # Default configuration for ppc-softmmu
 
 # For embedded PPCs:
-CONFIG_DS1338=y
 CONFIG_E500=y
 CONFIG_PPC405=y
 CONFIG_PPC440=y
diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index 66e0b15d9ef..2e4c56eb770 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -128,6 +128,7 @@ config E500
     select SERIAL
     select MPC_I2C
     select FDT_PPC
+    select DS1338
 
 config VIRTEX
     bool
-- 
2.26.3

[PATCH v2 09/12] hw/pci-host/Kconfig: Add missing dependency MV64361 -> I8259

[Philippe Mathieu-Daudé]

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

Looking at the MV64340 model source, there is a dependency on the
8259 interrupt controller:

  523     case MV64340_PCI_1_INTERRUPT_ACKNOWLEDGE_VIRTUAL_REG:
  524         /* FIXME: Should this be sent via the PCI bus somehow? */
  525         if (s->gpp_int_level && (s->gpp_value & BIT(31))) {
  526             ret = pic_read_irq(isa_pic);
  527         }
  528         break;

Add it to Kconfig to avoid the following build failure:

  /usr/bin/ld: libcommon.fa.p/hw_pci-host_mv64361.c.o: in function `mv64361_read':
  hw/pci-host/mv64361.c:526: undefined reference to `isa_pic'
  /usr/bin/ld: hw/pci-host/mv64361.c:526: undefined reference to `pic_read_irq'

Fixes: dcdf98a9015 ("hw/pci-host: Add emulation of Marvell MV64361 PPC system controller")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/pci-host/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
index 79c20bf28bb..9dc0d761815 100644
--- a/hw/pci-host/Kconfig
+++ b/hw/pci-host/Kconfig
@@ -76,3 +76,4 @@ config SH_PCI
 config MV64361
     bool
     select PCI
+    select I8259
-- 
2.26.3

Re: [PATCH v2 09/12] hw/pci-host/Kconfig: Add missing dependency MV64361 -> I8259

[BALATON Zoltan]

[-- Attachment #1: Type: text/plain, Size: 1487 bytes --]

On Sat, 15 May 2021, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> Looking at the MV64340 model source, there is a dependency on the
> 8259 interrupt controller:
>
>  523     case MV64340_PCI_1_INTERRUPT_ACKNOWLEDGE_VIRTUAL_REG:
>  524         /* FIXME: Should this be sent via the PCI bus somehow? */
>  525         if (s->gpp_int_level && (s->gpp_value & BIT(31))) {
>  526             ret = pic_read_irq(isa_pic);
>  527         }
>  528         break;
>
> Add it to Kconfig to avoid the following build failure:
>
>  /usr/bin/ld: libcommon.fa.p/hw_pci-host_mv64361.c.o: in function `mv64361_read':
>  hw/pci-host/mv64361.c:526: undefined reference to `isa_pic'
>  /usr/bin/ld: hw/pci-host/mv64361.c:526: undefined reference to `pic_read_irq'
>
> Fixes: dcdf98a9015 ("hw/pci-host: Add emulation of Marvell MV64361 PPC system controller")
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>

Correct, this is a dependency that I've missed, although pegasos2 probably 
has it already and nothing else is using this chip but it's more correct 
to list it explicitely.

> ---
> hw/pci-host/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
> index 79c20bf28bb..9dc0d761815 100644
> --- a/hw/pci-host/Kconfig
> +++ b/hw/pci-host/Kconfig
> @@ -76,3 +76,4 @@ config SH_PCI
> config MV64361
>     bool
>     select PCI
> +    select I8259
>

Re: [PATCH v2 09/12] hw/pci-host/Kconfig: Add missing dependency MV64361 -> I8259

[Bin Meng]

On Sun, May 16, 2021 at 1:52 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> Looking at the MV64340 model source, there is a dependency on the
> 8259 interrupt controller:
>
>   523     case MV64340_PCI_1_INTERRUPT_ACKNOWLEDGE_VIRTUAL_REG:
>   524         /* FIXME: Should this be sent via the PCI bus somehow? */
>   525         if (s->gpp_int_level && (s->gpp_value & BIT(31))) {
>   526             ret = pic_read_irq(isa_pic);
>   527         }
>   528         break;
>
> Add it to Kconfig to avoid the following build failure:
>
>   /usr/bin/ld: libcommon.fa.p/hw_pci-host_mv64361.c.o: in function `mv64361_read':
>   hw/pci-host/mv64361.c:526: undefined reference to `isa_pic'
>   /usr/bin/ld: hw/pci-host/mv64361.c:526: undefined reference to `pic_read_irq'
>
> Fixes: dcdf98a9015 ("hw/pci-host: Add emulation of Marvell MV64361 PPC system controller")
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/pci-host/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

There are some more codes that contain isa_pic. Maybe worth an additional check.

./hw/i386/x86.c:573:    intno = pic_read_irq(isa_pic);
./hw/intc/i8259.c:58:DeviceState *isa_pic;
./hw/intc/i8259.c:429:    isa_pic = dev;
./hw/intc/apic.c:387:    } else if (!apic_accept_pic_intr(dev) ||
!pic_get_output(isa_pic)) {
./hw/intc/apic.c:562:    if (!apic_accept_pic_intr(dev) ||
!pic_get_output(isa_pic)) {
./hw/intc/apic.c:615:        return isa_pic != NULL;
./hw/intc/ioapic.c:78:        info->vector = pic_read_irq(isa_pic);
./hw/hppa/pci.c:67:    return pic_read_irq(isa_pic);
./hw/mips/gt64xxx_pci.c:777:        val = pic_read_irq(isa_pic);
./hw/alpha/pci.c:70:    return pic_read_irq(isa_pic);
./hw/pci-host/mv64361.c:526:            ret = pic_read_irq(isa_pic);
./hw/pci-host/prep.c:121:    return pic_read_irq(isa_pic);
./include/hw/intc/i8259.h:6:extern DeviceState *isa_pic;

Regards,
Bin

Re: [PATCH v2 09/12] hw/pci-host/Kconfig: Add missing dependency MV64361 -> I8259

[Philippe Mathieu-Daudé]

On 5/17/21 4:49 AM, Bin Meng wrote:
> On Sun, May 16, 2021 at 1:52 AM Philippe Mathieu-Daudé
> <philmd@redhat.com> wrote:
>>
>> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>
>> Looking at the MV64340 model source, there is a dependency on the
>> 8259 interrupt controller:
>>
>>   523     case MV64340_PCI_1_INTERRUPT_ACKNOWLEDGE_VIRTUAL_REG:
>>   524         /* FIXME: Should this be sent via the PCI bus somehow? */
>>   525         if (s->gpp_int_level && (s->gpp_value & BIT(31))) {
>>   526             ret = pic_read_irq(isa_pic);
>>   527         }
>>   528         break;
>>
>> Add it to Kconfig to avoid the following build failure:
>>
>>   /usr/bin/ld: libcommon.fa.p/hw_pci-host_mv64361.c.o: in function `mv64361_read':
>>   hw/pci-host/mv64361.c:526: undefined reference to `isa_pic'
>>   /usr/bin/ld: hw/pci-host/mv64361.c:526: undefined reference to `pic_read_irq'
>>
>> Fixes: dcdf98a9015 ("hw/pci-host: Add emulation of Marvell MV64361 PPC system controller")
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>  hw/pci-host/Kconfig | 1 +
>>  1 file changed, 1 insertion(+)
>>
> 
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Thank you :)

> There are some more codes that contain isa_pic. Maybe worth an additional check.
> 
> ./hw/i386/x86.c:573:    intno = pic_read_irq(isa_pic);
> ./hw/intc/i8259.c:58:DeviceState *isa_pic;
> ./hw/intc/i8259.c:429:    isa_pic = dev;
> ./hw/intc/apic.c:387:    } else if (!apic_accept_pic_intr(dev) ||
> !pic_get_output(isa_pic)) {
> ./hw/intc/apic.c:562:    if (!apic_accept_pic_intr(dev) ||
> !pic_get_output(isa_pic)) {
> ./hw/intc/apic.c:615:        return isa_pic != NULL;
> ./hw/intc/ioapic.c:78:        info->vector = pic_read_irq(isa_pic);
> ./hw/hppa/pci.c:67:    return pic_read_irq(isa_pic);
> ./hw/mips/gt64xxx_pci.c:777:        val = pic_read_irq(isa_pic);
> ./hw/alpha/pci.c:70:    return pic_read_irq(isa_pic);
> ./hw/pci-host/mv64361.c:526:            ret = pic_read_irq(isa_pic);
> ./hw/pci-host/prep.c:121:    return pic_read_irq(isa_pic);
> ./include/hw/intc/i8259.h:6:extern DeviceState *isa_pic;

I'll have a look, by my secret plan is to remove the global isa_pic :)

Re: [PATCH v2 09/12] hw/pci-host/Kconfig: Add missing dependency MV64361 -> I8259

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1586 bytes --]

On Sat, May 15, 2021 at 07:37:13PM +0200, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
> 
> Looking at the MV64340 model source, there is a dependency on the
> 8259 interrupt controller:
> 
>   523     case MV64340_PCI_1_INTERRUPT_ACKNOWLEDGE_VIRTUAL_REG:
>   524         /* FIXME: Should this be sent via the PCI bus somehow? */
>   525         if (s->gpp_int_level && (s->gpp_value & BIT(31))) {
>   526             ret = pic_read_irq(isa_pic);
>   527         }
>   528         break;
> 
> Add it to Kconfig to avoid the following build failure:
> 
>   /usr/bin/ld: libcommon.fa.p/hw_pci-host_mv64361.c.o: in function `mv64361_read':
>   hw/pci-host/mv64361.c:526: undefined reference to `isa_pic'
>   /usr/bin/ld: hw/pci-host/mv64361.c:526: undefined reference to `pic_read_irq'
> 
> Fixes: dcdf98a9015 ("hw/pci-host: Add emulation of Marvell MV64361 PPC system controller")
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Acked-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  hw/pci-host/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
> index 79c20bf28bb..9dc0d761815 100644
> --- a/hw/pci-host/Kconfig
> +++ b/hw/pci-host/Kconfig
> @@ -76,3 +76,4 @@ config SH_PCI
>  config MV64361
>      bool
>      select PCI
> +    select I8259

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH v2 10/12] hw/isa/vt82c686: Add missing Kconfig dependencies (build error)

[Philippe Mathieu-Daudé]

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

The VT82C686 device model misses various dependencies:

  /usr/bin/ld: libcommon.fa.p/hw_isa_vt82c686.c.o: in function `vt82c686b_realize':
  hw/isa/vt82c686.c:622: undefined reference to `i8259_init'
  /usr/bin/ld: hw/isa/vt82c686.c:624: undefined reference to `i8257_dma_init'
  /usr/bin/ld: hw/isa/vt82c686.c:627: undefined reference to `mc146818_rtc_init'

Add them.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/isa/Kconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index 55e0003ce40..0703512209a 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -49,6 +49,9 @@ config VT82C686
     select FDC
     select USB_UHCI
     select APM
+    select I8257
+    select I8259
+    select MC146818RTC
 
 config SMC37C669
     bool
-- 
2.26.3

Re: [PATCH v2 10/12] hw/isa/vt82c686: Add missing Kconfig dependencies (build error)

[BALATON Zoltan]

[-- Attachment #1: Type: text/plain, Size: 989 bytes --]


On Sat, 15 May 2021, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> The VT82C686 device model misses various dependencies:
>
>  /usr/bin/ld: libcommon.fa.p/hw_isa_vt82c686.c.o: in function `vt82c686b_realize':
>  hw/isa/vt82c686.c:622: undefined reference to `i8259_init'
>  /usr/bin/ld: hw/isa/vt82c686.c:624: undefined reference to `i8257_dma_init'
>  /usr/bin/ld: hw/isa/vt82c686.c:627: undefined reference to `mc146818_rtc_init'
>
> Add them.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>

> ---
> hw/isa/Kconfig | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
> index 55e0003ce40..0703512209a 100644
> --- a/hw/isa/Kconfig
> +++ b/hw/isa/Kconfig
> @@ -49,6 +49,9 @@ config VT82C686
>     select FDC
>     select USB_UHCI
>     select APM
> +    select I8257
> +    select I8259
> +    select MC146818RTC
>
> config SMC37C669
>     bool
>

Re: [PATCH v2 10/12] hw/isa/vt82c686: Add missing Kconfig dependencies (build error)

[Bin Meng]

On Sun, May 16, 2021 at 1:43 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> The VT82C686 device model misses various dependencies:
>
>   /usr/bin/ld: libcommon.fa.p/hw_isa_vt82c686.c.o: in function `vt82c686b_realize':
>   hw/isa/vt82c686.c:622: undefined reference to `i8259_init'
>   /usr/bin/ld: hw/isa/vt82c686.c:624: undefined reference to `i8257_dma_init'
>   /usr/bin/ld: hw/isa/vt82c686.c:627: undefined reference to `mc146818_rtc_init'
>
> Add them.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/isa/Kconfig | 3 +++
>  1 file changed, 3 insertions(+)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

[PATCH v2 11/12] hw/isa/vt82c686: Add missing Kconfig dependency (runtime error)

[Philippe Mathieu-Daudé]

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

When building the Pegasos2 machine stand-alone we get:

  $ qemu-system-ppc -M pegasos2 -bios pegasos2.rom
  ERROR:qom/object.c:714:object_new_with_type: assertion failed: (type != NULL)
  Bail out! ERROR:qom/object.c:714:object_new_with_type: assertion failed: (type != NULL)

Looking at the backtrace:

  Thread 1 "qemu-system-ppc" received signal SIGABRT, Aborted.
  (gdb) bt
  #0  0x00007ffff53877d5 in raise () at /lib64/libc.so.6
  #1  0x00007ffff5370895 in abort () at /lib64/libc.so.6
  #2  0x00007ffff6dc4b6c in g_assertion_message_expr.cold () at /lib64/libglib-2.0.so.0
  #3  0x00007ffff6e229ff in g_assertion_message_expr () at /lib64/libglib-2.0.so.0
  #4  0x0000555555a0c8f4 in object_new_with_type (type=0x0) at qom/object.c:714
  #5  0x0000555555a0c9d5 in object_new (typename=0x555555c7afe4 "isa-pit") at qom/object.c:747
  #6  0x0000555555a053b8 in qdev_new (name=0x555555c7afe4 "isa-pit") at hw/core/qdev.c:153
  #7  0x00005555557cdd05 in isa_new (name=0x555555c7afe4 "isa-pit") at hw/isa/isa-bus.c:160
  #8  0x00005555557cf518 in i8254_pit_init (bus=0x55555603d140, base=64, isa_irq=0, alt_irq=0x0) at include/hw/timer/i8254.h:54
  #9  0x00005555557d12f9 in vt8231_realize (d=0x5555563d9770, errp=0x7fffffffcc28) at hw/isa/vt82c686.c:704
  #10 0x00005555557e1340 in pci_qdev_realize (qdev=0x5555563d9770, errp=0x7fffffffcca0) at hw/pci/pci.c:2116
  #11 0x0000555555a06a84 in device_set_realized (obj=0x5555563d9770, value=true, errp=0x7fffffffcda8) at hw/core/qdev.c:761
  #12 0x0000555555a0ff9e in property_set_bool (obj=0x5555563d9770, v=0x5555563da090, name=0x555555cd7881 "realized", opaque=0x5555560acf80, errp=0x7fffffffcda8) at qom/object.c:2257
  #13 0x0000555555a0e098 in object_property_set (obj=0x5555563d9770, name=0x555555cd7881 "realized", v=0x5555563da090, errp=0x555555fc3fa0 <error_fatal>) at qom/object.c:1402
  #14 0x0000555555a12271 in object_property_set_qobject (obj=0x5555563d9770, name=0x555555cd7881 "realized", value=0x5555563cf0a0, errp=0x555555fc3fa0 <error_fatal>) at qom/qom-qobject.c:28
  #15 0x0000555555a0e3fb in object_property_set_bool (obj=0x5555563d9770, name=0x555555cd7881 "realized", value=true, errp=0x555555fc3fa0 <error_fatal>) at qom/object.c:1472
  #16 0x0000555555a05b15 in qdev_realize (dev=0x5555563d9770, bus=0x5555563d32b0, errp=0x555555fc3fa0 <error_fatal>) at hw/core/qdev.c:389
  #17 0x0000555555a05b42 in qdev_realize_and_unref (dev=0x5555563d9770, bus=0x5555563d32b0, errp=0x555555fc3fa0 <error_fatal>) at hw/core/qdev.c:396
  #18 0x00005555557e160f in pci_realize_and_unref (dev=0x5555563d9770, bus=0x5555563d32b0, errp=0x555555fc3fa0 <error_fatal>) at hw/pci/pci.c:2181
  #19 0x00005555557e165b in pci_create_simple_multifunction (bus=0x5555563d32b0, devfn=96, multifunction=true, name=0x555555c9b63b "vt8231-isa") at hw/pci/pci.c:2189
  #20 0x0000555555867730 in pegasos2_init (machine=0x5555560427a0) at hw/ppc/pegasos2.c:105

The "isa-pit" type (TYPE_I8254) is missing. Add it.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/isa/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index 0703512209a..9822a90ce95 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -49,6 +49,7 @@ config VT82C686
     select FDC
     select USB_UHCI
     select APM
+    select I8254
     select I8257
     select I8259
     select MC146818RTC
-- 
2.26.3

Re: [PATCH v2 11/12] hw/isa/vt82c686: Add missing Kconfig dependency (runtime error)

[BALATON Zoltan]

[-- Attachment #1: Type: text/plain, Size: 3583 bytes --]

On Sat, 15 May 2021, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> When building the Pegasos2 machine stand-alone we get:
>
>  $ qemu-system-ppc -M pegasos2 -bios pegasos2.rom
>  ERROR:qom/object.c:714:object_new_with_type: assertion failed: (type != NULL)
>  Bail out! ERROR:qom/object.c:714:object_new_with_type: assertion failed: (type != NULL)
>
> Looking at the backtrace:
>
>  Thread 1 "qemu-system-ppc" received signal SIGABRT, Aborted.
>  (gdb) bt
>  #0  0x00007ffff53877d5 in raise () at /lib64/libc.so.6
>  #1  0x00007ffff5370895 in abort () at /lib64/libc.so.6
>  #2  0x00007ffff6dc4b6c in g_assertion_message_expr.cold () at /lib64/libglib-2.0.so.0
>  #3  0x00007ffff6e229ff in g_assertion_message_expr () at /lib64/libglib-2.0.so.0
>  #4  0x0000555555a0c8f4 in object_new_with_type (type=0x0) at qom/object.c:714
>  #5  0x0000555555a0c9d5 in object_new (typename=0x555555c7afe4 "isa-pit") at qom/object.c:747
>  #6  0x0000555555a053b8 in qdev_new (name=0x555555c7afe4 "isa-pit") at hw/core/qdev.c:153
>  #7  0x00005555557cdd05 in isa_new (name=0x555555c7afe4 "isa-pit") at hw/isa/isa-bus.c:160
>  #8  0x00005555557cf518 in i8254_pit_init (bus=0x55555603d140, base=64, isa_irq=0, alt_irq=0x0) at include/hw/timer/i8254.h:54
>  #9  0x00005555557d12f9 in vt8231_realize (d=0x5555563d9770, errp=0x7fffffffcc28) at hw/isa/vt82c686.c:704
>  #10 0x00005555557e1340 in pci_qdev_realize (qdev=0x5555563d9770, errp=0x7fffffffcca0) at hw/pci/pci.c:2116
>  #11 0x0000555555a06a84 in device_set_realized (obj=0x5555563d9770, value=true, errp=0x7fffffffcda8) at hw/core/qdev.c:761
>  #12 0x0000555555a0ff9e in property_set_bool (obj=0x5555563d9770, v=0x5555563da090, name=0x555555cd7881 "realized", opaque=0x5555560acf80, errp=0x7fffffffcda8) at qom/object.c:2257
>  #13 0x0000555555a0e098 in object_property_set (obj=0x5555563d9770, name=0x555555cd7881 "realized", v=0x5555563da090, errp=0x555555fc3fa0 <error_fatal>) at qom/object.c:1402
>  #14 0x0000555555a12271 in object_property_set_qobject (obj=0x5555563d9770, name=0x555555cd7881 "realized", value=0x5555563cf0a0, errp=0x555555fc3fa0 <error_fatal>) at qom/qom-qobject.c:28
>  #15 0x0000555555a0e3fb in object_property_set_bool (obj=0x5555563d9770, name=0x555555cd7881 "realized", value=true, errp=0x555555fc3fa0 <error_fatal>) at qom/object.c:1472
>  #16 0x0000555555a05b15 in qdev_realize (dev=0x5555563d9770, bus=0x5555563d32b0, errp=0x555555fc3fa0 <error_fatal>) at hw/core/qdev.c:389
>  #17 0x0000555555a05b42 in qdev_realize_and_unref (dev=0x5555563d9770, bus=0x5555563d32b0, errp=0x555555fc3fa0 <error_fatal>) at hw/core/qdev.c:396
>  #18 0x00005555557e160f in pci_realize_and_unref (dev=0x5555563d9770, bus=0x5555563d32b0, errp=0x555555fc3fa0 <error_fatal>) at hw/pci/pci.c:2181
>  #19 0x00005555557e165b in pci_create_simple_multifunction (bus=0x5555563d32b0, devfn=96, multifunction=true, name=0x555555c9b63b "vt8231-isa") at hw/pci/pci.c:2189
>  #20 0x0000555555867730 in pegasos2_init (machine=0x5555560427a0) at hw/ppc/pegasos2.c:105
>
> The "isa-pit" type (TYPE_I8254) is missing. Add it.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>

> ---
> hw/isa/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
> index 0703512209a..9822a90ce95 100644
> --- a/hw/isa/Kconfig
> +++ b/hw/isa/Kconfig
> @@ -49,6 +49,7 @@ config VT82C686
>     select FDC
>     select USB_UHCI
>     select APM
> +    select I8254
>     select I8257
>     select I8259
>     select MC146818RTC
>

Re: [PATCH v2 11/12] hw/isa/vt82c686: Add missing Kconfig dependency (runtime error)

[Bin Meng]

On Sun, May 16, 2021 at 1:46 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> When building the Pegasos2 machine stand-alone we get:
>
>   $ qemu-system-ppc -M pegasos2 -bios pegasos2.rom
>   ERROR:qom/object.c:714:object_new_with_type: assertion failed: (type != NULL)
>   Bail out! ERROR:qom/object.c:714:object_new_with_type: assertion failed: (type != NULL)
>
> Looking at the backtrace:
>
>   Thread 1 "qemu-system-ppc" received signal SIGABRT, Aborted.
>   (gdb) bt
>   #0  0x00007ffff53877d5 in raise () at /lib64/libc.so.6
>   #1  0x00007ffff5370895 in abort () at /lib64/libc.so.6
>   #2  0x00007ffff6dc4b6c in g_assertion_message_expr.cold () at /lib64/libglib-2.0.so.0
>   #3  0x00007ffff6e229ff in g_assertion_message_expr () at /lib64/libglib-2.0.so.0
>   #4  0x0000555555a0c8f4 in object_new_with_type (type=0x0) at qom/object.c:714
>   #5  0x0000555555a0c9d5 in object_new (typename=0x555555c7afe4 "isa-pit") at qom/object.c:747
>   #6  0x0000555555a053b8 in qdev_new (name=0x555555c7afe4 "isa-pit") at hw/core/qdev.c:153
>   #7  0x00005555557cdd05 in isa_new (name=0x555555c7afe4 "isa-pit") at hw/isa/isa-bus.c:160
>   #8  0x00005555557cf518 in i8254_pit_init (bus=0x55555603d140, base=64, isa_irq=0, alt_irq=0x0) at include/hw/timer/i8254.h:54
>   #9  0x00005555557d12f9 in vt8231_realize (d=0x5555563d9770, errp=0x7fffffffcc28) at hw/isa/vt82c686.c:704
>   #10 0x00005555557e1340 in pci_qdev_realize (qdev=0x5555563d9770, errp=0x7fffffffcca0) at hw/pci/pci.c:2116
>   #11 0x0000555555a06a84 in device_set_realized (obj=0x5555563d9770, value=true, errp=0x7fffffffcda8) at hw/core/qdev.c:761
>   #12 0x0000555555a0ff9e in property_set_bool (obj=0x5555563d9770, v=0x5555563da090, name=0x555555cd7881 "realized", opaque=0x5555560acf80, errp=0x7fffffffcda8) at qom/object.c:2257
>   #13 0x0000555555a0e098 in object_property_set (obj=0x5555563d9770, name=0x555555cd7881 "realized", v=0x5555563da090, errp=0x555555fc3fa0 <error_fatal>) at qom/object.c:1402
>   #14 0x0000555555a12271 in object_property_set_qobject (obj=0x5555563d9770, name=0x555555cd7881 "realized", value=0x5555563cf0a0, errp=0x555555fc3fa0 <error_fatal>) at qom/qom-qobject.c:28
>   #15 0x0000555555a0e3fb in object_property_set_bool (obj=0x5555563d9770, name=0x555555cd7881 "realized", value=true, errp=0x555555fc3fa0 <error_fatal>) at qom/object.c:1472
>   #16 0x0000555555a05b15 in qdev_realize (dev=0x5555563d9770, bus=0x5555563d32b0, errp=0x555555fc3fa0 <error_fatal>) at hw/core/qdev.c:389
>   #17 0x0000555555a05b42 in qdev_realize_and_unref (dev=0x5555563d9770, bus=0x5555563d32b0, errp=0x555555fc3fa0 <error_fatal>) at hw/core/qdev.c:396
>   #18 0x00005555557e160f in pci_realize_and_unref (dev=0x5555563d9770, bus=0x5555563d32b0, errp=0x555555fc3fa0 <error_fatal>) at hw/pci/pci.c:2181
>   #19 0x00005555557e165b in pci_create_simple_multifunction (bus=0x5555563d32b0, devfn=96, multifunction=true, name=0x555555c9b63b "vt8231-isa") at hw/pci/pci.c:2189
>   #20 0x0000555555867730 in pegasos2_init (machine=0x5555560427a0) at hw/ppc/pegasos2.c:105
>
> The "isa-pit" type (TYPE_I8254) is missing. Add it.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/isa/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

[PATCH v2 12/12] hw/ppc/Kconfig: Add dependency PEGASOS2 -> ATI_VGA

[Philippe Mathieu-Daudé]

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

While the ATI VGA device isn't a requisite (no crash without it):

  $ qemu-system-ppc -M pegasos2
  qemu-system-ppc: standard VGA not available

it is useful to have it with the Pegasos2 machine:

  $ qemu-system-ppc -M pegasos2 -vga none -bios pegasos2.rom -device ati-vga,romfile=
  qemu-system-ppc: -device ati-vga,romfile=: 'ati-vga' is not a valid device model name

Add it as an implicit Kconfig dependency.

Fixes: ba7e5ac18e7 ("hw/ppc: Add emulation of Genesi/bPlan Pegasos II")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/ppc/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index 2e4c56eb770..e36db08665a 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -77,6 +77,7 @@ config PEGASOS2
     select SMBUS_EEPROM
 # This should come with VT82C686
     select ACPI_X86
+    imply ATI_VGA
 
 config PREP
     bool
-- 
2.26.3

Re: [PATCH v2 12/12] hw/ppc/Kconfig: Add dependency PEGASOS2 -> ATI_VGA

[BALATON Zoltan]

[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]

On Sat, 15 May 2021, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> While the ATI VGA device isn't a requisite (no crash without it):
>
>  $ qemu-system-ppc -M pegasos2
>  qemu-system-ppc: standard VGA not available
>
> it is useful to have it with the Pegasos2 machine:
>
>  $ qemu-system-ppc -M pegasos2 -vga none -bios pegasos2.rom -device ati-vga,romfile=
>  qemu-system-ppc: -device ati-vga,romfile=: 'ati-vga' is not a valid device model name
>
> Add it as an implicit Kconfig dependency.
>
> Fixes: ba7e5ac18e7 ("hw/ppc: Add emulation of Genesi/bPlan Pegasos II")

You can list it as a fix but I regard this more an enhancement or 
amandment to that commit as it was not broken in this regard as the commit 
message above also explains. To me Fixes tag means more that something was 
broken in that commit that this one patches up but I don't care much about 
this tag. It would probably make more sense in your other commits fixing 
missing dependencies (although not clear which commit those fix as the 
missing dependencies were probably also missing before the latest clean 
ups).

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

Acked-by: BALATON Zoltan <balaton@eik.bme.hu>

> ---
> hw/ppc/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
> index 2e4c56eb770..e36db08665a 100644
> --- a/hw/ppc/Kconfig
> +++ b/hw/ppc/Kconfig
> @@ -77,6 +77,7 @@ config PEGASOS2
>     select SMBUS_EEPROM
> # This should come with VT82C686
>     select ACPI_X86
> +    imply ATI_VGA
>
> config PREP
>     bool
>

Re: [PATCH v2 12/12] hw/ppc/Kconfig: Add dependency PEGASOS2 -> ATI_VGA

[Philippe Mathieu-Daudé]

On 5/15/21 9:41 PM, BALATON Zoltan wrote:
> On Sat, 15 May 2021, Philippe Mathieu-Daudé wrote:
>> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>
>> While the ATI VGA device isn't a requisite (no crash without it):
>>
>>  $ qemu-system-ppc -M pegasos2
>>  qemu-system-ppc: standard VGA not available
>>
>> it is useful to have it with the Pegasos2 machine:
>>
>>  $ qemu-system-ppc -M pegasos2 -vga none -bios pegasos2.rom -device
>> ati-vga,romfile=
>>  qemu-system-ppc: -device ati-vga,romfile=: 'ati-vga' is not a valid
>> device model name
>>
>> Add it as an implicit Kconfig dependency.
>>
>> Fixes: ba7e5ac18e7 ("hw/ppc: Add emulation of Genesi/bPlan Pegasos II")
> 
> You can list it as a fix but I regard this more an enhancement or
> amandment to that commit as it was not broken in this regard as the
> commit message above also explains. To me Fixes tag means more that
> something was broken in that commit that this one patches up but I don't
> care much about this tag. It would probably make more sense in your
> other commits fixing missing dependencies (although not clear which
> commit those fix as the missing dependencies were probably also missing
> before the latest clean ups).

OK, I'll reword.

Thanks for reviewing this series!

> 
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> 
> Acked-by: BALATON Zoltan <balaton@eik.bme.hu>

Re: [PATCH v2 12/12] hw/ppc/Kconfig: Add dependency PEGASOS2 -> ATI_VGA

[Bin Meng]

On Sun, May 16, 2021 at 3:41 AM BALATON Zoltan <balaton@eik.bme.hu> wrote:
>
> On Sat, 15 May 2021, Philippe Mathieu-Daudé wrote:
> > From: Philippe Mathieu-Daudé <f4bug@amsat.org>
> >
> > While the ATI VGA device isn't a requisite (no crash without it):
> >
> >  $ qemu-system-ppc -M pegasos2
> >  qemu-system-ppc: standard VGA not available
> >
> > it is useful to have it with the Pegasos2 machine:
> >
> >  $ qemu-system-ppc -M pegasos2 -vga none -bios pegasos2.rom -device ati-vga,romfile=
> >  qemu-system-ppc: -device ati-vga,romfile=: 'ati-vga' is not a valid device model name
> >
> > Add it as an implicit Kconfig dependency.
> >
> > Fixes: ba7e5ac18e7 ("hw/ppc: Add emulation of Genesi/bPlan Pegasos II")
>
> You can list it as a fix but I regard this more an enhancement or
> amandment to that commit as it was not broken in this regard as the commit
> message above also explains. To me Fixes tag means more that something was

Agree. This patch is more like a feature, instead of a fix. So the
"Fixes" tag isn't appropriate.

> broken in that commit that this one patches up but I don't care much about
> this tag. It would probably make more sense in your other commits fixing
> missing dependencies (although not clear which commit those fix as the
> missing dependencies were probably also missing before the latest clean
> ups).
>
> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> Acked-by: BALATON Zoltan <balaton@eik.bme.hu>

FWIW:

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Regards,
Bin

Re: [PATCH v2 12/12] hw/ppc/Kconfig: Add dependency PEGASOS2 -> ATI_VGA

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1357 bytes --]

On Sat, May 15, 2021 at 07:37:16PM +0200, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
> 
> While the ATI VGA device isn't a requisite (no crash without it):
> 
>   $ qemu-system-ppc -M pegasos2
>   qemu-system-ppc: standard VGA not available
> 
> it is useful to have it with the Pegasos2 machine:
> 
>   $ qemu-system-ppc -M pegasos2 -vga none -bios pegasos2.rom -device ati-vga,romfile=
>   qemu-system-ppc: -device ati-vga,romfile=: 'ati-vga' is not a valid device model name
> 
> Add it as an implicit Kconfig dependency.
> 
> Fixes: ba7e5ac18e7 ("hw/ppc: Add emulation of Genesi/bPlan Pegasos II")
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Acked-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  hw/ppc/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
> index 2e4c56eb770..e36db08665a 100644
> --- a/hw/ppc/Kconfig
> +++ b/hw/ppc/Kconfig
> @@ -77,6 +77,7 @@ config PEGASOS2
>      select SMBUS_EEPROM
>  # This should come with VT82C686
>      select ACPI_X86
> +    imply ATI_VGA
>  
>  config PREP
>      bool

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v2 00/12] hw: Various Kconfig fixes

[Eduardo Habkost]

CCing Build system architecture maintainer (Daniel).

On Sat, May 15, 2021 at 07:37:04PM +0200, Philippe Mathieu-Daudé wrote:
> Various Kconfig fixes when building stand-alone machine binaries.

Who should merge this once it's ready?

> 
> Since v1:
> - Fixed Pegasos2 machine
> - Removed SEMIHOSTING related patches (will repost them later)
> 
> Philippe Mathieu-Daudé (12):
>   hw/mem/nvdimm: Use Kconfig 'imply' instead of 'depends on'
>   hw/ide/Kconfig: Add missing dependency PCI -> IDE_QDEV
>   hw/arm/Kconfig: Add missing dependency NPCM7XX -> SMBUS
>   hw/arm/Kconfig: Remove unused DS1338 symbol from i.MX25 PDK Board
>   hw/arm/Kconfig: Add missing SDHCI symbol to FSL_IMX25
>   hw/riscv/Kconfig: Add missing dependency MICROCHIP_PFSOC -> SERIAL
>   hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines
>   hw/ppc/Kconfig: Add missing dependency E500 -> DS1338 RTC
>   hw/pci-host/Kconfig: Add missing dependency MV64361 -> I8259
>   hw/isa/vt82c686: Add missing Kconfig dependencies (build error)
>   hw/isa/vt82c686: Add missing Kconfig dependency (runtime error)
>   hw/ppc/Kconfig: Add dependency PEGASOS2 -> ATI_VGA
> 
>  default-configs/devices/ppc-softmmu.mak   | 1 -
>  default-configs/devices/ppc64-softmmu.mak | 1 -
>  hw/arm/Kconfig                            | 4 +++-
>  hw/char/Kconfig                           | 1 +
>  hw/i386/Kconfig                           | 1 +
>  hw/ide/Kconfig                            | 2 +-
>  hw/isa/Kconfig                            | 4 ++++
>  hw/mem/Kconfig                            | 2 --
>  hw/pci-host/Kconfig                       | 1 +
>  hw/ppc/Kconfig                            | 3 +++
>  hw/riscv/Kconfig                          | 5 +++++
>  hw/riscv/meson.build                      | 2 +-
>  12 files changed, 20 insertions(+), 7 deletions(-)
> 
> -- 
> 2.26.3
> 
> 
> 

-- 
Eduardo

Re: [PATCH v2 00/12] hw: Various Kconfig fixes

[Eduardo Habkost]

On Mon, May 17, 2021 at 03:18:56PM -0400, Eduardo Habkost wrote:
> CCing Build system architecture maintainer (Daniel).

Oops, I was misled by the subsection title.  Daniel is
responsible only for the build system documentation.

Do we have any volunteers willing to be listed as reviewers for
build system changes in MAINTAINERS?  meson.build has a
non-trivial amount of code and no maintainers or reviewers at
all.

> 
> On Sat, May 15, 2021 at 07:37:04PM +0200, Philippe Mathieu-Daudé wrote:
> > Various Kconfig fixes when building stand-alone machine binaries.
> 
> Who should merge this once it's ready?
> 
> > 
> > Since v1:
> > - Fixed Pegasos2 machine
> > - Removed SEMIHOSTING related patches (will repost them later)
> > 
> > Philippe Mathieu-Daudé (12):
> >   hw/mem/nvdimm: Use Kconfig 'imply' instead of 'depends on'
> >   hw/ide/Kconfig: Add missing dependency PCI -> IDE_QDEV
> >   hw/arm/Kconfig: Add missing dependency NPCM7XX -> SMBUS
> >   hw/arm/Kconfig: Remove unused DS1338 symbol from i.MX25 PDK Board
> >   hw/arm/Kconfig: Add missing SDHCI symbol to FSL_IMX25
> >   hw/riscv/Kconfig: Add missing dependency MICROCHIP_PFSOC -> SERIAL
> >   hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines
> >   hw/ppc/Kconfig: Add missing dependency E500 -> DS1338 RTC
> >   hw/pci-host/Kconfig: Add missing dependency MV64361 -> I8259
> >   hw/isa/vt82c686: Add missing Kconfig dependencies (build error)
> >   hw/isa/vt82c686: Add missing Kconfig dependency (runtime error)
> >   hw/ppc/Kconfig: Add dependency PEGASOS2 -> ATI_VGA
> > 
> >  default-configs/devices/ppc-softmmu.mak   | 1 -
> >  default-configs/devices/ppc64-softmmu.mak | 1 -
> >  hw/arm/Kconfig                            | 4 +++-
> >  hw/char/Kconfig                           | 1 +
> >  hw/i386/Kconfig                           | 1 +
> >  hw/ide/Kconfig                            | 2 +-
> >  hw/isa/Kconfig                            | 4 ++++
> >  hw/mem/Kconfig                            | 2 --
> >  hw/pci-host/Kconfig                       | 1 +
> >  hw/ppc/Kconfig                            | 3 +++
> >  hw/riscv/Kconfig                          | 5 +++++
> >  hw/riscv/meson.build                      | 2 +-
> >  12 files changed, 20 insertions(+), 7 deletions(-)
> > 
> > -- 
> > 2.26.3
> > 
> > 
> > 
> 
> -- 
> Eduardo
> 
> 

-- 
Eduardo

Re: [PATCH v2 00/12] hw: Various Kconfig fixes

[Philippe Mathieu-Daudé]

On 5/17/21 10:04 PM, Eduardo Habkost wrote:
> On Mon, May 17, 2021 at 03:18:56PM -0400, Eduardo Habkost wrote:
>> CCing Build system architecture maintainer (Daniel).
> 
> Oops, I was misled by the subsection title.  Daniel is
> responsible only for the build system documentation.
> 
> Do we have any volunteers willing to be listed as reviewers for
> build system changes in MAINTAINERS?  meson.build has a
> non-trivial amount of code and no maintainers or reviewers at
> all.

Hmmm OK I can add an entry. Ideally with Paolo/Thomas but I don't
think they want to be listed in any new section ;)

>> On Sat, May 15, 2021 at 07:37:04PM +0200, Philippe Mathieu-Daudé wrote:
>>> Various Kconfig fixes when building stand-alone machine binaries.
>>
>> Who should merge this once it's ready?

Paolo said in v1 that I can send the pull request myself :))

I will do it in the next 48h~.

Thanks,

Phil.

Re: [PATCH v2 00/12] hw: Various Kconfig fixes

[Alex Bennée]

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

> On 5/17/21 10:04 PM, Eduardo Habkost wrote:
>> On Mon, May 17, 2021 at 03:18:56PM -0400, Eduardo Habkost wrote:
>>> CCing Build system architecture maintainer (Daniel).
>> 
>> Oops, I was misled by the subsection title.  Daniel is
>> responsible only for the build system documentation.
>> 
>> Do we have any volunteers willing to be listed as reviewers for
>> build system changes in MAINTAINERS?  meson.build has a
>> non-trivial amount of code and no maintainers or reviewers at
>> all.
>
> Hmmm OK I can add an entry. Ideally with Paolo/Thomas but I don't
> think they want to be listed in any new section ;)
>
>>> On Sat, May 15, 2021 at 07:37:04PM +0200, Philippe Mathieu-Daudé wrote:
>>>> Various Kconfig fixes when building stand-alone machine binaries.
>>>
>>> Who should merge this once it's ready?
>
> Paolo said in v1 that I can send the pull request myself :))
>
> I will do it in the next 48h~.

Did this happen? I tried to apply the series but it conflicted straight
away. 

-- 
Alex Bennée