diff mbox series

[5.7,05/79] usb: xhci: Fix ASMedia ASM1142 DMA addressing

Message ID	20200810151812.395216121@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=uOiG=BU=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Mathias Nyman <mathias.nyman@linux.intel.com>, Forest Crossman <cyrozap@gmail.com> Subject: [PATCH 5.7 05/79] usb: xhci: Fix ASMedia ASM1142 DMA addressing Date: Mon, 10 Aug 2020 17:20:24 +0200 Message-Id: <20200810151812.395216121@linuxfoundation.org> In-Reply-To: <20200810151812.114485777@linuxfoundation.org> References: <20200810151812.114485777@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.7,02/79] USB: serial: qcserial: add EM7305 QDL product ID [5.7,05/79] usb: xhci: Fix ASMedia ASM1142 DMA addressing [5.7,09/79] ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value. [5.7,10/79] ALSA: hda/ca0132 - Fix AE-5 microphone selection commands. [5.7,12/79] staging: android: ashmem: Fix lockdep warning for write operation [5.7,15/79] Bluetooth: Fix slab-out-of-bounds read in hci_extended_inquiry_result_evt() [5.7,16/79] Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_evt() [5.7,18/79] omapfb: dss: Fix max fclk divider for omap36xx [5.7,20/79] Smack: fix use-after-free in smk_write_relabel_self() [5.7,22/79] lkdtm/heap: Avoid edge and middle of slabs [5.7,24/79] mtd: properly check all write ioctls for permissions [5.7,26/79] leds: lm36274: fix use-after-free on unbind [5.7,27/79] leds: da903x: fix use-after-free on unbind [5.7,31/79] bpf: Fix NULL pointer dereference in __btf_resolve_helper_id() [5.7,32/79] net/9p: validate fds in p9_fd_open [5.7,34/79] drm/nouveau/fbcon: fix module unload when fbcon init has failed for some reason [5.7,35/79] drm/nouveau/fbcon: zero-initialise the mode_cmd2 structure [5.7,36/79] io_uring: fix lockup in io_fail_links() [5.7,39/79] drm/panel: Fix auo, kd101n80-45na horizontal noise on edges of panel [5.7,42/79] i2c: slave: improve sanity check when registering [5.7,43/79] i2c: slave: add sanity check when unregistering [5.7,46/79] ALSA: hda: fix NULL pointer dereference during suspend [5.7,48/79] cfg80211: check vendor command doit pointer before use [5.7,50/79] atm: fix atm_dev refcnt leaks in atmtcp_remove_persistent [5.7,53/79] Revert "powerpc/kasan: Fix shadow pages allocation failure" [5.7,55/79] ipv4: Silence suspicious RCU usage warning [5.7,57/79] ipv6: Fix nexthop refcnt leak when creating ipv6 route info [5.7,58/79] rxrpc: Fix race between recvmsg and sendmsg on immediate call failure [5.7,59/79] vxlan: Ensure FDB dump is performed under RCU [5.7,62/79] devlink: ignore -EOPNOTSUPP errors on dumpit [5.7,63/79] appletalk: Fix atalk_proc_init() return path [5.7,65/79] hv_netvsc: do not use VF device if link is down [5.7,67/79] net: gre: recompute gre csum for sctp over gre tunnels [5.7,71/79] net: thunderx: use spin_lock_bh in nicvf_set_rx_mode_task() [5.7,72/79] openvswitch: Prevent kernel-infoleak in ovs_ct_put_key() [5.7,75/79] tcp: apply a floor of 1 for RTT samples from TCP timestamps [5.7,76/79] mptcp: be careful on subflow creation [5.7,77/79] mptcp: fix bogus sendmsg() return code under pressure [5.7,79/79] arm64: kaslr: Use standard early random function

Commit Message

Greg KH Aug. 10, 2020, 3:20 p.m. UTC

From: Forest Crossman <cyrozap@gmail.com>

commit ec37198acca7b4c17b96247697406e47aafe0605 upstream.

I've confirmed that the ASMedia ASM1142 has the same problem as the
ASM2142/ASM3142, in that it too reports that it supports 64-bit DMA
addresses when in fact it does not. As with the ASM2142/ASM3142, this
can cause problems on systems where the upper bits matter, and adding
the XHCI_NO_64BIT_SUPPORT quirk completely fixes the issue.

Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Forest Crossman <cyrozap@gmail.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200728042408.180529-3-cyrozap@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/usb/host/xhci-pci.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -58,6 +58,7 @@ 
 #define PCI_DEVICE_ID_AMD_PROMONTORYA_1			0x43bc
 #define PCI_DEVICE_ID_ASMEDIA_1042_XHCI			0x1042
 #define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI		0x1142
+#define PCI_DEVICE_ID_ASMEDIA_1142_XHCI			0x1242
 #define PCI_DEVICE_ID_ASMEDIA_2142_XHCI			0x2142
 
 static const char hcd_name[] = "xhci_hcd";
@@ -258,7 +259,8 @@  static void xhci_pci_quirks(struct devic
 		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI)
 		xhci->quirks |= XHCI_TRUST_TX_LENGTH;
 	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
-		pdev->device == PCI_DEVICE_ID_ASMEDIA_2142_XHCI)
+	    (pdev->device == PCI_DEVICE_ID_ASMEDIA_1142_XHCI ||
+	     pdev->device == PCI_DEVICE_ID_ASMEDIA_2142_XHCI))
 		xhci->quirks |= XHCI_NO_64BIT_SUPPORT;
 
 	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&