Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200828' into...
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 28 Aug 2020 14:14:40 +0000 (15:14 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 28 Aug 2020 14:14:40 +0000 (15:14 +0100)
target-arm queue:
 * target/arm: Cleanup and refactoring preparatory to SVE2
 * armsse: Define ARMSSEClass correctly
 * hw/misc/unimp: Improve information provided in log messages
 * hw/qdev-clock: Avoid calling qdev_connect_clock_in after DeviceRealize
 * hw/arm/xilinx_zynq: Call qdev_connect_clock_in() before DeviceRealize
 * hw/net/allwinner-sun8i-emac: Use AddressSpace for DMA transfers
 * hw/sd/allwinner-sdhost: Use AddressSpace for DMA transfers
 * target/arm: Fill in the WnR syndrome bit in mte_check_fail
 * target/arm: Clarify HCR_EL2 ARMCPRegInfo type
 * hw/arm/musicpal: Use AddressSpace for DMA transfers
 * hw/clock: Minor cleanups
 * hw/arm/sbsa-ref: fix typo breaking PCIe IRQs

# gpg: Signature made Fri 28 Aug 2020 10:23:02 BST
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20200828: (35 commits)
  target/arm: Convert sq{, r}dmulh to gvec for aa64 advsimd
  target/arm: Convert integer multiply-add (indexed) to gvec for aa64 advsimd
  target/arm: Convert integer multiply (indexed) to gvec for aa64 advsimd
  target/arm: Generalize inl_qrdmlah_* helper functions
  target/arm: Tidy SVE tszimm shift formats
  target/arm: Split out gen_gvec_ool_zz
  target/arm: Split out gen_gvec_ool_zzz
  target/arm: Split out gen_gvec_ool_zzp
  target/arm: Merge helper_sve_clr_* and helper_sve_movz_*
  target/arm: Split out gen_gvec_ool_zzzp
  target/arm: Use tcg_gen_gvec_bitsel for trans_SEL_pppp
  target/arm: Clean up 4-operand predicate expansion
  target/arm: Merge do_vector2_p into do_mov_p
  target/arm: Rearrange {sve,fp}_check_access assert
  target/arm: Split out gen_gvec_fn_zzz, do_zzz_fn
  target/arm: Split out gen_gvec_fn_zz
  qemu/int128: Add int128_lshift
  armsse: Define ARMSSEClass correctly
  hw/misc/unimp: Display the offset with width of the region size
  hw/misc/unimp: Display the value with width of the access size
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
1  2 
hw/arm/allwinner-h3.c
hw/arm/armsse.c
include/hw/arm/armsse.h

index 341abe67185b09f2b30ca6cf68c893b7e238112b,76ac51a3efc0f4c42df605767a9831b9e3e003fe..88259a9c0d1f9dfe2ba60794a1570450f1fa73f4
@@@ -346,11 -346,13 +346,13 @@@ static void allwinner_h3_realize(Device
  
      /* Security Identifier */
      sysbus_realize(SYS_BUS_DEVICE(&s->sid), &error_fatal);
 -    sysbus_mmio_map(SYS_BUS_DEVICE(&s->sid), 0, s->memmap[AW_H3_SID]);
 +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->sid), 0, s->memmap[AW_H3_DEV_SID]);
  
      /* SD/MMC */
+     object_property_set_link(OBJECT(&s->mmc0), "dma-memory",
+                              OBJECT(get_system_memory()), &error_fatal);
      sysbus_realize(SYS_BUS_DEVICE(&s->mmc0), &error_fatal);
 -    sysbus_mmio_map(SYS_BUS_DEVICE(&s->mmc0), 0, s->memmap[AW_H3_MMC0]);
 +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->mmc0), 0, s->memmap[AW_H3_DEV_MMC0]);
      sysbus_connect_irq(SYS_BUS_DEVICE(&s->mmc0), 0,
                         qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_MMC0));
  
          qemu_check_nic_model(&nd_table[0], TYPE_AW_SUN8I_EMAC);
          qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);
      }
+     object_property_set_link(OBJECT(&s->emac), "dma-memory",
+                              OBJECT(get_system_memory()), &error_fatal);
      sysbus_realize(SYS_BUS_DEVICE(&s->emac), &error_fatal);
 -    sysbus_mmio_map(SYS_BUS_DEVICE(&s->emac), 0, s->memmap[AW_H3_EMAC]);
 +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->emac), 0, s->memmap[AW_H3_DEV_EMAC]);
      sysbus_connect_irq(SYS_BUS_DEVICE(&s->emac), 0,
                         qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_EMAC));
  
diff --cc hw/arm/armsse.c
index 6264eab16bad25b0d96ded77c823172e16eee3b8,6381bbd94d6b64423d90d8d478651d59967dda50..a93da37dcbb276948a9f4538a5f7897d1a64b88b
@@@ -1157,9 -1157,10 +1157,10 @@@ static void armsse_class_init(ObjectCla
  }
  
  static const TypeInfo armsse_info = {
 -    .name = TYPE_ARMSSE,
 +    .name = TYPE_ARM_SSE,
      .parent = TYPE_SYS_BUS_DEVICE,
      .instance_size = sizeof(ARMSSE),
+     .class_size = sizeof(ARMSSEClass),
      .instance_init = armsse_init,
      .abstract = true,
      .interfaces = (InterfaceInfo[]) {
Simple merge