Received: by 2002:a17:90b:8d0:0:0:0:0 with SMTP id ds16csp4888389pjb; Mon, 27 Jul 2020 07:39:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzGJREQvA4JnBG3/+DjCPxxfayaCODRrumW+jjb8K5Ydd18QjZStxv9cFe3EixzF3a7DmA X-Received: by 2002:a17:906:7a4d:: with SMTP id i13mr6996689ejo.351.1595860758443; Mon, 27 Jul 2020 07:39:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595860758; cv=none; d=google.com; s=arc-20160816; b=ePYIPi4DjHQNH4GWr2D7xy7t1I6faEmMhiPti8MU+UgfCT37tmh25yj7ZiTcy36513 RV/U8LO4v/a/7kGyQ0xL9JLX88dlQfXO9tWvEkbQd/RgG5j7HALbR/CYnrzewNNAWldO V3oFhJxjabRu5vCZP3cQFdWNh2NG2ajpNEgAmxZNlOZatBMJRmNThuev47kKJSFx0ng2 RwQHKi4H7Bu/4i8tHk2VicNRvWESJECWbaQtkUBXHqaS97OQwsPyAp7Iff3UvptXj45n qBdDBtlk+KYCuKFjSH3VI/Hp2gL1fgkomP4lOYYcEuYYKdvo9CHs7aMGyv3B/7HemnnV oUJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=V1BBoPaGcnlgQnQpsg9Mp2k2ar0/+sA1GxOMH7iX2sg=; b=hO3Ia6aJm3io6L/WeJxW5bLugmGPlJpKzxUXAXFd4ZQgJcZbUr0EoPhsubNPxuusBN jajSPCCj4V9ofz/KdDvPou+gDzgXwsrnFbU3AQyKGToRcElAk5Drq2B0/6/MU8Pm7ppe g0Fhg34y6SwTSNX8vOFRKftgnaEwT6D3K6IYSatIxSzCrcDb/1yj9b4DP9rkNI6TXZUM wyhn39bDrYSsU2J94ZUp34Ft6QB7EqbnC8tVsyFNYnDHx53YSreQXDlfWEwSu6SZ/l9d mwkaKv+FbmoHKjOL0RIU2A271E8cnd7OJvJmxW3m4dtWjVOyOpzZe6iBhXojhia0L/Rh KjJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vo7zG8Un; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w18si1167493edl.306.2020.07.27.07.38.56; Mon, 27 Jul 2020 07:39:18 -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=@kernel.org header.s=default header.b=vo7zG8Un; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730094AbgG0OLz (ORCPT + 99 others); Mon, 27 Jul 2020 10:11:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:35802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729274AbgG0OLx (ORCPT ); Mon, 27 Jul 2020 10:11:53 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 28B6920838; Mon, 27 Jul 2020 14:11:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859113; bh=3d40csHXYgAn1gKXI/bGgNGTJZgUioqvbt1dNEOH83A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vo7zG8UnvvX9X93xxLqzVL04UGZEjDHm5oU7Lavqc1LTONoOioYJi3QVI67FCTRmJ sbxq41gAyBMQU8SJht2dnO+otLC3PAPTFfylLMygMtaaYJb0CN4X1a1pFdFTQ3vQXv ZDMYcIHKIoFfrksNm/4OahYqzL8j6NSPjsckBpf4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Forest Crossman Subject: [PATCH 4.19 63/86] usb: xhci: Fix ASM2142/ASM3142 DMA addressing Date: Mon, 27 Jul 2020 16:04:37 +0200 Message-Id: <20200727134917.589434945@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134914.312934924@linuxfoundation.org> References: <20200727134914.312934924@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Forest Crossman commit dbb0897e805f2ab1b8bc358f6c3d878a376b8897 upstream. The ASM2142/ASM3142 (same PCI IDs) does not support full 64-bit DMA addresses, which can cause silent memory corruption or IOMMU errors on platforms that use the upper bits. Add the XHCI_NO_64BIT_SUPPORT quirk to fix this issue. Signed-off-by: Forest Crossman Cc: stable Link: https://lore.kernel.org/r/20200717112734.328432-1-cyrozap@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-pci.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -231,6 +231,9 @@ static void xhci_pci_quirks(struct devic 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)