From patchwork Wed Aug 2 09:06:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinbo Zhu X-Patchwork-Id: 129727 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp333882vqx; Wed, 2 Aug 2023 02:46:59 -0700 (PDT) X-Google-Smtp-Source: APBJJlHylxsWKUTXJypkiT8TP1HJnvgrHkJOAthkKsaZcG6z42A5R64eLB+NSaq2ytAud2yM8YwM X-Received: by 2002:a17:906:2d0:b0:993:f2c2:750b with SMTP id 16-20020a17090602d000b00993f2c2750bmr4709257ejk.17.1690969619462; Wed, 02 Aug 2023 02:46:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690969619; cv=none; d=google.com; s=arc-20160816; b=qK0rSEbHJLPuKGMSByeid14wVzo/JsOiUwGdAn+rDVhT3q82KNV9zLjjnqXD7dg9Bb TTkyOqINfk9dyjW16TA1aqo+2BQqgXNBNwuOTCQLnLaxV9BwrdW6SwpGTUiUKn+SZx7o NQUvflf0AOlpagh3z+dQCV9+tNBFk5Odi6X5SIjn8zV5npPNT4h8xdTj40S/vBmL1zfc 4wcl5BcT+ld2eMhZlGPaZaw68x/kfS/C2SOsxGLL7Stv5WXYTuzFCzhiJ+osgPgK3Q90 PPo89wCojrHwBkZRRIsV7HrWTs+3DQIiJJ+IJap9q+GoVHuR5LlU9/bp/TWXvL2ZGX3U LfWw== 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 :message-id:date:subject:cc:to:from; bh=cvu50lHiRZkjNcvlkI4UavsB73GrOtB8F9uLtF0y6OY=; fh=dMF8Xt+VFduQTLOxafuB116I1iPdfW8efLAwYMyzbWY=; b=XS/LTPL7cR/A72i99Vn9FuO7x8NzE46CtTavHDRXnLpK4DEQ5oYbm/JJml67hnJjqD wT2e1qRTLjCCkdELvOVz7gDy6nWnLqsO2/Gyvmo47oEmYmWHBA7RiYlTwbDKzF4Xl8Hj 8s3Ghq0A0aRjUoU35sD92vmJ17G5XyMACwdj9S5vb7NR2fDgXkz9sab5oBiISN7XPW7g YngLaEl4OOKbajxNM4CkVFLug1GwOeLiOCkznezib3XTwstyk+VW3N8QufKvkpiax2ZJ vPFh2sLRmfEkVqvBHrSG1oH1FVbqrWGoYWhKLqcoenhwEu5SpbAI2235urtcvWpf/xjT UoZQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lu22-20020a170906fad600b00982a267a399si10224346ejb.561.2023.08.02.02.46.36; Wed, 02 Aug 2023 02:46:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233845AbjHBJHC (ORCPT + 99 others); Wed, 2 Aug 2023 05:07:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233840AbjHBJG5 (ORCPT ); Wed, 2 Aug 2023 05:06:57 -0400 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 86204272A; Wed, 2 Aug 2023 02:06:55 -0700 (PDT) Received: from loongson.cn (unknown [10.20.42.201]) by gateway (Coremail) with SMTP id _____8DxPOuuHMpkNdQOAA--.29482S3; Wed, 02 Aug 2023 17:06:54 +0800 (CST) Received: from localhost.localdomain (unknown [10.20.42.201]) by localhost.localdomain (Coremail) with SMTP id AQAAf8CxriOqHMpk_mZFAA--.8718S2; Wed, 02 Aug 2023 17:06:53 +0800 (CST) From: Yinbo Zhu To: Mathias Nyman , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jianmin Lv , wanghongliang@loongson.cn, Liu Peibao , loongson-kernel@lists.loongnix.cn, Yinbo Zhu Subject: [PATCH] usb: xhci-plat: fix usb disconnect issue after s4 Date: Wed, 2 Aug 2023 17:06:42 +0800 Message-Id: <20230802090642.1642-1-zhuyinbo@loongson.cn> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CM-TRANSID: AQAAf8CxriOqHMpk_mZFAA--.8718S2 X-CM-SenderInfo: 52kx5xhqerqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773110159549112799 X-GMAIL-MSGID: 1773110159549112799 The xhci retaining bogus hardware states cause usb disconnect devices connected before hibernation(s4) and refer to the commit '547d55fa83 ("usb: ohci-platform: fix usb disconnect issue after s4")' which set flag "hibernated" as true when resume-from-hibernation and that the drivers will reset the hardware to get rid of any existing state and make sure resume from hibernation re-enumerates everything for xhci. Signed-off-by: Yinbo Zhu --- drivers/usb/host/xhci-plat.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 28218c8f1837..41a213070435 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -451,7 +451,7 @@ static int __maybe_unused xhci_plat_suspend(struct device *dev) return 0; } -static int __maybe_unused xhci_plat_resume(struct device *dev) +static int __maybe_unused xhci_plat_resume_common(struct device *dev, struct pm_message pmsg) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct xhci_hcd *xhci = hcd_to_xhci(hcd); @@ -466,7 +466,7 @@ static int __maybe_unused xhci_plat_resume(struct device *dev) if (ret) return ret; - ret = xhci_resume(xhci, PMSG_RESUME); + ret = xhci_resume(xhci, pmsg); if (ret) return ret; @@ -477,6 +477,16 @@ static int __maybe_unused xhci_plat_resume(struct device *dev) return 0; } +static int __maybe_unused xhci_plat_resume(struct device *dev) +{ + return xhci_plat_resume_common(dev, PMSG_RESUME); +} + +static int __maybe_unused xhci_plat_restore(struct device *dev) +{ + return xhci_plat_resume_common(dev, PMSG_RESTORE); +} + static int __maybe_unused xhci_plat_runtime_suspend(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); @@ -499,7 +509,12 @@ static int __maybe_unused xhci_plat_runtime_resume(struct device *dev) } const struct dev_pm_ops xhci_plat_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(xhci_plat_suspend, xhci_plat_resume) + .suspend = xhci_plat_suspend, + .resume = xhci_plat_resume, + .freeze = xhci_plat_suspend, + .thaw = xhci_plat_resume, + .poweroff = xhci_plat_suspend, + .restore = xhci_plat_restore, SET_RUNTIME_PM_OPS(xhci_plat_runtime_suspend, xhci_plat_runtime_resume,