From patchwork Mon Aug 6 07:24:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Behme X-Patchwork-Id: 1277041 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D8534DFF71 for ; Mon, 6 Aug 2012 07:25:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753112Ab2HFHZm (ORCPT ); Mon, 6 Aug 2012 03:25:42 -0400 Received: from smtp2-v.fe.bosch.de ([139.15.237.6]:41009 "EHLO smtp2-v.fe.bosch.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753024Ab2HFHZL (ORCPT ); Mon, 6 Aug 2012 03:25:11 -0400 Received: from vsmta14.fe.internet.bosch.com (unknown [10.4.98.30]) by imta24.fe.bosch.de (Postfix) with ESMTP id 55E92B001FF; Mon, 6 Aug 2012 09:25:10 +0200 (CEST) Received: from localhost (vsgw1.fe.internet.bosch.com [10.4.98.15]) by vsmta14.fe.internet.bosch.com (Postfix) with SMTP id 308441B40499; Mon, 6 Aug 2012 09:25:10 +0200 (CEST) Received: from SI-HUB1000.de.bosch.com (10.4.103.106) by si-hub03.de.bosch.com (10.3.144.92) with Microsoft SMTP Server (TLS) id 8.3.264.0; Mon, 6 Aug 2012 09:25:03 +0200 Received: from hi-z5661.hi.de.bosch.com (10.34.219.178) by SI-HUB1000.de.bosch.com (10.4.103.106) with Microsoft SMTP Server id 14.2.309.2; Mon, 6 Aug 2012 09:25:02 +0200 Received: from localhost.localdomain (localhost [127.0.0.1]) by hi-z5661.hi.de.bosch.com (Postfix) with ESMTP id B36BE40BAE; Mon, 6 Aug 2012 09:25:02 +0200 (CEST) From: Dirk Behme To: CC: , , Dirk Behme , Jassi Brar , Chris Ball Subject: [PATCH 1/2] mmc: block: mmcblkN: use slot index instead of dynamic name index Date: Mon, 6 Aug 2012 09:24:59 +0200 Message-ID: <1344237900-14815-1-git-send-email-dirk.behme@de.bosch.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org On embedded devices, often there is a combination of removable mmc devices (e.g. MMC/SD cards) and hard wired ones (e.g. eMMC). Depending on the hardware configuration, the 'mmcblkN' node might change if the removable device is available or not at boot time. E.g. if the removable device is attached at boot time, it might become mmxblk0. And the hard wired one mmcblk1. But if the removable device isn't there at boot time, the hard wired one will become mmcblk0. This makes it somehow difficult to hard code the root device to the non-removable device and boot fast. This change does simply associate 'N' of 'mmcblkN' with the slot index instead of the dynamic name index. The slot index is always the same, ensuring that the non-removable mmc device is associated always with the same mmcblkN. Independent of the availability of the removable one. This issue has a long history. One prominent one is e.g. from the Maemo based Nokia N810 device: https://bugs.maemo.org/show_bug.cgi?id=2747 Signed-off-by: Dirk Behme CC: Jassi Brar CC: Chris Ball --- drivers/mmc/card/block.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index f1c84de..a01d306 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1517,7 +1517,7 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, */ snprintf(md->disk->disk_name, sizeof(md->disk->disk_name), - "mmcblk%d%s", md->name_idx, subname ? subname : ""); + "mmcblk%d%s", card->host->index, subname ? subname : ""); if (mmc_card_mmc(card)) blk_queue_logical_block_size(md->queue.queue,