[PATCH 2/5] xhci: Extend debug messages

[Matt Evans <matt@ozlabs.org>]

Add more debug to print queued transfers, show control intentions and
modify an existing message to hexify address output.

Signed-off-by: Matt Evans <matt@ozlabs.org>
---
 drivers/usb/host/xhci-dbg.c  |    2 +-
 drivers/usb/host/xhci-hub.c  |    3 +++
 drivers/usb/host/xhci-ring.c |    5 +++++
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c
index 2e04861..905f3bf 100644
--- a/drivers/usb/host/xhci-dbg.c
+++ b/drivers/usb/host/xhci-dbg.c
@@ -278,7 +278,7 @@ void xhci_debug_trb(struct xhci_hcd *xhci, union xhci_trb *trb)
 		 * FIXME: look at flags to figure out if it's an address or if
 		 * the data is directly in the buffer field.
 		 */
-		xhci_dbg(xhci, "DMA address or buffer contents= %llu\n", address);
+		xhci_dbg(xhci, "DMA address or buffer contents= 0x%llx\n", address);
 		break;
 	case TRB_TYPE(TRB_COMPLETION):
 		address = le64_to_cpu(trb->event_cmd.cmd_trb);
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index ae1d24c..768fd6e 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -389,6 +389,9 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
 	}
 	bus_state = &xhci->bus_state[hcd_index(hcd)];
 
+	xhci_dbg(xhci, "%s(%04x, %04x, %04x, %p, %04x);\n", __func__,
+		 typeReq, wValue, wIndex, buf, wLength);
+
 	spin_lock_irqsave(&xhci->lock, flags);
 	switch (typeReq) {
 	case GetHubStatus:
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 3898f22..45f3b77 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2336,6 +2336,11 @@ static void queue_trb(struct xhci_hcd *xhci, struct xhci_ring *ring,
 	trb->field[1] = cpu_to_le32(field2);
 	trb->field[2] = cpu_to_le32(field3);
 	trb->field[3] = cpu_to_le32(field4);
+
+	xhci_dbg(xhci, "queue_trb @%llx %08x %08x %08x %08x\n",
+		 xhci_trb_virt_to_dma(ring->enq_seg, ring->enqueue),
+		 le32_to_cpu(trb->field[0]), le32_to_cpu(trb->field[1]),
+		 le32_to_cpu(trb->field[2]), le32_to_cpu(trb->field[3]));
 	inc_enq(xhci, ring, consumer, more_trbs_coming);
 }
 
-- 
1.7.0.4