Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d63f246 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'for-usb-linus-2012-10-25' of... 

Merge tag 'for-usb-linus-2012-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus

xHCI trivial fixes for 3.7

Hi Greg,

Here's four trivial xHCI bug fixes for 3.7.  They clean up some issues found
while running Coverity across the xHCI driver.  One is marked for stable.

Sarah Sharp
parents 8daf8b60 df037906

drivers/usb/host/xhci-dbg.c

+0 −2
Original line number Diff line number Diff line
@@ -544,7 +544,6 @@ void xhci_dbg_ctx(struct xhci_hcd *xhci, 
	int i;

	/* Fields are 32 bits wide, DMA addresses are in bytes */

	int field_size = 32 / 8;

	struct xhci_slot_ctx *slot_ctx;

	dma_addr_t dma = ctx->dma;

	int csz = HCC_64BYTE_CONTEXT(xhci->hcc_params);
@@ -570,7 +569,6 @@ void xhci_dbg_ctx(struct xhci_hcd *xhci, 
			dbg_rsvd64(xhci, (u64 *)ctrl_ctx, dma);

	}



	slot_ctx = xhci_get_slot_ctx(xhci, ctx);

	xhci_dbg_slot_ctx(xhci, ctx);

	xhci_dbg_ep_ctx(xhci, ctx, last_ep);

}

drivers/usb/host/xhci-ring.c

+11 −0
Original line number Diff line number Diff line
@@ -1228,6 +1228,17 @@ static void xhci_cmd_to_noop(struct xhci_hcd *xhci, struct xhci_cd *cur_cd) 
	cur_seg = find_trb_seg(xhci->cmd_ring->first_seg,

			xhci->cmd_ring->dequeue, &cycle_state);



	if (!cur_seg) {

		xhci_warn(xhci, "Command ring mismatch, dequeue = %p %llx (dma)\n",

				xhci->cmd_ring->dequeue,

				(unsigned long long)

				xhci_trb_virt_to_dma(xhci->cmd_ring->deq_seg,

					xhci->cmd_ring->dequeue));

		xhci_debug_ring(xhci, xhci->cmd_ring);

		xhci_dbg_ring_ptrs(xhci, xhci->cmd_ring);

		return;

	}



	/* find the command trb matched by cd from command ring */

	for (cmd_trb = xhci->cmd_ring->dequeue;

			cmd_trb != xhci->cmd_ring->enqueue;

drivers/usb/host/xhci.c

+2 −2
Original line number Diff line number Diff line
@@ -1627,7 +1627,6 @@ int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev, 
	struct xhci_hcd *xhci;

	struct xhci_container_ctx *in_ctx, *out_ctx;

	unsigned int ep_index;

	struct xhci_ep_ctx *ep_ctx;

	struct xhci_slot_ctx *slot_ctx;

	struct xhci_input_control_ctx *ctrl_ctx;

	u32 added_ctxs;
@@ -1663,7 +1662,6 @@ int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev, 
	out_ctx = virt_dev->out_ctx;

	ctrl_ctx = xhci_get_input_control_ctx(xhci, in_ctx);

	ep_index = xhci_get_endpoint_index(&ep->desc);

	ep_ctx = xhci_get_ep_ctx(xhci, out_ctx, ep_index);



	/* If this endpoint is already in use, and the upper layers are trying

	 * to add it again without dropping it, reject the addition.
@@ -1817,6 +1815,8 @@ static int xhci_evaluate_context_result(struct xhci_hcd *xhci, 
	case COMP_EBADSLT:

		dev_warn(&udev->dev, "WARN: slot not enabled for"

				"evaluate context command.\n");

		ret = -EINVAL;

		break;

	case COMP_CTX_STATE:

		dev_warn(&udev->dev, "WARN: invalid context state for "

				"evaluate context command.\n");