Commit cec9f94f authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/pflash-next-20190723' into staging 



One bugfix and silent a fallthru warning.

# gpg: Signature made Tue 23 Jul 2019 10:33:34 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-20190723:
  hw/block/pflash_cfi02: Rewrite a fall through comment
  hw/block/pflash_cfi01: Add missing DeviceReset() handler

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ecb199b1 124e4cfa

hw/block/pflash_cfi01.c

+19 −0
Original line number Diff line number Diff line
@@ -865,6 +865,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)

{

    PFlashCFI01 *pfl = PFLASH_CFI01(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", PFlashCFI01, blk),

    /* num-blocks is the number of blocks actually visible to the guest,
@@ -909,6 +927,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;

hw/block/pflash_cfi02.c

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ static void pflash_write(void *opaque, hwaddr offset, uint64_t value, 
                pfl->cmd = 0x98;

                return;

            }

            /* No break here */

            /* fall through */

        default:

            DPRINTF("%s: invalid write for command %02x\n",

                    __func__, pfl->cmd);