Commit 11fdcc39 authored by Chunfeng Yun's avatar Chunfeng Yun Committed by Greg Kroah-Hartman
Browse files

usb: xhci-mtk: use @tt_info to check the FS/LS device is under a HS hub 



If the LS/FS device is connected to an external HS hub, the member
@tt_info in xhci_virt_device struct in not NULL, use it to check
whether a LS/FS device is under an exernal HS hub, then no need get
the slot context of this device.

Signed-off-by: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/8117df52f16bd03087e486d7d740a183b6dd634a.1615170625.git.chunfeng.yun@mediatek.com


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

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

+2 −6
Original line number Diff line number Diff line
@@ -678,7 +678,6 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, 
	struct xhci_hcd_mtk *mtk = hcd_to_mtk(hcd);

	struct xhci_hcd *xhci;

	struct xhci_ep_ctx *ep_ctx;

	struct xhci_slot_ctx *slot_ctx;

	struct xhci_virt_device *virt_dev;

	struct mu3h_sch_ep_info *sch_ep;

	unsigned int ep_index;
@@ -686,7 +685,6 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, 
	xhci = hcd_to_xhci(hcd);

	virt_dev = xhci->devs[udev->slot_id];

	ep_index = xhci_get_endpoint_index(&ep->desc);

	slot_ctx = xhci_get_slot_ctx(xhci, virt_dev->in_ctx);

	ep_ctx = xhci_get_ep_ctx(xhci, virt_dev->in_ctx, ep_index);



	xhci_dbg(xhci, "%s() type:%d, speed:%d, mpkt:%d, dir:%d, ep:%p\n",
@@ -694,7 +692,7 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, 
		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)) {

	if (!need_bw_sch(ep, udev->speed, !!virt_dev->tt_info)) {

		/*

		 * set @bpkts to 1 if it is LS or FS periodic endpoint, and its

		 * device does not connected through an external HS hub
@@ -723,7 +721,6 @@ void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, 
{

	struct xhci_hcd_mtk *mtk = hcd_to_mtk(hcd);

	struct xhci_hcd *xhci;

	struct xhci_slot_ctx *slot_ctx;

	struct xhci_virt_device *virt_dev;

	struct mu3h_sch_bw_info *sch_array;

	struct mu3h_sch_bw_info *sch_bw;
@@ -732,7 +729,6 @@ void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, 


	xhci = hcd_to_xhci(hcd);

	virt_dev = xhci->devs[udev->slot_id];

	slot_ctx = xhci_get_slot_ctx(xhci, virt_dev->in_ctx);

	sch_array = mtk->sch_array;



	xhci_dbg(xhci, "%s() type:%d, speed:%d, mpks:%d, dir:%d, ep:%p\n",
@@ -740,7 +736,7 @@ void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, 
		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))

	if (!need_bw_sch(ep, udev->speed, !!virt_dev->tt_info))

		return;



	bw_index = get_bw_index(xhci, udev, ep);