From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dfmTx-00080N-Cg for qemu-devel@nongnu.org; Thu, 10 Aug 2017 08:22:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dfmTt-0004wL-Vg for qemu-devel@nongnu.org; Thu, 10 Aug 2017 08:22:33 -0400 Received: from mel.act-europe.fr ([194.98.77.210]:42697 helo=smtp.eu.adacore.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dfmTt-0004vq-Mq for qemu-devel@nongnu.org; Thu, 10 Aug 2017 08:22:29 -0400 From: KONRAD Frederic Date: Thu, 10 Aug 2017 14:21:38 +0200 Message-Id: <1502367698-4539-1-git-send-email-frederic.konrad@adacore.com> Subject: [Qemu-devel] [PATCH for-2.10] xlnx-qspi: add a property for mmio-execution List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, edgar.iglesias@gmail.com, alistair.francis@xilinx.com, dgilbert@redhat.com, quintela@redhat.com, frederic.konrad@adacore.com This adds mmio-exec property to workaround the migration bug. When enabled the migration is blocked and will return an error. Signed-off-by: KONRAD Frederic --- hw/ssi/xilinx_spips.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index e833028..f763bc3 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -31,6 +31,8 @@ #include "hw/ssi/ssi.h" #include "qemu/bitops.h" #include "hw/ssi/xilinx_spips.h" +#include "qapi/error.h" +#include "migration/blocker.h" #ifndef XILINX_SPIPS_ERR_DEBUG #define XILINX_SPIPS_ERR_DEBUG 0 @@ -139,6 +141,8 @@ typedef struct { uint8_t lqspi_buf[LQSPI_CACHE_SIZE]; hwaddr lqspi_cached_addr; + Error *migration_blocker; + bool mmio_execution_enabled; } XilinxQSPIPS; typedef struct XilinxSPIPSClass { @@ -500,12 +504,13 @@ static void xilinx_qspips_invalidate_mmio_ptr(XilinxQSPIPS *q) { XilinxSPIPS *s = &q->parent_obj; - if (q->lqspi_cached_addr != ~0ULL) { + if ((q->mmio_execution_enabled) && (q->lqspi_cached_addr != ~0ULL)) { /* Invalidate the current mapped mmio */ memory_region_invalidate_mmio_ptr(&s->mmlqspi, q->lqspi_cached_addr, LQSPI_CACHE_SIZE); - q->lqspi_cached_addr = ~0ULL; } + + q->lqspi_cached_addr = ~0ULL; } static void xilinx_qspips_write(void *opaque, hwaddr addr, @@ -601,12 +606,17 @@ static void *lqspi_request_mmio_ptr(void *opaque, hwaddr addr, unsigned *size, unsigned *offset) { XilinxQSPIPS *q = opaque; - hwaddr offset_within_the_region = addr & ~(LQSPI_CACHE_SIZE - 1); - - lqspi_load_cache(opaque, offset_within_the_region); - *size = LQSPI_CACHE_SIZE; - *offset = offset_within_the_region; - return q->lqspi_buf; + hwaddr offset_within_the_region; + + if (q->mmio_execution_enabled) { + offset_within_the_region = addr & ~(LQSPI_CACHE_SIZE - 1); + lqspi_load_cache(opaque, offset_within_the_region); + *size = LQSPI_CACHE_SIZE; + *offset = offset_within_the_region; + return q->lqspi_buf; + } else { + return NULL; + } } static uint64_t @@ -693,6 +703,15 @@ static void xilinx_qspips_realize(DeviceState *dev, Error **errp) sysbus_init_mmio(sbd, &s->mmlqspi); q->lqspi_cached_addr = ~0ULL; + + /* mmio_execution breaks migration better aborting than having strange + * bugs. + */ + if (q->mmio_execution_enabled) { + error_setg(&q->migration_blocker, + "enabling mmio_execution breaks migration"); + migrate_add_blocker(q->migration_blocker, &error_fatal); + } } static int xilinx_spips_post_load(void *opaque, int version_id) @@ -716,6 +735,11 @@ static const VMStateDescription vmstate_xilinx_spips = { } }; +static Property xilinx_qspips_properties[] = { + DEFINE_PROP_BOOL("mmio-exec", XilinxQSPIPS, mmio_execution_enabled, false), + DEFINE_PROP_END_OF_LIST(), +}; + static Property xilinx_spips_properties[] = { DEFINE_PROP_UINT8("num-busses", XilinxSPIPS, num_busses, 1), DEFINE_PROP_UINT8("num-ss-bits", XilinxSPIPS, num_cs, 4), @@ -729,6 +753,7 @@ static void xilinx_qspips_class_init(ObjectClass *klass, void * data) XilinxSPIPSClass *xsc = XILINX_SPIPS_CLASS(klass); dc->realize = xilinx_qspips_realize; + dc->props = xilinx_qspips_properties; xsc->reg_ops = &qspips_ops; xsc->rx_fifo_size = RXFF_A_Q; xsc->tx_fifo_size = TXFF_A_Q; -- 1.8.3.1