From mboxrd@z Thu Jan 1 00:00:00 1970 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 D7C31CCA488 for ; Tue, 7 Jun 2022 19:46:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357527AbiFGTpp (ORCPT ); Tue, 7 Jun 2022 15:45:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346941AbiFGSrf (ORCPT ); Tue, 7 Jun 2022 14:47:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E88F080206; Tue, 7 Jun 2022 11:02:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 09E3B618DF; Tue, 7 Jun 2022 18:02:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32EF5C34115; Tue, 7 Jun 2022 18:02:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654624969; bh=iPDGLaiCpDKpB218XQ4ilOz8blVhaF7quo/ECIy5Zx4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JhrAbuK22ya/dJAHjL0wuMSDaJC2aEVCGjvlMivEGYXMJ6U7863WlPpCTeykzKWHv U9gplUmHMfIakAsbEnG/Z/z1M8qPsm0af/3yi+o80IZGJlaXjNoxMI4rIp/zZW/GBi LThd5j0KbCFQBXNfuL7MOhgVQgkzWTnNKGqnzcB2Tl0UYu3IFM923dFbuRj7QFyWRt EmK5IL1ayj9C9wQJ7WFBjgvmD3mrjVYIpbgS3M7glvhFbE+yTRxLKIsnldGtqnZ7vg MUBH08Dde2rbG2YTRpxb7iv/UUngDnuxYFglxsjGO6W2MUitJJ/VJrcHUVaNllZeny M8v4TXXB9V6mA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Evan Green , Alan Stern , Greg Kroah-Hartman , Sasha Levin , yj84.jang@samsung.com, bhelgaas@google.com, christophe.leroy@csgroup.eu, linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 09/25] USB: hcd-pci: Fully suspend across freeze/thaw cycle Date: Tue, 7 Jun 2022 14:02:10 -0400 Message-Id: <20220607180229.482040-9-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607180229.482040-1-sashal@kernel.org> References: <20220607180229.482040-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Evan Green [ Upstream commit 63acaa8e9c65dc34dc249440216f8e977f5d2748 ] The documentation for the freeze() method says that it "should quiesce the device so that it doesn't generate IRQs or DMA". The unspoken consequence of not doing this is that MSIs aimed at non-boot CPUs may get fully lost if they're sent during the period where the target CPU is offline. The current callbacks for USB HCD do not fully quiesce interrupts, specifically on XHCI. Change to use the full suspend/resume flow for freeze/thaw to ensure interrupts are fully quiesced. This fixes issues where USB devices fail to thaw during hibernation because XHCI misses its interrupt and cannot recover. Acked-by: Alan Stern Signed-off-by: Evan Green Link: https://lore.kernel.org/r/20220421103751.v3.2.I8226c7fdae88329ef70957b96a39b346c69a914e@changeid Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/core/hcd-pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c index 5340d433cdf0..18b3a5e518cd 100644 --- a/drivers/usb/core/hcd-pci.c +++ b/drivers/usb/core/hcd-pci.c @@ -632,10 +632,10 @@ const struct dev_pm_ops usb_hcd_pci_pm_ops = { .suspend_noirq = hcd_pci_suspend_noirq, .resume_noirq = hcd_pci_resume_noirq, .resume = hcd_pci_resume, - .freeze = check_root_hub_suspended, + .freeze = hcd_pci_suspend, .freeze_noirq = check_root_hub_suspended, .thaw_noirq = NULL, - .thaw = NULL, + .thaw = hcd_pci_resume, .poweroff = hcd_pci_suspend, .poweroff_noirq = hcd_pci_suspend_noirq, .restore_noirq = hcd_pci_resume_noirq, -- 2.35.1