Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2534925pxj; Mon, 10 May 2021 05:23:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxffgLYCSUDElica8g82keN2+of20UMxE6rzkC3v8P3iNQF3Z52i6z5jJ+EYh5pbeuCvGTt X-Received: by 2002:a05:6402:199:: with SMTP id r25mr28981571edv.128.1620649404135; Mon, 10 May 2021 05:23:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620649404; cv=none; d=google.com; s=arc-20160816; b=JDfLecj0szy2CYmBWt4HQRyvHUmvbhz52CelubKBxxMHjq/9g1BeHq7yflpS7r9kJO 4HjtaT4Wi4MJBY/3wv9JxyjKQ3fJUrznfsKjzSiavn1ueqaAd1NZ/sIYJahWAVtPfqL9 O34xO1giZenRFNUQO0B8T0EzSEDpCdy47gsO+GR5w5pNCl4MM/xJ508A0AKqWsIsgvWy CKKRCXmA3WjOI2V/oOHirc9oFTbPC0YkCXXSD6TcL+Emakl+ftSRanYOPtCe4d3sWOgs b0vvT1Du1S82AsyO+frIW5NiIHUTk31PVyouTdjzoo1VBcO9bkbZYHJzms+kcoaOaAsl JHKA== 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=yIGWRsI2tI64oLbs3Fa1onlP/tT2WWJBoMBTVNLouyE=; b=U9XohIYUN3rDL11XIadL1Y6Cq4EsM3JHdeYpaZJziCkCnX8KKI0oIDKVPzr9nVFbWg 4WpJSKF5D0ctzrI4W6y/una7Xt62xeP80+RrNpjGB/SNONQZncjL1SrnNmiu03u9BnoF RHahrW1Mcw/bKtTFRsyD+2kKfskwxDiH41tzTaux6Y7r8MabejLtSw0H/Y4ynqn1q/Bk 6YCFWOn1NNfhvgFJNZb7O4++znfBGvy9xomEsSeIHJ9cobIduzHMgETZSDj2iP0UurR8 CSY6p8J3GgNBqC8AlRrTPhoj0YYlmMJJmfVVnFKOC7PuwDSBFcKwSyxdUpS20ytPaScJ OqoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wke9VeQM; 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 h3si8823810edf.461.2021.05.10.05.22.59; Mon, 10 May 2021 05:23:24 -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=wke9VeQM; 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 S238238AbhEJMKa (ORCPT + 99 others); Mon, 10 May 2021 08:10:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:46278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236451AbhEJLIK (ORCPT ); Mon, 10 May 2021 07:08:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A68456198C; Mon, 10 May 2021 11:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644484; bh=0rCUqkBZZMR4uJ2N+2owI05AkuDJrs3wfxx4M192WkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wke9VeQMoTh1g1Y/lixCsxo0XIBbCcAPM8Hge0CpO85XshPDlRsWnC7+l5DHZRtU1 fU3oYHVdtaXH7fyECwXpDFZ+zkXYE3RAB5/vhkv/NeFuIXnzBJEbx//pxwrv9E7Lta 3JsfFvMfl0wIf2fW8Ei5qMkuW1iJ2ROlTBFS3JTI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chunfeng Yun , Sasha Levin Subject: [PATCH 5.12 101/384] usb: xhci-mtk: support quirk to disable usb2 lpm Date: Mon, 10 May 2021 12:18:10 +0200 Message-Id: <20210510102018.210156084@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@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: Chunfeng Yun [ Upstream commit bee1f89aad2a51cd3339571bc8eadbb0dc88a683 ] The xHCI driver support usb2 HW LPM by default, here add support XHCI_HW_LPM_DISABLE quirk, then we can disable usb2 lpm when need it. Signed-off-by: Chunfeng Yun Link: https://lore.kernel.org/r/1617181553-3503-4-git-send-email-chunfeng.yun@mediatek.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/host/xhci-mtk.c | 3 +++ drivers/usb/host/xhci-mtk.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c index 2f27dc0d9c6b..1c331577fca9 100644 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -397,6 +397,8 @@ static void xhci_mtk_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |= XHCI_SPURIOUS_SUCCESS; if (mtk->lpm_support) xhci->quirks |= XHCI_LPM_SUPPORT; + if (mtk->u2_lpm_disable) + xhci->quirks |= XHCI_HW_LPM_DISABLE; /* * MTK xHCI 0.96: PSA is 1 by default even if doesn't support stream, @@ -469,6 +471,7 @@ static int xhci_mtk_probe(struct platform_device *pdev) return ret; mtk->lpm_support = of_property_read_bool(node, "usb3-lpm-capable"); + mtk->u2_lpm_disable = of_property_read_bool(node, "usb2-lpm-disable"); /* optional property, ignore the error if it does not exist */ of_property_read_u32(node, "mediatek,u3p-dis-msk", &mtk->u3p_dis_msk); diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h index cbb09dfea62e..080109012b9a 100644 --- a/drivers/usb/host/xhci-mtk.h +++ b/drivers/usb/host/xhci-mtk.h @@ -150,6 +150,7 @@ struct xhci_hcd_mtk { struct phy **phys; int num_phys; bool lpm_support; + bool u2_lpm_disable; /* usb remote wakeup */ bool uwk_en; struct regmap *uwk; -- 2.30.2