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

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

[Philippe Mathieu-Daudé]

Express the MIPS machine dependencies with Kconfig.

Due to its complexity, the Malta board fill follow in a different
series.

v3:
- addressed review comments from Thomas and Aleksandar
  (noted in each patch)

v2: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00887.html
- Do not remove machines from the default config (Thomas)
- Corrected comment about CONFIG_PCI_BONITO (Thomas)

v1: https://www.mail-archive.com/qemu-devel@nongnu.org/msg593013.html

$ git backport-diff -u kconfig_mips-v2
Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/7:[----] [--] 'hw/mips: Express dependencies of the MIPSsim machine with kconfig'
002/7:[0001] [FC] 'hw/mips: Express dependencies of the Jazz machine with kconfig'
003/7:[0002] [FC] 'hw/mips: Express dependencies of the r4k platform with kconfig'
004/7:[down] 'hw/mips: Remove the redundant CONFIG_MIPS_ITU Makefile variable'
005/7:[----] [-C] 'hw/mips: Express dependencies of the Boston machine with kconfig'
006/7:[----] [-C] 'hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge'
007/7:[----] [-C] 'hw/mips: Express dependencies of the Fulong 2E machine with kconfig'

Regards,

Phil.

Philippe Mathieu-Daudé (7):
  hw/mips: Express dependencies of the MIPSsim machine with Kconfig
  hw/mips: Express dependencies of the Jazz machine with Kconfig
  hw/mips: Express dependencies of the r4k platform with Kconfig
  hw/mips: Remove the redundant CONFIG_MIPS_ITU Makefile variable
  hw/mips: Express dependencies of the Boston machine with Kconfig
  hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge
  hw/mips: Express dependencies of the Fulong 2E machine with Kconfig

 default-configs/mips-softmmu-common.mak |  4 ---
 default-configs/mips64-softmmu.mak      |  5 ---
 default-configs/mips64el-softmmu.mak    | 11 -------
 hw/isa/Kconfig                          | 13 +++++---
 hw/mips/Kconfig                         | 41 +++++++++++++++++++++++++
 hw/misc/Kconfig                         |  3 --
 hw/misc/Makefile.objs                   |  2 +-
 hw/pci-host/Kconfig                     |  4 +++
 hw/pci-host/Makefile.objs               |  2 +-
 9 files changed, 56 insertions(+), 29 deletions(-)

-- 
2.20.1

[Qemu-devel] [PATCH v3 1/7] hw/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.

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

diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index 0795d522db..8c5fdf5ee1 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
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

[Qemu-devel] [PATCH v3 2/7] hw/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>
---
v3: Keep CONFIG_JAZZ in default-configs/mips64el-softmmu.mak (Thomas)
---
 default-configs/mips-softmmu-common.mak |  1 -
 default-configs/mips64-softmmu.mak      |  5 -----
 default-configs/mips64el-softmmu.mak    |  5 -----
 hw/mips/Kconfig                         | 17 +++++++++++++++++
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index 8c5fdf5ee1..caebafd416 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..a169738635 100644
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/mips64-softmmu.mak
@@ -1,9 +1,4 @@
 # 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..a7b88318b2 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -2,13 +2,8 @@
 
 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 v3 2/7] hw/mips: Express dependencies of the Jazz machine with Kconfig

[Aleksandar Markovic]

> From: Philippe Mathieu-Daudé <philmd@redhat.com>
> Subject: [PATCH v3 2/7] hw/mips: Express dependencies of the Jazz machine with Kconfig
> 
> 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>
> ---

Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>

Re: [Qemu-devel] [PATCH v3 2/7] hw/mips: Express dependencies of the Jazz machine with Kconfig

[Thomas Huth]

On 11/03/2019 01.56, 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>
> ---
> v3: Keep CONFIG_JAZZ in default-configs/mips64el-softmmu.mak (Thomas)
> ---
>  default-configs/mips-softmmu-common.mak |  1 -
>  default-configs/mips64-softmmu.mak      |  5 -----
>  default-configs/mips64el-softmmu.mak    |  5 -----
>  hw/mips/Kconfig                         | 17 +++++++++++++++++
>  4 files changed, 17 insertions(+), 11 deletions(-)
> 
> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
> index 8c5fdf5ee1..caebafd416 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..a169738635 100644
> --- a/default-configs/mips64-softmmu.mak
> +++ b/default-configs/mips64-softmmu.mak
> @@ -1,9 +1,4 @@
>  # 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..a7b88318b2 100644
> --- a/default-configs/mips64el-softmmu.mak
> +++ b/default-configs/mips64el-softmmu.mak
> @@ -2,13 +2,8 @@
>  
>  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

