Received: by 2002:a17:90b:8d0:0:0:0:0 with SMTP id ds16csp4880040pjb; Mon, 27 Jul 2020 07:28:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5WicqlQY3OgQAX5XAa1RhzIru1saglWBI6J3e/QouFuTBcqY/Z82D1i1iLukpzhviORwL X-Received: by 2002:a17:906:2356:: with SMTP id m22mr6946863eja.124.1595860103743; Mon, 27 Jul 2020 07:28:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595860103; cv=none; d=google.com; s=arc-20160816; b=vohiqpgSdh68AhzoNNXlQbHTjknsaS0/cVDVk3HD1vQj73oHUM2DTffyUCdNHmR2OK 9j+J4BjaCgmHUjD3nBA8xRwnwxXHStFH8XID/V6xamotQKHSDa3rILZVk91V316GQRuD wxNsgWbyBoTfjHeJORd7Pq/vaa4RyR4qh6UUlu5/NdxP2eqh3DRQZbTd4DWeN5oRWayW gJy2+xvXb/N25f0oAfj8+y1749baSKkFDwVw5bUkI6td6X2b8V9y9kC2PYb7PZLJUtd5 r2ZGmZkJuCjnbQp843CeT1F9CddJZ8Cb7fm0RzVy/SQO4vVCuLPzHq7EcOeJfUi1q1Np tkIw== 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=X++pxp1d9DfQEbIQK+u6ylj/MoXObMSvtWEGoMKA3cc=; b=EjyXYXKpv2+qMjwfVOolMXg34rLWXSooMnYhsXsIgoV95RzFg7C0lJVj+wU3byG7d9 eDWli+DCxDHfN/sc5yJ94QP7FsoXifDQ7kfzCb6go8A4uNyq6EihCOmuJLH4U+7EzcXq nzbVSupVUFQhj1eWwgUspPY7LC4P7nFBNqO1I3iTjKeuJNba6JQiuNruzvqY8kHi/LZT KAccgdL3fCt6vl9B1L+cBQhiG/bpbUf+/kTbURBpKnZe/OAYbzBWwdwy/29NR1byqdMo QiaLRoITI9+mWES9VFwD3F+GEEVMcs9n8K6eXRtE4j4OBRdDSyxtIaovlS2kzvS4eZ1S 09VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=U+jT80Px; 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 x2si931761ejj.386.2020.07.27.07.28.01; Mon, 27 Jul 2020 07:28:23 -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=U+jT80Px; 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 S1732313AbgG0OYq (ORCPT + 99 others); Mon, 27 Jul 2020 10:24:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:54404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730144AbgG0OYo (ORCPT ); Mon, 27 Jul 2020 10:24:44 -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 4E75E2083E; Mon, 27 Jul 2020 14:24:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859883; bh=xwuGqYwWhqJuT+IJhAMSzSHEhB5ViUJSzt5YbrzCaUs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U+jT80Px5ek1qrkLezBUBpR+osOYQ613E8YtsJ/B8yceJeKuuvXXoiwNHYsPlagrg p9QTGp7qRei9sKcZ97vljf77fLWkhCI1U+pAPNnFdnT42/3CCRZwmrvnXA+zc0AEEL 2qw6cyvr8wgHPHBt5ZaORstsfD3UYqScbmF5Hf1A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Forest Crossman Subject: [PATCH 5.7 142/179] usb: xhci: Fix ASM2142/ASM3142 DMA addressing Date: Mon, 27 Jul 2020 16:05:17 +0200 Message-Id: <20200727134939.550584391@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134932.659499757@linuxfoundation.org> References: <20200727134932.659499757@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 @@ -255,6 +255,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)