Commit e5389163 authored by John Snow's avatar John Snow
Browse files

ahci: make port read traces more descriptive 



A trace is added to let us watch unimplemented registers specifically,
as these are more likely to cause us trouble. Otherwise, the port read
traces now tell us what register is getting hit, which is nicer.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180531222835.16558-4-jsnow@redhat.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 536551d7

hw/ide/ahci.c

+3 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ static bool ahci_map_fis_address(AHCIDevice *ad); 
static void ahci_unmap_clb_address(AHCIDevice *ad);

static void ahci_unmap_fis_address(AHCIDevice *ad);



__attribute__((__unused__)) /* TODO */

static const char *AHCIPortReg_lookup[AHCI_PORT_REG__COUNT] = {

    [AHCI_PORT_REG_LST_ADDR]    = "PxCLB",

    [AHCI_PORT_REG_LST_ADDR_HI] = "PxCLBU",
@@ -149,10 +148,12 @@ static uint32_t ahci_port_read(AHCIState *s, int port, int offset) 
        val = pr->cmd_issue;

        break;

    default:

        trace_ahci_port_read_default(s, port, AHCIPortReg_lookup[regnum],

                                     offset);

        val = 0;

    }



    trace_ahci_port_read(s, port, offset, val);

    trace_ahci_port_read(s, port, AHCIPortReg_lookup[regnum], offset, val);

    return val;

}

hw/ide/trace-events

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ ide_atapi_cmd_read_dma_cb_aio(void *s, int lba, int n) "IDEState: %p; aio read: 
ide_atapi_cmd_packet(void *s, uint16_t limit, const char *packet) "IDEState: %p; limit=0x%x packet: %s"



# hw/ide/ahci.c

ahci_port_read(void *s, int port, int offset, uint32_t ret) "ahci(%p)[%d]: port read @ 0x%x: 0x%08x"

ahci_port_read(void *s, int port, const char *reg, int offset, uint32_t ret) "ahci(%p)[%d]: port read [reg:%s] @ 0x%x: 0x%08x"

ahci_port_read_default(void *s, int port, const char *reg, int offset) "ahci(%p)[%d]: unimplemented port read [reg:%s] @ 0x%x"

ahci_irq_raise(void *s) "ahci(%p): raise irq"

ahci_irq_lower(void *s) "ahci(%p): lower irq"

ahci_check_irq(void *s, uint32_t old, uint32_t new) "ahci(%p): check irq 0x%08x --> 0x%08x"