Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3527529pxf; Mon, 15 Mar 2021 11:32:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUZF32qMxOezuMqAe1uDklXj4TbjoLhyUQpj+KJlG6gOmaPZqsIWeY2c/949XeyfRHBVUc X-Received: by 2002:aa7:c0c7:: with SMTP id j7mr31450644edp.298.1615833168721; Mon, 15 Mar 2021 11:32:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615833168; cv=none; d=google.com; s=arc-20160816; b=cr+im/5J9qlbD95uKQyjwOZbbF0H+mWPTdiCA3eMxXTle5777n6/XZZU2a1RqWoQwT +Aa1gsPWXLY11QqrsmyXjqukChXZFXg24LkjoEpO48NNWaYsiA28mnUalIPuMNorrOL1 JFpKMwM40/T1ANL5niI9r25iLzUCKD7xdbWMR+iwnevEKY/p1Ueb0d/3cyOiS/keOkj0 TKBUTiE0BApUmGov8DRg14q52MMY6rIGp8eFIsN8/IqQX6HWjCc87nwn2RNFwtJZ62g6 xNwNnlmC948oCfIB0PihebXCivrpKUQQAPyz4kmsKMttBze4X8HWv0YRBkL9StI2HUE/ +MZw== 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=oabXczLHy5X7nbwWSiW3fHR0sVsHU7W7squanY3fo+s=; b=o5GRaTeaLAwwrt1s6T/SUE8oRJQ8k9vEqbWRupYgNCO3QcyI2aBHeHau038dD3cNBV vPT3xXZgBHZ2Wn6wZsb2WIyoVwve6xa433Wo1jUew3nH5kAhOLlm+4VAQXxHyobpk+ge B9/pguKrPThMjg3sDTwfH9bmGVpyoVKzHsFSir43p+mK4iwuV6hCzYbs5GQ7wYYdAAHB mbvZnv0X9VAGm6y3ULW9xljk0qu1ygNV9Ta9GlGA3ddB2XIuXtYjXGQzErAnVUHEGbyo KHaqrHSMoaO7bq4JNmXsqSMQf6mEcNujyxChyyi2B7q9/zTIePl/E+PxxhR+wex+MNfP an5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vwEAif7A; 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 x8si13679092edl.510.2021.03.15.11.32.26; Mon, 15 Mar 2021 11:32:48 -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=vwEAif7A; 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 S237340AbhCOOkc (ORCPT + 99 others); Mon, 15 Mar 2021 10:40:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:48934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233653AbhCOOCQ (ORCPT ); Mon, 15 Mar 2021 10:02:16 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 64EC564EF3; Mon, 15 Mar 2021 14:02:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816925; bh=29PgtmEDf0c+uslzpTsM6GpiVJ9WCgJL2+GQIQYDjMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vwEAif7A3NjOjDGFQAHTn56fL3BF3sW81Tkkj8gO6c6pbex7xOjVId5gS0bc+dSXM FKAcgOE7ws/I4pVkZGDV5Jd8aLmrP6SowHKYgU6kv0g93cTDhDLdp5vAFVQOzPbIdA JV9ks0agwvp78hKMHYdls4CZMWzEHzsw7XvRLu8U= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Forest Crossman , Mathias Nyman Subject: [PATCH 5.11 206/306] usb: xhci: Fix ASMedia ASM1042A and ASM3242 DMA addressing Date: Mon, 15 Mar 2021 14:54:29 +0100 Message-Id: <20210315135514.595644519@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135507.611436477@linuxfoundation.org> References: <20210315135507.611436477@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 @@ -66,6 +66,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"; @@ -276,11 +277,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 &&