Commit 080e73c9 authored by Niklas Neronin's avatar Niklas Neronin Committed by Greg Kroah-Hartman
Browse files

usb: xhci: compact 'trb_in_td()' arguments 



Pass pointer to the TD (struct xhci_td *) directly, instead of its
components separately.

Signed-off-by: default avatarNiklas Neronin <niklas.neronin@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20240429140245.3955523-19-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b44c0ce3

drivers/usb/host/xhci-ring.c

+14 −24
Original line number Diff line number Diff line
@@ -1024,8 +1024,7 @@ static int xhci_invalidate_cancelled_tds(struct xhci_virt_ep *ep) 
					 td->urb->stream_id);

		hw_deq &= ~0xf;



		if (td->cancel_status == TD_HALTED ||

		    trb_in_td(xhci, td->start_seg, td->first_trb, td->last_trb, hw_deq, false)) {

		if (td->cancel_status == TD_HALTED || trb_in_td(xhci, td, hw_deq, false)) {

			switch (td->cancel_status) {

			case TD_CLEARED: /* TD is already no-op */

			case TD_CLEARING_CACHE: /* set TR deq command already queued */
@@ -1082,8 +1081,7 @@ static struct xhci_td *find_halted_td(struct xhci_virt_ep *ep) 
		hw_deq = xhci_get_hw_deq(ep->xhci, ep->vdev, ep->ep_index, 0);

		hw_deq &= ~0xf;

		td = list_first_entry(&ep->ring->td_list, struct xhci_td, td_list);

		if (trb_in_td(ep->xhci, td->start_seg, td->first_trb,

				td->last_trb, hw_deq, false))

		if (trb_in_td(ep->xhci, td, hw_deq, false))

			return td;

	}

	return NULL;
@@ -2049,16 +2047,10 @@ static void handle_port_status(struct xhci_hcd *xhci, 
}



/*

 * This TD is defined by the TRBs starting at start_trb in start_seg and ending

 * at end_trb, which may be in another segment.  If the suspect DMA address is a

 * TRB in this TD, this function returns that TRB's segment.  Otherwise it

 * returns 0.

 * If the suspect DMA address is a TRB in this TD, this function returns that

 * TRB's segment. Otherwise it returns 0.

 */

struct xhci_segment *trb_in_td(struct xhci_hcd *xhci,

		struct xhci_segment *start_seg,

		union xhci_trb	*start_trb,

		union xhci_trb	*end_trb,

		dma_addr_t	suspect_dma,

struct xhci_segment *trb_in_td(struct xhci_hcd *xhci, struct xhci_td *td, dma_addr_t suspect_dma,

			       bool debug)

{

	dma_addr_t start_dma;
@@ -2066,8 +2058,8 @@ struct xhci_segment *trb_in_td(struct xhci_hcd *xhci, 
	dma_addr_t end_trb_dma;

	struct xhci_segment *cur_seg;



	start_dma = xhci_trb_virt_to_dma(start_seg, start_trb);

	cur_seg = start_seg;

	start_dma = xhci_trb_virt_to_dma(td->start_seg, td->first_trb);

	cur_seg = td->start_seg;



	do {

		if (start_dma == 0)
@@ -2076,7 +2068,7 @@ struct xhci_segment *trb_in_td(struct xhci_hcd *xhci, 
		end_seg_dma = xhci_trb_virt_to_dma(cur_seg,

				&cur_seg->trbs[TRBS_PER_SEGMENT - 1]);

		/* If the end TRB isn't in this segment, this is set to 0 */

		end_trb_dma = xhci_trb_virt_to_dma(cur_seg, end_trb);

		end_trb_dma = xhci_trb_virt_to_dma(cur_seg, td->last_trb);



		if (debug)

			xhci_warn(xhci,
@@ -2110,7 +2102,7 @@ struct xhci_segment *trb_in_td(struct xhci_hcd *xhci, 
		}

		cur_seg = cur_seg->next;

		start_dma = xhci_trb_virt_to_dma(cur_seg, &cur_seg->trbs[0]);

	} while (cur_seg != start_seg);

	} while (cur_seg != td->start_seg);



	return NULL;

}
@@ -2822,8 +2814,7 @@ static int handle_tx_event(struct xhci_hcd *xhci, 
			td_num--;



		/* Is this a TRB in the currently executing TD? */

		ep_seg = trb_in_td(xhci, td->start_seg, td->first_trb,

				td->last_trb, ep_trb_dma, false);

		ep_seg = trb_in_td(xhci, td, ep_trb_dma, false);



		/*

		 * Skip the Force Stopped Event. The event_trb(event_dma) of FSE
@@ -2870,8 +2861,7 @@ static int handle_tx_event(struct xhci_hcd *xhci, 
			    !list_is_last(&td->td_list, &ep_ring->td_list)) {

				struct xhci_td *td_next = list_next_entry(td, td_list);



				ep_seg = trb_in_td(xhci, td_next->start_seg, td_next->first_trb,

						   td_next->last_trb, ep_trb_dma, false);

				ep_seg = trb_in_td(xhci, td_next, ep_trb_dma, false);

				if (ep_seg) {

					/* give back previous TD, start handling new */

					xhci_dbg(xhci, "Missing TD completion event after mid TD error\n");
@@ -2890,8 +2880,8 @@ static int handle_tx_event(struct xhci_hcd *xhci, 
					"part of current TD ep_index %d "

					"comp_code %u\n", ep_index,

					trb_comp_code);

				trb_in_td(xhci, td->start_seg, td->first_trb,

					  td->last_trb, ep_trb_dma, true);

				trb_in_td(xhci, td, ep_trb_dma, true);



				return -ESHUTDOWN;

			}

		}

drivers/usb/host/xhci.h

+2 −3
Original line number Diff line number Diff line
@@ -1870,9 +1870,8 @@ int xhci_alloc_tt_info(struct xhci_hcd *xhci, 


/* xHCI ring, segment, TRB, and TD functions */

dma_addr_t xhci_trb_virt_to_dma(struct xhci_segment *seg, union xhci_trb *trb);

struct xhci_segment *trb_in_td(struct xhci_hcd *xhci,

		struct xhci_segment *start_seg, union xhci_trb *start_trb,

		union xhci_trb *end_trb, dma_addr_t suspect_dma, bool debug);

struct xhci_segment *trb_in_td(struct xhci_hcd *xhci, struct xhci_td *td,

			       dma_addr_t suspect_dma, bool debug);

int xhci_is_vendor_info_code(struct xhci_hcd *xhci, unsigned int trb_comp_code);

void xhci_ring_cmd_db(struct xhci_hcd *xhci);

int xhci_queue_slot_control(struct xhci_hcd *xhci, struct xhci_command *cmd,