From patchwork Thu Apr 28 23:06:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Anderson X-Patchwork-Id: 8975831 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B1C889F1C1 for ; Thu, 28 Apr 2016 23:07:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C7C0420256 for ; Thu, 28 Apr 2016 23:07:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E50E220251 for ; Thu, 28 Apr 2016 23:07:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752765AbcD1XHg (ORCPT ); Thu, 28 Apr 2016 19:07:36 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:33758 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751722AbcD1XHe (ORCPT ); Thu, 28 Apr 2016 19:07:34 -0400 Received: by mail-pf0-f182.google.com with SMTP id 206so39970232pfu.0 for ; Thu, 28 Apr 2016 16:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dLIKvDqWY7ZV/eQgC5MknOeK5V2sLq4J4LaGV1+UPLM=; b=d0HPjmVOrnp8ShghoVxwYYrQnNlBzvOPDLPF9yItliarByQ6ye0M1X7UNke4Z/Rt8a GnpzJSdBoHP5uXzhQfFWkoIJXEsRTvMX/tI6x51xQtaH+dFASC2O1Yow0H40IIqgPPvr M0iOD1+QmR8WpUYYmZbWa/FvHfomODIi6RAcQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dLIKvDqWY7ZV/eQgC5MknOeK5V2sLq4J4LaGV1+UPLM=; b=MA5i1sKRuARuF8ipmOiVX5KudDIZt50GKQrvWOwRisxqrUqMPoCqi2xBnp9bV1viXY WsNQxh8E1LluDrealxNkoQF8+9dFstdT1qUYvKt76vI/qRH/5U18J4PWEUSVDpNRvTQs wxLSoKYUYOkpPkiHEWh9fhBOGCS5qX12sMj8D8psQodzJl0r7RF0XxQgoXq1H67j7xcM lKSsn5c+gZokoR0hVqN/P71xjLLhr50y+GLt07dvBGM9r6szRFdVldTJd0GhSVBoy6X+ 6cw4S4ypixpCLAxYGvuFXplHmhal/6L/MNnwO8GpPz7ejY0tjBJN0WbhhQgZ/YJD5JjW Ju8w== X-Gm-Message-State: AOPr4FVdaB21WWfjYOKqlS5K1oVgLkwCTOtlZk1ZvzCB9JwKvntVPS1B44LxoAOndv857Q== X-Received: by 10.98.46.71 with SMTP id u68mr24789857pfu.136.1461884854089; Thu, 28 Apr 2016 16:07:34 -0700 (PDT) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by smtp.gmail.com with ESMTPSA id lg8sm103564pab.48.2016.04.28.16.07.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Apr 2016 16:07:33 -0700 (PDT) From: Douglas Anderson To: ulf.hansson@linaro.org, jh80.chung@samsung.com Cc: shawn.lin@rock-chips.com, adrian.hunter@intel.com, stefan@agner.ch, linux-mmc@vger.kernel.org, computersforpeace@gmail.com, dmitry.torokhov@gmail.com, Dmitry Torokhov , Douglas Anderson , vbyravarasu@nvidia.com, huangtao@rock-chips.com, lars@metafoo.de, sergei.shtylyov@cogentembedded.com, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] mmc: read mmc alias from device tree Date: Thu, 28 Apr 2016 16:06:44 -0700 Message-Id: <1461884805-29466-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1461884805-29466-1-git-send-email-dianders@chromium.org> References: <1461884805-29466-1-git-send-email-dianders@chromium.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Stefan Agner To get the SD/MMC host device ID, read the alias from the device tree. This is useful in case a SoC has multipe SD/MMC host controllers while the second controller should logically be the first device (e.g. if the second controller is connected to an internal eMMC). Combined with block device numbering using MMC/SD host device ID, this results in predictable name assignment of the internal eMMC block device. Signed-off-by: Stefan Agner Signed-off-by: Dmitry Torokhov [dianders: rebase + roll in http://crosreview.com/259916] Signed-off-by: Douglas Anderson --- drivers/mmc/core/host.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 71bb2372f71d..7ecb6a6351b3 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -321,8 +321,8 @@ EXPORT_SYMBOL(mmc_of_parse); */ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) { - int err; struct mmc_host *host; + int of_id = -1, id = -1; host = kzalloc(sizeof(struct mmc_host) + extra, GFP_KERNEL); if (!host) @@ -330,14 +330,29 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) /* scanning will be enabled when we're ready */ host->rescan_disable = 1; + + if (dev->of_node) + of_id = of_alias_get_id(dev->of_node, "mmc"); + idr_preload(GFP_KERNEL); spin_lock(&mmc_host_lock); - err = idr_alloc(&mmc_host_idr, host, 0, 0, GFP_NOWAIT); - if (err >= 0) - host->index = err; + + if (of_id >= 0) { + id = idr_alloc(&mmc_host_idr, host, of_id, of_id + 1, + GFP_NOWAIT); + if (id < 0) + dev_warn(dev, "/aliases ID %d not available\n", of_id); + } + + if (id < 0) + id = idr_alloc(&mmc_host_idr, host, 0, 0, GFP_NOWAIT); + + if (id >= 0) + host->index = id; + spin_unlock(&mmc_host_lock); idr_preload_end(); - if (err < 0) { + if (id < 0) { kfree(host); return NULL; }