Looking at the code, it seems like you can also run the machine with
"-net none", so I'd rather use "imply DP8393X" here instead.

 Thomas

Re: [Qemu-devel] [PATCH v3 2/7] hw/mips: Express dependencies of the Jazz machine with Kconfig

[Philippe Mathieu-Daudé]

Hi Thomas,

On 3/11/19 12:17 PM, Thomas Huth wrote:
> On 11/03/2019 01.56, 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>
>> ---
>> v3: Keep CONFIG_JAZZ in default-configs/mips64el-softmmu.mak (Thomas)
>> ---
>>  default-configs/mips-softmmu-common.mak |  1 -
>>  default-configs/mips64-softmmu.mak      |  5 -----
>>  default-configs/mips64el-softmmu.mak    |  5 -----
>>  hw/mips/Kconfig                         | 17 +++++++++++++++++
>>  4 files changed, 17 insertions(+), 11 deletions(-)
>>
>> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
>> index 8c5fdf5ee1..caebafd416 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..a169738635 100644
>> --- a/default-configs/mips64-softmmu.mak
>> +++ b/default-configs/mips64-softmmu.mak
>> @@ -1,9 +1,4 @@
>>  # 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..a7b88318b2 100644
>> --- a/default-configs/mips64el-softmmu.mak
>> +++ b/default-configs/mips64el-softmmu.mak
>> @@ -2,13 +2,8 @@
>>  
>>  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
> 
> Looking at the code, it seems like you can also run the machine with
> "-net none", so I'd rather use "imply DP8393X" here instead.

Well here I'm not sure.
For the both machine variants (PICA-61 and Magnum 4000), the chipset is
soldered on the board, and is MMIO mapped (via a ChipSelect, no via a
bus you can plug/unplug). So it looks the code inherited habits from
boards having network card via busses.

Not sure the code can be fixed in time for soft freeze.
I might improve the commit message explaining this chipset is soldered
on the board.

Regards,

Phil.

Re: [Qemu-devel] [PATCH v3 2/7] hw/mips: Express dependencies of the Jazz machine with Kconfig

[Thomas Huth]

On 11/03/2019 12.37, Philippe Mathieu-Daudé wrote:
> Hi Thomas,
> 
> On 3/11/19 12:17 PM, Thomas Huth wrote:
>> On 11/03/2019 01.56, 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>
>>> ---
>>> v3: Keep CONFIG_JAZZ in default-configs/mips64el-softmmu.mak (Thomas)
>>> ---
>>>  default-configs/mips-softmmu-common.mak |  1 -
>>>  default-configs/mips64-softmmu.mak      |  5 -----
>>>  default-configs/mips64el-softmmu.mak    |  5 -----
>>>  hw/mips/Kconfig                         | 17 +++++++++++++++++
>>>  4 files changed, 17 insertions(+), 11 deletions(-)
>>>
>>> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
>>> index 8c5fdf5ee1..caebafd416 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..a169738635 100644
>>> --- a/default-configs/mips64-softmmu.mak
>>> +++ b/default-configs/mips64-softmmu.mak
>>> @@ -1,9 +1,4 @@
>>>  # 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..a7b88318b2 100644
>>> --- a/default-configs/mips64el-softmmu.mak
>>> +++ b/default-configs/mips64el-softmmu.mak
>>> @@ -2,13 +2,8 @@
>>>  
>>>  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
>>
>> Looking at the code, it seems like you can also run the machine with
>> "-net none", so I'd rather use "imply DP8393X" here instead.
> 
> Well here I'm not sure.
> For the both machine variants (PICA-61 and Magnum 4000), the chipset is
> soldered on the board, and is MMIO mapped (via a ChipSelect, no via a
> bus you can plug/unplug).
Ok, then please ignore my comment and keep the "select" here!

 Thomas

[Qemu-devel] [PATCH v3 3/7] hw/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>
---
v3: remove CONFIG_NE2000_ISA (Thomas)
    add PFLASH_CFI01
---
 default-configs/mips-softmmu-common.mak |  1 -
 hw/mips/Kconfig                         | 11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index caebafd416..2ca57bfee1 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -24,7 +24,6 @@ CONFIG_I8257=y
 CONFIG_PIIX4=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_PIIX=y
-CONFIG_NE2000_ISA=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_I8259=y
 CONFIG_MC146818RTC=y
diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
index ab006477c7..5678c9cf15 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -1,5 +1,16 @@
 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
