Commit 1ead3ed5 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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



target-arm queue:
 * support REFCNT register on integrator/cp board
 * implement the A9MP's global timer
 * add the 'virt' platform
 * support '-cpu host' on KVM/ARM
 * Cadence GEM ethernet device bugfixes
 * Implement 32-bit ARMv8 VSEL, VMAXNM, VMINNM
 * fix TTBCR write masking
 * update 32 bit decoder to use new qemu_ld/st TCG opcodes

# gpg: Signature made Tue 10 Dec 2013 06:22:01 AM PST using RSA key ID 14360CDE
# gpg: Can't check signature: public key not found

# By Peter Crosthwaite (16) and others
# Via Peter Maydell
* pmaydell/tags/pull-target-arm-20131210: (37 commits)
  target-arm: fix TTBCR write masking
  target-arm: Use new qemu_ld/st opcodes
  target-arm: Implement ARMv8 SIMD VMAXNM and VMINNM instructions.
  target-arm: Implement ARMv8 FP VMAXNM and VMINNM instructions.
  softfloat: Add minNum() and maxNum() functions to softfloat.
  softfloat: Remove unused argument from MINMAX macro.
  target-arm: Implement ARMv8 VSEL instruction.
  target-arm: Move call to disas_vfp_insn out of disas_coproc_insn.
  net/cadence_gem: Don't rx packets when no rx buffer available
  net/cadence_gem: Improve can_receive debug printfery
  net/cadence_gem: Fix register w1c logic
  net/cadence_gem: Fix small packet FCS stripping
  net/cadence_gem: Fix rx multi-fragment packets
  net/cadence_gem: Add missing VMSTATE_END_OF_LIST
  net/cadence_gem: Implement SAR (de)activation
  net/cadence_gem: Implement SAR match bit in rx desc
  net/cadence_gem: Implement RX descriptor match mode flags
  net/cadence_gem: Prefetch rx descriptors ASAP
  net/cadence_gem: simplify rx buf descriptor walking
  net/cadence_gem: Don't assert against 0 buffer address
  ...

Message-id: 1386686613-2390-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents b5527dad 74f1c6dd

default-configs/arm-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ CONFIG_ARM_GIC=y 
CONFIG_ARM_GIC_KVM=$(CONFIG_KVM)

CONFIG_ARM_TIMER=y

CONFIG_ARM_MPTIMER=y

CONFIG_A9_GTIMER=y

CONFIG_PL011=y

CONFIG_PL022=y

CONFIG_PL031=y

device_tree.c

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ void *create_device_tree(int *sizep) 
    if (ret < 0) {

        goto fail;

    }

    ret = fdt_finish_reservemap(fdt);

    if (ret < 0) {

        goto fail;

    }

    ret = fdt_begin_node(fdt, "");

    if (ret < 0) {

        goto fail;

fpu/softfloat.c

+32 −6
Original line number Diff line number Diff line
@@ -6705,10 +6705,17 @@ int float128_compare_quiet( float128 a, float128 b STATUS_PARAM ) 
/* min() and max() functions. These can't be implemented as

 * 'compare and pick one input' because that would mishandle

 * NaNs and +0 vs -0.

 *

 * minnum() and maxnum() functions. These are similar to the min()

 * and max() functions but if one of the arguments is a QNaN and

 * the other is numerical then the numerical argument is returned.

 * minnum() and maxnum correspond to the IEEE 754-2008 minNum()

 * and maxNum() operations. min() and max() are the typical min/max

 * semantics provided by many CPUs which predate that specification.

 */

#define MINMAX(s, nan_exp)                                              \

#define MINMAX(s)                                                       \

INLINE float ## s float ## s ## _minmax(float ## s a, float ## s b,     \

                                        int ismin STATUS_PARAM )        \

                                        int ismin, int isieee STATUS_PARAM) \

