From patchwork Sat May 16 07:18:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 48594 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BBED62121F for ; Sat, 16 May 2015 08:42:39 +0000 (UTC) Received: by wizk4 with SMTP id k4sf5002000wiz.2 for ; Sat, 16 May 2015 01:42:39 -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=/H+2o1NyFyxsoxvQYS2QwmV2DmvfusyRQpsdNX1Nf7g=; b=HQmm515pPgpz+HzRPp+TgCL7CgLGEquhReMCMs2htj5g72LUJtJDECxIwwZmMAMvlD PARE4q68JZ8PO8olMgq7zy5zeSrBL4PxnXFZsxOlK3I+e+SCyTOysikOTWbtYTyoXhwh lbakeYo+XHnwAPfT9rHEHu/7pydW6wlBDYJOogS2zxfibolPQBII8k7oirzSFLbB8iHp uhY0SsPj+yoeWg33KSpBINAmgcd5gtl2/qMdiiTtm9/WKpD0aHwORuLYvfSaiY72Py4v TbV27kOHKN9y+R3v/7t9QE/ENZKgDDkmqAMcHwAuWkci0JTm1tydsKDyZTrzMZiAZUXk Ou4w== X-Gm-Message-State: ALoCoQkfEGbzkSHMuakZfoE4gDCmtZqViNLfSXYIwMA33RMAVbTSyD+oA6z/dkTz/fCquZBFpvM2 X-Received: by 10.180.106.10 with SMTP id gq10mr2193797wib.0.1431765759031; Sat, 16 May 2015 01:42:39 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.231 with SMTP id i7ls556680lae.85.gmail; Sat, 16 May 2015 01:42:38 -0700 (PDT) X-Received: by 10.112.54.225 with SMTP id m1mr10334856lbp.34.1431765758901; Sat, 16 May 2015 01:42:38 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id ac10si2650386lbc.134.2015.05.16.01.42.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 May 2015 01:42:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lagv1 with SMTP id v1so154236209lag.3 for ; Sat, 16 May 2015 01:42:38 -0700 (PDT) X-Received: by 10.112.140.231 with SMTP id rj7mr10021352lbb.76.1431765758298; Sat, 16 May 2015 01:42:38 -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 hn6csp2574302lbb; Sat, 16 May 2015 01:42:37 -0700 (PDT) X-Received: by 10.69.25.41 with SMTP id in9mr25699882pbd.80.1431765756314; Sat, 16 May 2015 01:42:36 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sa6si6243314pbb.125.2015.05.16.01.42.35; Sat, 16 May 2015 01:42:36 -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 S2992991AbbEPITq (ORCPT + 2 others); Sat, 16 May 2015 04:19:46 -0400 Received: from bband-dyn183.178-41-215.t-com.sk ([178.41.215.183]:22951 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2992888AbbEPITo (ORCPT ); Sat, 16 May 2015 04:19:44 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1YtWNA-0004th-7g; Sat, 16 May 2015 09:19:00 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: Grygorii Strashko , Ulf Hansson , Jiri Slaby Subject: [patch added to the 3.12 stable tree] mmc: core: add missing pm event in mmc_pm_notify to fix hib restore Date: Sat, 16 May 2015 09:18:53 +0200 Message-Id: <1431760739-18709-16-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.3.7 In-Reply-To: <1431760739-18709-1-git-send-email-jslaby@suse.cz> References: <1431760739-18709-1-git-send-email-jslaby@suse.cz> 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.46 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.12 stable tree. If you have any objections, please let us know. =============== commit 184af16b09360d6273fd6160e6ff7f8e2482ef23 upstream. 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: Jiri Slaby --- 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 bf18b6bfce48..e743d3984d29 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2694,6 +2694,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);