+    select PFLASH_CFI01
 
 config MALTA
     bool
-- 
2.20.1

Re: [Qemu-devel] [PATCH v3 3/7] hw/mips: Express dependencies of the r4k platform with Kconfig

[Thomas Huth]

On 11/03/2019 01.56, 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>
> ---
> v3: remove CONFIG_NE2000_ISA (Thomas)
>     add PFLASH_CFI01
> ---
>  default-configs/mips-softmmu-common.mak |  1 -
>  hw/mips/Kconfig                         | 11 +++++++++++
>  2 files changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
> index caebafd416..2ca57bfee1 100644
> --- a/default-configs/mips-softmmu-common.mak
> +++ b/default-configs/mips-softmmu-common.mak
> @@ -24,7 +24,6 @@ CONFIG_I8257=y
>  CONFIG_PIIX4=y
>  CONFIG_IDE_ISA=y
>  CONFIG_IDE_PIIX=y
> -CONFIG_NE2000_ISA=y
>  CONFIG_PFLASH_CFI01=y
>  CONFIG_I8259=y
>  CONFIG_MC146818RTC=y
> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
> index ab006477c7..5678c9cf15 100644
> --- a/hw/mips/Kconfig
> +++ b/hw/mips/Kconfig
> @@ -1,5 +1,16 @@
>  config R4K
>      bool
> +    select ISA_BUS
> +    select SERIAL_ISA
> +    select I8259
> +    select I8254
> +    select MC146818RTC
> +    select VGA_ISA
> +    select NE2000_ISA

Since Paolo now also introduced the "imply" keyword, I think you should
use "imply" instead of "select" for both, VGA_ISA and NE2000_ISA, since
the r4k machine can work without both when you specify -vga none and
-net none.

 Thomas

Re: [Qemu-devel] [PATCH v3 3/7] hw/mips: Express dependencies of the r4k platform with Kconfig

[Philippe Mathieu-Daudé]

On 3/11/19 7:58 AM, Thomas Huth wrote:
> On 11/03/2019 01.56, 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>
>> ---
>> v3: remove CONFIG_NE2000_ISA (Thomas)
>>     add PFLASH_CFI01
>> ---
>>  default-configs/mips-softmmu-common.mak |  1 -
>>  hw/mips/Kconfig                         | 11 +++++++++++
>>  2 files changed, 11 insertions(+), 1 deletion(-)
>>
>> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
>> index caebafd416..2ca57bfee1 100644
>> --- a/default-configs/mips-softmmu-common.mak
>> +++ b/default-configs/mips-softmmu-common.mak
>> @@ -24,7 +24,6 @@ CONFIG_I8257=y
>>  CONFIG_PIIX4=y
>>  CONFIG_IDE_ISA=y
>>  CONFIG_IDE_PIIX=y
>> -CONFIG_NE2000_ISA=y
>>  CONFIG_PFLASH_CFI01=y
>>  CONFIG_I8259=y
>>  CONFIG_MC146818RTC=y
>> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
>> index ab006477c7..5678c9cf15 100644
>> --- a/hw/mips/Kconfig
>> +++ b/hw/mips/Kconfig
>> @@ -1,5 +1,16 @@
>>  config R4K
>>      bool
>> +    select ISA_BUS
>> +    select SERIAL_ISA
>> +    select I8259
>> +    select I8254
>> +    select MC146818RTC
>> +    select VGA_ISA
>> +    select NE2000_ISA
> 
> Since Paolo now also introduced the "imply" keyword, I think you should
> use "imply" instead of "select" for both, VGA_ISA and NE2000_ISA, since
> the r4k machine can work without both when you specify -vga none and
> -net none.

OK I'll use "imply", thanks.

> 
>  Thomas
> 

[Qemu-devel] [PATCH v3 4/7] hw/mips: Remove the redundant CONFIG_MIPS_ITU Makefile variable

[Philippe Mathieu-Daudé]

The Inter-Thread Communication Unit (ITU, introduced in commit
34fa7e83e11) is part of the Coherent Processing System (CPS),
as describe in commit 408294352ad:

    Make ITU available in the system if CPU supports multithreading
    and is part of CPS.

Replate the CONFIG_MIPS_ITU variable by the CONFIG_MIPS_CPS one.

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

diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index 2ca57bfee1..c5b148b1c6 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -29,7 +29,6 @@ CONFIG_I8259=y
 CONFIG_MC146818RTC=y
 CONFIG_EMPTY_SLOT=y
 CONFIG_MIPS_CPS=y
