From patchwork Tue Dec 21 11:28:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Nyman X-Patchwork-Id: 527651 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA287C433FE for ; Tue, 21 Dec 2021 11:27:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237119AbhLUL13 (ORCPT ); Tue, 21 Dec 2021 06:27:29 -0500 Received: from mga02.intel.com ([134.134.136.20]:57171 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237167AbhLUL1Z (ORCPT ); Tue, 21 Dec 2021 06:27:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1640086044; x=1671622044; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=A9fPQ3h1WE2KeRMuB+0n6GI7j3tjl3q9NM7fg2igRjI=; b=f8WBGO6aaP6RU5R2YvWP0j+POK2VIbZFo6R+OjY5zIAya0quxwv5/WHz gRuwwEukXHOt2gk2YqdHpTztkpVN8ZSMGEfgxQ3AsTlv6I+zoZJdat64f 8YRwVijC4WXvzTCF8DijiWwIC0qYylcRZXNkBRQda+yNOcdMYlfYoweW9 CxIkTrlCxMzZanApm5hfJctiieGxueX/RAMYNjIWP8dZxGJQLBism9yXz dsWX6Q3c4e8v0/QM06Ac/5mv+cQiEkBxvAWsBinv26YYGSuJgvWqB3CgU UdvPbKlyc5HnnBN+UIV5I+/rnd2EHVPCvISMDii7PSwpTElPsMQmE546d w==; X-IronPort-AV: E=McAfee;i="6200,9189,10204"; a="227669342" X-IronPort-AV: E=Sophos;i="5.88,223,1635231600"; d="scan'208";a="227669342" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2021 03:27:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,223,1635231600"; d="scan'208";a="467759747" Received: from mattu-haswell.fi.intel.com ([10.237.72.199]) by orsmga006.jf.intel.com with ESMTP; 21 Dec 2021 03:27:22 -0800 From: Mathias Nyman To: Cc: , Mathias Nyman , stable@vger.kernel.org, Nikolay Martynov Subject: [PATCH 1/1] xhci: Fresco FL1100 controller should not have BROKEN_MSI quirk set. Date: Tue, 21 Dec 2021 13:28:25 +0200 Message-Id: <20211221112825.54690-2-mathias.nyman@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211221112825.54690-1-mathias.nyman@linux.intel.com> References: <20211221112825.54690-1-mathias.nyman@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The Fresco Logic FL1100 controller needs the TRUST_TX_LENGTH quirk like other Fresco controllers, but should not have the BROKEN_MSI quirks set. BROKEN_MSI quirk causes issues in detecting usb drives connected to docks with this FL1100 controller. The BROKEN_MSI flag was apparently accidentally set together with the TRUST_TX_LENGTH quirk Original patch went to stable so this should go there as well. Fixes: ea0f69d82119 ("xhci: Enable trust tx length quirk for Fresco FL11 USB controller") Cc: stable@vger.kernel.org cc: Nikolay Martynov Signed-off-by: Mathias Nyman --- drivers/usb/host/xhci-pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 3af017883231..5c351970cdf1 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -123,7 +123,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) /* Look for vendor-specific quirks */ if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC && (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK || - pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1100 || pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1400)) { if (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK && pdev->revision == 0x0) { @@ -158,6 +157,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1009) xhci->quirks |= XHCI_BROKEN_STREAMS; + if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC && + pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1100) + xhci->quirks |= XHCI_TRUST_TX_LENGTH; + if (pdev->vendor == PCI_VENDOR_ID_NEC) xhci->quirks |= XHCI_NEC_HOST;