Commit 997eba28 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



target-arm queue:
 * add aarch64_be linux-user target
 * Virt: ACPI: fix qemu assert due to re-assigned table data address
 * imx_fec: various bug fixes and cleanups
 * hw/timer/pxa2xx_timer: replace hw_error() -> qemu_log_mask()
 * hw/sd/pxa2xx_mmci: add read/write() trace events
 * linux-user/arm/nwfpe: Check coprocessor number for FPA emulation
 * target/arm: Make disas_thumb2_insn() generate its own UNDEF exceptions
 * hw/intc/arm_gicv3: Make reserved register addresses RAZ/WI
 * hw/intc/arm_gic: reserved register addresses are RAZ/WI

# gpg: Signature made Thu 11 Jan 2018 13:37:25 GMT
# gpg:                using RSA key 0x3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20180111: (26 commits)
  hw/intc/arm_gic: reserved register addresses are RAZ/WI
  hw/intc/arm_gicv3: Make reserved register addresses RAZ/WI
  target/arm: Make disas_thumb2_insn() generate its own UNDEF exceptions
  linux-user/arm/nwfpe: Check coprocessor number for FPA emulation
  hw/sd/pxa2xx_mmci: add read/write() trace events
  hw/timer/pxa2xx_timer: replace hw_error() -> qemu_log_mask()
  imx_fec: Reserve full FSL_IMX25_FEC_SIZE page for the register file
  imx_fec: Fix a typo in imx_enet_receive()
  imx_fec: Use correct length for packet size
  imx_fec: Add support for multiple Tx DMA rings
  imx_fec: Emulate SHIFT16 in ENETx_RACC
  imx_fec: Use MIN instead of explicit ternary operator
  imx_fec: Use ENET_FTRL to determine truncation length
  imx_fec: Move Tx frame buffer away from the stack
  imx_fec: Change queue flushing heuristics
  imx_fec: Refactor imx_eth_enable_rx()
  imx_fec: Do not link to netdev
  Virt: ACPI: fix qemu assert due to re-assigned table data address
  target/arm: Fix stlxp for aarch64_be
  linux-user: Activate armeb handler registration
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e890966d 0cf09852

configure

+3 −2
Original line number Diff line number Diff line
@@ -6439,7 +6439,7 @@ target_name=$(echo $target | cut -d '-' -f 1) 
target_bigendian="no"



case "$target_name" in

  armeb|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)

  armeb|aarch64_be|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)

  target_bigendian=yes

  ;;

esac
@@ -6494,7 +6494,8 @@ case "$target_name" in 
    mttcg="yes"

    gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"

  ;;

  aarch64)

  aarch64|aarch64_be)

    TARGET_ARCH=aarch64

    TARGET_BASE_ARCH=arm

    bflt="yes"

    mttcg="yes"

default-configs/aarch64_be-linux-user.mak

0 → 100644
+1 −0
Original line number Diff line number Diff line 
# Default configuration for aarch64_be-linux-user

hw/arm/fsl-imx6.c

+1 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) 
                                            spi_table[i].irq));

    }



    qdev_set_nic_properties(DEVICE(&s->eth), &nd_table[0]);

    object_property_set_bool(OBJECT(&s->eth), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

hw/arm/virt-acpi-build.c

+11 −7
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ build_spcr(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) 
    AcpiSerialPortConsoleRedirection *spcr;

    const MemMapEntry *uart_memmap = &vms->memmap[VIRT_UART];

    int irq = vms->irqmap[VIRT_UART] + ARM_SPI_BASE;

    int spcr_start = table_data->len;



    spcr = acpi_data_push(table_data, sizeof(*spcr));
@@ -476,8 +477,8 @@ build_spcr(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) 
    spcr->pci_device_id = 0xffff;  /* PCI Device ID: not a PCI device */

    spcr->pci_vendor_id = 0xffff;  /* PCI Vendor ID: not a PCI device */



    build_header(linker, table_data, (void *)spcr, "SPCR", sizeof(*spcr), 2,

                 NULL, NULL);

    build_header(linker, table_data, (void *)(table_data->data + spcr_start),

                 "SPCR", table_data->len - spcr_start, 2, NULL, NULL);

}



static void
@@ -512,8 +513,8 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) 
        mem_base += numa_info[i].node_mem;

    }



    build_header(linker, table_data, (void *)srat, "SRAT",

                 table_data->len - srat_start, 3, NULL, NULL);

    build_header(linker, table_data, (void *)(table_data->data + srat_start),

                 "SRAT", table_data->len - srat_start, 3, NULL, NULL);

}



static void
@@ -522,6 +523,7 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) 
    AcpiTableMcfg *mcfg;

    const MemMapEntry *memmap = vms->memmap;

    int len = sizeof(*mcfg) + sizeof(mcfg->allocation[0]);

    int mcfg_start = table_data->len;



    mcfg = acpi_data_push(table_data, len);

    mcfg->allocation[0].address = cpu_to_le64(memmap[VIRT_PCIE_ECAM].base);
@@ -532,7 +534,8 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) 
    mcfg->allocation[0].end_bus_number = (memmap[VIRT_PCIE_ECAM].size

                                          / PCIE_MMCFG_SIZE_MIN) - 1;



    build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1, NULL, NULL);

    build_header(linker, table_data, (void *)(table_data->data + mcfg_start),

                 "MCFG", table_data->len - mcfg_start, 1, NULL, NULL);

}



/* GTDT */
@@ -651,6 +654,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) 
static void build_fadt(GArray *table_data, BIOSLinker *linker,

                       VirtMachineState *vms, unsigned dsdt_tbl_offset)

{

    int fadt_start = table_data->len;

    AcpiFadtDescriptorRev5_1 *fadt = acpi_data_push(table_data, sizeof(*fadt));

    unsigned xdsdt_entry_offset = (char *)&fadt->x_dsdt - table_data->data;

    uint16_t bootflags;
@@ -681,8 +685,8 @@ static void build_fadt(GArray *table_data, BIOSLinker *linker, 
        ACPI_BUILD_TABLE_FILE, xdsdt_entry_offset, sizeof(fadt->x_dsdt),

        ACPI_BUILD_TABLE_FILE, dsdt_tbl_offset);



    build_header(linker, table_data,

                 (void *)fadt, "FACP", sizeof(*fadt), 5, NULL, NULL);

    build_header(linker, table_data, (void *)(table_data->data + fadt_start),

                 "FACP", table_data->len - fadt_start, 5, NULL, NULL);

}



/* DSDT */

hw/intc/arm_gic.c

+3 −2
Original line number Diff line number Diff line
@@ -1261,7 +1261,8 @@ static MemTxResult gic_cpu_read(GICState *s, int cpu, int offset, 
    default:

        qemu_log_mask(LOG_GUEST_ERROR,

                      "gic_cpu_read: Bad offset %x\n", (int)offset);

        return MEMTX_ERROR;

        *data = 0;

        break;

    }

    return MEMTX_OK;

}
@@ -1329,7 +1330,7 @@ static MemTxResult gic_cpu_write(GICState *s, int cpu, int offset, 
    default:

        qemu_log_mask(LOG_GUEST_ERROR,

                      "gic_cpu_write: Bad offset %x\n", (int)offset);

        return MEMTX_ERROR;

        return MEMTX_OK;

    }

    gic_update(s);

    return MEMTX_OK;