Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756614Ab3CNBGl (ORCPT ); Wed, 13 Mar 2013 21:06:41 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:33810 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755649Ab3CNBGj (ORCPT ); Wed, 13 Mar 2013 21:06:39 -0400 From: Sergey Yanovich To: Chris Ball Cc: Sergey Yanovich , Greg Kroah-Hartman , Ulf Hansson , Linus Walleij , Jaehoon Chung , Namjae Jeon , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [PATCH] wait while adding MMC host to ensure root mounts Date: Thu, 14 Mar 2013 05:06:23 +0400 Message-Id: <1363223183-3772-1-git-send-email-ynvich@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2367 Lines: 70 MMC hosts are added asynchronously. We need to wait until detect returns to avoid failed root filesystem mounts. ---8<--- VFS: Cannot open root device "mmcblk0p1" or unknown-block(0,0): error -6 Please append a correct "root=" boot option; here are the available partitions: mmc0: host does not support reading read-only switch. assuming write-enable. 1f00 256 mtdblock0 (driver?) 1f01 256 mtdblock1 (driver?) 1f02 2560 mtdblock2 mmc0: new SDHC card at address b368 (driver?) 1f03 29696 mtdblock3 (driver?) 1f04 16384 mtdblock4 mmcblk0: mmc0:b368 USD 3.72 GiB (driver?) mmcblk0: p1 b300 3910656 mmcblk0 driver: mmcblk b301 3906560 mmcblk0p1 00000000-01 Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0) ---8<--- Signed-off-by: Sergey Yanovich --- drivers/base/dd.c | 1 - drivers/mmc/core/core.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 218f1e6..61d3e1b 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -345,7 +345,6 @@ int driver_probe_done(void) void wait_for_device_probe(void) { /* wait for the known devices to complete their probing */ - wait_event(probe_waitqueue, atomic_read(&probe_count) == 0); async_synchronize_full(); } diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index aaed768..9790323 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -91,10 +91,11 @@ static int mmc_schedule_delayed_work(struct delayed_work *work, /* * Internal function. Flush all scheduled work from the MMC work queue. */ -static void mmc_flush_scheduled_work(void) +void mmc_flush_scheduled_work(void) { flush_workqueue(workqueue); } +EXPORT_SYMBOL(mmc_flush_scheduled_work); #ifdef CONFIG_FAIL_MMC_REQUEST @@ -2225,6 +2226,7 @@ void mmc_start_host(struct mmc_host *host) host->rescan_disable = 0; mmc_power_up(host); mmc_detect_change(host, 0); + mmc_flush_scheduled_work(); } void mmc_stop_host(struct mmc_host *host) -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/