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

[Cédric Le Goater]

On 1/30/19 12:04 PM, Thomas Huth wrote:
> On 2019-01-30 12:00, Cédric Le Goater wrote:
>> On 1/30/19 10:43 AM, Thomas Huth wrote:
>>> 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.
>>> CONFIG_SPAPR_RNG should stay in the ppc-softmmu.mak file since this
>>> is a completely optional device.
>>>
>>> Cc: Cédric Le Goater <address@hidden>
>>> Signed-off-by: Thomas Huth <address@hidden>
>>> ---
>>>  default-configs/ppc64-softmmu.mak | 7 -------
>>>  hw/intc/Kconfig                   | 4 +---
>>>  hw/mem/Kconfig                    | 1 +
>>>  hw/ppc/Kconfig                    | 9 +++++++++
>>>  4 files changed, 11 insertions(+), 10 deletions(-)
>>>
>>> diff --git a/default-configs/ppc64-softmmu.mak 
>>> b/default-configs/ppc64-softmmu.mak
>>> index a0a9151..6f8d7ea 100644
>>> --- a/default-configs/ppc64-softmmu.mak
>>> +++ b/default-configs/ppc64-softmmu.mak
>>> @@ -5,14 +5,7 @@ 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..1e819d0 100644
>>> --- a/hw/intc/Kconfig
>>> +++ b/hw/intc/Kconfig
>>> @@ -31,13 +31,11 @@ config OPENPIC_KVM
>>>  
>>>  config XICS
>>>      bool
>>> -    default y
>>> -    depends on PSERIES
>>>  
>>>  config XICS_SPAPR
>>>      bool
>>>      default y
>>> -    depends on PSERIES
>>> +    depends on XICS && PSERIES
>>>  
>>>  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..b44e3bd 100644
>>> --- a/hw/ppc/Kconfig
>>> +++ b/hw/ppc/Kconfig
>>> @@ -1,11 +1,20 @@
>>>  config PSERIES
>>>      bool
>>> +    select DIMM
>>> +    select PCI
>>> +    select VFIO
>>> +    select XICS
>>
>> Don't we want XICS_SPAPR ? or is there another toggle with KVM ?
>>
>>>  config SPAPR_RNG
>>>      bool
>>> +    depends on PSERIES
>>>  
>>>  config POWERNV
>>>      bool
>>> +    select ISA_IPMI_BT
>>
>> yes.
>>
>> It is possible to start a PowerNV machine without defining a 
>> BT device but the machine relies on the BT device and the IPMI 
>> backend attached to it to powerdown. 
>>
>> Ideally I would have preferred to define the device internally 
>> in the machine and plug it on the ISA bus but I couldn't find 
>> a way to do it cleanly. 
>>
>>> +    select ISA_BUS
>>> +    select MC146818RTC
>>> +    select XICS
>>
>> only for POWER8 machines. POWER9 uses XIVE.
> 
> Sure, but you don't know at compile time yet whether the user wants to
> use a POWER8 or a POWER9 CPU. So this currently always needs to be selected.

ah yes :) Please add XIVE then. I should get the Pnv model merged one day.

Thanks,

C.