static void decode_fast_read_cmd(Flash *s)

@@ -XXX,XX +XXX,XX @@ static void decode_qio_read_cmd(Flash *s)

static void decode_new_cmd(Flash *s, uint32_t value)

{

- s->cmd_in_progress = value;

int i;

- DB_PRINT_L(0, "decoded new command:%x\n", value);

+

+ s->cmd_in_progress = value;

+ trace_m25p80_command_decoded(s, value);

if (value != RESET_MEMORY) {

s->reset_enable = false;

@@ -XXX,XX +XXX,XX @@ static void decode_new_cmd(Flash *s, uint32_t value)

break;

case JEDEC_READ:

- DB_PRINT_L(0, "populated jedec code\n");

+ trace_m25p80_populated_jedec(s);

for (i = 0; i < s->pi->id_len; i++) {

s->data[i] = s->pi->id[i];

}

@@ -XXX,XX +XXX,XX @@ static void decode_new_cmd(Flash *s, uint32_t value)

case BULK_ERASE_60:

case BULK_ERASE:

if (s->write_enable) {

- DB_PRINT_L(0, "chip erase\n");

+ trace_m25p80_chip_erase(s);

flash_erase(s, 0, BULK_ERASE);

} else {

qemu_log_mask(LOG_GUEST_ERROR, "M25P80: chip erase with write "

@@ -XXX,XX +XXX,XX @@ static int m25p80_cs(SSISlave *ss, bool select)

s->data_read_loop = false;

}

- DB_PRINT_L(0, "%sselect\n", select ? "de" : "");

+ trace_m25p80_select(s, select ? "de" : "");

return 0;

}

@@ -XXX,XX +XXX,XX @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t tx)

Flash *s = M25P80(ss);

uint32_t r = 0;

+ trace_m25p80_transfer(s, s->state, s->len, s->needed_bytes, s->pos,

+ s->cur_addr, (uint8_t)tx);

+

switch (s->state) {

case STATE_PAGE_PROGRAM:

- DB_PRINT_L(1, "page program cur_addr=%#" PRIx32 " data=%" PRIx8 "\n",

- s->cur_addr, (uint8_t)tx);

+ trace_m25p80_page_program(s, s->cur_addr, (uint8_t)tx);

flash_write8(s, s->cur_addr, (uint8_t)tx);

s->cur_addr = (s->cur_addr + 1) & (s->size - 1);

break;

case STATE_READ:

r = s->storage[s->cur_addr];

- DB_PRINT_L(1, "READ 0x%" PRIx32 "=%" PRIx8 "\n", s->cur_addr,

- (uint8_t)r);

+ trace_m25p80_read_byte(s, s->cur_addr, (uint8_t)r);

s->cur_addr = (s->cur_addr + 1) & (s->size - 1);

break;

@@ -XXX,XX +XXX,XX @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t tx)

}

r = s->data[s->pos];

+ trace_m25p80_read_data(s, s->pos, (uint8_t)r);

s->pos++;

if (s->pos == s->len) {

s->pos = 0;

@@ -XXX,XX +XXX,XX @@ static void m25p80_realize(SSISlave *ss, Error **errp)

return;

}

- DB_PRINT_L(0, "Binding to IF_MTD drive\n");

+ trace_m25p80_binding(s);

s->storage = blk_blockalign(s->blk, s->size);

if (blk_pread(s->blk, 0, s->storage, s->size) != s->size) {

@@ -XXX,XX +XXX,XX @@ static void m25p80_realize(SSISlave *ss, Error **errp)

return;

}

} else {

- DB_PRINT_L(0, "No BDRV - binding to RAM\n");

+ trace_m25p80_binding_no_bdrv(s);

s->storage = blk_blockalign(NULL, s->size);

memset(s->storage, 0xFF, s->size);

}

diff --git a/hw/block/trace-events b/hw/block/trace-events

index XXXXXXX..XXXXXXX 100644

--- a/hw/block/trace-events

+++ b/hw/block/trace-events

@@ -XXX,XX +XXX,XX @@ xen_block_blockdev_add(char *str) "%s"

xen_block_blockdev_del(const char *node_name) "%s"

xen_block_device_create(unsigned int number) "%u"

xen_block_device_destroy(unsigned int number) "%u"

+

+# m25p80.c

+m25p80_flash_erase(void *s, int offset, uint32_t len) "[%p] offset = 0x%"PRIx32", len = %u"

