isa/piix: move to mips malta

[Qemu-devel] [PATCH v2] isa/piix: move to mips malta

Posted by Michael S. Tsirkin 7 years, 9 months ago

This device is only used on mips malta, move it to the maintainer
that's actually testing it.

Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Yongbok Kim <yongbok.kim@mips.com>
Cc: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

Aurelien, pls feel free to merge this or v1.

 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 0255113..0b8a5e7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -641,6 +641,7 @@ Malta
 M: Aurelien Jarno <aurelien@aurel32.net>
 S: Maintained
 F: hw/mips/mips_malta.c
+F: hw/isa/piix4.c
 
 Mipssim
 M: Yongbok Kim <yongbok.kim@mips.com>
@@ -849,7 +850,6 @@ F: hw/pci-host/q35.c
 F: hw/pci-host/pam.c
 F: include/hw/pci-host/q35.h
 F: include/hw/pci-host/pam.h
-F: hw/isa/piix4.c
 F: hw/isa/lpc_ich9.c
 F: hw/i2c/smbus_ich9.c
 F: hw/acpi/piix4.c
-- 
MST

Re: [Qemu-devel] [PATCH v2] isa/piix: move to mips malta

Posted by Philippe Mathieu-Daudé 6 years, 7 months ago

Hi Michael,

On 1/9/18 3:59 PM, Michael S. Tsirkin wrote:
> This device is only used on mips malta, move it to the maintainer
> that's actually testing it.

Slighly related to this patch, since I included it while working on
Kconfig/MIPS.
I splitted PIIX3/PIIX4 (Actually PIIX3 was mixed with I440FX).
These are indeed 2 different chipsets, PIIX4 is an improved PIIX3.

I compiled MIPS with PIIX4 and it works, however when I ran all the
testsuite X86 failed due to PIIX4_PM missing.
I looked where it is used:

$ git grep PIIX4_PM
docs/interop/firmware.json:96:#           enabled with "-global
PIIX4_PM.disable_s3=0" and disabled
docs/interop/firmware.json:97:#           with "-global
PIIX4_PM.disable_s3=1". On the "pc-q35-*"
docs/interop/firmware.json:105:#           can be enabled with "-global
PIIX4_PM.disable_s4=0" and
docs/interop/firmware.json:106:#           disabled with "-global
PIIX4_PM.disable_s4=1". On the
hw/i386/pc.c:282:    { "PIIX4_PM", "memory-hotplug-support", "off" },
hw/i386/pc.c:299:    { "PIIX4_PM",
"acpi-pci-hotplug-with-bridge-support", "off" },

So now I'm confused, looking at git history I see you introduced this in
commit 9e047b98245.

What chipset do use the PC machine? An unreal hybrid of PIIX3/PIIX4?

Thanks,

Phil.

> 
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> Cc: Yongbok Kim <yongbok.kim@mips.com>
> Cc: Hervé Poussineau <hpoussin@reactos.org>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> 
> Aurelien, pls feel free to merge this or v1.
> 
>  MAINTAINERS | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 0255113..0b8a5e7 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -641,6 +641,7 @@ Malta
>  M: Aurelien Jarno <aurelien@aurel32.net>
>  S: Maintained
>  F: hw/mips/mips_malta.c
> +F: hw/isa/piix4.c
>  
>  Mipssim
>  M: Yongbok Kim <yongbok.kim@mips.com>
> @@ -849,7 +850,6 @@ F: hw/pci-host/q35.c
>  F: hw/pci-host/pam.c
>  F: include/hw/pci-host/q35.h
>  F: include/hw/pci-host/pam.h
> -F: hw/isa/piix4.c
>  F: hw/isa/lpc_ich9.c
>  F: hw/i2c/smbus_ich9.c
>  F: hw/acpi/piix4.c
>

Re: [Qemu-devel] [PATCH v2] isa/piix: move to mips malta

Posted by Michael S. Tsirkin 6 years, 7 months ago

On Tue, Mar 05, 2019 at 01:53:45AM +0100, Philippe Mathieu-Daudé wrote:
> Hi Michael,
> 
> On 1/9/18 3:59 PM, Michael S. Tsirkin wrote:
> > This device is only used on mips malta, move it to the maintainer
> > that's actually testing it.
> 
> Slighly related to this patch, since I included it while working on
> Kconfig/MIPS.
> I splitted PIIX3/PIIX4 (Actually PIIX3 was mixed with I440FX).
> These are indeed 2 different chipsets, PIIX4 is an improved PIIX3.
> 
> I compiled MIPS with PIIX4 and it works, however when I ran all the
> testsuite X86 failed due to PIIX4_PM missing.
> I looked where it is used:
> 
> $ git grep PIIX4_PM
> docs/interop/firmware.json:96:#           enabled with "-global
> PIIX4_PM.disable_s3=0" and disabled
> docs/interop/firmware.json:97:#           with "-global
> PIIX4_PM.disable_s3=1". On the "pc-q35-*"
> docs/interop/firmware.json:105:#           can be enabled with "-global
> PIIX4_PM.disable_s4=0" and
> docs/interop/firmware.json:106:#           disabled with "-global
> PIIX4_PM.disable_s4=1". On the
> hw/i386/pc.c:282:    { "PIIX4_PM", "memory-hotplug-support", "off" },
> hw/i386/pc.c:299:    { "PIIX4_PM",
> "acpi-pci-hotplug-with-bridge-support", "off" },
> 
> So now I'm confused, looking at git history I see you introduced this in
> commit 9e047b98245.
> 
> What chipset do use the PC machine? An unreal hybrid of PIIX3/PIIX4?
> 
> Thanks,
> 
> Phil.

