Commit e0175b71 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200228' into staging 



target-arm queue:
 * hw/arm: Use TYPE_PL011 to create serial port
 * target/arm: Set ID_MMFR4.HPDS for aarch64_max_initfn
 * hw/arm/integratorcp: Map the audio codec controller
 * GICv2: Correctly implement the limited number of priority bits
 * target/arm: refactoring of VFP related feature checks and decode
 * xilinx_zynq: Fix USB port instantiation
 * acceptance tests for n800, n810, integratorcp
 * Implement v8.3-RCPC, v8.4-RCPC, v8.3-CCIDX
 * arm_gic_kvm: Don't assume kernel can provide a GICv2
   (provide better error message for user error)

# gpg: Signature made Fri 28 Feb 2020 16:38:04 GMT
# 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-20200228: (33 commits)
  hw/intc/arm_gic_kvm: Don't assume kernel can provide a GICv2
  target/arm: Implement ARMv8.3-CCIDX
  target/arm: Implement v8.4-RCPC
  target/arm: Implement v8.3-RCPC
  target/arm: Fix wrong use of FIELD_EX32 on ID_AA64DFR0
  tests/acceptance/integratorcp: Verify Tux is displayed on framebuffer
  tests/acceptance: Extract boot_integratorcp() from test_integratorcp()
  tests/acceptance: Add a test for the integratorcp arm machine
  tests/acceptance: Add a test for the N800 and N810 arm machines
  hw/usb/hcd-ehci-sysbus: Remove obsolete xlnx, ps7-usb class
  hw/arm/xilinx_zynq: Fix USB port instantiation
  target/arm: Split VMINMAXNM decode
  target/arm: Split VFM decode
  target/arm: Add formats for some vfp 2 and 3-register insns
  target/arm: Remove ARM_FEATURE_VFP*
  linux-user/arm: Replace ARM_FEATURE_VFP* tests for HWCAP
  target/arm: Move the vfp decodetree calls next to the base isa
  target/arm: Move VLLDM and VLSTM to vfp.decode
  target/arm: Remove ARM_FEATURE_VFP check from disas_vfp_insn
  target/arm: Replace ARM_FEATURE_VFP4 with isar_feature_aa32_simdfmac
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e27d5b48 1904f9b5

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -613,6 +613,7 @@ S: Maintained 
F: hw/arm/integratorcp.c

F: hw/misc/arm_integrator_debug.c

F: include/hw/misc/arm_integrator_debug.h

F: tests/acceptance/machine_arm_integratorcp.py



MCIMX6UL EVK / i.MX6ul

M: Peter Maydell <peter.maydell@linaro.org>
@@ -686,6 +687,7 @@ F: hw/rtc/twl92230.c 
F: include/hw/display/blizzard.h

F: include/hw/input/tsc2xxx.h

F: include/hw/misc/cbus.h

F: tests/acceptance/machine_arm_n8x0.py



Palm

M: Andrzej Zaborowski <balrogg@gmail.com>

hw/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ config INTEGRATOR 
    select INTEGRATOR_DEBUG

    select PL011 # UART

    select PL031 # RTC

    select PL041 # audio

    select PL050 # keyboard/mouse

    select PL110 # pl111 LCD controller

    select PL181 # display

hw/arm/integratorcp.c

+1 −0
Original line number Diff line number Diff line
@@ -642,6 +642,7 @@ static void integratorcp_init(MachineState *machine) 
                          qdev_get_gpio_in_named(icp, ICP_GPIO_MMC_WPROT, 0));

    qdev_connect_gpio_out(dev, 1,

                          qdev_get_gpio_in_named(icp, ICP_GPIO_MMC_CARDIN, 0));

    sysbus_create_varargs("pl041", 0x1d000000, pic[25], NULL);



    if (nd_table[0].used)

        smc91c111_init(&nd_table[0], 0xc8000000, pic[27]);

hw/arm/sbsa-ref.c

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "hw/pci-host/gpex.h"

#include "hw/qdev-properties.h"

#include "hw/usb.h"

#include "hw/char/pl011.h"

#include "net/net.h"



#define RAMLIMIT_GB 8192
@@ -409,7 +410,7 @@ static void create_uart(const SBSAMachineState *sms, int uart, 
{

    hwaddr base = sbsa_ref_memmap[uart].base;

    int irq = sbsa_ref_irqmap[uart];

    DeviceState *dev = qdev_create(NULL, "pl011");

    DeviceState *dev = qdev_create(NULL, TYPE_PL011);

    SysBusDevice *s = SYS_BUS_DEVICE(dev);



    qdev_prop_set_chr(dev, "chardev", chr);

hw/arm/virt.c

+2 −1
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
#include "hw/mem/nvdimm.h"

#include "hw/acpi/generic_event_device.h"

#include "hw/virtio/virtio-iommu.h"

#include "hw/char/pl011.h"



#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \

    static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
@@ -727,7 +728,7 @@ static void create_uart(const VirtMachineState *vms, int uart, 
    int irq = vms->irqmap[uart];

    const char compat[] = "arm,pl011\0arm,primecell";

    const char clocknames[] = "uartclk\0apb_pclk";

    DeviceState *dev = qdev_create(NULL, "pl011");

    DeviceState *dev = qdev_create(NULL, TYPE_PL011);

    SysBusDevice *s = SYS_BUS_DEVICE(dev);



    qdev_prop_set_chr(dev, "chardev", chr);