+m25p80_programming_zero_to_one(void *s, uint32_t addr, uint8_t prev, uint8_t data) "[%p] programming zero to one! addr=0x%"PRIx32" 0x%"PRIx8" -> 0x%"PRIx8

+m25p80_reset_done(void *s) "[%p] Reset done."

+m25p80_command_decoded(void *s, uint32_t cmd) "[%p] new command:0x%"PRIx32

+m25p80_complete_collecting(void *s, uint32_t cmd, int n, uint8_t ear, uint32_t cur_addr) "[%p] decode cmd: 0x%"PRIx32" len %d ear 0x%"PRIx8" addr 0x%"PRIx32

+m25p80_populated_jedec(void *s) "[%p] populated jedec code"

+m25p80_chip_erase(void *s) "[%p] chip erase"

+m25p80_select(void *s, const char *what) "[%p] %sselect"

+m25p80_page_program(void *s, uint32_t addr, uint8_t tx) "[%p] page program cur_addr=0x%"PRIx32" data=0x%"PRIx8

+m25p80_transfer(void *s, uint8_t state, uint32_t len, uint8_t needed, uint32_t pos, uint32_t cur_addr, uint8_t t) "[%p] Transfer state 0x%"PRIx8" len 0x%"PRIx32" needed 0x%"PRIx8" pos 0x%"PRIx32" addr 0x%"PRIx32" tx 0x%"PRIx8

+m25p80_read_byte(void *s, uint32_t addr, uint8_t v) "[%p] Read byte 0x%"PRIx32"=0x%"PRIx8

+m25p80_read_data(void *s, uint32_t pos, uint8_t v) "[%p] Read data 0x%"PRIx32"=0x%"PRIx8

+m25p80_binding(void *s) "[%p] Binding to IF_MTD drive"

+m25p80_binding_no_bdrv(void *s) "[%p] No BDRV - binding to RAM"

+ for (i = 0; i < FSL_IMX6_NUM_USB_PHYS; i++) {

+ snprintf(name, NAME_SIZE, "usbphy%d", i);

+ sysbus_init_child_obj(obj, name, &s->usbphy[i], sizeof(s->usbphy[i]),

+ TYPE_IMX_USBPHY);

+ }

+ for (i = 0; i < FSL_IMX6_NUM_USBS; i++) {

+ snprintf(name, NAME_SIZE, "usb%d", i);

+ sysbus_init_child_obj(obj, name, &s->usb[i], sizeof(s->usb[i]),

+ TYPE_CHIPIDEA);

+ }

+

for (i = 0; i < FSL_IMX6_NUM_ECSPIS; i++) {

snprintf(name, NAME_SIZE, "spi%d", i + 1);

sysbus_init_child_obj(obj, name, &s->spi[i], sizeof(s->spi[i]),

@@ -XXX,XX +XXX,XX @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)

esdhc_table[i].irq));

}

+ /* USB */

+ for (i = 0; i < FSL_IMX6_NUM_USB_PHYS; i++) {

+ object_property_set_bool(OBJECT(&s->usbphy[i]), true, "realized",

+ &error_abort);

+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->usbphy[i]), 0,

+ FSL_IMX6_USBPHY1_ADDR + i * 0x1000);

+ }

+ for (i = 0; i < FSL_IMX6_NUM_USBS; i++) {

+ static const int FSL_IMX6_USBn_IRQ[] = {

+ FSL_IMX6_USB_OTG_IRQ,

+ FSL_IMX6_USB_HOST1_IRQ,

+ FSL_IMX6_USB_HOST2_IRQ,

+ FSL_IMX6_USB_HOST3_IRQ,

+ };

+

+ object_property_set_bool(OBJECT(&s->usb[i]), true, "realized",

+ &error_abort);

+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->usb[i]), 0,

+ FSL_IMX6_USBOH3_USB_ADDR + i * 0x200);

+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->usb[i]), 0,

+ qdev_get_gpio_in(DEVICE(&s->a9mpcore),

+ FSL_IMX6_USBn_IRQ[i]));

+ }

+

/* Initialize all ECSPI */

for (i = 0; i < FSL_IMX6_NUM_ECSPIS; i++) {

static const struct {

Signed-off-by: Guenter Roeck <linux@roeck-us.net>

Message-id: 20200313014551.12554-2-linux@roeck-us.net