diff mbox series

[4/5] ppc405_boards: use qdev properties instead of legacy m48t59_init() function

Message ID 20201016182739.22875-5-mark.cave-ayland@ilande.co.uk
State Superseded
Headers show
Series m48t59: remove legacy init functions | expand

Commit Message

Mark Cave-Ayland Oct. 16, 2020, 6:27 p.m. UTC 
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/ppc/ppc405_boards.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Comments

Gonglei (Arei)" via Oct. 16, 2020, 8:38 p.m. UTC | #1 
On Fri, 16 Oct 2020, Mark Cave-Ayland wrote:
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
> hw/ppc/ppc405_boards.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
> index 6198ec1035..4687715b15 100644
> --- a/hw/ppc/ppc405_boards.c
> +++ b/hw/ppc/ppc405_boards.c
> @@ -28,6 +28,8 @@
> #include "qemu-common.h"
> #include "cpu.h"
> #include "hw/ppc/ppc.h"
> +#include "hw/qdev-properties.h"
> +#include "hw/sysbus.h"
> #include "ppc405.h"
> #include "hw/rtc/m48t59.h"
> #include "hw/block/flash.h"
> @@ -145,6 +147,8 @@ static void ref405ep_init(MachineState *machine)
>     char *filename;
>     ppc4xx_bd_info_t bd;
>     CPUPPCState *env;
> +    DeviceState *dev;
> +    SysBusDevice *s;
>     qemu_irq *pic;
>     MemoryRegion *bios;
>     MemoryRegion *sram = g_new(MemoryRegion, 1);
> @@ -227,7 +231,11 @@ static void ref405ep_init(MachineState *machine)
>     /* Register FPGA */
>     ref405ep_fpga_init(sysmem, 0xF0300000);
>     /* Register NVRAM */
> -    m48t59_init(NULL, 0xF0000000, 0, 8192, 1968, 8);
> +    dev = qdev_new("sysbus-m48t08");
> +    qdev_prop_set_int32(dev, "base-year", 1968);

Is there anything that uses other than 1968 as base year? If not this 
could be the default in the device so you don't need these set prop calls 
here and in sun machines.

The only other place this device is used seems to be ppc/prep machine that 
uses the isa version but does not set a base year. Is that a bug? The 
original prep machine removed in b2ce76a0730 used 2000 but that's unlikely 
as well as these machines predate that. Anyway, the sysbus and isa 
versions are different so their default base-year could be set 
independently and then boards won't need to set this propery and may be 
could use qdev_create_simple instead or whatever that was renamed to.

Regards,
BALATON Zoltan

> +    s = SYS_BUS_DEVICE(dev);
> +    sysbus_realize_and_unref(s, &error_fatal);
> +    sysbus_mmio_map(s, 0, 0xF0000000);
>     /* Load kernel */
>     linux_boot = (kernel_filename != NULL);
>     if (linux_boot) {
>
Philippe Mathieu-Daudé Oct. 17, 2020, 9:45 a.m. UTC | #2 
On 10/16/20 10:38 PM, BALATON Zoltan via wrote:
> On Fri, 16 Oct 2020, Mark Cave-Ayland wrote:
>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>> ---
>> hw/ppc/ppc405_boards.c | 10 +++++++++-
>> 1 file changed, 9 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
>> index 6198ec1035..4687715b15 100644
>> --- a/hw/ppc/ppc405_boards.c
>> +++ b/hw/ppc/ppc405_boards.c
>> @@ -28,6 +28,8 @@
>> #include "qemu-common.h"
>> #include "cpu.h"
>> #include "hw/ppc/ppc.h"
>> +#include "hw/qdev-properties.h"
>> +#include "hw/sysbus.h"
>> #include "ppc405.h"
>> #include "hw/rtc/m48t59.h"
>> #include "hw/block/flash.h"
>> @@ -145,6 +147,8 @@ static void ref405ep_init(MachineState *machine)
>>     char *filename;
>>     ppc4xx_bd_info_t bd;
>>     CPUPPCState *env;
>> +    DeviceState *dev;
>> +    SysBusDevice *s;
>>     qemu_irq *pic;
>>     MemoryRegion *bios;
>>     MemoryRegion *sram = g_new(MemoryRegion, 1);
>> @@ -227,7 +231,11 @@ static void ref405ep_init(MachineState *machine)
>>     /* Register FPGA */
>>     ref405ep_fpga_init(sysmem, 0xF0300000);
>>     /* Register NVRAM */
>> -    m48t59_init(NULL, 0xF0000000, 0, 8192, 1968, 8);
>> +    dev = qdev_new("sysbus-m48t08");
>> +    qdev_prop_set_int32(dev, "base-year", 1968);
> 
> Is there anything that uses other than 1968 as base year? If not this 
> could be the default in the device so you don't need these set prop 
> calls here and in sun machines.
> 
> The only other place this device is used seems to be ppc/prep machine 
> that uses the isa version but does not set a base year. Is that a bug? 
> The original prep machine removed in b2ce76a0730 used 2000 but that's 
> unlikely as well as these machines predate that.

=)

