diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-16 17:02:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-16 17:02:44 +0100 |
| commit | a1a4d49f60d2b899620ee2be4ebb991c4a90a026 (patch) | |
| tree | e171f34afb0e36c472fc07fc1a826e4cec5deb4d | |
| parent | 1a1c0995cd4f8fe3bfeaac4e7a42e6125d6e05e7 (diff) | |
| parent | 611c749c3b86fe377c94ea301feab3d9ce3bf617 (diff) | |
Merge remote-tracking branch 'remotes/philmd-gitlab/tags/pflash-next-20190716' into staging
pflash-next patches for v4.1.0-rc1
Trivial pflash fixes for rc1.
# gpg: Signature made Tue 16 Jul 2019 16:59:53 BST
# gpg: using RSA key E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE
* remotes/philmd-gitlab/tags/pflash-next-20190716:
hw/block/pflash_cfi01: Start state machine as READY to accept commands
hw/block/pflash_cfi02: Explicit switch fallthrough for ERASE commands
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/block/pflash_cfi01.c | 2 | ||||
| -rw-r--r-- | hw/block/pflash_cfi02.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index db4a246b22..435be1e35c 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -777,7 +777,7 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) pfl->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, pflash_timer, pfl); pfl->wcycle = 0; pfl->cmd = 0; - pfl->status = 0; + pfl->status = 0x80; /* WSM ready */ /* Hardcoded CFI table */ /* Standard "QRY" string */ pfl->cfi_table[0x10] = 'Q'; diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 83084b9d72..f68837a449 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -367,6 +367,7 @@ static uint64_t pflash_read(void *opaque, hwaddr offset, unsigned int width) case 0x30: /* Sector Erase */ /* Toggle bit 2 during erase, but not program. */ toggle_dq2(pfl); + /* fall through */ case 0xA0: /* Program */ /* Toggle bit 6 */ toggle_dq6(pfl); |