Commit a1a4d49f authored Jul 16, 2019 by Peter Maydell

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>

parents 1a1c0995 611c749c

hw/block/pflash_cfi01.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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';

hw/block/pflash_cfi02.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);