Commit 17f50e28 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-5.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb into master 

Pull USB fixes from Greg KH:
 "Three small USB XHCI driver fixes for 5.8-rc7.

  They all resolve some minor issues that have been reported on some
  different platforms.

  All of these have been in linux-next with no reported issues"

* tag 'usb-5.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: tegra: Fix allocation for the FPCI context
  usb: xhci: Fix ASM2142/ASM3142 DMA addressing
  usb: xhci-mtk: fix the failure of bandwidth allocation
parents cf48f79b 0b987032

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

+4 −0
Original line number Diff line number Diff line
@@ -557,6 +557,10 @@ static bool need_bw_sch(struct usb_host_endpoint *ep, 
	if (is_fs_or_ls(speed) && !has_tt)

		return false;



	/* skip endpoint with zero maxpkt */

	if (usb_endpoint_maxp(&ep->desc) == 0)

		return false;



	return true;

}

drivers/usb/host/xhci-pci.c

+3 −0
Original line number Diff line number Diff line
@@ -265,6 +265,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&

			pdev->device == 0x1142)

		xhci->quirks |= XHCI_TRUST_TX_LENGTH;

	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&

			pdev->device == 0x2142)

		xhci->quirks |= XHCI_NO_64BIT_SUPPORT;



	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&

		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI)

drivers/usb/host/xhci-tegra.c

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ static int tegra_xusb_init_context(struct tegra_xusb *tegra) 
	if (!tegra->context.ipfs)

		return -ENOMEM;



	tegra->context.fpci = devm_kcalloc(tegra->dev, soc->ipfs.num_offsets,

	tegra->context.fpci = devm_kcalloc(tegra->dev, soc->fpci.num_offsets,

					   sizeof(u32), GFP_KERNEL);

	if (!tegra->context.fpci)

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE