Commit 734d3ddd authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: host: xhci: purge GET_MAX_PACKET() 



usb_endpoint_maxp() is now returning maxpacket
correctly - iow only bits 10:0. We can finaly remove
XHCI's private GET_MAX_PACKET macro.

Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent abb62184

drivers/usb/host/xhci-mem.c

+2 −2
Original line number Diff line number Diff line
@@ -1415,7 +1415,7 @@ static u32 xhci_get_max_esit_payload(struct usb_device *udev, 
	else if (udev->speed >= USB_SPEED_SUPER)

		return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval);



	max_packet = GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc));

	max_packet = usb_endpoint_maxp(&ep->desc);

	max_burst = usb_endpoint_maxp_mult(&ep->desc);

	/* A 0 in max burst means 1 transfer per ESIT */

	return max_packet * max_burst;
@@ -1461,7 +1461,7 @@ int xhci_endpoint_init(struct xhci_hcd *xhci, 
	max_esit_payload = xhci_get_max_esit_payload(udev, ep);

	interval = xhci_get_endpoint_interval(udev, ep);

	mult = xhci_get_endpoint_mult(udev, ep);

	max_packet = GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc));

	max_packet = usb_endpoint_maxp(&ep->desc);

	max_burst = xhci_get_endpoint_max_burst(udev, ep);

	avg_trb_len = max_esit_payload;

drivers/usb/host/xhci-mtk-sch.c

+2 −2
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, 


	xhci_dbg(xhci, "%s() type:%d, speed:%d, mpkt:%d, dir:%d, ep:%p\n",

		__func__, usb_endpoint_type(&ep->desc), udev->speed,

		GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc)),

		usb_endpoint_maxp(&ep->desc),

		usb_endpoint_dir_in(&ep->desc), ep);



	if (!need_bw_sch(ep, udev->speed, slot_ctx->tt_info & TT_SLOT)) {
@@ -403,7 +403,7 @@ void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, 


	xhci_dbg(xhci, "%s() type:%d, speed:%d, mpks:%d, dir:%d, ep:%p\n",

		__func__, usb_endpoint_type(&ep->desc), udev->speed,

		GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc)),

		usb_endpoint_maxp(&ep->desc),

		usb_endpoint_dir_in(&ep->desc), ep);



	if (!need_bw_sch(ep, udev->speed, slot_ctx->tt_info & TT_SLOT))

drivers/usb/host/xhci-ring.c

+3 −3
Original line number Diff line number Diff line
@@ -3120,7 +3120,7 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred, 
	if (xhci->quirks & XHCI_MTK_HOST)

		trb_buff_len = 0;



	maxp = GET_MAX_PACKET(usb_endpoint_maxp(&urb->ep->desc));

	maxp = usb_endpoint_maxp(&urb->ep->desc);

	total_packet_count = DIV_ROUND_UP(td_total_len, maxp);



	/* Queueing functions don't count the current TRB into transferred */
@@ -3136,7 +3136,7 @@ static int xhci_align_td(struct xhci_hcd *xhci, struct urb *urb, u32 enqd_len, 
	unsigned int max_pkt;

	u32 new_buff_len;



	max_pkt = GET_MAX_PACKET(usb_endpoint_maxp(&urb->ep->desc));

	max_pkt = usb_endpoint_maxp(&urb->ep->desc);

	unalign = (enqd_len + *trb_buff_len) % max_pkt;



	/* we got lucky, last normal TRB data on segment is packet aligned */
@@ -3650,7 +3650,7 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags, 
		addr = start_addr + urb->iso_frame_desc[i].offset;

		td_len = urb->iso_frame_desc[i].length;

		td_remain_len = td_len;

		max_pkt = GET_MAX_PACKET(usb_endpoint_maxp(&urb->ep->desc));

		max_pkt = usb_endpoint_maxp(&urb->ep->desc);

		total_pkt_count = DIV_ROUND_UP(td_len, max_pkt);



		/* A zero-length transfer still involves at least one packet. */

drivers/usb/host/xhci.c

+1 −1
Original line number Diff line number Diff line
@@ -3209,7 +3209,7 @@ int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev, 


	for (i = 0; i < num_eps; i++) {

		ep_index = xhci_get_endpoint_index(&eps[i]->desc);

		max_packet = GET_MAX_PACKET(usb_endpoint_maxp(&eps[i]->desc));

		max_packet = usb_endpoint_maxp(&eps[i]->desc);

		vdev->eps[ep_index].stream_info = xhci_alloc_stream_info(xhci,

				num_stream_ctxs,

				num_streams,

drivers/usb/host/xhci.h

+0 −5
Original line number Diff line number Diff line
@@ -747,11 +747,6 @@ struct xhci_ep_ctx { 
#define MAX_PACKET_MASK		(0xffff << 16)

#define MAX_PACKET_DECODED(p)	(((p) >> 16) & 0xffff)



/* Get max packet size from ep desc. Bit 10..0 specify the max packet size.

 * USB2.0 spec 9.6.6.

 */

#define GET_MAX_PACKET(p)	((p) & 0x7ff)



/* tx_info bitmasks */

#define EP_AVG_TRB_LENGTH(p)		((p) & 0xffff)

#define EP_MAX_ESIT_PAYLOAD_LO(p)	(((p) & 0xffff) << 16)

CRA Git | Maintained and supported by SUSTech CRA and CCSE