[Qemu-devel] [PATCH v2 0/5] Kconfig dependencies for ppc machines

[Qemu-devel] [PATCH v2 0/5] Kconfig dependencies for ppc machines

[Thomas Huth]

Here's now my stab at expressing the ppc machine dependencies with
Kconfig. I've carefully stepped through the dependencies and tried to
built each machine separately (which should be possible now, apart
from some few quirks like the RTAS dependency in qtest.c which I will
address later).

v2: Adressed review feedback from v1

Based-on: 1548410831-19553-1-git-send-email-pbonzini@redhat.com

Thomas Huth (5):
  ppc64: Express dependencies of 'pseries' and 'powernv' machines with
    kconfig
  ppc: Express dependencies of the 'prep' and '40p' machines with
    kconfig
  ppc: Express dependencies of the Mac machines with kconfig
  ppc: Express dependencies of the Sam460EX machines with kconfig
  ppc: Express dependencies of the embedded machines with kconfig

 default-configs/ppc-softmmu.mak   | 51 +++--------------------------------
 default-configs/ppc64-softmmu.mak |  8 ------
 hw/display/Kconfig                |  1 +
 hw/intc/Kconfig                   |  6 ++---
 hw/mem/Kconfig                    |  1 +
 hw/misc/Kconfig                   |  6 +++++
 hw/net/Kconfig                    |  2 ++
 hw/nvram/Kconfig                  |  2 ++
 hw/pci-host/Kconfig               |  4 ++-
 hw/ppc/Kconfig                    | 57 ++++++++++++++++++++++++++++++++++++---
 hw/usb/Kconfig                    |  2 +-
 11 files changed, 75 insertions(+), 65 deletions(-)

-- 
1.8.3.1

[Qemu-devel] [PATCH v2 1/5] ppc64: Express dependencies of 'pseries' and 'powernv' machines with kconfig

[Thomas Huth]

The POWERNV switch should always select ISA_IPMI_BT, then the other
IPMI options are turned on automatically now.
CONFIG_DIMM should always be selected by the pseries machine,
which in turn depends on CONFIG_MEM_DEVICE since DIMM implements
this interface.
CONFIG_VIRTIO_VGA can be dropped from default-configs/ppc64-softmmu.mak
completely since this device is already automatically enabled via
hw/display/Kconfig now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 default-configs/ppc64-softmmu.mak |  8 --------
 hw/intc/Kconfig                   |  6 ++----
 hw/mem/Kconfig                    |  1 +
 hw/ppc/Kconfig                    | 18 ++++++++++++++----
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index a0a9151..cca5266 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -5,14 +5,6 @@ include ppc-softmmu.mak
 
 # For PowerNV
 CONFIG_POWERNV=y
-CONFIG_IPMI=y
-CONFIG_IPMI_LOCAL=y
-CONFIG_IPMI_EXTERN=y
-CONFIG_ISA_IPMI_BT=y
 
 # For pSeries
 CONFIG_PSERIES=y
-CONFIG_VIRTIO_VGA=y
-CONFIG_MEM_DEVICE=y
-CONFIG_DIMM=y
-CONFIG_SPAPR_RNG=y
diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
index 6eea14e..de10a6b 100644
--- a/hw/intc/Kconfig
+++ b/hw/intc/Kconfig
@@ -31,13 +31,11 @@ config OPENPIC_KVM
 
 config XICS
     bool
-    default y
-    depends on PSERIES
+    depends on POWERNV || PSERIES
 
 config XICS_SPAPR
     bool
-    default y
-    depends on PSERIES
+    select XICS
 
 config XICS_KVM
     bool
diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig
index d1e635c..620fd4c 100644
--- a/hw/mem/Kconfig
+++ b/hw/mem/Kconfig
@@ -1,5 +1,6 @@
 config DIMM
     bool
+    select MEM_DEVICE
 
 config MEM_DEVICE
     bool
diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index b0095e1..4dbf866 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -1,11 +1,23 @@
 config PSERIES
     bool
+    select DIMM
+    select PCI
+    select VFIO
+    select XICS_SPAPR
+    select XIVE_SPAPR
 
 config SPAPR_RNG
     bool
+    default y
+    depends on PSERIES
 
 config POWERNV
     bool
+    select ISA_IPMI_BT
+    select ISA_BUS
+    select MC146818RTC
+    select XICS
+    select XIVE
 
 config PPC405
     bool
@@ -45,16 +57,14 @@ config MAC_PMU
 
 config XIVE
     bool
