[Qemu-devel] [PATCH 0/6] Kconfig dependencies for MIPS machines (but Malta)

[Qemu-devel] [PATCH 0/6] Kconfig dependencies for MIPS machines (but Malta)

[Philippe Mathieu-Daudé]

Express the MIPS machine dependencies with Kconfig.

Due to the complexity of the PIIX codebase being shared with
the X86 machines, the Malta board fill follow in a different
series (after some refactor cleanup).

Regards,

Phil.

Based on "Kconfig dependencies for ppc machines" from Thomas
Huth (which is based on Paolo's, which uses Yang Zhong "make
qemu configurable for Kconfig" v1).
Based-on: 1548942810-22942-1-git-send-email-thuth@redhat.com

Philippe Mathieu-Daudé (6):
  mips: Express dependencies of the MIPSsim machine with kconfig
  mips: Express dependencies of the Jazz machine with kconfig
  mips: Express dependencies of the r4k platform with kconfig
  mips: Express dependencies of the Boston machine with kconfig
  hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge
  mips: Express dependencies of the Loongson 2E machine with kconfig

 default-configs/mips-softmmu-common.mak |  4 ---
 default-configs/mips64-softmmu.mak      |  6 ----
 default-configs/mips64el-softmmu.mak    | 14 ---------
 hw/isa/Kconfig                          | 13 +++++---
 hw/mips/Kconfig                         | 40 +++++++++++++++++++++++++
 hw/pci-host/Kconfig                     |  4 +++
 hw/pci-host/Makefile.objs               |  2 +-
 7 files changed, 54 insertions(+), 29 deletions(-)

-- 
2.20.1

[Qemu-devel] [PATCH 1/6] mips: Express dependencies of the MIPSsim machine with kconfig

[Philippe Mathieu-Daudé]

The MIPSsim machine only emulates an 8250 UART and a simple network
controller, connected via an ISA bus.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 default-configs/mips-softmmu-common.mak | 2 --
 hw/mips/Kconfig                         | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index 0795d522db..aa73a4a822 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -26,7 +26,6 @@ CONFIG_PIIX4=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_PIIX=y
 CONFIG_NE2000_ISA=y
-CONFIG_MIPSNET=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_I8259=y
 CONFIG_MC146818RTC=y
@@ -35,7 +34,6 @@ CONFIG_MIPS_CPS=y
 CONFIG_MIPS_ITU=y
 CONFIG_R4K=y
 CONFIG_MALTA=y
-CONFIG_MIPSSIM=y
 CONFIG_ACPI_SMBUS=y
 CONFIG_SMBUS_EEPROM=y
 CONFIG_TEST_DEVICES=y
diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
index cdc07e59b6..3433e97e1a 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -6,6 +6,9 @@ config MALTA
 
 config MIPSSIM
     bool
+    select ISA_BUS
+    select SERIAL_ISA
+    select MIPSNET
 
 config JAZZ
     bool
-- 
2.20.1

Re: [Qemu-devel] [PATCH 1/6] mips: Express dependencies of the MIPSsim machine with kconfig

[Thomas Huth]

On 2019-02-03 23:07, Philippe Mathieu-Daudé wrote:
> The MIPSsim machine only emulates an 8250 UART and a simple network
> controller, connected via an ISA bus.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  default-configs/mips-softmmu-common.mak | 2 --
>  hw/mips/Kconfig                         | 3 +++
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
> index 0795d522db..aa73a4a822 100644
> --- a/default-configs/mips-softmmu-common.mak
> +++ b/default-configs/mips-softmmu-common.mak
> @@ -26,7 +26,6 @@ CONFIG_PIIX4=y
>  CONFIG_IDE_ISA=y
>  CONFIG_IDE_PIIX=y
>  CONFIG_NE2000_ISA=y
> -CONFIG_MIPSNET=y
>  CONFIG_PFLASH_CFI01=y
>  CONFIG_I8259=y
>  CONFIG_MC146818RTC=y
> @@ -35,7 +34,6 @@ CONFIG_MIPS_CPS=y
>  CONFIG_MIPS_ITU=y
>  CONFIG_R4K=y
>  CONFIG_MALTA=y
> -CONFIG_MIPSSIM=y
>  CONFIG_ACPI_SMBUS=y
>  CONFIG_SMBUS_EEPROM=y
>  CONFIG_TEST_DEVICES=y
> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
> index cdc07e59b6..3433e97e1a 100644
> --- a/hw/mips/Kconfig
> +++ b/hw/mips/Kconfig
> @@ -6,6 +6,9 @@ config MALTA
>  
>  config MIPSSIM
>      bool
> +    select ISA_BUS
> +    select SERIAL_ISA
> +    select MIPSNET
>  
>  config JAZZ
>      bool
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [Qemu-devel] [PATCH 1/6] mips: Express dependencies of the MIPSsim machine with kconfig

[Thomas Huth]

On 2019-02-04 09:31, Thomas Huth wrote:
> On 2019-02-03 23:07, Philippe Mathieu-Daudé wrote:
>> The MIPSsim machine only emulates an 8250 UART and a simple network
>> controller, connected via an ISA bus.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>>  default-configs/mips-softmmu-common.mak | 2 --
>>  hw/mips/Kconfig                         | 3 +++
>>  2 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
>> index 0795d522db..aa73a4a822 100644
>> --- a/default-configs/mips-softmmu-common.mak
>> +++ b/default-configs/mips-softmmu-common.mak
>> @@ -26,7 +26,6 @@ CONFIG_PIIX4=y
>>  CONFIG_IDE_ISA=y
>>  CONFIG_IDE_PIIX=y
>>  CONFIG_NE2000_ISA=y
>> -CONFIG_MIPSNET=y
>>  CONFIG_PFLASH_CFI01=y
>>  CONFIG_I8259=y
>>  CONFIG_MC146818RTC=y
>> @@ -35,7 +34,6 @@ CONFIG_MIPS_CPS=y
>>  CONFIG_MIPS_ITU=y
>>  CONFIG_R4K=y
>>  CONFIG_MALTA=y
>> -CONFIG_MIPSSIM=y
>>  CONFIG_ACPI_SMBUS=y
>>  CONFIG_SMBUS_EEPROM=y
>>  CONFIG_TEST_DEVICES=y
>> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
>> index cdc07e59b6..3433e97e1a 100644
>> --- a/hw/mips/Kconfig
>> +++ b/hw/mips/Kconfig
>> @@ -6,6 +6,9 @@ config MALTA
>>  
>>  config MIPSSIM
>>      bool
>> +    select ISA_BUS
>> +    select SERIAL_ISA
>> +    select MIPSNET
>>  
>>  config JAZZ
>>      bool
>>
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>

Scratch that. I think you have to keep CONFIG_MIPSSIM=y enabled in the
default-configs, don't you?

 Thomas

Re: [Qemu-devel] [PATCH 1/6] mips: Express dependencies of the MIPSsim machine with kconfig

[Philippe Mathieu-Daudé]

Hi Thomas,

On 2/4/19 9:36 AM, Thomas Huth wrote:
> On 2019-02-04 09:31, Thomas Huth wrote:
>> On 2019-02-03 23:07, Philippe Mathieu-Daudé wrote:
>>> The MIPSsim machine only emulates an 8250 UART and a simple network
>>> controller, connected via an ISA bus.
>>>
>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> ---
>>>  default-configs/mips-softmmu-common.mak | 2 --
>>>  hw/mips/Kconfig                         | 3 +++
>>>  2 files changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
>>> index 0795d522db..aa73a4a822 100644
>>> --- a/default-configs/mips-softmmu-common.mak
>>> +++ b/default-configs/mips-softmmu-common.mak
>>> @@ -26,7 +26,6 @@ CONFIG_PIIX4=y
>>>  CONFIG_IDE_ISA=y
>>>  CONFIG_IDE_PIIX=y
>>>  CONFIG_NE2000_ISA=y
>>> -CONFIG_MIPSNET=y
>>>  CONFIG_PFLASH_CFI01=y
>>>  CONFIG_I8259=y
>>>  CONFIG_MC146818RTC=y
>>> @@ -35,7 +34,6 @@ CONFIG_MIPS_CPS=y
>>>  CONFIG_MIPS_ITU=y
>>>  CONFIG_R4K=y
>>>  CONFIG_MALTA=y
>>> -CONFIG_MIPSSIM=y
>>>  CONFIG_ACPI_SMBUS=y
>>>  CONFIG_SMBUS_EEPROM=y
>>>  CONFIG_TEST_DEVICES=y
>>> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
>>> index cdc07e59b6..3433e97e1a 100644
>>> --- a/hw/mips/Kconfig
>>> +++ b/hw/mips/Kconfig
>>> @@ -6,6 +6,9 @@ config MALTA
>>>  
>>>  config MIPSSIM
>>>      bool
>>> +    select ISA_BUS
>>> +    select SERIAL_ISA
>>> +    select MIPSNET
>>>  
>>>  config JAZZ
>>>      bool
>>>
>>
>> Reviewed-by: Thomas Huth <thuth@redhat.com>
> 
> Scratch that. I think you have to keep CONFIG_MIPSSIM=y enabled in the
> default-configs, don't you?

I guess I misunderstood --without-default-devices with --no-defaults,
where you'd manually select the machines you want.

Thanks for the review!

Phil.

Re: [Qemu-devel] [PATCH 1/6] mips: Express dependencies of the MIPSsim machine with kconfig

[Paolo Bonzini]

On 04/02/19 12:05, Philippe Mathieu-Daudé wrote:
>> Scratch that. I think you have to keep CONFIG_MIPSSIM=y enabled in the
>> default-configs, don't you?
> I guess I misunderstood --without-default-devices with --no-defaults,
> where you'd manually select the machines you want.

Note that machines have to be included in default-configs/ even for
--with-default-devices (which is the default).

Paolo

Re: [Qemu-devel] [PATCH 1/6] mips: Express dependencies of the MIPSsim machine with kconfig

[Philippe Mathieu-Daudé]

On 2/4/19 12:21 PM, Paolo Bonzini wrote:
> On 04/02/19 12:05, Philippe Mathieu-Daudé wrote:
>>> Scratch that. I think you have to keep CONFIG_MIPSSIM=y enabled in the
>>> default-configs, don't you?
>> I guess I misunderstood --without-default-devices with --no-defaults,
>> where you'd manually select the machines you want.
> 
> Note that machines have to be included in default-configs/ even for
> --with-default-devices (which is the default).

OK, I'll respin.

Thanks,

Phil.

[Qemu-devel] [PATCH 2/6] mips: Express dependencies of the Jazz machine with kconfig

[Philippe Mathieu-Daudé]

The Jazz use the RC4030 Asic to provide an EISA bus and DMA/IRQ. The
framebuffer display is managed by a G364, the network card is a Sonic
DP83932. A QLogic ESP216 provides a SCSI bus.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 default-configs/mips-softmmu-common.mak |  1 -
 default-configs/mips64-softmmu.mak      |  6 ------
 default-configs/mips64el-softmmu.mak    |  6 ------
 hw/mips/Kconfig                         | 17 +++++++++++++++++
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index aa73a4a822..a1681edec4 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -3,7 +3,6 @@
 CONFIG_ISA_BUS=y
 CONFIG_PCI=y
 CONFIG_PCI_DEVICES=y
-CONFIG_ESP=y
 CONFIG_VGA_ISA=y
 CONFIG_VGA_ISA_MM=y
 CONFIG_VGA_CIRRUS=y
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
index bad7496672..ea66ce0b72 100644
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/mips64-softmmu.mak
@@ -1,9 +1,3 @@
 # Default configuration for mips64-softmmu
 
 include mips-softmmu-common.mak
-CONFIG_RC4030=y
-CONFIG_DP8393X=y
-CONFIG_DS1225Y=y
-CONFIG_JAZZ=y
-CONFIG_G364FB=y
-CONFIG_JAZZ_LED=y
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index 8b255efc54..23445cfcf9 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -2,13 +2,7 @@
 
 include mips-softmmu-common.mak
 CONFIG_IDE_VIA=y
-CONFIG_RC4030=y
-CONFIG_DP8393X=y
-CONFIG_DS1225Y=y
 CONFIG_FULONG=y
-CONFIG_JAZZ=y
-CONFIG_G364FB=y
-CONFIG_JAZZ_LED=y
 CONFIG_VT82C686=y
 CONFIG_AHCI=y
 CONFIG_MIPS_BOSTON=y
diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
index 3433e97e1a..ab006477c7 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -12,6 +12,23 @@ config MIPSSIM
 
 config JAZZ
     bool
+    select ISA_BUS
+    select RC4030
+    select I8259
+    select I8254
+    select I8257
+    select PCSPK
+    select VGA_ISA_MM
+    select G364FB
+    select DP8393X
+    select ESP
+    select FDC
+    select MC146818RTC
+    select PCKBD
+    select SERIAL
+    select PARALLEL
+    select DS1225Y
+    select JAZZ_LED
 
 config FULONG
     bool
-- 
2.20.1

Re: [Qemu-devel] [PATCH 2/6] mips: Express dependencies of the Jazz machine with kconfig

[Thomas Huth]

On 2019-02-03 23:07, Philippe Mathieu-Daudé wrote:
> The Jazz use the RC4030 Asic to provide an EISA bus and DMA/IRQ. The
> framebuffer display is managed by a G364, the network card is a Sonic
> DP83932. A QLogic ESP216 provides a SCSI bus.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  default-configs/mips-softmmu-common.mak |  1 -
>  default-configs/mips64-softmmu.mak      |  6 ------
>  default-configs/mips64el-softmmu.mak    |  6 ------
>  hw/mips/Kconfig                         | 17 +++++++++++++++++
>  4 files changed, 17 insertions(+), 13 deletions(-)
> 
> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
> index aa73a4a822..a1681edec4 100644
> --- a/default-configs/mips-softmmu-common.mak
> +++ b/default-configs/mips-softmmu-common.mak
> @@ -3,7 +3,6 @@
>  CONFIG_ISA_BUS=y
>  CONFIG_PCI=y
>  CONFIG_PCI_DEVICES=y
> -CONFIG_ESP=y
>  CONFIG_VGA_ISA=y
>  CONFIG_VGA_ISA_MM=y
>  CONFIG_VGA_CIRRUS=y
> diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
> index bad7496672..ea66ce0b72 100644
> --- a/default-configs/mips64-softmmu.mak
> +++ b/default-configs/mips64-softmmu.mak
> @@ -1,9 +1,3 @@
>  # Default configuration for mips64-softmmu
>  
>  include mips-softmmu-common.mak
> -CONFIG_RC4030=y
> -CONFIG_DP8393X=y
> -CONFIG_DS1225Y=y
> -CONFIG_JAZZ=y
> -CONFIG_G364FB=y
> -CONFIG_JAZZ_LED=y
> diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
> index 8b255efc54..23445cfcf9 100644
> --- a/default-configs/mips64el-softmmu.mak
> +++ b/default-configs/mips64el-softmmu.mak
> @@ -2,13 +2,7 @@
>  
>  include mips-softmmu-common.mak
>  CONFIG_IDE_VIA=y
> -CONFIG_RC4030=y
> -CONFIG_DP8393X=y
> -CONFIG_DS1225Y=y
>  CONFIG_FULONG=y
> -CONFIG_JAZZ=y
> -CONFIG_G364FB=y
> -CONFIG_JAZZ_LED=y
>  CONFIG_VT82C686=y
>  CONFIG_AHCI=y
>  CONFIG_MIPS_BOSTON=y
> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
> index 3433e97e1a..ab006477c7 100644
> --- a/hw/mips/Kconfig
> +++ b/hw/mips/Kconfig
> @@ -12,6 +12,23 @@ config MIPSSIM
>  
>  config JAZZ
>      bool
> +    select ISA_BUS
> +    select RC4030
> +    select I8259
> +    select I8254
> +    select I8257
> +    select PCSPK
> +    select VGA_ISA_MM
> +    select G364FB
> +    select DP8393X
> +    select ESP
> +    select FDC
> +    select MC146818RTC
> +    select PCKBD
> +    select SERIAL
> +    select PARALLEL
> +    select DS1225Y
> +    select JAZZ_LED
>  
>  config FULONG
>      bool
> 

You remove CONFIG_JAZZ=y from all the default configs - doesn't disable
that the machine completely?

 Thomas

[Qemu-devel] [PATCH 3/6] mips: Express dependencies of the r4k platform with kconfig

[Philippe Mathieu-Daudé]

This platform use standard PC devices connected to an ISA bus.
Networking is provided by a ne2000 chipset.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 default-configs/mips-softmmu-common.mak |  1 -
 hw/mips/Kconfig                         | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index a1681edec4..aa3ca196b4 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -31,7 +31,6 @@ CONFIG_MC146818RTC=y
 CONFIG_EMPTY_SLOT=y
 CONFIG_MIPS_CPS=y
 CONFIG_MIPS_ITU=y
-CONFIG_R4K=y
 CONFIG_MALTA=y
 CONFIG_ACPI_SMBUS=y
 CONFIG_SMBUS_EEPROM=y
diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
index ab006477c7..ee6290d497 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -1,5 +1,15 @@
 config R4K
     bool
+    select ISA_BUS
+    select SERIAL_ISA
+    select I8259
+    select I8254
+    select MC146818RTC
+    select VGA_ISA
+    select NE2000_ISA
+    select IDE_ISA
+    # I8042
+    select PCKBD
 
 config MALTA
     bool
-- 
2.20.1

Re: [Qemu-devel] [PATCH 3/6] mips: Express dependencies of the r4k platform with kconfig

[Thomas Huth]

On 2019-02-03 23:07, Philippe Mathieu-Daudé wrote:
> This platform use standard PC devices connected to an ISA bus.
> Networking is provided by a ne2000 chipset.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  default-configs/mips-softmmu-common.mak |  1 -
>  hw/mips/Kconfig                         | 10 ++++++++++
>  2 files changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
> index a1681edec4..aa3ca196b4 100644
> --- a/default-configs/mips-softmmu-common.mak
> +++ b/default-configs/mips-softmmu-common.mak
> @@ -31,7 +31,6 @@ CONFIG_MC146818RTC=y
>  CONFIG_EMPTY_SLOT=y
>  CONFIG_MIPS_CPS=y
>  CONFIG_MIPS_ITU=y
> -CONFIG_R4K=y

Keep it? Otherwise the machine is disabled by default, isn't it?

 Thomas

[Qemu-devel] [PATCH 4/6] mips: Express dependencies of the Boston machine with kconfig

[Philippe Mathieu-Daudé]

Boston is built around a Xilinx FPGA, which includes a PCIe root port
and an UART. An Intel EG20T PCH connects the I/O peripherals, but only
the SATA bus is emulated.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 default-configs/mips64el-softmmu.mak | 5 -----
 hw/mips/Kconfig                      | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index 23445cfcf9..ac44df1d0d 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -4,8 +4,3 @@ include mips-softmmu-common.mak
 CONFIG_IDE_VIA=y
 CONFIG_FULONG=y
 CONFIG_VT82C686=y
-CONFIG_AHCI=y
-CONFIG_MIPS_BOSTON=y
-CONFIG_FITLOADER=y
-CONFIG_PCI_EXPRESS=y
-CONFIG_PCI_EXPRESS_XILINX=y
diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
index ee6290d497..2940ff39ab 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -49,3 +49,8 @@ config MIPS_CPS
 
 config MIPS_BOSTON
     bool
+    select FITLOADER
+    select MIPS_CPS
+    select PCI_EXPRESS_XILINX
+    select AHCI
+    select SERIAL
-- 
2.20.1

[Qemu-devel] [PATCH 5/6] hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge

[Philippe Mathieu-Daudé]

Ease the kconfig selection by introducing CONFIG_PCI_BONITO to select
the Bonito North Bridge. Select it for the Loongson 2E machine.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 default-configs/mips64el-softmmu.mak | 1 +
 hw/pci-host/Kconfig                  | 4 ++++
 hw/pci-host/Makefile.objs            | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index ac44df1d0d..ee583758e1 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -3,4 +3,5 @@
 include mips-softmmu-common.mak
 CONFIG_IDE_VIA=y
 CONFIG_FULONG=y
+CONFIG_PCI_BONITO=y
 CONFIG_VT82C686=y
diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
index b39ea297ba..9abadafaf5 100644
--- a/hw/pci-host/Kconfig
+++ b/hw/pci-host/Kconfig
@@ -49,3 +49,7 @@ config PCI_EXPRESS_XILINX
 config PCI_EXPRESS_DESIGNWARE
     bool
     select PCI_EXPRESS
+
+config PCI_BONITO
+    select PCI
+    bool
diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs
index a9cd3e022d..d6e86b9b89 100644
--- a/hw/pci-host/Makefile.objs
+++ b/hw/pci-host/Makefile.objs
@@ -12,7 +12,7 @@ common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o
 common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o
 
 common-obj-$(CONFIG_PCI_SABRE) += sabre.o
-common-obj-$(CONFIG_FULONG) += bonito.o
+common-obj-$(CONFIG_PCI_BONITO) += bonito.o
 common-obj-$(CONFIG_PCI_PIIX) += piix.o
 common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o
 common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o
-- 
2.20.1

Re: [Qemu-devel] [PATCH 5/6] hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge

[Thomas Huth]

On 2019-02-03 23:07, Philippe Mathieu-Daudé wrote:
> Ease the kconfig selection by introducing CONFIG_PCI_BONITO to select
> the Bonito North Bridge. Select it for the Loongson 2E machine.

I think you should either rather drop the last sentence here (since the
"select" is only done in the next patch), or even merge this patch with
the next one.

 Thomas


> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  default-configs/mips64el-softmmu.mak | 1 +
>  hw/pci-host/Kconfig                  | 4 ++++
>  hw/pci-host/Makefile.objs            | 2 +-
>  3 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
> index ac44df1d0d..ee583758e1 100644
> --- a/default-configs/mips64el-softmmu.mak
> +++ b/default-configs/mips64el-softmmu.mak
> @@ -3,4 +3,5 @@
>  include mips-softmmu-common.mak
>  CONFIG_IDE_VIA=y
>  CONFIG_FULONG=y
> +CONFIG_PCI_BONITO=y
>  CONFIG_VT82C686=y
> diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
> index b39ea297ba..9abadafaf5 100644
> --- a/hw/pci-host/Kconfig
> +++ b/hw/pci-host/Kconfig
> @@ -49,3 +49,7 @@ config PCI_EXPRESS_XILINX
>  config PCI_EXPRESS_DESIGNWARE
>      bool
>      select PCI_EXPRESS
> +
> +config PCI_BONITO
> +    select PCI
> +    bool
> diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs
> index a9cd3e022d..d6e86b9b89 100644
> --- a/hw/pci-host/Makefile.objs
> +++ b/hw/pci-host/Makefile.objs
> @@ -12,7 +12,7 @@ common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o
>  common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o
>  
>  common-obj-$(CONFIG_PCI_SABRE) += sabre.o
> -common-obj-$(CONFIG_FULONG) += bonito.o
> +common-obj-$(CONFIG_PCI_BONITO) += bonito.o
>  common-obj-$(CONFIG_PCI_PIIX) += piix.o
>  common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o
>  common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o
> 

[Qemu-devel] [PATCH 6/6] mips: Express dependencies of the Loongson 2E machine with kconfig

[Philippe Mathieu-Daudé]

The Loongson 2E uses a Bonito64 system controller as North Bridge and a
VT82C686 chipset as South Bridge. The network card chipset is a RTL8139D.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 default-configs/mips64el-softmmu.mak |  4 ----
 hw/isa/Kconfig                       | 13 +++++++++----
 hw/mips/Kconfig                      |  5 +++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index ee583758e1..aa4f0d1a44 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -1,7 +1,3 @@
 # Default configuration for mips64el-softmmu
 
 include mips-softmmu-common.mak
-CONFIG_IDE_VIA=y
-CONFIG_FULONG=y
-CONFIG_PCI_BONITO=y
-CONFIG_VT82C686=y
diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index d580471c00..bd6f60dd3d 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -33,10 +33,15 @@ config PIIX4
 
 config VT82C686
     bool
-    select ISA_BUS
-    select ACPI_SMBUS
-    select SERIAL_ISA
-    select FDC
+    select PCI
+    select I8259
+    select I8254
+    select I8257
+    select PARALLEL
+    select IDE_ISA
+    select IDE_VIA
+    select USB_UHCI
+    #select PCKBD
 
 config SMC37C669
     bool
diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
index 2940ff39ab..16b2bdb068 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -42,6 +42,11 @@ config JAZZ
 
 config FULONG
     bool
+    select PCI_BONITO
+    select VT82C686
+    select SMBUS_EEPROM
+    select RTL8139_PCI
+    select MC146818RTC
 
 config MIPS_CPS
     bool
-- 
2.20.1

Re: [Qemu-devel] [PATCH 6/6] mips: Express dependencies of the Loongson 2E machine with kconfig

[Thomas Huth]

On 2019-02-03 23:07, Philippe Mathieu-Daudé wrote:
> The Loongson 2E uses a Bonito64 system controller as North Bridge and a
> VT82C686 chipset as South Bridge. The network card chipset is a RTL8139D.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
[...]
> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
> index 2940ff39ab..16b2bdb068 100644
> --- a/hw/mips/Kconfig
> +++ b/hw/mips/Kconfig
> @@ -42,6 +42,11 @@ config JAZZ
>  
>  config FULONG
>      bool
> +    select PCI_BONITO
> +    select VT82C686
> +    select SMBUS_EEPROM
> +    select RTL8139_PCI

If I've got the code right, the RTL8139 is optional for this board, i.e.
when you run with -nodefaults or -net none, then the board is still
usable. So this is not a hard requirement and thus I think it would be
nicer to drop the "select RTL8139_PCI" and rely on the "default y if
PCI_DEVICES" in the hw/net/Kconfig file.

 Thomas

Re: [Qemu-devel] [PATCH 6/6] mips: Express dependencies of the Loongson 2E machine with kconfig

[Philippe Mathieu-Daudé]

Hi Thomas,

On 2/4/19 9:46 AM, Thomas Huth wrote:
> On 2019-02-03 23:07, Philippe Mathieu-Daudé wrote:
>> The Loongson 2E uses a Bonito64 system controller as North Bridge and a
>> VT82C686 chipset as South Bridge. The network card chipset is a RTL8139D.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
> [...]
>> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
>> index 2940ff39ab..16b2bdb068 100644
>> --- a/hw/mips/Kconfig
>> +++ b/hw/mips/Kconfig
>> @@ -42,6 +42,11 @@ config JAZZ
>>  
>>  config FULONG
>>      bool
>> +    select PCI_BONITO
>> +    select VT82C686
>> +    select SMBUS_EEPROM
>> +    select RTL8139_PCI
> 
> If I've got the code right, the RTL8139 is optional for this board, i.e.
> when you run with -nodefaults or -net none, then the board is still
> usable. So this is not a hard requirement and thus I think it would be
> nicer to drop the "select RTL8139_PCI" and rely on the "default y if
> PCI_DEVICES" in the hw/net/Kconfig file.

I think since his introduction (051c190bce59) the code wants to deal
with no network backend, but the RTL8139D is always available.
On this picture you can se the chipset soldered on the back of the
board: https://www.linux-mips.org/wiki/Fulong#back
I'll keep the RTL8139_PCI selection and eventually propose a patch to
clean the hw/mips/mips_fulong2e.c.

Thanks for your other reviews!

Phil.

Re: [Qemu-devel] [PATCH 0/6] Kconfig dependencies for MIPS machines (but Malta)

[Philippe Mathieu-Daudé]

On Sun, Feb 3, 2019 at 11:07 PM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> Express the MIPS machine dependencies with Kconfig.

I forgot this serie misses a rule such "depends of MIPS64".
Asked here: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00064.html

Re: [Qemu-devel] [PATCH 0/6] Kconfig dependencies for MIPS machines (but Malta)

[Thomas Huth]

On 2019-02-04 01:06, Philippe Mathieu-Daudé wrote:
> On Sun, Feb 3, 2019 at 11:07 PM Philippe Mathieu-Daudé
> <philmd@redhat.com> wrote:
>>
>> Express the MIPS machine dependencies with Kconfig.
> 
> I forgot this serie misses a rule such "depends of MIPS64".
> Asked here: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00064.html

I guess the easiest solution is to simply set a CONFIG_MIPS64=y in the
default-configs/mips64*softmmu* files.

 Thomas

Re: [Qemu-devel] [PATCH 0/6] Kconfig dependencies for MIPS machines (but Malta)

[Paolo Bonzini]

On 04/02/19 10:51, Thomas Huth wrote:
> On 2019-02-04 01:06, Philippe Mathieu-Daudé wrote:
>> On Sun, Feb 3, 2019 at 11:07 PM Philippe Mathieu-Daudé
>> <philmd@redhat.com> wrote:
>>>
>>> Express the MIPS machine dependencies with Kconfig.
>>
>> I forgot this serie misses a rule such "depends of MIPS64".
>> Asked here: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00064.html
> 
> I guess the easiest solution is to simply set a CONFIG_MIPS64=y in the
> default-configs/mips64*softmmu* files.

Or just do not specify the machine in the mips64*softmmu.mak files.  If
you add CONFIG_Q35=y to ARM, Kconfig doesn't complain.

Another possibility is to move those machines to hw/mips64, similar to
hw/sparc64.

Paolo