> Anyway, the sysbus and 
> isa versions are different

They shouldn't, it is the same chipset, wired differently.

> so their default base-year could be set 
> independently and then boards won't need to set this propery and may be 
> could use qdev_create_simple instead or whatever that was renamed to.

Agreed.

Preferably following Zoltan's suggestion:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> 
> Regards,
> BALATON Zoltan
> 
>> +    s = SYS_BUS_DEVICE(dev);
>> +    sysbus_realize_and_unref(s, &error_fatal);
>> +    sysbus_mmio_map(s, 0, 0xF0000000);
>>     /* Load kernel */
>>     linux_boot = (kernel_filename != NULL);
>>     if (linux_boot) {
>>
>
Gonglei (Arei)" via Oct. 17, 2020, 10:44 a.m. UTC | #3 
On Sat, 17 Oct 2020, Philippe Mathieu-Daudé wrote:
> On 10/16/20 10:38 PM, BALATON Zoltan via wrote:

>> On Fri, 16 Oct 2020, Mark Cave-Ayland wrote:

>>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

>>> ---

>>> hw/ppc/ppc405_boards.c | 10 +++++++++-

>>> 1 file changed, 9 insertions(+), 1 deletion(-)

>>> 

>>> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c

>>> index 6198ec1035..4687715b15 100644

>>> --- a/hw/ppc/ppc405_boards.c

>>> +++ b/hw/ppc/ppc405_boards.c

>>> @@ -28,6 +28,8 @@

>>> #include "qemu-common.h"

>>> #include "cpu.h"

>>> #include "hw/ppc/ppc.h"

>>> +#include "hw/qdev-properties.h"

>>> +#include "hw/sysbus.h"

>>> #include "ppc405.h"

>>> #include "hw/rtc/m48t59.h"

>>> #include "hw/block/flash.h"

>>> @@ -145,6 +147,8 @@ static void ref405ep_init(MachineState *machine)

>>>     char *filename;

>>>     ppc4xx_bd_info_t bd;

>>>     CPUPPCState *env;

>>> +    DeviceState *dev;

>>> +    SysBusDevice *s;

>>>     qemu_irq *pic;

>>>     MemoryRegion *bios;

>>>     MemoryRegion *sram = g_new(MemoryRegion, 1);

>>> @@ -227,7 +231,11 @@ static void ref405ep_init(MachineState *machine)

>>>     /* Register FPGA */

>>>     ref405ep_fpga_init(sysmem, 0xF0300000);

>>>     /* Register NVRAM */

>>> -    m48t59_init(NULL, 0xF0000000, 0, 8192, 1968, 8);

>>> +    dev = qdev_new("sysbus-m48t08");

>>> +    qdev_prop_set_int32(dev, "base-year", 1968);

>> 

>> Is there anything that uses other than 1968 as base year? If not this could 

>> be the default in the device so you don't need these set prop calls here 

>> and in sun machines.

>> 

>> The only other place this device is used seems to be ppc/prep machine that 

>> uses the isa version but does not set a base year. Is that a bug? The 

>> original prep machine removed in b2ce76a0730 used 2000 but that's unlikely 

>> as well as these machines predate that.

>

> =)