{                                                                       \

    flag aSign, bSign;                                                  \

    uint ## s ## _t av, bv;                                             \
@@ -6716,6 +6723,15 @@ INLINE float ## s float ## s ## _minmax(float ## s a, float ## s b, \ 
    b = float ## s ## _squash_input_denormal(b STATUS_VAR);             \

    if (float ## s ## _is_any_nan(a) ||                                 \

        float ## s ## _is_any_nan(b)) {                                 \

        if (isieee) {                                                   \

            if (float ## s ## _is_quiet_nan(a) &&                       \

                !float ## s ##_is_any_nan(b)) {                         \

                return b;                                               \

            } else if (float ## s ## _is_quiet_nan(b) &&                \

                       !float ## s ## _is_any_nan(a)) {                 \

                return a;                                               \

            }                                                           \

        }                                                               \

        return propagateFloat ## s ## NaN(a, b STATUS_VAR);             \

    }                                                                   \

    aSign = extractFloat ## s ## Sign(a);                               \
@@ -6739,16 +6755,26 @@ INLINE float ## s float ## s ## _minmax(float ## s a, float ## s b, \ 
                                                                        \

float ## s float ## s ## _min(float ## s a, float ## s b STATUS_PARAM)  \

{                                                                       \

    return float ## s ## _minmax(a, b, 1 STATUS_VAR);                   \

    return float ## s ## _minmax(a, b, 1, 0 STATUS_VAR);                \

}                                                                       \

                                                                        \

float ## s float ## s ## _max(float ## s a, float ## s b STATUS_PARAM)  \

{                                                                       \

    return float ## s ## _minmax(a, b, 0 STATUS_VAR);                   \

    return float ## s ## _minmax(a, b, 0, 0 STATUS_VAR);                \

}                                                                       \

                                                                        \

float ## s float ## s ## _minnum(float ## s a, float ## s b STATUS_PARAM) \

{                                                                       \

    return float ## s ## _minmax(a, b, 1, 1 STATUS_VAR);                \

}                                                                       \

                                                                        \

float ## s float ## s ## _maxnum(float ## s a, float ## s b STATUS_PARAM) \

{                                                                       \

    return float ## s ## _minmax(a, b, 0, 1 STATUS_VAR);                \

}



MINMAX(32, 0xff)

MINMAX(64, 0x7ff)

MINMAX(32)

MINMAX(64)





/* Multiply A by 2 raised to the power N.  */

hw/arm/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o

obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o

obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o

obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o

obj-y += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o



obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o

obj-y += omap1.o omap2.o strongarm.o

hw/arm/boot.c

+20 −12
Original line number Diff line number Diff line
@@ -228,10 +228,11 @@ static void set_kernel_args_old(const struct arm_boot_info *info) 
static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo)

{

    void *fdt = NULL;

    char *filename;

    int size, rc;

    uint32_t acells, scells;



    if (binfo->dtb_filename) {

        char *filename;

        filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, binfo->dtb_filename);

        if (!filename) {

            fprintf(stderr, "Couldn't open dtb file %s\n", binfo->dtb_filename);
@@ -245,6 +246,13 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo) 
            goto fail;

        }

        g_free(filename);

    } else if (binfo->get_dtb) {

        fdt = binfo->get_dtb(binfo, &size);

        if (!fdt) {

            fprintf(stderr, "Board was unable to create a dtb blob\n");

            goto fail;

        }

    }



    acells = qemu_devtree_getprop_cell(fdt, "/", "#address-cells");

    scells = qemu_devtree_getprop_cell(fdt, "/", "#size-cells");
@@ -438,7 +446,7 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) 
        /* for device tree boot, we pass the DTB directly in r2. Otherwise

         * we point to the kernel args.

         */

        if (info->dtb_filename) {

        if (info->dtb_filename || info->get_dtb) {

            /* Place the DTB after the initrd in memory. Note that some

             * kernels will trash anything in the 4K page the initrd

             * ends in, so make sure the DTB isn't caught up in that.