-CONFIG_MIPS_ITU=y
 CONFIG_R4K=y
 CONFIG_MALTA=y
 CONFIG_MIPSSIM=y
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 2c60be99bc..3125cf86f2 100644
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -80,9 +80,6 @@ config IMX
 config STM32F2XX_SYSCFG
     bool
 
-config MIPS_ITU
-    bool
-
 config MPS2_FPGAIO
     bool
 
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
index c71e07ae35..22565d72af 100644
--- a/hw/misc/Makefile.objs
+++ b/hw/misc/Makefile.objs
@@ -59,7 +59,7 @@ obj-$(CONFIG_ZYNQ) += zynq-xadc.o
 obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o
 obj-$(CONFIG_MIPS_CPS) += mips_cmgcr.o
 obj-$(CONFIG_MIPS_CPS) += mips_cpc.o
-obj-$(CONFIG_MIPS_ITU) += mips_itu.o
+obj-$(CONFIG_MIPS_CPS) += mips_itu.o
 obj-$(CONFIG_MPS2_FPGAIO) += mps2-fpgaio.o
 obj-$(CONFIG_MPS2_SCC) += mps2-scc.o
 
-- 
2.20.1

[Qemu-devel] [PATCH v3 5/7] hw/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.

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

diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index a7b88318b2..c7409d23d2 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -5,8 +5,4 @@ CONFIG_IDE_VIA=y
 CONFIG_FULONG=y
 CONFIG_JAZZ=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 5678c9cf15..bd6e3be2cd 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -50,3 +50,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 v3 6/7] 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.

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 c7409d23d2..88b66a91d7 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -3,6 +3,7 @@
 include mips-softmmu-common.mak
 CONFIG_IDE_VIA=y
 CONFIG_FULONG=y
+CONFIG_PCI_BONITO=y
 CONFIG_JAZZ=y
 CONFIG_VT82C686=y
 CONFIG_MIPS_BOSTON=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 v3 6/7] hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge

[Aleksandar Markovic]

> From: Philippe Mathieu-Daudé <philmd@redhat.com>
> Subject: [PATCH v3 6/7] hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge
> 
> Ease the kconfig selection by introducing CONFIG_PCI_BONITO to select
> the Bonito North Bridge.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---

Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>

[Qemu-devel] [PATCH v3 7/7] hw/mips: Express dependencies of the Fulong 2E machine with Kconfig

[Philippe Mathieu-Daudé]

The Fulong 2E machine uses a Loongson 2E as CPU, 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>
---
v3: Loongson 2E = CPU, Fulong 2E = machine (Aleksandar)
---
 default-configs/mips64el-softmmu.mak |  3 ---
 hw/isa/Kconfig                       | 13 +++++++++----
 hw/mips/Kconfig                      |  5 +++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index 88b66a91d7..d0814e76af 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -1,9 +1,6 @@
 # Default configuration for mips64el-softmmu
 
 include mips-softmmu-common.mak
-CONFIG_IDE_VIA=y
 CONFIG_FULONG=y
-CONFIG_PCI_BONITO=y
 CONFIG_JAZZ=y
-CONFIG_VT82C686=y
 CONFIG_MIPS_BOSTON=y
diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index 57e09a0cb8..30055aed82 100644
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -32,10 +32,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 bd6e3be2cd..b06d70bf01 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -43,6 +43,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 v3 7/7] hw/mips: Express dependencies of the Fulong 2E machine with Kconfig

[Aleksandar Markovic]

> From: Philippe Mathieu-Daudé <philmd@redhat.com>
> Subject: [PATCH v3 7/7] hw/mips: Express dependencies of the Fulong 2E machine with Kconfig
> 
> The Fulong 2E machine uses a Loongson 2E as CPU, 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>
> ---

Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>

Re: [Qemu-devel] [PATCH v3 7/7] hw/mips: Express dependencies of the Fulong 2E machine with Kconfig

[Thomas Huth]

On 11/03/2019 01.56, Philippe Mathieu-Daudé wrote:
> The Fulong 2E machine uses a Loongson 2E as CPU, 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>
> ---
> v3: Loongson 2E = CPU, Fulong 2E = machine (Aleksandar)
> ---
>  default-configs/mips64el-softmmu.mak |  3 ---
>  hw/isa/Kconfig                       | 13 +++++++++----
>  hw/mips/Kconfig                      |  5 +++++
>  3 files changed, 14 insertions(+), 7 deletions(-)
> 
> diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
> index 88b66a91d7..d0814e76af 100644
> --- a/default-configs/mips64el-softmmu.mak
> +++ b/default-configs/mips64el-softmmu.mak
> @@ -1,9 +1,6 @@
>  # Default configuration for mips64el-softmmu
>  
>  include mips-softmmu-common.mak
> -CONFIG_IDE_VIA=y
>  CONFIG_FULONG=y
> -CONFIG_PCI_BONITO=y