>

>> Anyway, the sysbus and isa versions are different

>

> They shouldn't, it is the same chipset, wired differently.


I mean in QEMU the sysbus and isa devices are different object types so 
their default is settable independently. So setting the sysbus device 
base-year does not change the isa device which can be sorted out in 
another patch independently from this series later when the behaviour on 
40p is confirmed.

Regards,
BALATON Zoltan

>> so their default base-year could be set independently and then boards won't 

>> need to set this propery and may be could use qdev_create_simple instead or 

>> whatever that was renamed to.

>

> Agreed.

>

> Preferably following Zoltan's suggestion:

> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

>

>> 

>> Regards,

>> BALATON Zoltan

>> 

>>> +    s = SYS_BUS_DEVICE(dev);

>>> +    sysbus_realize_and_unref(s, &error_fatal);

>>> +    sysbus_mmio_map(s, 0, 0xF0000000);

>>>     /* Load kernel */

>>>     linux_boot = (kernel_filename != NULL);

>>>     if (linux_boot) {

>>> 

>> 

>

>
Mark Cave-Ayland Oct. 17, 2020, 11:16 a.m. UTC | #4 
On 17/10/2020 10:45, Philippe Mathieu-Daudé wrote:

> On 10/16/20 10:38 PM, BALATON Zoltan via wrote:
>> On Fri, 16 Oct 2020, Mark Cave-Ayland wrote:
>>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>>> ---
>>> hw/ppc/ppc405_boards.c | 10 +++++++++-
>>> 1 file changed, 9 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
>>> index 6198ec1035..4687715b15 100644
>>> --- a/hw/ppc/ppc405_boards.c
>>> +++ b/hw/ppc/ppc405_boards.c
>>> @@ -28,6 +28,8 @@
>>> #include "qemu-common.h"
>>> #include "cpu.h"
>>> #include "hw/ppc/ppc.h"
>>> +#include "hw/qdev-properties.h"
>>> +#include "hw/sysbus.h"
>>> #include "ppc405.h"
>>> #include "hw/rtc/m48t59.h"
>>> #include "hw/block/flash.h"
>>> @@ -145,6 +147,8 @@ static void ref405ep_init(MachineState *machine)
>>>     char *filename;
>>>     ppc4xx_bd_info_t bd;
>>>     CPUPPCState *env;
>>> +    DeviceState *dev;
>>> +    SysBusDevice *s;
>>>     qemu_irq *pic;
>>>     MemoryRegion *bios;
>>>     MemoryRegion *sram = g_new(MemoryRegion, 1);
>>> @@ -227,7 +231,11 @@ static void ref405ep_init(MachineState *machine)
>>>     /* Register FPGA */
>>>     ref405ep_fpga_init(sysmem, 0xF0300000);
>>>     /* Register NVRAM */
>>> -    m48t59_init(NULL, 0xF0000000, 0, 8192, 1968, 8);
>>> +    dev = qdev_new("sysbus-m48t08");
>>> +    qdev_prop_set_int32(dev, "base-year", 1968);
>>
>> Is there anything that uses other than 1968 as base year? If not this could be the 
>> default in the device so you don't need these set prop calls here and in sun machines.
>>
>> The only other place this device is used seems to be ppc/prep machine that uses the 
>> isa version but does not set a base year. Is that a bug? The original prep machine 
>> removed in b2ce76a0730 used 2000 but that's unlikely as well as these machines 
>> predate that.
> 
> =)

This is quite interesting, since if you look at prep.c you see that the machine has 
both a MC146818 RTC and a M48T59 RTC, and the NVRAM variables are stored in the 
M48T59. My guess is that a real 40p has a MC146818, but OHW only supported M48T59 and 
so it was only ever used to pass data from QEMU to OHW - the OS would use MC146818 
for the clock which has the base year set correctly.

