Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3522288pxf; Mon, 15 Mar 2021 11:25:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhXIeUZzwS3DVo8Mn8KebLTnI2ud2x59g7gdlV8BOqlK5E/vHPAJl4Bpb09Lfov5kg95Ku X-Received: by 2002:a17:907:d0b:: with SMTP id gn11mr25168461ejc.463.1615832747972; Mon, 15 Mar 2021 11:25:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615832747; cv=none; d=google.com; s=arc-20160816; b=IozyHbPgbJXSjwtfWPRTsnOnBaCjFt8tryggXj89WF0Jvyc1HO0gduL6jCcOWyFMZ7 sYJ9gVg0XLbV9aTCA0mzsaVShX0RGBjH3yI/BOP9kgIDocyPne7DQzH0Bu3Jkjp3+R38 AbY2F0ykN9SYDWyr+lVJyVMIK7M+S4hYstuK+B0OptvY220KD+fg8MsY3ks2uuan/7L+ sgNgQ9DK0cmp5icFOM4sfBwFtHap6X3Ih+h/TVgSh0jg7FK6a5ddEhvBTeF2cIi1Ms/q NMqgh4O/3HkKM1GN5kUAPNY++dp0wmzqTnOBbWYjnGH8aWhX2WB+8DzMTmdsxYkN5WEi Cp4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZI59crA7QPxJHIIqrkcXeL1zV0VdJ89wSGgHaWa3FBQ=; b=jdUh4YB34jbn09UcIyEEt9N/LRhvU+6OjXyYM/ZxoUsNil3ie5Jtu/K5lY2Eq7e4oB /TfhuIUF1sy80+G+RfdfYsmSQsSb0eY4AGWR/sCV9Ywjr3BdNXufnuex6071urg/Emzs GqodkcsXg+y2J0emxpoCPSJ7ycNBtdKkrERu5sllg4VOBRfXACfbisJCgDbQvVQYlAWk oLMx+S5az/cLDQUs5BHARmybCwena3LCApQSATdIDWri8tOMrZo+U1boXV+s2p2lSYzg eJCY4HNwpO/8c5X0L+/51rGmAsA8Xg0+qiiqQsQVVD3A+PKLzKltU9mw/pxUpSwE9AZ1 oW0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=A36lzJ2A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gb41si11222890ejc.90.2021.03.15.11.25.25; Mon, 15 Mar 2021 11:25:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=A36lzJ2A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238597AbhCOOXa (ORCPT + 99 others); Mon, 15 Mar 2021 10:23:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:35904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232735AbhCOOAR (ORCPT ); Mon, 15 Mar 2021 10:00:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6210364EEA; Mon, 15 Mar 2021 14:00:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816802; bh=XlqWqZdMo0szd/He4PcWUcQJerYiwbYteG1qsO7llho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A36lzJ2AFNJFkgqrUqJg2StEgqnrwkEwCu87n2AkDeo3x0O2zNIq3jOEkeQA3UPxW IuX8X52n9yuq/NEpFi6QR+xXtO87Te9sM8Zg1REptJUDF90ayMvUb/O5IA36HslRgp 1lwXDLzKyKlRXrtPjGuV+EF9dm05Pi92j5+acdCA= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Forest Crossman , Mathias Nyman Subject: [PATCH 4.19 078/120] usb: xhci: Fix ASMedia ASM1042A and ASM3242 DMA addressing Date: Mon, 15 Mar 2021 14:57:09 +0100 Message-Id: <20210315135722.524547726@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135720.002213995@linuxfoundation.org> References: <20210315135720.002213995@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Forest Crossman commit b71c669ad8390dd1c866298319ff89fe68b45653 upstream. I've confirmed that both the ASMedia ASM1042A and ASM3242 have the same problem as the ASM1142 and ASM2142/ASM3142, where they lose some of the upper bits of 64-bit DMA addresses. As with the other chips, this can cause problems on systems where the upper bits matter, and adding the XHCI_NO_64BIT_SUPPORT quirk completely fixes the issue. Cc: stable@vger.kernel.org Signed-off-by: Forest Crossman Signed-off-by: Mathias Nyman Link: https://lore.kernel.org/r/20210311115353.2137560-4-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-pci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -53,6 +53,7 @@ #define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI 0x1142 #define PCI_DEVICE_ID_ASMEDIA_1142_XHCI 0x1242 #define PCI_DEVICE_ID_ASMEDIA_2142_XHCI 0x2142 +#define PCI_DEVICE_ID_ASMEDIA_3242_XHCI 0x3242 static const char hcd_name[] = "xhci_hcd"; @@ -237,11 +238,14 @@ static void xhci_pci_quirks(struct devic pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) xhci->quirks |= XHCI_BROKEN_STREAMS; if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && - pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI) + pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI) { xhci->quirks |= XHCI_TRUST_TX_LENGTH; + xhci->quirks |= XHCI_NO_64BIT_SUPPORT; + } if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && (pdev->device == PCI_DEVICE_ID_ASMEDIA_1142_XHCI || - pdev->device == PCI_DEVICE_ID_ASMEDIA_2142_XHCI)) + pdev->device == PCI_DEVICE_ID_ASMEDIA_2142_XHCI || + pdev->device == PCI_DEVICE_ID_ASMEDIA_3242_XHCI)) xhci->quirks |= XHCI_NO_64BIT_SUPPORT; if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&