-    default y
-    depends on PSERIES
+    depends on POWERNV || PSERIES
 
 config MACIO_GPIO
     bool
 
 config XIVE_SPAPR
     bool
-    default y
-    depends on PSERIES
+    select XIVE
 
 config CUDA
     bool
-- 
1.8.3.1

[Qemu-devel] [PATCH v2 2/5] ppc: Express dependencies of the 'prep' and '40p' machines with kconfig

[Thomas Huth]

Select the required devices in hw/ppc/Kconfig instead, so that
ppc-softmmu.mak only contains the user-selectable PREP switch.
Plug-in devices like NE2000_ISA are pulled in automatically by the
Kconfig build system now.

Cc: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 default-configs/ppc-softmmu.mak | 8 --------
 hw/ppc/Kconfig                  | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 05ba726..422f1b7 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -57,11 +57,3 @@ CONFIG_MAC_NEWWORLD=y
 
 # For PReP
 CONFIG_PREP=y
-CONFIG_PREP_PCI=y
-CONFIG_RS6000_MC=y
-CONFIG_I82374=y
-CONFIG_I82378=y
-CONFIG_PCKBD=y
-CONFIG_NE2000_ISA=y
-CONFIG_PC87312=y
-CONFIG_CS4231A=y
diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index 4dbf866..b1c3a30 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -33,6 +33,14 @@ config SAM460EX
 
 config PREP
     bool
+    select CS4231A
+    select PREP_PCI
+    select I82374
+    select I82378
+    select LSI_SCSI_PCI
+    select M48T59
+    select PC87312
+    select RS6000_MC
 
 config RS6000_MC
     bool
-- 
1.8.3.1

[Qemu-devel] [PATCH v2 3/5] ppc: Express dependencies of the Mac machines with kconfig

[Thomas Huth]

This will make it for example easier if the users want to disable
one of the two machines for their builds.

Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 default-configs/ppc-softmmu.mak | 15 ---------------
 hw/misc/Kconfig                 |  6 ++++++
 hw/net/Kconfig                  |  2 ++
 hw/pci-host/Kconfig             |  4 +++-
 hw/ppc/Kconfig                  |  9 +++++++++
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 422f1b7..513a8e9 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -37,21 +37,6 @@ CONFIG_VGA_CIRRUS=y
 CONFIG_SMBUS_EEPROM=y
 
 # For Macs
-CONFIG_ESCC=y
-CONFIG_MACIO=y
-CONFIG_MACIO_GPIO=y
-CONFIG_SUNGEM=y
-CONFIG_MOS6522=y
-CONFIG_CUDA=y
-CONFIG_ADB=y
-CONFIG_MAC_NVRAM=y
-CONFIG_MAC_DBDMA=y
-CONFIG_MAC_PMU=y
-CONFIG_HEATHROW_PIC=y
-CONFIG_GRACKLE_PCI=y
-CONFIG_UNIN_PCI=y
-CONFIG_DEC_PCI=y
-CONFIG_IDE_MACIO=y
 CONFIG_MAC_OLDWORLD=y
 CONFIG_MAC_NEWWORLD=y
 
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 3ebe30f..9b63f75 100644
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -59,6 +59,12 @@ config MOS6522
 
 config MACIO
     bool
+    select CUDA
+    select ESCC
+    select IDE_MACIO
+    select MAC_DBDMA
+    select MAC_NVRAM
+    select MOS6522
 
 config IVSHMEM_DEVICE
     bool
diff --git a/hw/net/Kconfig b/hw/net/Kconfig
index 47368d7..9047f6d 100644
--- a/hw/net/Kconfig
+++ b/hw/net/Kconfig
@@ -85,6 +85,8 @@ config FTGMAC100
 
 config SUNGEM
     bool
+    default y if (MAC_OLDWORLD || MAC_NEWWORLD)
+    depends on PCI
 
 config COLDFIRE
     bool
diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
index ff4080c..b39ea29 100644
--- a/hw/pci-host/Kconfig
+++ b/hw/pci-host/Kconfig
@@ -10,8 +10,10 @@ config GRACKLE_PCI
     bool
 
 config UNIN_PCI
-    select PCI
     bool
+    select PCI
+    select DEC_PCI
+    select OPENPIC
 
 config PPCE500_PCI
     select PCI
diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index b1c3a30..2956c86 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -47,9 +47,18 @@ config RS6000_MC
 
 config MAC_OLDWORLD
     bool
