[intelxl] Identify rings consistently in debug messages

Use the tail register offset (which exists for all ring types) as the
ring identifier in all relevant debug messages.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/654/head
Michael Brown 2022-03-23 12:21:49 +00:00
parent 814aef68c5
commit 319caeaa7b
1 changed files with 3 additions and 4 deletions

View File

@ -965,8 +965,7 @@ int intelxl_alloc_ring ( struct intelxl_nic *intelxl,
ring->cons = 0; ring->cons = 0;
DBGC ( intelxl, "INTELXL %p ring %06x is at [%08lx,%08lx)\n", DBGC ( intelxl, "INTELXL %p ring %06x is at [%08lx,%08lx)\n",
intelxl, ( ring->reg + ring->tail ), intelxl, ring->tail, virt_to_phys ( ring->desc.raw ),
virt_to_phys ( ring->desc.raw ),
( virt_to_phys ( ring->desc.raw ) + ring->len ) ); ( virt_to_phys ( ring->desc.raw ) + ring->len ) );
return 0; return 0;
@ -1205,7 +1204,7 @@ static int intelxl_enable_ring ( struct intelxl_nic *intelxl,
qxx_ena = readl ( ring_regs + INTELXL_QXX_ENA ); qxx_ena = readl ( ring_regs + INTELXL_QXX_ENA );
if ( ! ( qxx_ena & INTELXL_QXX_ENA_STAT ) ) { if ( ! ( qxx_ena & INTELXL_QXX_ENA_STAT ) ) {
DBGC ( intelxl, "INTELXL %p ring %06x failed to enable: " DBGC ( intelxl, "INTELXL %p ring %06x failed to enable: "
"%#08x\n", intelxl, ring->reg, qxx_ena ); "%#08x\n", intelxl, ring->tail, qxx_ena );
return -EIO; return -EIO;
} }
@ -1241,7 +1240,7 @@ static int intelxl_disable_ring ( struct intelxl_nic *intelxl,
} }
DBGC ( intelxl, "INTELXL %p ring %06x timed out waiting for disable: " DBGC ( intelxl, "INTELXL %p ring %06x timed out waiting for disable: "
"%#08x\n", intelxl, ring->reg, qxx_ena ); "%#08x\n", intelxl, ring->tail, qxx_ena );
return -ETIMEDOUT; return -ETIMEDOUT;
} }