Target-arm queue...

The following changes since commit 735286a4f88255e1463d42ce28d8d14181fd32d4:

Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170613' into staging (2017-06-13 13:51:29 +0100)

are available in the git repository at:

git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20170613

for you to fetch changes up to 252a7a6a968c279a4636a86b0559ba3a930a90b5:

hw/intc/arm_gicv3_its: Allow save/restore (2017-06-13 14:57:01 +0100)

* vITS: Support save/restore

* timer/aspeed: Fix timer enablement when reload is not set

* aspped: add temperature sensor device

* timer.h: Provide better monotonic time on ARM hosts

* exynos4210: various cleanups

* exynos4210: support system poweroff

Cédric Le Goater (3):

hw/misc: add a TMP42{1, 2, 3} device model

aspeed: add a temp sensor device on I2C bus 3

timer/aspeed: fix timer enablement when a reload is not set

Eric Auger (4):

kvm-all: Pass an error object to kvm_device_access

hw/intc/arm_gicv3_its: Implement state save/restore

hw/intc/arm_gicv3_kvm: Implement pending table save

hw/intc/arm_gicv3_its: Allow save/restore

Krzysztof Kozlowski (9):

hw/intc/exynos4210_gic: Use more meaningful name for local variable

hw/timer/exynos4210_mct: Fix checkpatch style errors

hw/timer/exynos4210_mct: Cleanup indentation and empty new lines

hw/timer/exynos4210_mct: Remove unused defines

hw/arm/exynos: Move DRAM initialization next boards

hw/arm/exynos: Declare local variables in some order

hw/arm/exynos: Use type define instead of hard-coded a9mpcore_priv string

hw/intc/exynos4210_gic: Constify array of combiner interrupts

hw/misc/exynos4210_pmu: Add support for system poweroff

Pranith Kumar (1):

timer.h: Provide better monotonic time

hw/misc/Makefile.objs | 1 +

include/hw/arm/exynos4210.h | 5 +-

include/hw/intc/arm_gicv3_its_common.h | 8 +

include/migration/vmstate.h | 2 +

include/qemu/timer.h | 5 +-

include/sysemu/kvm.h | 11 +-

hw/arm/aspeed.c | 9 +

hw/arm/exynos4210.c | 27 +--

hw/arm/exynos4_boards.c | 50 +++-

hw/intc/arm_gic_kvm.c | 9 +-

hw/intc/arm_gicv3_common.c | 1 +

hw/intc/arm_gicv3_its_common.c | 12 +-

hw/intc/arm_gicv3_its_kvm.c | 131 +++++++++--

hw/intc/arm_gicv3_kvm.c | 48 +++-

hw/intc/exynos4210_gic.c | 14 +-

hw/misc/exynos4210_pmu.c | 20 +-

hw/misc/tmp421.c | 402 +++++++++++++++++++++++++++++++++

hw/timer/aspeed_timer.c | 37 ++-

hw/timer/exynos4210_mct.c | 50 ++--

kvm-all.c | 14 +-

default-configs/arm-softmmu.mak | 1 +

21 files changed, 741 insertions(+), 116 deletions(-)

create mode 100644 hw/misc/tmp421.c

From: Krzysztof Kozlowski <krzk@kernel.org>

Use a define for a9mpcore_priv device type name instead of hard-coded

string.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

hw/arm/exynos4210.c | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c

--- a/hw/arm/exynos4210.c

+++ b/hw/arm/exynos4210.c

#include "qemu-common.h"

#include "qemu/log.h"

#include "cpu.h"

+#include "hw/cpu/a9mpcore.h"

#include "hw/boards.h"

#include "sysemu/sysemu.h"

#include "hw/sysbus.h"

@@ -XXX,XX +XXX,XX @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem)

/* Private memory region and Internal GIC */

- dev = qdev_create(NULL, "a9mpcore_priv");

+ dev = qdev_create(NULL, TYPE_A9MPCORE_PRIV);

qdev_prop_set_uint32(dev, "num-cpu", EXYNOS4210_NCPUS);

qdev_init_nofail(dev);

busdev = SYS_BUS_DEVICE(dev);

2.7.4

From: Eric Auger <eric.auger@redhat.com>

We change the restoration priority of both the GICv3 and ITS. The

GICv3 must be restored before the ITS and the ITS needs to be restored

before PCIe devices since it translates their MSI transactions.

Signed-off-by: Eric Auger <eric.auger@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Message-id: 1497023553-18411-5-git-send-email-eric.auger@redhat.com