I think I'd rather squash the previous patch into this one here (and
adjust the patch description here with some information about BONITO),
so that you don't have to remove the switch again that you've just added
one patch earlier.

>  CONFIG_JAZZ=y
> -CONFIG_VT82C686=y
>  CONFIG_MIPS_BOSTON=y
> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
> index 57e09a0cb8..30055aed82 100644
> --- a/hw/isa/Kconfig
> +++ b/hw/isa/Kconfig
> @@ -32,10 +32,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

Why is this commented out? Please mention the reason either in the
commit message or in an additional comment here.

>  config SMC37C669
>      bool
> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
> index bd6e3be2cd..b06d70bf01 100644
> --- a/hw/mips/Kconfig
> +++ b/hw/mips/Kconfig
> @@ -43,6 +43,11 @@ config JAZZ
>  
>  config FULONG
>      bool
> +    select PCI_BONITO
> +    select VT82C686
> +    select SMBUS_EEPROM
> +    select RTL8139_PCI

I'd suggest to use "imply RTL8139_PCI" here instead, since "-net none"
should be possible for this machine, too.

 Thomas

Re: [Qemu-devel] [PATCH v3 7/7] hw/mips: Express dependencies of the Fulong 2E machine with Kconfig

[Philippe Mathieu-Daudé]

On 3/11/19 12:25 PM, Thomas Huth wrote:
> On 11/03/2019 01.56, Philippe Mathieu-Daudé wrote:
>> The Fulong 2E machine uses a Loongson 2E as CPU, 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>
>> ---
>> v3: Loongson 2E = CPU, Fulong 2E = machine (Aleksandar)
>> ---
>>  default-configs/mips64el-softmmu.mak |  3 ---
>>  hw/isa/Kconfig                       | 13 +++++++++----
>>  hw/mips/Kconfig                      |  5 +++++
>>  3 files changed, 14 insertions(+), 7 deletions(-)
>>
>> diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
>> index 88b66a91d7..d0814e76af 100644
>> --- a/default-configs/mips64el-softmmu.mak
>> +++ b/default-configs/mips64el-softmmu.mak
>> @@ -1,9 +1,6 @@
>>  # Default configuration for mips64el-softmmu
>>  
>>  include mips-softmmu-common.mak
>> -CONFIG_IDE_VIA=y
>>  CONFIG_FULONG=y
>> -CONFIG_PCI_BONITO=y
> 
> I think I'd rather squash the previous patch into this one here (and
> adjust the patch description here with some information about BONITO),
> so that you don't have to remove the switch again that you've just added
> one patch earlier.

I find it clearer this way... And easier for the PCI maintainers to review.

> 
>>  CONFIG_JAZZ=y
>> -CONFIG_VT82C686=y
>>  CONFIG_MIPS_BOSTON=y
>> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
>> index 57e09a0cb8..30055aed82 100644
>> --- a/hw/isa/Kconfig
>> +++ b/hw/isa/Kconfig
>> @@ -32,10 +32,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
> 
> Why is this commented out? Please mention the reason either in the
> commit message or in an additional comment here.

Oops I missed this while rebasing.
I commented this because I was not sure how to express the "USB Legacy
Support", I couldn't find reference to this feature in the USB specs.
It looks something the southbridge manufacturers use to emulate an i8042
controller for USB keyboard/mouse.
Gerd any idea?

Thomas, what about adding in hw/usb/Kconfig:

  config USB_LEGACY_PS2_SUPPORT
      # Emulated i8042
      select I8042

>>  config SMC37C669
>>      bool
>> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
>> index bd6e3be2cd..b06d70bf01 100644
>> --- a/hw/mips/Kconfig
>> +++ b/hw/mips/Kconfig
>> @@ -43,6 +43,11 @@ config JAZZ
>>  
>>  config FULONG
>>      bool
>> +    select PCI_BONITO
>> +    select VT82C686
>> +    select SMBUS_EEPROM
>> +    select RTL8139_PCI
> 
> I'd suggest to use "imply RTL8139_PCI" here instead, since "-net none"
> should be possible for this machine, too.

This chipset is soldered onboard, so I'd rather keep it that way...

The -net option is confusing IMHO.

Thought?

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

[Aleksandar Markovic]

