87 lines
3.2 KiB
Diff
87 lines
3.2 KiB
Diff
|
From 707a777c2992e840d2c3dd4e1fbed5b0d6c682ec Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
||
|
|
Date: Tue, 23 Jul 2019 11:51:05 +0100
|
||
|
|
Subject: [PATCH 01/14] hw/block/pflash_cfi01: Add missing DeviceReset()
|
||
|
|
handler
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
Message-id: <20190723115105.31305-2-philmd@redhat.com>
|
||
|
|
Patchwork-id: 89645
|
||
|
|
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH 1/1] hw/block/pflash_cfi01: Add missing DeviceReset() handler
|
||
|
|
Bugzilla: 1707192
|
||
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
RH-Acked-by: John Snow <jsnow@redhat.com>
|
||
|
|
|
||
|
|
To avoid incoherent states when the machine resets (see bug report
|
||
|
|
below), add the device reset callback.
|
||
|
|
|
||
|
|
A "system reset" sets the device state machine in READ_ARRAY mode
|
||
|
|
and, after some delay, set the SR.7 READY bit.
|
||
|
|
|
||
|
|
Since we do not model timings, we set the SR.7 bit directly.
|
||
|
|
|
||
|
|
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1678713
|
||
|
|
Reported-by: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
Reviewed-by: John Snow <jsnow@redhat.com>
|
||
|
|
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
|
||
|
|
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
Tested-by: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
[Laszlo Ersek: Regression tested EDK2 OVMF IA32X64, ArmVirtQemu Aarch64
|
||
|
|
https://lists.gnu.org/archive/html/qemu-devel/2019-07/msg04373.html]
|
||
|
|
Message-Id: <20190718104837.13905-2-philmd@redhat.com>
|
||
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
(cherry picked from commit 3a283507c03474d285196620fca506bd1a89b198)
|
||
|
|
[PMD: upstream commit e7b6274197c changed PFLASH_CFI01 <- CFI_PFLASH01,
|
||
|
|
and upstream commit 1643406520f changed PFlashCFI01 <- pflash_t]
|
||
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
hw/block/pflash_cfi01.c | 19 +++++++++++++++++++
|
||
|
|
1 file changed, 19 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
|
||
|
|
index 2e82840..1be351e 100644
|
||
|
|
--- a/hw/block/pflash_cfi01.c
|
||
|
|
+++ b/hw/block/pflash_cfi01.c
|
||
|
|
@@ -876,6 +876,24 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp)
|
||
|
|
pfl->cfi_table[0x3f] = 0x01; /* Number of protection fields */
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void pflash_cfi01_system_reset(DeviceState *dev)
|
||
|
|
+{
|
||
|
|
+ pflash_t *pfl = CFI_PFLASH01(dev);
|
||
|
|
+
|
||
|
|
+ /*
|
||
|
|
+ * The command 0x00 is not assigned by the CFI open standard,
|
||
|
|
+ * but QEMU historically uses it for the READ_ARRAY command (0xff).
|
||
|
|
+ */
|
||
|
|
+ pfl->cmd = 0x00;
|
||
|
|
+ pfl->wcycle = 0;
|
||
|
|
+ memory_region_rom_device_set_romd(&pfl->mem, true);
|
||
|
|
+ /*
|
||
|
|
+ * The WSM ready timer occurs at most 150ns after system reset.
|
||
|
|
+ * This model deliberately ignores this delay.
|
||
|
|
+ */
|
||
|
|
+ pfl->status = 0x80;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static Property pflash_cfi01_properties[] = {
|
||
|
|
DEFINE_PROP_DRIVE("drive", struct pflash_t, blk),
|
||
|
|
/* num-blocks is the number of blocks actually visible to the guest,
|
||
|
|
@@ -920,6 +938,7 @@ static void pflash_cfi01_class_init(ObjectClass *klass, void *data)
|
||
|
|
{
|
||
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||
|
|
|
||
|
|
+ dc->reset = pflash_cfi01_system_reset;
|
||
|
|
dc->realize = pflash_cfi01_realize;
|
||
|
|
dc->props = pflash_cfi01_properties;
|
||
|
|
dc->vmsd = &vmstate_pflash;
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|