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 X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45AA5C43381 for ; Mon, 25 Feb 2019 21:49:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 02FC02083D for ; Mon, 25 Feb 2019 21:49:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551131394; bh=94fiyagb8cGolmq5ydDpZMwlq9rk8h/0fTnSncwDWmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K1lCwjVz5y/GV7m/HID74hvb7gQtbuWSRnJ7GUtrn3M+q64pH8/T6MiQl0sJYFDsD T61UybOuV/IaoL9SMTS1adRVQJrO5zKUa0vvhxm7L9wHv8gQLiSP0TXA8ANw1+ROCa Y5tJSmfwUXEUAvYs3SaFInLn+tf0bnx6Jj++pDZM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731366AbfBYVZO (ORCPT ); Mon, 25 Feb 2019 16:25:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:59582 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731337AbfBYVZE (ORCPT ); Mon, 25 Feb 2019 16:25:04 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4251620C01; Mon, 25 Feb 2019 21:25:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551129903; bh=94fiyagb8cGolmq5ydDpZMwlq9rk8h/0fTnSncwDWmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WxdwXH0+QKgrqcbLEhsg6SFSZ8zl8hYoJ2lUvDnmM5G/irighz3OtvbgwCpj26u39 D2OhYCzdhdnRpwLfMZG7N4Xe7r8zVk5ipigKaFmgiXvb9bz5Zhju/VvMtcEK69SfbN YFkNZ7ljAnv58JCL5pmE/VvavGAdTOKr41UoKrcI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stanley Chu , Avri Altman , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.19 067/152] scsi: ufs: Fix system suspend status Date: Mon, 25 Feb 2019 22:10:59 +0100 Message-Id: <20190225195047.955849125@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195043.645958524@linuxfoundation.org> References: <20190225195043.645958524@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit ce9e7bce43526626f7cffe2e657953997870197e ] hba->is_sys_suspended is set after successful system suspend but not clear after successful system resume. According to current behavior, hba->is_sys_suspended will not be set if host is runtime-suspended but not system-suspended. Thus we shall aligh the same policy: clear this flag even if host remains runtime-suspended after ufshcd_system_resume is successfully returned. Simply fix this flag to correct host status logs. Signed-off-by: Stanley Chu Reviewed-by: Avri Altman Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufshcd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 12ddb5928a738..6e80dfe4fa979 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7768,6 +7768,8 @@ int ufshcd_system_resume(struct ufs_hba *hba) trace_ufshcd_system_resume(dev_name(hba->dev), ret, ktime_to_us(ktime_sub(ktime_get(), start)), hba->curr_dev_pwr_mode, hba->uic_link_state); + if (!ret) + hba->is_sys_suspended = false; return ret; } EXPORT_SYMBOL(ufshcd_system_resume); -- 2.19.1