On Mar 11, 2019 1:56 AM, "Philippe Mathieu-Daudé" <philmd@redhat.com> wrote:
>
> Express the MIPS machine dependencies with Kconfig.
>
> Due to its complexity, the Malta board fill follow in a different
> series.
>

Philippe,

What would be the status of this series? I am willing to integrate all
this, including all followups, but have hard time sorting out what happend
after this submission, what is the most complete version etc. Can you
enlighten me please?

Yours,
Aleksandar

> v3:
> - addressed review comments from Thomas and Aleksandar
>   (noted in each patch)
>
> v2: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00887.html
> - Do not remove machines from the default config (Thomas)
> - Corrected comment about CONFIG_PCI_BONITO (Thomas)
>
> v1: https://www.mail-archive.com/qemu-devel@nongnu.org/msg593013.html
>
> $ git backport-diff -u kconfig_mips-v2
> Key:
> [----] : patches are identical
> [####] : number of functional differences between upstream/downstream
patch
> The flags [FC] indicate (F)unctional and (C)ontextual differences,
respectively
>
> 001/7:[----] [--] 'hw/mips: Express dependencies of the MIPSsim machine
with kconfig'
> 002/7:[0001] [FC] 'hw/mips: Express dependencies of the Jazz machine with
kconfig'
> 003/7:[0002] [FC] 'hw/mips: Express dependencies of the r4k platform with
kconfig'
> 004/7:[down] 'hw/mips: Remove the redundant CONFIG_MIPS_ITU Makefile
variable'
> 005/7:[----] [-C] 'hw/mips: Express dependencies of the Boston machine
with kconfig'
> 006/7:[----] [-C] 'hw/pci-host: Use CONFIG_PCI_BONITO to select the
Bonito North Bridge'
> 007/7:[----] [-C] 'hw/mips: Express dependencies of the Fulong 2E machine
with kconfig'
>
> Regards,
>
> Phil.
>
> Philippe Mathieu-Daudé (7):
>   hw/mips: Express dependencies of the MIPSsim machine with Kconfig
>   hw/mips: Express dependencies of the Jazz machine with Kconfig
>   hw/mips: Express dependencies of the r4k platform with Kconfig
>   hw/mips: Remove the redundant CONFIG_MIPS_ITU Makefile variable
>   hw/mips: Express dependencies of the Boston machine with Kconfig
>   hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge
>   hw/mips: Express dependencies of the Fulong 2E machine with Kconfig
>
>  default-configs/mips-softmmu-common.mak |  4 ---
>  default-configs/mips64-softmmu.mak      |  5 ---
>  default-configs/mips64el-softmmu.mak    | 11 -------
>  hw/isa/Kconfig                          | 13 +++++---
>  hw/mips/Kconfig                         | 41 +++++++++++++++++++++++++
>  hw/misc/Kconfig                         |  3 --
>  hw/misc/Makefile.objs                   |  2 +-
>  hw/pci-host/Kconfig                     |  4 +++
>  hw/pci-host/Makefile.objs               |  2 +-
>  9 files changed, 56 insertions(+), 29 deletions(-)
>
> --
> 2.20.1
>
>

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

[Philippe Mathieu-Daudé]

Hi Aleksandar,

On 5/27/19 8:31 PM, Aleksandar Markovic wrote:
> 
> On Mar 11, 2019 1:56 AM, "Philippe Mathieu-Daudé" <philmd@redhat.com
> <mailto:philmd@redhat.com>> wrote:
>>
>> Express the MIPS machine dependencies with Kconfig.
>>
>> Due to its complexity, the Malta board fill follow in a different
>> series.
>>
> 
> Philippe,
> 
> What would be the status of this series? I am willing to integrate all
> this, including all followups, but have hard time sorting out what
> happend after this submission, what is the most complete version etc.
> Can you enlighten me please?

Thanks for your interest in this series :)

I was chatting with Thomas about this series earlier today!
I addressed your comment about the ITU/CPS devices, then wanted to join
all the Malta patches in the same series, but there are too many for a
single series so I'll keep them separate.
About Malta, I can do it two ways: one quick and dirty, and one clean
but long. Problem with long series is they can take too long before
landing. I'm trying to figure a quick but not that dirty way to solve
this, then we can improve later.

I'll resend during the week.

Regards,

Phil.

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

[Philippe Mathieu-Daudé]

