| From d64e53c04b734498ee72b6a47c31e784d002054c Mon Sep 17 00:00:00 2001 |
| From: Lu Baolu <baolu.lu@linux.intel.com> |
| Date: Fri, 7 Apr 2017 17:57:07 +0300 |
| Subject: [PATCH 193/286] usb: xhci: remove ring debugging code |
| |
| XHCI ring changes have already been traced by the ring trace |
| events. It's unnecessary to put the same messages in kernel |
| log. This patch removes the debugging code for a ring. |
| |
| Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 121dcf11908ecea252776c8268aab117f91aa1f5) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/host/xhci-dbg.c | 62 ------------------------------------------- |
| drivers/usb/host/xhci-ring.c | 4 -- |
| drivers/usb/host/xhci.c | 6 ---- |
| drivers/usb/host/xhci.h | 3 -- |
| 4 files changed, 75 deletions(-) |
| |
| --- a/drivers/usb/host/xhci-dbg.c |
| +++ b/drivers/usb/host/xhci-dbg.c |
| @@ -311,68 +311,6 @@ void xhci_debug_trb(struct xhci_hcd *xhc |
| } |
| } |
| |
| -/** |
| - * Debug a segment with an xHCI ring. |
| - * |
| - * @return The Link TRB of the segment, or NULL if there is no Link TRB |
| - * (which is a bug, since all segments must have a Link TRB). |
| - * |
| - * Prints out all TRBs in the segment, even those after the Link TRB. |
| - * |
| - * XXX: should we print out TRBs that the HC owns? As long as we don't |
| - * write, that should be fine... We shouldn't expect that the memory pointed to |
| - * by the TRB is valid at all. Do we care about ones the HC owns? Probably, |
| - * for HC debugging. |
| - */ |
| -void xhci_debug_segment(struct xhci_hcd *xhci, struct xhci_segment *seg) |
| -{ |
| - int i; |
| - u64 addr = seg->dma; |
| - union xhci_trb *trb = seg->trbs; |
| - |
| - for (i = 0; i < TRBS_PER_SEGMENT; i++) { |
| - trb = &seg->trbs[i]; |
| - xhci_dbg(xhci, "@%016llx %08x %08x %08x %08x\n", addr, |
| - lower_32_bits(le64_to_cpu(trb->link.segment_ptr)), |
| - upper_32_bits(le64_to_cpu(trb->link.segment_ptr)), |
| - le32_to_cpu(trb->link.intr_target), |
| - le32_to_cpu(trb->link.control)); |
| - addr += sizeof(*trb); |
| - } |
| -} |
| - |
| -void xhci_dbg_ring_ptrs(struct xhci_hcd *xhci, struct xhci_ring *ring) |
| -{ |
| - xhci_dbg(xhci, "Ring deq = %p (virt), 0x%llx (dma)\n", |
| - ring->dequeue, |
| - (unsigned long long)xhci_trb_virt_to_dma(ring->deq_seg, |
| - ring->dequeue)); |
| - xhci_dbg(xhci, "Ring enq = %p (virt), 0x%llx (dma)\n", |
| - ring->enqueue, |
| - (unsigned long long)xhci_trb_virt_to_dma(ring->enq_seg, |
| - ring->enqueue)); |
| -} |
| - |
| -/** |
| - * Debugging for an xHCI ring, which is a queue broken into multiple segments. |
| - * |
| - * Print out each segment in the ring. Check that the DMA address in |
| - * each link segment actually matches the segment's stored DMA address. |
| - * Check that the link end bit is only set at the end of the ring. |
| - * Check that the dequeue and enqueue pointers point to real data in this ring |
| - * (not some other ring). |
| - */ |
| -void xhci_debug_ring(struct xhci_hcd *xhci, struct xhci_ring *ring) |
| -{ |
| - /* FIXME: Throw an error if any segment doesn't have a Link TRB */ |
| - struct xhci_segment *seg; |
| - struct xhci_segment *first_seg = ring->first_seg; |
| - xhci_debug_segment(xhci, first_seg); |
| - |
| - for (seg = first_seg->next; seg != first_seg; seg = seg->next) |
| - xhci_debug_segment(xhci, seg); |
| -} |
| - |
| void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst) |
| { |
| u64 addr = erst->erst_dma_addr; |
| --- a/drivers/usb/host/xhci-ring.c |
| +++ b/drivers/usb/host/xhci-ring.c |
| @@ -2295,8 +2295,6 @@ static int handle_tx_event(struct xhci_h |
| upper_32_bits(le64_to_cpu(event->buffer)), |
| le32_to_cpu(event->transfer_len), |
| le32_to_cpu(event->flags)); |
| - xhci_dbg(xhci, "Event ring:\n"); |
| - xhci_debug_segment(xhci, xhci->event_ring->deq_seg); |
| return -ENODEV; |
| } |
| |
| @@ -2317,8 +2315,6 @@ static int handle_tx_event(struct xhci_h |
| upper_32_bits(le64_to_cpu(event->buffer)), |
| le32_to_cpu(event->transfer_len), |
| le32_to_cpu(event->flags)); |
| - xhci_dbg(xhci, "Event ring:\n"); |
| - xhci_debug_segment(xhci, xhci->event_ring->deq_seg); |
| return -ENODEV; |
| } |
| |
| --- a/drivers/usb/host/xhci.c |
| +++ b/drivers/usb/host/xhci.c |
| @@ -622,16 +622,10 @@ int xhci_run(struct usb_hcd *hcd) |
| if (ret) |
| return ret; |
| |
| - xhci_dbg(xhci, "Command ring memory map follows:\n"); |
| - xhci_debug_ring(xhci, xhci->cmd_ring); |
| - xhci_dbg_ring_ptrs(xhci, xhci->cmd_ring); |
| xhci_dbg_cmd_ptrs(xhci); |
| |
| xhci_dbg(xhci, "ERST memory map follows:\n"); |
| xhci_dbg_erst(xhci, &xhci->erst); |
| - xhci_dbg(xhci, "Event ring:\n"); |
| - xhci_debug_ring(xhci, xhci->event_ring); |
| - xhci_dbg_ring_ptrs(xhci, xhci->event_ring); |
| temp_64 = xhci_read_64(xhci, &xhci->ir_set->erst_dequeue); |
| temp_64 &= ~ERST_PTR_MASK; |
| xhci_dbg_trace(xhci, trace_xhci_dbg_init, |
| --- a/drivers/usb/host/xhci.h |
| +++ b/drivers/usb/host/xhci.h |
| @@ -1926,11 +1926,8 @@ void xhci_dbg_regs(struct xhci_hcd *xhci |
| void xhci_print_run_regs(struct xhci_hcd *xhci); |
| void xhci_print_trb_offsets(struct xhci_hcd *xhci, union xhci_trb *trb); |
| void xhci_debug_trb(struct xhci_hcd *xhci, union xhci_trb *trb); |
| -void xhci_debug_segment(struct xhci_hcd *xhci, struct xhci_segment *seg); |
| -void xhci_debug_ring(struct xhci_hcd *xhci, struct xhci_ring *ring); |
| void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst); |
| void xhci_dbg_cmd_ptrs(struct xhci_hcd *xhci); |
| -void xhci_dbg_ring_ptrs(struct xhci_hcd *xhci, struct xhci_ring *ring); |
| void xhci_dbg_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx, unsigned int last_ep); |
| char *xhci_get_slot_state(struct xhci_hcd *xhci, |
| struct xhci_container_ctx *ctx); |