[Qemu-commits] [qemu/qemu] 758b71: arm/smmuv3: Fix missing VMSD terminator

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 758b71f7a3855cc8a3e3ae120b70294fa1502835
      
https://github.com/qemu/qemu/commit/758b71f7a3855cc8a3e3ae120b70294fa1502835
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M hw/arm/smmuv3.c

  Log Message:
  -----------
  arm/smmuv3: Fix missing VMSD terminator

The 'vmstate_smmuv3_queue' is missing the end-of-list marker.

Fixes: 10a83cb9887
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
[PMM: dropped stray blank line]
Signed-off-by: Peter Maydell <address@hidden>


  Commit: d1fb710a9b88fa6e11476ba7536b1c5cc2a55b19
      
https://github.com/qemu/qemu/commit/d1fb710a9b88fa6e11476ba7536b1c5cc2a55b19
  Author: Geert Uytterhoeven <address@hidden>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M hw/arm/sysbus-fdt.c

  Log Message:
  -----------
  hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host()

When copy_properties_from_host() ignores the error for an optional
property, it frees the error, but fails to reset it.

Hence if two or more optional properties are missing, an assertion is
triggered:

    util/error.c:57: error_setv: Assertion `*errp == NULL' failed.

Fis this by resetting err to NULL after ignoring the error.

Fixes: 9481cf2e5f2f2bb6 ("hw/arm/sysbus-fdt: helpers for clock node generation")
Signed-off-by: Geert Uytterhoeven <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 942566ffc189ad1ea09d350860d08d95597537ca
      
https://github.com/qemu/qemu/commit/942566ffc189ad1ea09d350860d08d95597537ca
  Author: Peter Maydell <address@hidden>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M hw/intc/armv7m_nvic.c

  Log Message:
  -----------
  armv7m_nvic: Fix m-security subsection name

The vmstate save/load code insists that subsections of a VMState must
have names which include their parent VMState's name as a leading
substring.  Unfortunately it neither documents this nor checks it on
device init or state save, but instead fails state load with a
confusing error message ("Missing section footer for armv7m_nvic").

Fix the name of the m-security subsection of the NVIC, so that
state save/load works correctly for the security-enabled NVIC.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-id: address@hidden


  Commit: 984b0c100f74eb4a32b3d44eb80963ee82ebfba5
      
https://github.com/qemu/qemu/commit/984b0c100f74eb4a32b3d44eb80963ee82ebfba5
  Author: Peter Maydell <address@hidden>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M hw/arm/iotkit.c

  Log Message:
  -----------
  hw/arm/iotkit: Fix IRQ number for timer1

A cut-and-paste error meant we were incorrectly wiring up the timer1
IRQ to IRQ3. IRQ3 is the interrupt for timer0 -- move timer0 to
IRQ4 where it belongs.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden


  Commit: 218fe5ce402986cf2cf246d65bf71de9f3508fe3
      
https://github.com/qemu/qemu/commit/218fe5ce402986cf2cf246d65bf71de9f3508fe3
  Author: Peter Maydell <address@hidden>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M hw/misc/tz-mpc.c

  Log Message:
  -----------
  hw/misc/tz-mpc: Zero the LUT on initialization, not just reset

In the tz-mpc device we allocate a data block for the LUT,
which we then clear to zero in the device's reset method.
This is conceptually fine, but unfortunately results in a
valgrind complaint about use of uninitialized data on startup:

==30906== Conditional jump or move depends on uninitialised value(s)
==30906==    at 0x503609: tz_mpc_translate (tz-mpc.c:439)
==30906==    by 0x3F3D90: address_space_translate_iommu (exec.c:511)
==30906==    by 0x3F3FF8: flatview_do_translate (exec.c:584)
==30906==    by 0x3F4292: flatview_translate (exec.c:644)
==30906==    by 0x3F2120: address_space_translate (memory.h:1962)
==30906==    by 0x3FB753: address_space_ldl_internal (memory_ldst.inc.c:36)
==30906==    by 0x3FB8A6: address_space_ldl (memory_ldst.inc.c:80)
==30906==    by 0x619037: ldl_phys (memory_ldst_phys.inc.h:25)
==30906==    by 0x61985D: arm_cpu_reset (cpu.c:255)
==30906==    by 0x98791B: cpu_reset (cpu.c:249)
==30906==    by 0x57FFDB: armv7m_reset (armv7m.c:265)
==30906==    by 0x7B1775: qemu_devices_reset (reset.c:69)

This is because of a reset ordering problem -- the TZ MPC
resets after the CPU, but an M-profile CPU's reset function
includes memory loads to get the initial PC and SP, which
then go through an MPC that hasn't yet been reset.

The simplest fix for this is to zero the LUT when we
initialize the data, which will result in the MPC's
translate function giving the right answers for these
early memory accesses.

Reported-by: Thomas Huth <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
Tested-by: Thomas Huth <address@hidden>
Message-id: address@hidden


  Commit: 0261fb805c00a6f97d143235e7b06b0906bdf898
      
https://github.com/qemu/qemu/commit/0261fb805c00a6f97d143235e7b06b0906bdf898
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M target/arm/helper.c

  Log Message:
  -----------
  target/arm: Remove duplicate 'host' entry in '-cpu ?' output

Since 86f0a186d6f the TYPE_ARM_HOST_CPU is only compiled when CONFIG_KVM
is enabled.

Remove the now redundant special-case introduced in a96c0514ab7, to avoid:

  $ qemu-system-aarch64 -machine virt -cpu \? | fgrep host
  host
  host (only available in KVM mode)

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 7aefc145659f1586c2f060c1ded5ec0c5c3f08dd
      
https://github.com/qemu/qemu/commit/7aefc145659f1586c2f060c1ded5ec0c5c3f08dd
  Author: Peter Maydell <address@hidden>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M hw/arm/iotkit.c
    M hw/arm/smmuv3.c
    M hw/arm/sysbus-fdt.c
    M hw/intc/armv7m_nvic.c
    M hw/misc/tz-mpc.c
    M target/arm/helper.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180730' 
into staging

target-arm queue:
 * arm/smmuv3: Fix broken VM state migration
 * armv7m_nvic: Fix broken VM state migration
 * hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host()
 * hw/arm/iotkit: Fix IRQ number for timer1
 * hw/misc/tz-mpc: Zero the LUT on initialization, not just reset
 * target/arm: Remove duplicate 'host' entry in '-cpu ?' output

# gpg: Signature made Mon 30 Jul 2018 15:16:01 BST
# gpg:                using RSA key 3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <address@hidden>"
# gpg:                 aka "Peter Maydell <address@hidden>"
# gpg:                 aka "Peter Maydell <address@hidden>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20180730:
  target/arm: Remove duplicate 'host' entry in '-cpu ?' output
  hw/misc/tz-mpc: Zero the LUT on initialization, not just reset
  hw/arm/iotkit: Fix IRQ number for timer1
  armv7m_nvic: Fix m-security subsection name
  hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host()
  arm/smmuv3: Fix missing VMSD terminator

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/6d9dd5fb9d0e...7aefc145659f
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.