> On 5/27/19 8:31 PM, Aleksandar Markovic wrote:
> > What would be the status of this series? I am willing to integrate all
> > this, including all followups, but have hard time sorting out what
> > happend after this submission, what is the most complete version etc.
> > Can you enlighten me please?
>
> Thanks for your interest in this series :)
>
> I was chatting with Thomas about this series earlier today!
> I addressed your comment about the ITU/CPS devices, then wanted to join
> all the Malta patches in the same series, but there are too many for a
> single series so I'll keep them separate.

After some sleep I could remember why I postponed this series:

1/ making the ITU selectable gives:

  /usr/bin/ld: target/mips/op_helper.o: in function `helper_mtc0_saar':
  ./target/mips/op_helper.c:1614: undefined reference to `itc_reconfigure'
  /usr/bin/ld: target/mips/op_helper.o: in function `helper_mthc0_saar':
  ./target/mips/op_helper.c:1631: undefined reference to `itc_reconfigure'
  collect2: error: ld returned 1 exit status

Anyway it is now selectable but has to be always selected.

2/ I thought only the Malta board was deeply mixed with the X86 ACPI
code, but I later noticed the Fulong is too.

  /usr/bin/ld: ../hw/isa/vt82c686.o: in function `vt82c686b_pm_realize':
  ./hw/isa/vt82c686.c:381: undefined reference to `acpi_pm_tmr_init'
  /usr/bin/ld: ./hw/isa/vt82c686.c:382: undefined reference to
`acpi_pm1_evt_init'
  /usr/bin/ld: ../hw/isa/vt82c686.o: in function `pm_update_sci':
  ./hw/isa/vt82c686.c:195: undefined reference to `acpi_pm1_evt_get_sts'
  collect2: error: ld returned 1 exit status

Both VT82C686B/PIIX4 southbridges require considerable cleanup.
I think I now have something workable, but I have to sell my patches
correctly to the different subsystem maintainers ;)

Regards,

Phil.

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

[Aleksandar Markovic]

On May 28, 2019 8:49 AM, "Philippe Mathieu-Daudé" <philmd@redhat.com> wrote:
>
> > On 5/27/19 8:31 PM, Aleksandar Markovic wrote:
> > > What would be the status of this series? I am willing to integrate all
> > > this, including all followups, but have hard time sorting out what
> > > happend after this submission, what is the most complete version etc.
> > > Can you enlighten me please?
> >
> > Thanks for your interest in this series :)
> >
> > I was chatting with Thomas about this series earlier today!
> > I addressed your comment about the ITU/CPS devices, then wanted to join
> > all the Malta patches in the same series, but there are too many for a
> > single series so I'll keep them separate.
>
> After some sleep I could remember why I postponed this series:
>
> 1/ making the ITU selectable gives:
>
>   /usr/bin/ld: target/mips/op_helper.o: in function `helper_mtc0_saar':
>   ./target/mips/op_helper.c:1614: undefined reference to `itc_reconfigure'
>   /usr/bin/ld: target/mips/op_helper.o: in function `helper_mthc0_saar':
>   ./target/mips/op_helper.c:1631: undefined reference to `itc_reconfigure'
>   collect2: error: ld returned 1 exit status
>
> Anyway it is now selectable but has to be always selected.
>
> 2/ I thought only the Malta board was deeply mixed with the X86 ACPI
> code, but I later noticed the Fulong is too.
>
>   /usr/bin/ld: ../hw/isa/vt82c686.o: in function `vt82c686b_pm_realize':
>   ./hw/isa/vt82c686.c:381: undefined reference to `acpi_pm_tmr_init'
>   /usr/bin/ld: ./hw/isa/vt82c686.c:382: undefined reference to
> `acpi_pm1_evt_init'
>   /usr/bin/ld: ../hw/isa/vt82c686.o: in function `pm_update_sci':
>   ./hw/isa/vt82c686.c:195: undefined reference to `acpi_pm1_evt_get_sts'
>   collect2: error: ld returned 1 exit status
>
> Both VT82C686B/PIIX4 southbridges require considerable cleanup.
> I think I now have something workable, but I have to sell my patches
> correctly to the different subsystem maintainers ;)
>

I appreciate all this very much!

I don't want to rush you in any way, but just want to tell you that the
next MIPS pull request is planned for mid or end of the next week - so if
you judge some parts can be independently wrapped up by that time, by no
means send such set of patches. But again, it is up to you, no obligations
and no questions asked.

Au revoir,
Aleksandar

> Regards,
>
> Phil.

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

[Aleksandar Markovic]

On Mar 11, 2019 1:56 AM, "Philippe Mathieu-Daudé" <philmd@redhat.com> wrote:
>
> Express the MIPS machine dependencies with Kconfig.
>
> Due to its complexity, the Malta board fill follow in a different
> series.
>

