Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200616' into...

 * hw: arm: Set vendor property for IMX SDHCI emulations
 * sd: sdhci: Implement basic vendor specific register support
 * hw/net/imx_fec: Convert debug fprintf() to trace events
 * target/arm/cpu: adjust virtual time for all KVM arm cpus
 * Implement configurable descriptor size in ftgmac100
 * hw/misc/imx6ul_ccm: Implement non writable bits in CCM registers
 * target/arm: More Neon decodetree conversion work

# gpg: Signature made Tue 16 Jun 2020 10:56:10 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-20200616: (23 commits)
  hw: arm: Set vendor property for IMX SDHCI emulations
  sd: sdhci: Implement basic vendor specific register support
  hw/net/imx_fec: Convert debug fprintf() to trace events
  target/arm/cpu: adjust virtual time for all KVM arm cpus
  Implement configurable descriptor size in ftgmac100
  hw/misc/imx6ul_ccm: Implement non writable bits in CCM registers
  target/arm: Convert Neon VDUP (scalar) to decodetree
  target/arm: Convert Neon VTBL, VTBX to decodetree
  target/arm: Convert Neon VEXT to decodetree
  target/arm: Convert Neon 2-reg-scalar long multiplies to decodetree
  target/arm: Convert Neon 2-reg-scalar VQRDMLAH, VQRDMLSH to decodetree
  target/arm: Convert Neon 2-reg-scalar VQDMULH, VQRDMULH to decodetree
  target/arm: Convert Neon 2-reg-scalar float multiplies to decodetree
  target/arm: Convert Neon 2-reg-scalar integer multiplies to decodetree
  target/arm: Add missing TCG temp free in do_2shift_env_64()
  target/arm: Add 'static' and 'const' annotations to VSHLL function arrays
  target/arm: Convert Neon 3-reg-diff polynomial VMULL
  target/arm: Convert Neon 3-reg-diff saturating doubling multiplies
  target/arm: Convert Neon 3-reg-diff long multiplies
  target/arm: Convert Neon 3-reg-diff VABAL, VABDL to decodetree
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
#	hw/arm/fsl-imx25.c
#	hw/arm/fsl-imx6.c
#	hw/arm/fsl-imx6ul.c
#	hw/arm/fsl-imx7.c

diff --cc hw/arm/fsl-imx25.c
index fb516bdbacd377f616f83a075acd8f2e52fa7c44,a853ffcc006b1cd72ce357dc7930cd3cbf123190..f32f9bce0fc70b8ff6aa8b0765c08dcf4eca3434
--- 1/hw/arm/fsl-imx25.c
--- 2/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@@ -263,7 -274,13 +263,13 @@@ static void fsl_imx25_realize(DeviceSta
                                   &err);
          object_property_set_uint(OBJECT(&s->esdhc[i]), IMX25_ESDHC_CAPABILITIES,
                                   "capareg", &err);
 -        object_property_set_bool(OBJECT(&s->esdhc[i]), true, "realized", &err);
+         object_property_set_uint(OBJECT(&s->esdhc[i]), SDHCI_VENDOR_IMX,
+                                  "vendor", &err);
+         if (err) {
+             error_propagate(errp, err);
+             return;
+         }
 +        sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), &err);
          if (err) {
              error_propagate(errp, err);
              return;

diff --cc hw/arm/fsl-imx6.c
index 17593485b724c516fae38b46df398e4a8b35305a,29677cfd59d1a6c727f314c815df26de35b0518c..d4bc4fae9394f6fb869cf43d7a896abf2723f44d
--- 1/hw/arm/fsl-imx6.c
--- 2/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@@ -339,7 -350,13 +339,13 @@@ static void fsl_imx6_realize(DeviceStat
                                   &err);
          object_property_set_uint(OBJECT(&s->esdhc[i]), IMX6_ESDHC_CAPABILITIES,
                                   "capareg", &err);
 -        object_property_set_bool(OBJECT(&s->esdhc[i]), true, "realized", &err);
+         object_property_set_uint(OBJECT(&s->esdhc[i]), SDHCI_VENDOR_IMX,
+                                  "vendor", &err);
+         if (err) {
+             error_propagate(errp, err);
+             return;
+         }
 +        sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), &err);
          if (err) {
              error_propagate(errp, err);
              return;

diff --cc hw/arm/fsl-imx6ul.c
index f8c564033ec8b72acae16c13809d0fb87873ccd0,ce1462927cd3e5f108e770a462fc4f7a192fb87c..6446034711efe30ec0d45e6784207c352d7a8e67
--- 1/hw/arm/fsl-imx6ul.c
--- 2/hw/arm/fsl-imx6ul.c
+++ b/hw/arm/fsl-imx6ul.c
@@@ -479,7 -505,10 +479,9 @@@ static void fsl_imx6ul_realize(DeviceSt
              FSL_IMX6UL_USDHC2_IRQ,
          };
  
 -        object_property_set_bool(OBJECT(&s->usdhc[i]), true, "realized",
 -                                 &error_abort);
+         object_property_set_uint(OBJECT(&s->usdhc[i]), SDHCI_VENDOR_IMX,
+                                         "vendor", &error_abort);
 +        sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), &error_abort);
  
          sysbus_mmio_map(SYS_BUS_DEVICE(&s->usdhc[i]), 0,
                          FSL_IMX6UL_USDHCn_ADDR[i]);

diff --cc hw/arm/fsl-imx7.c
index ca8b5cc358ca6e47c7b83f2c623d7eef005b8873,dbf16b2814a5ff47dded667474795a5896ea1009..b49d895a41233a096335fdda3b79c8028692e101
--- 1/hw/arm/fsl-imx7.c
--- 2/hw/arm/fsl-imx7.c
+++ b/hw/arm/fsl-imx7.c
@@@ -393,7 -416,10 +393,9 @@@ static void fsl_imx7_realize(DeviceStat
              FSL_IMX7_USDHC3_IRQ,
          };
  
 -        object_property_set_bool(OBJECT(&s->usdhc[i]), true, "realized",
 -                                 &error_abort);
+         object_property_set_uint(OBJECT(&s->usdhc[i]), SDHCI_VENDOR_IMX,
+                                  "vendor", &error_abort);
 +        sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), &error_abort);
  
          sysbus_mmio_map(SYS_BUS_DEVICE(&s->usdhc[i]), 0,
                          FSL_IMX7_USDHCn_ADDR[i]);