[Qemu-devel] [PATCH v4 0/4] arm: isolate and clean up dtb generation

Igor Mammedov posted 4 patches 5 years, 11 months ago
Failed in applying to current master (apply log)
hw/ppc/e500.h               |  5 +++
include/hw/arm/arm.h        | 45 +++++++++++++++------
include/hw/arm/sysbus-fdt.h | 37 ++++-------------
include/hw/arm/virt.h       |  1 +
include/hw/i386/pc.h        |  8 ----
include/hw/platform-bus.h   |  4 +-
hw/arm/boot.c               | 72 +++++++++-------------------------
hw/arm/sysbus-fdt.c         | 64 ++----------------------------
hw/arm/virt.c               | 96 +++++++++++++++++++++++++++++----------------
hw/core/platform-bus.c      | 29 +++-----------
hw/i386/pc.c                |  7 +---
hw/ppc/e500.c               | 38 ++++++++----------
hw/ppc/e500plat.c           | 32 +++++++++++++++
hw/ppc/spapr.c              |  1 +
hw/s390x/s390-virtio-ccw.c  |  1 +
15 files changed, 192 insertions(+), 248 deletions(-)
[Qemu-devel] [PATCH v4 0/4] arm: isolate and clean up dtb generation
Posted by Igor Mammedov 5 years, 11 months ago
Changelog v3->v4:
   * dropped "arm: boot: set boot_info starting from  first_cpu",
     since it's applied to target-arm.next
   * fix crash (in 3/4) when QEMU tried to load DTB but none was provided,
     get_dtb() hook isn't set by most ARM boards so such boards crash
     trying to call it. Check if there is DTB before trying to load it.
Changelog v2->v3:
   * drop already merged patches
       'arm: always start from  first_cpu when registering loader cpu reset callback'
       'ppc: e500: switch E500 based  machines to full machine definition'
   * add small not related cleanup
       'arm: boot: set boot_info starting from first_cpu'
   * add extra suggested patch
       'make sure that we aren't overwriting mc->get_hotplug_handler by accident'
   * make sure that dtb_limit initialized to 0
   * drop stale comment
   * drop not needed line movement
   * drop not needed extra new line
Changelog v1->v2:
   * drop "arm: reuse  arm_boot_address_space() in armv7m_load_kernel()"
   * move "arm: always start from first_cpu  when registering loader cpu reset callback"
     at the begigning of series and rebase
   * add "ppc: e500: switch E500 based machines to full  machine definition"
     and rebase 4/5 on top of it
   * fixup typo in virt_machine_get_hotpug_handler() name
   * add doc comment to skip_dtb_autoload field
   * 1-2/5 are queued in respective arm/ppc trees and are included for series
     completness so it would be easier to test, I expect series to go through
     arm tree
   

While working on cpu hotplug for mach-virt, I've noticed that DTB
is generated incrementally across whole machvirt_init(). While it's
fine for machines with static DTB, it won't really work in case of
cpu hotplug and followed up reset since machine will load old DTB
that doesn't account for hotplugged CPUs.
So I've set on a quest to consolidate DTB generation and make it
reentrant so that on reset guest would see update DTB.

It's preliminary series which makes possible to call load_dtb()
later outside of arm_load_kernel() and in process of it drops
several machine_done notifiers, that were introduced to make
plaform-bus-devices work. Hopefully it makes code easier to follow.
It replaces machine_done notifiers with device hotplug framework
to allow for dynamic sysbus devices mapping at the moment they
are created instead of waiting for machine_done time and trying to
juggle with notifiers order to do initialization in propper order.

Mostly 'make check' tested +
manually with "ppce500" machine type and eTSEC device
(eTSEC is still initialized with the same IRQs as before series)


CC: qemu-arm@nongnu.org
CC: peter.maydell@linaro.org


Igor Mammedov (4):
  pc: simplify MachineClass::get_hotplug_handler handling
  platform-bus-device: use device plug callback instead of machine_done
    notifier
  arm/boot: split load_dtb() from arm_load_kernel()
  make sure that we aren't overwriting mc->get_hotplug_handler by
    accident

 hw/ppc/e500.h               |  5 +++
 include/hw/arm/arm.h        | 45 +++++++++++++++------
 include/hw/arm/sysbus-fdt.h | 37 ++++-------------
 include/hw/arm/virt.h       |  1 +
 include/hw/i386/pc.h        |  8 ----
 include/hw/platform-bus.h   |  4 +-
 hw/arm/boot.c               | 72 +++++++++-------------------------
 hw/arm/sysbus-fdt.c         | 64 ++----------------------------
 hw/arm/virt.c               | 96 +++++++++++++++++++++++++++++----------------
 hw/core/platform-bus.c      | 29 +++-----------
 hw/i386/pc.c                |  7 +---
 hw/ppc/e500.c               | 38 ++++++++----------
 hw/ppc/e500plat.c           | 32 +++++++++++++++
 hw/ppc/spapr.c              |  1 +
 hw/s390x/s390-virtio-ccw.c  |  1 +
 15 files changed, 192 insertions(+), 248 deletions(-)

-- 
2.7.4


Re: [Qemu-devel] [PATCH v4 0/4] arm: isolate and clean up dtb generation
Posted by Peter Maydell 5 years, 11 months ago
On 7 May 2018 at 12:12, Igor Mammedov <imammedo@redhat.com> wrote:
>
> Changelog v3->v4:
>    * dropped "arm: boot: set boot_info starting from  first_cpu",
>      since it's applied to target-arm.next
>    * fix crash (in 3/4) when QEMU tried to load DTB but none was provided,
>      get_dtb() hook isn't set by most ARM boards so such boards crash
>      trying to call it. Check if there is DTB before trying to load it.

Thanks, applied this version to target-arm.next.

-- PMM