Yes I think it does not match any real hardware at this point.

Not sure what does grep above show: to create piix4 pm
pc_init1 calls piix4_pm_init.


> > 
> > Cc: Aurelien Jarno <aurelien@aurel32.net>
> > Cc: Yongbok Kim <yongbok.kim@mips.com>
> > Cc: Hervé Poussineau <hpoussin@reactos.org>
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> > 
> > Aurelien, pls feel free to merge this or v1.
> > 
> >  MAINTAINERS | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 0255113..0b8a5e7 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -641,6 +641,7 @@ Malta
> >  M: Aurelien Jarno <aurelien@aurel32.net>
> >  S: Maintained
> >  F: hw/mips/mips_malta.c
> > +F: hw/isa/piix4.c
> >  
> >  Mipssim
> >  M: Yongbok Kim <yongbok.kim@mips.com>
> > @@ -849,7 +850,6 @@ F: hw/pci-host/q35.c
> >  F: hw/pci-host/pam.c
> >  F: include/hw/pci-host/q35.h
> >  F: include/hw/pci-host/pam.h
> > -F: hw/isa/piix4.c
> >  F: hw/isa/lpc_ich9.c
> >  F: hw/i2c/smbus_ich9.c
> >  F: hw/acpi/piix4.c
> >

Re: [Qemu-devel] [PATCH v2] isa/piix: move to mips malta

Posted by Philippe Mathieu-Daudé 6 years, 7 months ago

On 3/5/19 3:11 AM, Michael S. Tsirkin wrote:
> On Tue, Mar 05, 2019 at 01:53:45AM +0100, Philippe Mathieu-Daudé wrote:
>> Hi Michael,
>>
>> On 1/9/18 3:59 PM, Michael S. Tsirkin wrote:
>>> This device is only used on mips malta, move it to the maintainer
>>> that's actually testing it.
>>
>> Slighly related to this patch, since I included it while working on
>> Kconfig/MIPS.
>> I splitted PIIX3/PIIX4 (Actually PIIX3 was mixed with I440FX).
>> These are indeed 2 different chipsets, PIIX4 is an improved PIIX3.
>>
>> I compiled MIPS with PIIX4 and it works, however when I ran all the
>> testsuite X86 failed due to PIIX4_PM missing.
>> I looked where it is used:
>>
>> $ git grep PIIX4_PM
>> docs/interop/firmware.json:96:#           enabled with "-global
>> PIIX4_PM.disable_s3=0" and disabled
>> docs/interop/firmware.json:97:#           with "-global
>> PIIX4_PM.disable_s3=1". On the "pc-q35-*"
>> docs/interop/firmware.json:105:#           can be enabled with "-global
>> PIIX4_PM.disable_s4=0" and
>> docs/interop/firmware.json:106:#           disabled with "-global
>> PIIX4_PM.disable_s4=1". On the
>> hw/i386/pc.c:282:    { "PIIX4_PM", "memory-hotplug-support", "off" },
>> hw/i386/pc.c:299:    { "PIIX4_PM",
>> "acpi-pci-hotplug-with-bridge-support", "off" },
>>
>> So now I'm confused, looking at git history I see you introduced this in
>> commit 9e047b98245.
>>
>> What chipset do use the PC machine? An unreal hybrid of PIIX3/PIIX4?
>>
>> Thanks,
>>
>> Phil.
> 
> Yes I think it does not match any real hardware at this point.

This is unfortunate :( I'll try to sort this out.

> 
> Not sure what does grep above show: to create piix4 pm
> pc_init1 calls piix4_pm_init.

Indeed, which makes me wonder what I'm running =)

Thanks for the quick answer,

Phil.

>>>
>>> Cc: Aurelien Jarno <aurelien@aurel32.net>
>>> Cc: Yongbok Kim <yongbok.kim@mips.com>
>>> Cc: Hervé Poussineau <hpoussin@reactos.org>
>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>> ---
>>>
>>> Aurelien, pls feel free to merge this or v1.
>>>
>>>  MAINTAINERS | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index 0255113..0b8a5e7 100644
>>> --- a/MAINTAINERS
>>> +++ b/MAINTAINERS
>>> @@ -641,6 +641,7 @@ Malta
>>>  M: Aurelien Jarno <aurelien@aurel32.net>
>>>  S: Maintained
>>>  F: hw/mips/mips_malta.c
>>> +F: hw/isa/piix4.c
>>>  
>>>  Mipssim
>>>  M: Yongbok Kim <yongbok.kim@mips.com>
>>> @@ -849,7 +850,6 @@ F: hw/pci-host/q35.c
>>>  F: hw/pci-host/pam.c
>>>  F: include/hw/pci-host/q35.h
>>>  F: include/hw/pci-host/pam.h
>>> -F: hw/isa/piix4.c
>>>  F: hw/isa/lpc_ich9.c
>>>  F: hw/i2c/smbus_ich9.c
>>>  F: hw/acpi/piix4.c
>>>