>> Anyway, the sysbus and isa versions are different
> 
> They shouldn't, it is the same chipset, wired differently.
> 
>> so their default base-year could be set independently and then boards won't need to 
>> set this propery and may be could use qdev_create_simple instead or whatever that 
>> was renamed to.
> 
> Agreed.
> 
> Preferably following Zoltan's suggestion:
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

There is certainly some more untangling to be done here, but given my current backlog 
it is something that will need to wait until after 5.2.


ATB,

Mark.
Mark Cave-Ayland Oct. 17, 2020, 11:53 a.m. UTC | #5 
On 17/10/2020 11:44, BALATON Zoltan via wrote:

> On Sat, 17 Oct 2020, Philippe Mathieu-Daudé wrote:

>> On 10/16/20 10:38 PM, BALATON Zoltan via wrote:

>>> On Fri, 16 Oct 2020, Mark Cave-Ayland wrote:

>>>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

>>>> ---

>>>> hw/ppc/ppc405_boards.c | 10 +++++++++-

>>>> 1 file changed, 9 insertions(+), 1 deletion(-)

>>>>

>>>> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c

>>>> index 6198ec1035..4687715b15 100644

>>>> --- a/hw/ppc/ppc405_boards.c

>>>> +++ b/hw/ppc/ppc405_boards.c

>>>> @@ -28,6 +28,8 @@

>>>> #include "qemu-common.h"

>>>> #include "cpu.h"

>>>> #include "hw/ppc/ppc.h"

>>>> +#include "hw/qdev-properties.h"

>>>> +#include "hw/sysbus.h"

>>>> #include "ppc405.h"

>>>> #include "hw/rtc/m48t59.h"

>>>> #include "hw/block/flash.h"

>>>> @@ -145,6 +147,8 @@ static void ref405ep_init(MachineState *machine)

>>>>     char *filename;

>>>>     ppc4xx_bd_info_t bd;

>>>>     CPUPPCState *env;

>>>> +    DeviceState *dev;

>>>> +    SysBusDevice *s;

>>>>     qemu_irq *pic;

>>>>     MemoryRegion *bios;

>>>>     MemoryRegion *sram = g_new(MemoryRegion, 1);

>>>> @@ -227,7 +231,11 @@ static void ref405ep_init(MachineState *machine)

>>>>     /* Register FPGA */

>>>>     ref405ep_fpga_init(sysmem, 0xF0300000);

>>>>     /* Register NVRAM */

>>>> -    m48t59_init(NULL, 0xF0000000, 0, 8192, 1968, 8);

>>>> +    dev = qdev_new("sysbus-m48t08");

>>>> +    qdev_prop_set_int32(dev, "base-year", 1968);

>>>

>>> Is there anything that uses other than 1968 as base year? If not this could be the 

>>> default in the device so you don't need these set prop calls here and in sun 

>>> machines.

>>>

>>> The only other place this device is used seems to be ppc/prep machine that uses 

>>> the isa version but does not set a base year. Is that a bug? The original prep 

>>> machine removed in b2ce76a0730 used 2000 but that's unlikely as well as these 

>>> machines predate that.

>>

>> =)

>>

>>> Anyway, the sysbus and isa versions are different

>>

>> They shouldn't, it is the same chipset, wired differently.

> 

> I mean in QEMU the sysbus and isa devices are different object types so their default 

> is settable independently. So setting the sysbus device base-year does not change the 

> isa device which can be sorted out in another patch independently from this series 

> later when the behaviour on 40p is confirmed.


Right, there are certainly some questions around exactly how this behaviour works but 
in general people seem happy with this series. I'm going to apply this to my 
qemu-macppc branch with the NVRAM cast suggested by Philippe so the basic conversion 
is done, and then other improvements/tidy-ups can follow up later as time allows.


ATB,

Mark.
Artyom Tarasenko Oct. 17, 2020, 2:41 p.m. UTC | #6 
On Fri, Oct 16, 2020 at 10:38 PM BALATON Zoltan <balaton@eik.bme.hu> wrote:
>

> On Fri, 16 Oct 2020, Mark Cave-Ayland wrote:

> > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

> > ---