include/migration/vmstate.h | 2 ++

hw/intc/arm_gicv3_common.c | 1 +

hw/intc/arm_gicv3_its_common.c | 2 +-

hw/intc/arm_gicv3_its_kvm.c | 24 ++++++++++++------------

4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h

--- a/include/migration/vmstate.h

+++ b/include/migration/vmstate.h

@@ -XXX,XX +XXX,XX @@ enum VMStateFlags {

typedef enum {

MIG_PRI_DEFAULT = 0,

MIG_PRI_IOMMU, /* Must happen before PCI devices */

+ MIG_PRI_GICV3_ITS, /* Must happen before PCI devices */

+ MIG_PRI_GICV3, /* Must happen before the ITS */

MIG_PRI_MAX,

} MigrationPriority;

diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/intc/arm_gicv3_common.c

+++ b/hw/intc/arm_gicv3_common.c

@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_gicv3 = {

.minimum_version_id = 1,

.pre_save = gicv3_pre_save,

.post_load = gicv3_post_load,

+ .priority = MIG_PRI_GICV3,

.fields = (VMStateField[]) {

VMSTATE_UINT32(gicd_ctlr, GICv3State),

VMSTATE_UINT32_ARRAY(gicd_statusr, GICv3State, 2),

diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/intc/arm_gicv3_its_common.c

+++ b/hw/intc/arm_gicv3_its_common.c

@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_its = {

.name = "arm_gicv3_its",

.pre_save = gicv3_its_pre_save,

.post_load = gicv3_its_post_load,

- .unmigratable = true,

+ .priority = MIG_PRI_GICV3_ITS,

.fields = (VMStateField[]) {

VMSTATE_UINT32(ctlr, GICv3ITSState),

VMSTATE_UINT32(iidr, GICv3ITSState),

diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/intc/arm_gicv3_its_kvm.c

+++ b/hw/intc/arm_gicv3_its_kvm.c

@@ -XXX,XX +XXX,XX @@ static void kvm_arm_its_realize(DeviceState *dev, Error **errp)

GICv3ITSState *s = ARM_GICV3_ITS_COMMON(dev);

Error *local_err = NULL;

- /*

- * Block migration of a KVM GICv3 ITS device: the API for saving and

- * restoring the state in the kernel is not yet available

- */

- error_setg(&s->migration_blocker, "vITS migration is not implemented");

- migrate_add_blocker(s->migration_blocker, &local_err);

- if (local_err) {

- error_propagate(errp, local_err);

- error_free(s->migration_blocker);

- return;

- }

-

s->dev_fd = kvm_create_device(kvm_state, KVM_DEV_TYPE_ARM_VGIC_ITS, false);

if (s->dev_fd < 0) {

error_setg_errno(errp, -s->dev_fd, "error creating in-kernel ITS");

@@ -XXX,XX +XXX,XX @@ static void kvm_arm_its_realize(DeviceState *dev, Error **errp)

gicv3_its_init_mmio(s, NULL);

+ if (!kvm_device_check_attr(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_ITS_REGS,

+ GITS_CTLR)) {

+ error_setg(&s->migration_blocker, "This operating system kernel "

+ "does not support vITS migration");

+ migrate_add_blocker(s->migration_blocker, &local_err);

+ if (local_err) {

+ error_propagate(errp, local_err);

+ error_free(s->migration_blocker);

+ return;

+ }

+ }

+

kvm_msi_use_devid = true;

kvm_gsi_direct_mapping = false;

kvm_msi_via_irqfd_allowed = kvm_irqfds_enabled();

2.7.4

From: Krzysztof Kozlowski <krzk@kernel.org>

There are to SysBusDevice variables in exynos4210_gic_realize()

function: one for the device itself and second for arm_gic device. Add

a prefix "gic" to the second one so it will be easier to understand the

code.

While at it, put local uninitialized 'i' variable at the end, next to

other uninitialized ones.

hw/intc/exynos4210_gic.c | 12 ++++++------

diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c

--- a/hw/intc/exynos4210_gic.c

+++ b/hw/intc/exynos4210_gic.c

@@ -XXX,XX +XXX,XX @@ static void exynos4210_gic_init(Object *obj)

DeviceState *dev = DEVICE(obj);

Exynos4210GicState *s = EXYNOS4210_GIC(obj);

SysBusDevice *sbd = SYS_BUS_DEVICE(obj);

- uint32_t i;

const char cpu_prefix[] = "exynos4210-gic-alias_cpu";

const char dist_prefix[] = "exynos4210-gic-alias_dist";

char cpu_alias_name[sizeof(cpu_prefix) + 3];

char dist_alias_name[sizeof(cpu_prefix) + 3];

- SysBusDevice *busdev;

+ SysBusDevice *gicbusdev;

+ uint32_t i;

s->gic = qdev_create(NULL, "arm_gic");

qdev_prop_set_uint32(s->gic, "num-cpu", s->num_cpu);

qdev_prop_set_uint32(s->gic, "num-irq", EXYNOS4210_GIC_NIRQ);

qdev_init_nofail(s->gic);

- busdev = SYS_BUS_DEVICE(s->gic);

+ gicbusdev = SYS_BUS_DEVICE(s->gic);

/* Pass through outbound IRQ lines from the GIC */

- sysbus_pass_irq(sbd, busdev);

+ sysbus_pass_irq(sbd, gicbusdev);

/* Pass through inbound GPIO lines to the GIC */

qdev_init_gpio_in(dev, exynos4210_gic_set_irq,

@@ -XXX,XX +XXX,XX @@ static void exynos4210_gic_init(Object *obj)

sprintf(cpu_alias_name, "%s%x", cpu_prefix, i);

memory_region_init_alias(&s->cpu_alias[i], obj,

cpu_alias_name,

- sysbus_mmio_get_region(busdev, 1),

+ sysbus_mmio_get_region(gicbusdev, 1),

0,

EXYNOS4210_GIC_CPU_REGION_SIZE);

memory_region_add_subregion(&s->cpu_container,

@@ -XXX,XX +XXX,XX @@ static void exynos4210_gic_init(Object *obj)

sprintf(dist_alias_name, "%s%x", dist_prefix, i);

memory_region_init_alias(&s->dist_alias[i], obj,

dist_alias_name,

- sysbus_mmio_get_region(busdev, 0),

+ sysbus_mmio_get_region(gicbusdev, 0),

0,

EXYNOS4210_GIC_DIST_REGION_SIZE);

memory_region_add_subregion(&s->dist_container,

2.7.4

From: Eric Auger <eric.auger@redhat.com>

In some circumstances, we don't want to abort if the

kvm_device_access fails. This will be the case during ITS

migration, in case the ITS table save/restore fails because

the guest did not program the vITS correctly. So let's pass an

error object to the function and return the ioctl value. New

callers will be able to make a decision upon this returned

value.

Existing callers pass &error_abort which will cause the

function to abort on failure.

Signed-off-by: Eric Auger <eric.auger@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Peter Xu <peterx@redhat.com>

Message-id: 1497023553-18411-2-git-send-email-eric.auger@redhat.com

[PMM: wrapped long line]

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---

include/sysemu/kvm.h | 11 +++++++----

hw/intc/arm_gic_kvm.c | 9 +++++----

hw/intc/arm_gicv3_its_kvm.c | 2 +-

hw/intc/arm_gicv3_kvm.c | 14 +++++++-------

kvm-all.c | 14 ++++++++------

5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h

--- a/include/sysemu/kvm.h

+++ b/include/sysemu/kvm.h

@@ -XXX,XX +XXX,XX @@ int kvm_device_check_attr(int fd, uint32_t group, uint64_t attr);

* @attr: the attribute of that group to set or get

* @val: pointer to a storage area for the value

* @write: true for set and false for get operation

+ * @errp: error object handle

*

- * This function is not allowed to fail. Use kvm_device_check_attr()

- * in order to check for the availability of optional attributes.

+ * Returns: 0 on success

+ * < 0 on error

+ * Use kvm_device_check_attr() in order to check for the availability

+ * of optional attributes.

*/

-void kvm_device_access(int fd, int group, uint64_t attr,

- void *val, bool write);

+int kvm_device_access(int fd, int group, uint64_t attr,

+ void *val, bool write, Error **errp);

/**

* kvm_create_device - create a KVM device for the device control API

diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/intc/arm_gic_kvm.c

+++ b/hw/intc/arm_gic_kvm.c

@@ -XXX,XX +XXX,XX @@ static void kvm_gicd_access(GICState *s, int offset, int cpu,

uint32_t *val, bool write)

kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_DIST_REGS,

- KVM_VGIC_ATTR(offset, cpu), val, write);

+ KVM_VGIC_ATTR(offset, cpu), val, write, &error_abort);

static void kvm_gicc_access(GICState *s, int offset, int cpu,

uint32_t *val, bool write)

kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CPU_REGS,

- KVM_VGIC_ATTR(offset, cpu), val, write);

+ KVM_VGIC_ATTR(offset, cpu), val, write, &error_abort);

2.7.4

From: Pranith Kumar <bobby.prani@gmail.com>

Tested and confirmed that the stretch i386 debian qcow2 image on a

raspberry pi 2 works.

Fixes: LP#: 893208 <https://bugs.launchpad.net/qemu/+bug/893208/>

Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Message-id: 20170418191817.10430-1-bobby.prani@gmail.com

include/qemu/timer.h | 5 ++---

1 file changed, 2 insertions(+), 3 deletions(-)

@@ -XXX,XX +XXX,XX @@ static inline int64_t cpu_get_host_ticks(void)

/* The host CPU doesn't have an easily accessible cycle counter.

Just return a monotonically increasing value. This will be

totally wrong, but hopefully better than nothing. */

-static inline int64_t cpu_get_host_ticks (void)

+static inline int64_t cpu_get_host_ticks(void)

{

- static int64_t ticks = 0;

- return ticks++;

+ return get_clock();

}

#endif

2.7.4

From: Cédric Le Goater <clg@kaod.org>

Largely inspired by the TMP105 temperature sensor, here is a model for

the TMP42{1,2,3} temperature sensors.

Specs can be found here :

    http://www.ti.com/lit/gpn/tmp421

Signed-off-by: Cédric Le Goater <clg@kaod.org>

Message-id: 1496739230-32109-2-git-send-email-clg@kaod.org

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

---

hw/misc/Makefile.objs | 1 +

hw/misc/tmp421.c | 402 ++++++++++++++++++++++++++++++++++++++++

default-configs/arm-softmmu.mak | 1 +

3 files changed, 404 insertions(+)

create mode 100644 hw/misc/tmp421.c

diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs

index XXXXXXX..XXXXXXX 100644

--- a/hw/misc/Makefile.objs

+++ b/hw/misc/Makefile.objs

@@ -XXX,XX +XXX,XX @@

common-obj-$(CONFIG_APPLESMC) += applesmc.o

common-obj-$(CONFIG_MAX111X) += max111x.o

common-obj-$(CONFIG_TMP105) += tmp105.o

+common-obj-$(CONFIG_TMP421) += tmp421.o

common-obj-$(CONFIG_ISA_DEBUG) += debugexit.o

common-obj-$(CONFIG_SGA) += sga.o

common-obj-$(CONFIG_ISA_TESTDEV) += pc-testdev.o

diff --git a/hw/misc/tmp421.c b/hw/misc/tmp421.c

+++ b/hw/misc/tmp421.c

+/*

+ * Texas Instruments TMP421 temperature sensor.

+ *

+ * Copyright (c) 2016 IBM Corporation.

+ *

+ * Largely inspired by :

+ *

+ * Texas Instruments TMP105 temperature sensor.

+ *

+ * Copyright (C) 2008 Nokia Corporation

+ * Written by Andrzej Zaborowski <andrew@openedhand.com>

+ *

+ * This program is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU General Public License as

+ * published by the Free Software Foundation; either version 2 or

+ * (at your option) version 3 of the License.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License along

+ * with this program; if not, see <http://www.gnu.org/licenses/>.

+ */

+#include "qemu/osdep.h"

+#include "hw/hw.h"

+#include "hw/i2c/i2c.h"

+#include "qapi/error.h"

+#include "qapi/visitor.h"

+

+/* Manufacturer / Device ID's */

+#define TMP421_MANUFACTURER_ID 0x55

+#define TMP421_DEVICE_ID 0x21

+#define TMP422_DEVICE_ID 0x22

+#define TMP423_DEVICE_ID 0x23

+

+typedef struct DeviceInfo {

+ int model;

+ const char *name;

+} DeviceInfo;

+

+static const DeviceInfo devices[] = {

+ { TMP421_DEVICE_ID, "tmp421" },

+ { TMP422_DEVICE_ID, "tmp422" },

+ { TMP423_DEVICE_ID, "tmp423" },

+};

+

+typedef struct TMP421State {

+ /*< private >*/

+ I2CSlave i2c;

+ /*< public >*/

+

+ int16_t temperature[4];

+

+ uint8_t status;

+ uint8_t config[2];

+ uint8_t rate;

+

+ uint8_t len;