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 87E5CC433EF for ; Tue, 21 Jun 2022 21:02:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355641AbiFUVCa (ORCPT ); Tue, 21 Jun 2022 17:02:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355843AbiFUU7F (ORCPT ); Tue, 21 Jun 2022 16:59:05 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5285833352; Tue, 21 Jun 2022 13:51:45 -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 ams.source.kernel.org (Postfix) with ESMTPS id CD285B81B2F; Tue, 21 Jun 2022 20:51:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A9B7C341C8; Tue, 21 Jun 2022 20:51:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655844703; bh=bd/KPa0a6+0M9iaMh9nwFkxRjg/cFio+lqQpyCG3vKM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y6tlb92YL5gVdbOT6pTN72Oe2JT5lQvCzDbozjj4iTihht9NUQ6+0kT+gEht+rkd0 B+6hcduPIECvRCUyI3adWr2AV90OVa6d/PcOmw7/9y7mAT1YjXaF+X/dzE42NmXchB Y+udApNmUSs8cU1Co2N2+ve33SJRBlZfOswKndlTivGeiXnaQRxqJzdAhLuWia35VL 0jm8mDzULqEWIVMUVkEWcluMJv1LmWmofW7km/X17UoLCsYMMuaCGRMvyT4cwDqD0U dQSkRfed0cjTjGMnBMXukehEYH9iICczJqjG9/PkAZbXKskFeezZ0j1eIz75MNp3Dp dY5sM3VR3OGpA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexander Usyskin , Tomas Winkler , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL 4.14 2/5] mei: me: set internal pg flag to off on hardware reset Date: Tue, 21 Jun 2022 16:51:36 -0400 Message-Id: <20220621205140.250968-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220621205140.250968-1-sashal@kernel.org> References: <20220621205140.250968-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: Alexander Usyskin [ Upstream commit 9f4639373e6756e1ccf0029f861f1061db3c3616 ] Link reset flow is always performed in the runtime resumed state. The internal PG state may be left as ON after the suspend and will not be updated upon the resume if the D0i3 is not supported. Ensure that the internal PG state is set to the right value on the flow entrance in case the firmware does not support D0i3. Signed-off-by: Alexander Usyskin Signed-off-by: Tomas Winkler Link: https://lore.kernel.org/r/20220606144225.282375-1-tomas.winkler@intel.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/misc/mei/hw-me.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index 10dcf4ff99a5..7a708c58e435 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c @@ -1125,6 +1125,8 @@ static int mei_me_hw_reset(struct mei_device *dev, bool intr_enable) ret = mei_me_d0i3_exit_sync(dev); if (ret) return ret; + } else { + hw->pg_state = MEI_PG_OFF; } } -- 2.35.1