Philippe,

What do we do with this series for 4.1?

Yours,
Aleksandar

> v3:
> - addressed review comments from Thomas and Aleksandar
>   (noted in each patch)
>
> v2: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00887.html
> - Do not remove machines from the default config (Thomas)
> - Corrected comment about CONFIG_PCI_BONITO (Thomas)
>
> v1: https://www.mail-archive.com/qemu-devel@nongnu.org/msg593013.html
>
> $ git backport-diff -u kconfig_mips-v2
> Key:
> [----] : patches are identical
> [####] : number of functional differences between upstream/downstream
patch
> The flags [FC] indicate (F)unctional and (C)ontextual differences,
respectively
>
> 001/7:[----] [--] 'hw/mips: Express dependencies of the MIPSsim machine
with kconfig'
> 002/7:[0001] [FC] 'hw/mips: Express dependencies of the Jazz machine with
kconfig'
> 003/7:[0002] [FC] 'hw/mips: Express dependencies of the r4k platform with
kconfig'
> 004/7:[down] 'hw/mips: Remove the redundant CONFIG_MIPS_ITU Makefile
variable'
> 005/7:[----] [-C] 'hw/mips: Express dependencies of the Boston machine
with kconfig'
> 006/7:[----] [-C] 'hw/pci-host: Use CONFIG_PCI_BONITO to select the
Bonito North Bridge'
> 007/7:[----] [-C] 'hw/mips: Express dependencies of the Fulong 2E machine
with kconfig'
>
> Regards,
>
> Phil.
>
> Philippe Mathieu-Daudé (7):
>   hw/mips: Express dependencies of the MIPSsim machine with Kconfig
>   hw/mips: Express dependencies of the Jazz machine with Kconfig
>   hw/mips: Express dependencies of the r4k platform with Kconfig
>   hw/mips: Remove the redundant CONFIG_MIPS_ITU Makefile variable
>   hw/mips: Express dependencies of the Boston machine with Kconfig
>   hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge
>   hw/mips: Express dependencies of the Fulong 2E machine with Kconfig
>
>  default-configs/mips-softmmu-common.mak |  4 ---
>  default-configs/mips64-softmmu.mak      |  5 ---
>  default-configs/mips64el-softmmu.mak    | 11 -------
>  hw/isa/Kconfig                          | 13 +++++---
>  hw/mips/Kconfig                         | 41 +++++++++++++++++++++++++
>  hw/misc/Kconfig                         |  3 --
>  hw/misc/Makefile.objs                   |  2 +-
>  hw/pci-host/Kconfig                     |  4 +++
>  hw/pci-host/Makefile.objs               |  2 +-
>  9 files changed, 56 insertions(+), 29 deletions(-)
>
> --
> 2.20.1
>
>

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

[Philippe Mathieu-Daudé]

Hi Aleksandar,

On 6/30/19 9:12 AM, Aleksandar Markovic wrote:
> 
> On Mar 11, 2019 1:56 AM, "Philippe Mathieu-Daudé" <philmd@redhat.com
> <mailto:philmd@redhat.com>> wrote:
>>
>> Express the MIPS machine dependencies with Kconfig.
>>
>> Due to its complexity, the Malta board fill follow in a different
>> series.
>>
> 
> Philippe,
> 
> What do we do with this series for 4.1?

As commented in another reply of this cover, while addressing your
comment "systems with CPS that doesn't have ITU" I hit an incongruous issue:

  /usr/bin/ld: target/mips/op_helper.o: in function `helper_mtc0_saar':
  ./target/mips/op_helper.c:1614: undefined reference to `itc_reconfigure'
  /usr/bin/ld: target/mips/op_helper.o: in function `helper_mthc0_saar':
  ./target/mips/op_helper.c:1631: undefined reference to `itc_reconfigure'
  collect2: error: ld returned 1 exit status

Then while trying to resolve this I exhausted the time I had to work on
this.

Since I doubt we can fix easily the design flow when (coproc)
instructions access optional device before 4.1, I'll also take out the
Boston patches, and see what's left I can respin.

Regards,

Phil.

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

[Aleksandar Markovic]

> Since I doubt we can fix easily the design flow when (coproc)
> instructions access optional device before 4.1, I'll also take out the
> Boston patches, and see what's left I can respin.

No problem, what can we do.

Or you can tell me just what patches I should apply from this series now.

I plan a MIPS pull request tomorrow evening.

Bon aprés midi,
Aleksandar

> Regards,
>Phil.