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 B9C2EC43334 for ; Tue, 21 Jun 2022 21:02:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355653AbiFUVCy (ORCPT ); Tue, 21 Jun 2022 17:02:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356094AbiFUU7Z (ORCPT ); Tue, 21 Jun 2022 16:59:25 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 478B533A3C; Tue, 21 Jun 2022 13:52:13 -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 9F47FB81B62; Tue, 21 Jun 2022 20:51:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0A37C341C6; Tue, 21 Jun 2022 20:51:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655844684; bh=xHg3h5H+TOg6s2pFatFWDTT4oQQcZqByOQG2eDgawcs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g9uTSUooM6qAOdnubIECmY7BRPCrnqa1HoPNVJo7F1TE+39TryAjDMD2N6mH84DrF C6Cw1uLTrGaH1r8z1wkBB2qw6aAMzEkWeW+xzY7euoWnyYVp+8ornRWzLLIO1JG424 i5Hu1Amg4kNaFujOQPkI+tBCLwe7YSzluITeCEPoPTL5w2tf2JX4J7cwTQ1gXr30ba xl0QBpK7DTWrVJjZ4hcjqePy+OdRpsXZXcE4BZTtMaT8pe4m4tNsQrKvaNdR7sFiXI T5eOk18od5QaBZo6k3MvVRZqmF1Ys1uj/ceH9t9q8NVO3nSTR2TWEuj2VupIsx7xfO 81N1lbKqLVIww== 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 5.4 3/7] mei: me: set internal pg flag to off on hardware reset Date: Tue, 21 Jun 2022 16:51:15 -0400 Message-Id: <20220621205120.250779-3-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220621205120.250779-1-sashal@kernel.org> References: <20220621205120.250779-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 c4f6991d3028..2342eae2e9f2 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