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 107F6CCA486 for ; Tue, 21 Jun 2022 21:05:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356362AbiFUVEI (ORCPT ); Tue, 21 Jun 2022 17:04:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356250AbiFUU7o (ORCPT ); Tue, 21 Jun 2022 16:59:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7949333A3D; Tue, 21 Jun 2022 13:52:32 -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 198456188D; Tue, 21 Jun 2022 20:51:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08818C36AE2; Tue, 21 Jun 2022 20:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655844694; bh=mgM1U4HzcvMMp0z+maQndZhe3LltKXwQl4NU4lVOCfY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WJHaki0PQhYVVI8Q+qF1U18MWesRGZUN9YQ8sYUF6DHgEATv03spF4jhwgQPsZmMt ogStxju23lKZLv5oG1uRyWA8FMxn3fn/4SVI8zMW7/gO5ajSc5dSJ8lQ2772Y2yx8V pBgV3cDefrGAivWPB+s0E1xRGyMrMjPL/O9PlY0ViBV7VCLfN39AlS5z5rxRJ2M+yZ NEMTYHMTHniapQ5mtWThEbOezSXbnT8hCXPZiwO8nteD/vWTbaqGCnSItBvbM6FPt/ Imy39wKZ7M4aMvko8O67KzpQbq0CKd82s1ROMQLRzdeM+EQwnr7Y5gRiELb1Vt4NM9 pVa5EnUK4CkaQ== 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.19 3/7] mei: me: set internal pg flag to off on hardware reset Date: Tue, 21 Jun 2022 16:51:25 -0400 Message-Id: <20220621205130.250874-3-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220621205130.250874-1-sashal@kernel.org> References: <20220621205130.250874-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 60c8c84181a9..ba12be7ec7df 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c @@ -1138,6 +1138,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