+    select ADB
+    select GRACKLE_PCI
+    select HEATHROW_PIC
+    select MACIO
 
 config MAC_NEWWORLD
     bool
+    select ADB
+    select MACIO
+    select MACIO_GPIO
+    select MAC_PMU
+    select UNIN_PCI
 
 config E500
     bool
-- 
1.8.3.1

[Qemu-devel] [PATCH v2 4/5] ppc: Express dependencies of the Sam460EX machines with kconfig

[Thomas Huth]

Most of the dependencies are now directly selected by the SAM460EX
switch. We can drop CONFIG_VGA_CIRRUS since this device is already
selected automatically when CONFIG_PCI_DEVICES is set.

Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 default-configs/ppc-softmmu.mak | 10 ----------
 hw/display/Kconfig              |  1 +
 hw/ppc/Kconfig                  | 10 ++++++++++
 hw/usb/Kconfig                  |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 513a8e9..5265d8a 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -25,16 +25,6 @@ CONFIG_PCI_EXPRESS=y
 
 # For Sam460ex
 CONFIG_SAM460EX=y
-CONFIG_USB_EHCI_SYSBUS=y
-CONFIG_SM501=y
-CONFIG_DDC=y
-CONFIG_IDE_SII3112=y
-CONFIG_I2C=y
-CONFIG_AT24C=y
-CONFIG_BITBANG_I2C=y
-CONFIG_M41T80=y
-CONFIG_VGA_CIRRUS=y
-CONFIG_SMBUS_EEPROM=y
 
 # For Macs
 CONFIG_MAC_OLDWORLD=y
diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index c784fe8..f8e6136 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -76,6 +76,7 @@ config MILKYMIST_TMU2
 config SM501
     bool
     depends on I2C
+    select DDC
 
 config TCX
     bool
diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index 2956c86..35e3704 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -27,9 +27,19 @@ config PPC440
 
 config PPC4XX
     bool
+    select BITBANG_I2C
+    select PCI
 
 config SAM460EX
     bool
+    select PFLASH_CFI01
+    select IDE_SII3112
+    select M41T80
+    select PPC440
+    select SM501
+    select SMBUS_EEPROM
+    select USB_EHCI_SYSBUS
+    select USB_OHCI
 
 config PREP
     bool
diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig
index a1b7acb..871ea47 100644
--- a/hw/usb/Kconfig
+++ b/hw/usb/Kconfig
@@ -21,7 +21,7 @@ config USB_EHCI
 
 config USB_EHCI_SYSBUS
     bool
-    select USB
+    select USB_EHCI
 
 config USB_XHCI
     bool
-- 
1.8.3.1

[Qemu-devel] [PATCH v2 5/5] ppc: Express dependencies of the embedded machines with kconfig

[Thomas Huth]

This makes it much easier if the users want to disable some of
the embedded machines for their builds.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 default-configs/ppc-softmmu.mak | 18 ++++--------------
 hw/nvram/Kconfig                |  2 ++
 hw/ppc/Kconfig                  | 12 ++++++++++++
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 5265d8a..5192aca 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -1,27 +1,17 @@
 # Default configuration for ppc-softmmu
 
-CONFIG_PCI=y
 CONFIG_PCI_DEVICES=y
-CONFIG_ISA_BUS=y
 CONFIG_TEST_DEVICES=y
 
-# For embedded PPCs:
-CONFIG_PPC4XX=y
-CONFIG_M48T59=y
+# FIXME: CONFIG_SERIAL is currently still required to link all of the
+# ppc machines (due to the usage of serial_mm_init() in ppc405_uc.c).
 CONFIG_SERIAL=y
-CONFIG_OPENPIC=y
-CONFIG_PPCE500_PCI=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_PFLASH_CFI02=y
-CONFIG_XILINX=y
-CONFIG_XILINX_ETHLITE=y
+
+# For embedded PPCs:
 CONFIG_E500=y
-CONFIG_PLATFORM_BUS=y
-CONFIG_ETSEC=y
 CONFIG_PPC405=y
 CONFIG_PPC440=y
 CONFIG_VIRTEX=y
-CONFIG_PCI_EXPRESS=y
 
 # For Sam460ex
 CONFIG_SAM460EX=y
diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig
index 1f5ec95..4f44f9b 100644
--- a/hw/nvram/Kconfig
+++ b/hw/nvram/Kconfig
@@ -3,6 +3,8 @@ config DS1225Y
 
 config AT24C
     bool
+    default y if E500
+    depends on I2C
 
 config MAC_NVRAM
     bool
diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index 35e3704..4085107 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -21,9 +21,14 @@ config POWERNV
 
 config PPC405
     bool
+    select M48T59
+    select PFLASH_CFI02
+    select PPC4XX
 
 config PPC440
     bool
+    select PCI_EXPRESS
+    select PPC4XX
 
 config PPC4XX
     bool
@@ -72,9 +77,16 @@ config MAC_NEWWORLD
 
 config E500
     bool
+    select ETSEC
+    select OPENPIC
+    select PLATFORM_BUS
+    select PPCE500_PCI
 
 config VIRTEX
     bool
+    select PFLASH_CFI01
+    select XILINX
+    select XILINX_ETHLITE
 
 config MAC_DBDMA
     bool
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH v2 1/5] ppc64: Express dependencies of 'pseries' and 'powernv' machines with kconfig

[Paolo Bonzini]

On 31/01/19 14:53, Thomas Huth wrote:

>  config PSERIES
>      bool
> +    select DIMM
> +    select PCI
> +    select VFIO
> +    select XICS_SPAPR
> +    select XIVE_SPAPR

Missing "select SPAPR_VSCSI", added it locally.

> 
>  config POWERNV
>      bool
> +    select ISA_IPMI_BT
> +    select ISA_BUS
> +    select MC146818RTC
> +    select XICS
> +    select XIVE
>  

Missing "select IPMI_LOCAL" for

/home/pbonzini/work/upstream/qemu/hw/ppc/pnv_bmc.c:67: undefined
reference to `ipmi_bmc_gen_event'
hw/ppc/pnv_bmc.o: In function `pnv_dt_bmc_sensors':
/home/pbonzini/work/upstream/qemu/hw/ppc/pnv_bmc.c:95: undefined
reference to `ipmi_bmc_sdr_find'

added it locally too.

Paolo

Re: [Qemu-devel] [PATCH v2 0/5] Kconfig dependencies for ppc machines

[Paolo Bonzini]

On 31/01/19 14:53, Thomas Huth wrote:
> Here's now my stab at expressing the ppc machine dependencies with
> Kconfig. I've carefully stepped through the dependencies and tried to
> built each machine separately (which should be possible now, apart
> from some few quirks like the RTAS dependency in qtest.c which I will
> address later).
> 
> v2: Adressed review feedback from v1
> 
> Based-on: 1548410831-19553-1-git-send-email-pbonzini@redhat.com
> 
> Thomas Huth (5):
>   ppc64: Express dependencies of 'pseries' and 'powernv' machines with
>     kconfig
>   ppc: Express dependencies of the 'prep' and '40p' machines with
>     kconfig
>   ppc: Express dependencies of the Mac machines with kconfig
>   ppc: Express dependencies of the Sam460EX machines with kconfig
>   ppc: Express dependencies of the embedded machines with kconfig
> 
>  default-configs/ppc-softmmu.mak   | 51 +++--------------------------------
>  default-configs/ppc64-softmmu.mak |  8 ------
>  hw/display/Kconfig                |  1 +
>  hw/intc/Kconfig                   |  6 ++---
>  hw/mem/Kconfig                    |  1 +
>  hw/misc/Kconfig                   |  6 +++++
>  hw/net/Kconfig                    |  2 ++
>  hw/nvram/Kconfig                  |  2 ++
>  hw/pci-host/Kconfig               |  4 ++-
>  hw/ppc/Kconfig                    | 57 ++++++++++++++++++++++++++++++++++++---
>  hw/usb/Kconfig                    |  2 +-
>  11 files changed, 75 insertions(+), 65 deletions(-)
> 

I queued this to my kconfig branch at https://github.com/bonzini/qemu.git.

Only ARM and MIPS are missing there. :)

Paolo

Re: [Qemu-devel] [PATCH v2 2/5] ppc: Express dependencies of the 'prep' and '40p' machines with kconfig

[Hervé Poussineau]

Le 31/01/2019 à 14:53, Thomas Huth a écrit :
> Select the required devices in hw/ppc/Kconfig instead, so that
> ppc-softmmu.mak only contains the user-selectable PREP switch.
> Plug-in devices like NE2000_ISA are pulled in automatically by the
> Kconfig build system now.
> 
> Cc: Hervé Poussineau <hpoussin@reactos.org>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   default-configs/ppc-softmmu.mak | 8 --------
>   hw/ppc/Kconfig                  | 8 ++++++++
>   2 files changed, 8 insertions(+), 8 deletions(-)
> 

Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>