From patchwork Tue May 26 13:01:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 48991 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3CE9520294 for ; Tue, 26 May 2015 14:56:47 +0000 (UTC) Received: by wixv7 with SMTP id v7sf22434140wix.0 for ; Tue, 26 May 2015 07:56:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=E6LnHyblPOsKpX8S3X5YXGBjNZbNyUCg7LNFDxd3CAg=; b=jj5wd2qCg5UCYIJ4aENQ/msml0PNTkp2Jz374eFbTh8QQMYlezyiG6r5K5gZaPUZoA Q/uHYp85Mcy/uiCb0nAN1eyrbw5qKfdwbJ1bnR6e7DmnzXeZuYukIjsLLvfGeo4ArBQ4 ZLGzE1KdjpWFcfYeE1T1kZMelO+KAvVjMKzgFSIu7zwc5AQ+leTAXIQyNHxkX+x4liaL pOuBujb+sZgD2f2C6yseK4DtLmTZfJDOmmXAnT60l9zjPbV53D837NMcXBbd/ObcmjeG T5/A7GD5/mNka4r3yMa1aYeRUA3Z94Dz8VhH4rokDCmBeF7UhEyOqO0QlvNASfxVSSvX SRHg== X-Gm-Message-State: ALoCoQn//UE06fJXvI0uOXswObTc+ahGcu9Mcx++dqFa/ZkXnI7lrC46vpi3z6Hmx9DhTnDVlR1c X-Received: by 10.152.37.101 with SMTP id x5mr27756720laj.5.1432652206304; Tue, 26 May 2015 07:56:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.171 with SMTP id az11ls919473lab.107.gmail; Tue, 26 May 2015 07:56:46 -0700 (PDT) X-Received: by 10.152.21.136 with SMTP id v8mr23271162lae.19.1432652206175; Tue, 26 May 2015 07:56:46 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id h1si11158380lae.45.2015.05.26.07.56.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2015 07:56:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by lagv1 with SMTP id v1so69625701lag.3 for ; Tue, 26 May 2015 07:56:45 -0700 (PDT) X-Received: by 10.112.234.200 with SMTP id ug8mr22535969lbc.117.1432652205861; Tue, 26 May 2015 07:56:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2608094lbb; Tue, 26 May 2015 07:56:44 -0700 (PDT) X-Received: by 10.66.235.200 with SMTP id uo8mr49811562pac.18.1432652203943; Tue, 26 May 2015 07:56:43 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bi13si21367559pdb.40.2015.05.26.07.56.42; Tue, 26 May 2015 07:56:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753573AbbEZO43 (ORCPT + 2 others); Tue, 26 May 2015 10:56:29 -0400 Received: from aserp1050.oracle.com ([141.146.126.70]:33321 "EHLO aserp1050.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752338AbbEZO42 (ORCPT ); Tue, 26 May 2015 10:56:28 -0400 Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) by aserp1050.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t4QD3U62015820 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 May 2015 13:03:30 GMT Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t4QD2WsJ027716 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 26 May 2015 13:02:32 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t4QD2Wuj019684 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 26 May 2015 13:02:32 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id t4QD2VXV000472; Tue, 26 May 2015 13:02:31 GMT Received: from lappy.hsd1.nh.comcast.net (/10.154.191.32) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 26 May 2015 06:02:31 -0700 From: Sasha Levin To: stable@vger.kernel.org, stable-commits@vger.kernel.org Cc: Grygorii Strashko , Ulf Hansson , Sasha Levin Subject: [added to the 3.18 stable tree] mmc: core: add missing pm event in mmc_pm_notify to fix hib restore Date: Tue, 26 May 2015 09:01:25 -0400 Message-Id: <1432645294-9185-42-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1432645294-9185-1-git-send-email-sasha.levin@oracle.com> References: <1432645294-9185-1-git-send-email-sasha.levin@oracle.com> X-Source-IP: aserp1040.oracle.com [141.146.126.69] Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Grygorii Strashko This patch has been added to the 3.18 stable tree. If you have any objections, please let us know. =============== [ Upstream commit 184af16b09360d6273fd6160e6ff7f8e2482ef23 ] The PM_RESTORE_PREPARE is not handled now in mmc_pm_notify(), as result mmc_rescan() could be scheduled and executed at late hibernation restore stages when MMC device is suspended already - which, in turn, will lead to system crash on TI dra7-evm board: WARNING: CPU: 0 PID: 3188 at drivers/bus/omap_l3_noc.c:148 l3_interrupt_handler+0x258/0x374() 44000000.ocp:L3 Custom Error: MASTER MPU TARGET L4_PER1_P3 (Idle): Data Access in User mode during Functional access Hence, add missed PM_RESTORE_PREPARE PM event in mmc_pm_notify(). Fixes: 4c2ef25fe0b8 (mmc: fix all hangs related to mmc/sd card...) Signed-off-by: Grygorii Strashko Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/core/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index f26a5f1..297b4f9 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2615,6 +2615,7 @@ int mmc_pm_notify(struct notifier_block *notify_block, switch (mode) { case PM_HIBERNATION_PREPARE: case PM_SUSPEND_PREPARE: + case PM_RESTORE_PREPARE: spin_lock_irqsave(&host->lock, flags); host->rescan_disable = 1; spin_unlock_irqrestore(&host->lock, flags);