From patchwork Wed Aug 19 15:30:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schiffer X-Patchwork-Id: 11724505 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B6EBE739 for ; Wed, 19 Aug 2020 15:30:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 97A4C20885 for ; Wed, 19 Aug 2020 15:30:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.b="OycrMALr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726751AbgHSPao (ORCPT ); Wed, 19 Aug 2020 11:30:44 -0400 Received: from mx1.tq-group.com ([62.157.118.193]:50250 "EHLO mx1.tq-group.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726570AbgHSPao (ORCPT ); Wed, 19 Aug 2020 11:30:44 -0400 IronPort-SDR: oFZJ1H6ZcItnLIZshHTl77Xx9dkifph+pmlUEKxjSYWtI35Yn2Nm06TwYsgPgysmD8AMpABAuy b8j0cMrnPTaRGE0ncDb4yr9O+mVqgc7lFQ51WPUU5kbFXpVWUdQ92bxPlRg/bKzty9aXF/VyQd JfUs/sP89W2G6kgqgGG8ms6Q01SmiNazlNjO9cfTGHTAzhM08YX8jdOp+RXU5VqFcTq0WXmtxK E+2OoRMNM//JY3evYc1awThvT1+QokX43yCWUb70MA7qjivltq7xECgTo9MFBX6Pa558tkb84z A1I= X-IronPort-AV: E=Sophos;i="5.76,331,1592863200"; d="scan'208";a="13527450" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 19 Aug 2020 17:30:39 +0200 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Wed, 19 Aug 2020 17:30:39 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Wed, 19 Aug 2020 17:30:39 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1597851039; x=1629387039; h=from:to:cc:subject:date:message-id; bh=vBqZ0zGw5NluF+dYthXe4dg6vcsvfsa5wcIWZoz69is=; b=OycrMALrHBymYxz/YdXqBUuphGQf5lbpfgjJ+7V1uIpUqJTTK4jtE4cE 0AtxSuKdHlzTScKdKz67bDG5Gcb0IOVhGw3r9N4pu4enElE+GePn+Y7m6 vN19NHnsRVCFj4E05nghzHe3E+ViuQOOGt+gSiyjoPy1o8+nc7+UU+feY ikmYB9zTG/mvbUIVhejRYHVvix6jJtTKTU9JOijdoSP6mdNPV5M7T7RJj saujycP3rhpUcLXMi77eEOmqAx0Aw9FWl0mmf5VCqrWYEHjUZGPWR0gEm VylbkyQWJJPy11Jiq9EMy8GQaJQHpLqWgsPqIrZCHHI5sOSy7zW4so7rG w==; IronPort-SDR: v9eY0hlrS9CrFgkikDigBx9/f4cfFpnPzeCNKgdroeUAnaXggSgHVCM1B3X92CqbX+VIjdiyt+ yDUhYmJSIPORRfTMbvvyk8J8c1nUABzGOL+1o7m8pAw4Kg6SaPsfU0j+J7TLXNolgBJ6TTNRSl fESZxdyKOsUdbUYyWz+10V6cEsx1yI37sRzJYAXHZjJd1Yyu0C6RmcLI5XuAngwMb3G0kZlcWv K12TrZEIAJMu3e8STNPTPfWbRynzN+LaMkZPOsAafJGaoGsUMJy3vISQnWrfAu96a75vwviUQU vPE= X-IronPort-AV: E=Sophos;i="5.76,331,1592863200"; d="scan'208";a="13527449" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 19 Aug 2020 17:30:39 +0200 Received: from schifferm-ubuntu4.tq-net.de (schifferm-ubuntu4.tq-net.de [10.117.49.26]) by vtuxmail01.tq-net.de (Postfix) with ESMTPA id 373AC280065; Wed, 19 Aug 2020 17:30:39 +0200 (CEST) From: Matthias Schiffer To: Ulf Hansson Cc: Sascha Hauer , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Matthias Schiffer Subject: [PATCH mmc-next] mmc: allow setting slot index via device tree alias Date: Wed, 19 Aug 2020 17:30:28 +0200 Message-Id: <20200819153028.29721-1-matthias.schiffer@ew.tq-group.com> X-Mailer: git-send-email 2.17.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org As with GPIO, UART and others, allow specifying the device index via the aliases node in the device tree. On embedded devices, there is often a combination of removable (e.g. SD card) and non-removable MMC devices (e.g. eMMC). Therefore the index might change depending on * host of removable device * removable card present or not This makes it difficult to hardcode the root device, if it is on the non-removable device. E.g. if SD card is present eMMC will be mmcblk1, if SD card is not present at boot, eMMC will be mmcblk0. All indices defined in the aliases node will be reserved for use by the respective MMC device, moving the indices of devices that don't have an alias up into the non-reserved range. If the aliases node is not found, the driver will act as before. This is a rebased and slightly cleaned up version of https://www.spinics.net/lists/linux-mmc/msg26588.html . Based-on-patch-by: Sascha Hauer Signed-off-by: Matthias Schiffer Link: https://lkml.org/lkml/2020/8/5/194 Reported-by: kernel test robot --- drivers/mmc/core/block.c | 13 +++++++++++-- drivers/mmc/core/core.c | 38 ++++++++++++++++++++++++++++++++++++++ drivers/mmc/core/core.h | 3 +++ drivers/mmc/core/host.c | 15 +++++++++++++-- 4 files changed, 65 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 7896952de1ac..4620afaf0e50 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -2260,9 +2261,17 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, int area_type) { struct mmc_blk_data *md; - int devidx, ret; + int rsvidx, devidx = -1, ret; + + rsvidx = mmc_get_reserved_index(card->host); + if (rsvidx >= 0) + devidx = ida_simple_get(&mmc_blk_ida, rsvidx, rsvidx + 1, + GFP_KERNEL); + if (devidx < 0) + devidx = ida_simple_get(&mmc_blk_ida, + mmc_first_nonreserved_index(), + max_devices, GFP_KERNEL); - devidx = ida_simple_get(&mmc_blk_ida, 0, max_devices, GFP_KERNEL); if (devidx < 0) { /* * We get -ENOSPC because there are no more any available diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 8ccae6452b9c..39aca8adacd1 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2419,10 +2419,48 @@ void mmc_unregister_pm_notifier(struct mmc_host *host) } #endif +static int mmc_max_reserved_idx = -1; + +/** + * mmc_first_nonreserved_index() - get the first index that is not reserved + */ +int mmc_first_nonreserved_index(void) +{ + return mmc_max_reserved_idx + 1; +} + +/** + * mmc_get_reserved_index() - get the index reserved for this MMC host + * + * Returns: + * The index reserved for this host on success, + * negative error if no index is reserved for this host + */ +int mmc_get_reserved_index(struct mmc_host *host) +{ + return of_alias_get_id(host->parent->of_node, "mmc"); +} + +static void __init mmc_of_reserve_idx(void) +{ + int max; + + max = of_alias_get_highest_id("mmc"); + if (max < 0) + return; + + mmc_max_reserved_idx = max; + + pr_debug("MMC: reserving %d slots for OF aliases\n", + mmc_max_reserved_idx + 1); +} + static int __init mmc_init(void) { int ret; + mmc_of_reserve_idx(); + ret = mmc_register_bus(); if (ret) return ret; diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h index 575ac0257af2..6aef6cf4e90f 100644 --- a/drivers/mmc/core/core.h +++ b/drivers/mmc/core/core.h @@ -79,6 +79,9 @@ int mmc_attach_mmc(struct mmc_host *host); int mmc_attach_sd(struct mmc_host *host); int mmc_attach_sdio(struct mmc_host *host); +int mmc_first_nonreserved_index(void); +int mmc_get_reserved_index(struct mmc_host *host); + /* Module parameters */ extern bool use_spi_crc; diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index ce43f7573d80..386e15afde83 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -387,6 +387,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) { int err; struct mmc_host *host; + int alias_id, min_idx, max_idx; host = kzalloc(sizeof(struct mmc_host) + extra, GFP_KERNEL); if (!host) @@ -395,7 +396,18 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) /* scanning will be enabled when we're ready */ host->rescan_disable = 1; - err = ida_simple_get(&mmc_host_ida, 0, 0, GFP_KERNEL); + host->parent = dev; + + alias_id = mmc_get_reserved_index(host); + if (alias_id >= 0) { + min_idx = alias_id; + max_idx = alias_id + 1; + } else { + min_idx = mmc_first_nonreserved_index(); + max_idx = 0; + } + + err = ida_simple_get(&mmc_host_ida, min_idx, max_idx, GFP_KERNEL); if (err < 0) { kfree(host); return NULL; @@ -406,7 +418,6 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) dev_set_name(&host->class_dev, "mmc%d", host->index); host->ws = wakeup_source_register(NULL, dev_name(&host->class_dev)); - host->parent = dev; host->class_dev.parent = dev; host->class_dev.class = &mmc_host_class; device_initialize(&host->class_dev);