> > hw/ppc/ppc405_boards.c | 10 +++++++++-

> > 1 file changed, 9 insertions(+), 1 deletion(-)

> >

> > diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c

> > index 6198ec1035..4687715b15 100644

> > --- a/hw/ppc/ppc405_boards.c

> > +++ b/hw/ppc/ppc405_boards.c

> > @@ -28,6 +28,8 @@

> > #include "qemu-common.h"

> > #include "cpu.h"

> > #include "hw/ppc/ppc.h"

> > +#include "hw/qdev-properties.h"

> > +#include "hw/sysbus.h"

> > #include "ppc405.h"

> > #include "hw/rtc/m48t59.h"

> > #include "hw/block/flash.h"

> > @@ -145,6 +147,8 @@ static void ref405ep_init(MachineState *machine)

> >     char *filename;

> >     ppc4xx_bd_info_t bd;

> >     CPUPPCState *env;

> > +    DeviceState *dev;

> > +    SysBusDevice *s;

> >     qemu_irq *pic;

> >     MemoryRegion *bios;

> >     MemoryRegion *sram = g_new(MemoryRegion, 1);

> > @@ -227,7 +231,11 @@ static void ref405ep_init(MachineState *machine)

> >     /* Register FPGA */

> >     ref405ep_fpga_init(sysmem, 0xF0300000);

> >     /* Register NVRAM */

> > -    m48t59_init(NULL, 0xF0000000, 0, 8192, 1968, 8);

> > +    dev = qdev_new("sysbus-m48t08");

> > +    qdev_prop_set_int32(dev, "base-year", 1968);

>

> Is there anything that uses other than 1968 as base year?


I think 40p uses 1900 as the base year.

> If not this

> could be the default in the device so you don't need these set prop calls

> here and in sun machines.

>

> The only other place this device is used seems to be ppc/prep machine that

> uses the isa version but does not set a base year. Is that a bug? The

> original prep machine removed in b2ce76a0730 used 2000 but that's unlikely

> as well as these machines predate that. Anyway, the sysbus and isa

> versions are different so their default base-year could be set

> independently and then boards won't need to set this propery and may be

> could use qdev_create_simple instead or whatever that was renamed to.

>

> Regards,

> BALATON Zoltan

>

> > +    s = SYS_BUS_DEVICE(dev);

> > +    sysbus_realize_and_unref(s, &error_fatal);

> > +    sysbus_mmio_map(s, 0, 0xF0000000);

> >     /* Load kernel */

> >     linux_boot = (kernel_filename != NULL);

> >     if (linux_boot) {

> >
diff mbox series

Patch

diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 6198ec1035..4687715b15 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -28,6 +28,8 @@ 
 #include "qemu-common.h"
 #include "cpu.h"
 #include "hw/ppc/ppc.h"
+#include "hw/qdev-properties.h"
+#include "hw/sysbus.h"
 #include "ppc405.h"
 #include "hw/rtc/m48t59.h"
 #include "hw/block/flash.h"
@@ -145,6 +147,8 @@  static void ref405ep_init(MachineState *machine)
     char *filename;
     ppc4xx_bd_info_t bd;
     CPUPPCState *env;
+    DeviceState *dev;
+    SysBusDevice *s;
     qemu_irq *pic;
     MemoryRegion *bios;
     MemoryRegion *sram = g_new(MemoryRegion, 1);
@@ -227,7 +231,11 @@  static void ref405ep_init(MachineState *machine)
     /* Register FPGA */
     ref405ep_fpga_init(sysmem, 0xF0300000);
     /* Register NVRAM */
-    m48t59_init(NULL, 0xF0000000, 0, 8192, 1968, 8);
+    dev = qdev_new("sysbus-m48t08");
+    qdev_prop_set_int32(dev, "base-year", 1968);
+    s = SYS_BUS_DEVICE(dev);
+    sysbus_realize_and_unref(s, &error_fatal);
+    sysbus_mmio_map(s, 0, 0xF0000000);
     /* Load kernel */
     linux_boot = (kernel_filename != NULL);
     if (linux_boot) {