Commit 10f9f1fb authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé
Browse files

hw/block/pflash: Remove dynamic field width from trace events 



Since not all trace backends support dynamic field width in
format (dtrace via stap does not), replace by a static field
width instead.

We previously passed to the trace API 'width << 1' as the number
of hex characters to display (the dynamic field width). We don't
need this anymore. Instead, display the size of bytes accessed.

Fixes: e8aa2d95 ("pflash: Simplify trace_pflash_io_read/write")
Fixes: c1474acd ("pflash: Simplify trace_pflash_data_read/write")
Reported-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Buglink: https://bugs.launchpad.net/qemu/+bug/1844817


Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 385e43e6

hw/block/pflash_cfi01.c

+4 −4
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static uint32_t pflash_data_read(PFlashCFI01 *pfl, hwaddr offset, 
        DPRINTF("BUG in %s\n", __func__);

        abort();

    }

    trace_pflash_data_read(offset, width << 1, ret);

    trace_pflash_data_read(offset, width, ret);

    return ret;

}
@@ -389,7 +389,7 @@ static uint32_t pflash_read(PFlashCFI01 *pfl, hwaddr offset, 


        break;

    }

    trace_pflash_io_read(offset, width, width << 1, ret, pfl->cmd, pfl->wcycle);

    trace_pflash_io_read(offset, width, ret, pfl->cmd, pfl->wcycle);



    return ret;

}
@@ -414,7 +414,7 @@ static inline void pflash_data_write(PFlashCFI01 *pfl, hwaddr offset, 
{

    uint8_t *p = pfl->storage;



    trace_pflash_data_write(offset, width << 1, value, pfl->counter);

    trace_pflash_data_write(offset, width, value, pfl->counter);

    switch (width) {

    case 1:

        p[offset] = value;
@@ -453,7 +453,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, 


    cmd = value;



    trace_pflash_io_write(offset, width, width << 1, value, pfl->wcycle);

    trace_pflash_io_write(offset, width, value, pfl->wcycle);

    if (!pfl->wcycle) {

        /* Set the device in I/O access mode */

        memory_region_rom_device_set_romd(&pfl->mem, false);

hw/block/pflash_cfi02.c

+4 −4
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static uint64_t pflash_data_read(PFlashCFI02 *pfl, hwaddr offset, 
{

    uint8_t *p = (uint8_t *)pfl->storage + offset;

    uint64_t ret = pfl->be ? ldn_be_p(p, width) : ldn_le_p(p, width);

    trace_pflash_data_read(offset, width << 1, ret);

    trace_pflash_data_read(offset, width, ret);

    return ret;

}
@@ -385,7 +385,7 @@ static uint64_t pflash_read(void *opaque, hwaddr offset, unsigned int width) 
        }

        break;

    }

    trace_pflash_io_read(offset, width, width << 1, ret, pfl->cmd, pfl->wcycle);

    trace_pflash_io_read(offset, width, ret, pfl->cmd, pfl->wcycle);



    return ret;

}
@@ -432,7 +432,7 @@ static void pflash_write(void *opaque, hwaddr offset, uint64_t value, 
    uint8_t *p;

    uint8_t cmd;



    trace_pflash_io_write(offset, width, width << 1, value, pfl->wcycle);

    trace_pflash_io_write(offset, width, value, pfl->wcycle);

    cmd = value;

    if (pfl->cmd != 0xA0) {

        /* Reset does nothing during chip erase and sector erase. */
@@ -542,7 +542,7 @@ static void pflash_write(void *opaque, hwaddr offset, uint64_t value, 
                }

                goto reset_flash;

            }

            trace_pflash_data_write(offset, width << 1, value, 0);

            trace_pflash_data_write(offset, width, value, 0);

            if (!pfl->ro) {

                p = (uint8_t *)pfl->storage + offset;

                if (pfl->be) {

hw/block/trace-events

+4 −4
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ fdc_ioport_write(uint8_t reg, uint8_t value) "write reg 0x%02x val 0x%02x" 
# pflash_cfi01.c

pflash_reset(void) "reset"

pflash_timer_expired(uint8_t cmd) "command 0x%02x done"

pflash_io_read(uint64_t offset, int width, int fmt_width, uint32_t value, uint8_t cmd, uint8_t wcycle) "offset:0x%04"PRIx64" width:%d value:0x%0*x cmd:0x%02x wcycle:%u"

pflash_io_write(uint64_t offset, int width, int fmt_width, uint32_t value, uint8_t wcycle) "offset:0x%04"PRIx64" width:%d value:0x%0*x wcycle:%u"

pflash_data_read(uint64_t offset, int width, uint32_t value) "data offset:0x%04"PRIx64" value:0x%0*x"

pflash_data_write(uint64_t offset, int width, uint32_t value, uint64_t counter) "data offset:0x%04"PRIx64" value:0x%0*x counter:0x%016"PRIx64

pflash_io_read(uint64_t offset, unsigned size, uint32_t value, uint8_t cmd, uint8_t wcycle) "offset:0x%04"PRIx64" size:%u value:0x%04x cmd:0x%02x wcycle:%u"

pflash_io_write(uint64_t offset, unsigned size, uint32_t value, uint8_t wcycle) "offset:0x%04"PRIx64" size:%u value:0x%04x wcycle:%u"

pflash_data_read(uint64_t offset, unsigned size, uint32_t value) "data offset:0x%04"PRIx64" size:%u value:0x%04x"

pflash_data_write(uint64_t offset, unsigned size, uint32_t value, uint64_t counter) "data offset:0x%04"PRIx64" size:%u value:0x%04x counter:0x%016"PRIx64

pflash_manufacturer_id(uint16_t id) "Read Manufacturer ID: 0x%04x"

pflash_device_id(uint16_t id) "Read Device ID: 0x%04x"

pflash_device_info(uint64_t offset) "Read Device Information offset:0x%04"PRIx64