Commit fe847705 authored by Marcin Krzeminski's avatar Marcin Krzeminski Committed by Peter Maydell
Browse files

m25p80: Fix QIOR/DIOR handling for Winbond 



Winbond also support continuous read mode, but as an opposite for other
flash type read mode clock cycles are included to dummy cycles number.
This path add proper handling of read mode byte and update needed
dummy cycles. QPI mode and dummy cycles configuration are not supported.

Signed-off-by: default avatarMarcin Krzeminski <marcin.krzeminski@nokia.com>
Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
Message-id: 1467809036-6986-1-git-send-email-marcin.krzeminski@nokia.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 541ef8c2

hw/block/m25p80.c

+4 −2
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ typedef struct FlashPartInfo { 
*/



#define SPANSION_CONTINUOUS_READ_MODE_CMD_LEN 1

#define WINBOND_CONTINUOUS_READ_MODE_CMD_LEN 1



static const FlashPartInfo known_devices[] = {

    /* Atmel -- some are (confusingly) marketed as "DataFlash" */
@@ -777,7 +778,7 @@ static void decode_dio_read_cmd(Flash *s) 
    /* Dummy cycles modeled with bytes writes instead of bits */

    switch (get_man(s)) {

    case MAN_WINBOND:

        s->needed_bytes += 8;

        s->needed_bytes += WINBOND_CONTINUOUS_READ_MODE_CMD_LEN;

        break;

    case MAN_SPANSION:

        s->needed_bytes += SPANSION_CONTINUOUS_READ_MODE_CMD_LEN;
@@ -816,7 +817,8 @@ static void decode_qio_read_cmd(Flash *s) 
    /* Dummy cycles modeled with bytes writes instead of bits */

    switch (get_man(s)) {

    case MAN_WINBOND:

        s->needed_bytes += 8;

        s->needed_bytes += WINBOND_CONTINUOUS_READ_MODE_CMD_LEN;

        s->needed_bytes += 4;

        break;

    case MAN_SPANSION:

        s->needed_bytes += SPANSION_CONTINUOUS_READ_MODE_CMD_LEN;