[Qemu-devel] [PATCH 0/2] mac: don't use legacy fw_cfg_init_mem() functions

[Qemu-devel] [PATCH 0/2] mac: don't use legacy fw_cfg_init_mem() functions

[Mark Cave-Ayland]

Here are a couple of patches to switch the fw_cfg initialisation for
the Mac Old World and New World machines over to use qdev rather than
using the legacy fw_cfg_init_mem() function.

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


Mark Cave-Ayland (2):
  mac_oldworld: don't use legacy fw_cfg_init_mem() function
  mac_newworld: don't use legacy fw_cfg_init_mem() function

 hw/ppc/mac_newworld.c | 12 +++++++++++-
 hw/ppc/mac_oldworld.c | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

-- 
2.11.0

[Qemu-devel] [PATCH 1/2] mac_oldworld: don't use legacy fw_cfg_init_mem() function

[Mark Cave-Ayland]

Instead initialise the device via qdev to allow us to set device properties
directly as required.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/ppc/mac_oldworld.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 064d7eb30a..80b5525775 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -309,7 +309,17 @@ static void ppc_heathrow_init(MachineState *machine)
 
     /* No PCI init: the BIOS will do it */
 
-    fw_cfg = fw_cfg_init_mem(CFG_ADDR, CFG_ADDR + 2);
+    dev = qdev_create(NULL, TYPE_FW_CFG_MEM);
+    fw_cfg = FW_CFG(dev);
+    qdev_prop_set_uint32(dev, "data_width", 1);
+    qdev_prop_set_bit(dev, "dma_enabled", false);
+    object_property_add_child(OBJECT(qdev_get_machine()), TYPE_FW_CFG,
+                              OBJECT(fw_cfg), NULL);
+    qdev_init_nofail(dev);
+    s = SYS_BUS_DEVICE(dev);
+    sysbus_mmio_map(s, 0, CFG_ADDR);
+    sysbus_mmio_map(s, 1, CFG_ADDR + 2);
+
     fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)smp_cpus);
     fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)max_cpus);
     fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
-- 
2.11.0

[Qemu-devel] [PATCH 2/2] mac_newworld: don't use legacy fw_cfg_init_mem() function

[Mark Cave-Ayland]

Instead initialise the device via qdev to allow us to set device properties
directly as required.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/ppc/mac_newworld.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 2ca294664b..a6b95f024c 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -454,7 +454,17 @@ static void ppc_core99_init(MachineState *machine)
     pmac_format_nvram_partition(nvr, 0x2000);
     /* No PCI init: the BIOS will do it */
 
-    fw_cfg = fw_cfg_init_mem(CFG_ADDR, CFG_ADDR + 2);
+    dev = qdev_create(NULL, TYPE_FW_CFG_MEM);
+    fw_cfg = FW_CFG(dev);
+    qdev_prop_set_uint32(dev, "data_width", 1);
+    qdev_prop_set_bit(dev, "dma_enabled", false);
+    object_property_add_child(OBJECT(qdev_get_machine()), TYPE_FW_CFG,
+                              OBJECT(fw_cfg), NULL);
+    qdev_init_nofail(dev);
+    s = SYS_BUS_DEVICE(dev);
+    sysbus_mmio_map(s, 0, CFG_ADDR);
+    sysbus_mmio_map(s, 1, CFG_ADDR + 2);
+
     fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)smp_cpus);
     fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)max_cpus);
     fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
-- 
2.11.0

Re: [Qemu-devel] [PATCH 0/2] mac: don't use legacy fw_cfg_init_mem() functions

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 873 bytes --]

On Fri, Aug 10, 2018 at 11:27:55AM +0100, Mark Cave-Ayland wrote:
> Here are a couple of patches to switch the fw_cfg initialisation for
> the Mac Old World and New World machines over to use qdev rather than
> using the legacy fw_cfg_init_mem() function.
> 
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Applied to ppc-for-3.1, thanks.

> 
> 
> Mark Cave-Ayland (2):
>   mac_oldworld: don't use legacy fw_cfg_init_mem() function
>   mac_newworld: don't use legacy fw_cfg_init_mem() function
> 
>  hw/ppc/mac_newworld.c | 12 +++++++++++-
>  hw/ppc/mac_oldworld.c | 12 +++++++++++-
>  2 files changed, 22 insertions(+), 2 deletions(-)
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]