From patchwork Wed Aug 18 00:55:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 12442441 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF1B9C19F37 for ; Wed, 18 Aug 2021 00:57:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C3AA661059 for ; Wed, 18 Aug 2021 00:57:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237273AbhHRA5s (ORCPT ); Tue, 17 Aug 2021 20:57:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237271AbhHRA5s (ORCPT ); Tue, 17 Aug 2021 20:57:48 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35772C061764; Tue, 17 Aug 2021 17:57:14 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id u22so820649lfq.13; Tue, 17 Aug 2021 17:57:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s3Vv60zrqT++YyiYanL+6/G2oO/cuU/RaWrweHuPjcg=; b=fx+/BJFxPb5FnS0XPHkrkv8GVMf2mOUi2DX/ZOp9mE+mBJfi1il7r7xzdcrzQcJErD ROVIOZzuKcqX+nctTE9qrOESpTFo8b3pcwW/VvgE/pV9fMgULYa0fhp//bQaxAgRaRUm pW99AJCDDxASyFMVGuI/rX7hgqTv2O7PPmKfvZt0rzh930kwwXXe9jdIZlUPpYF/KIOh vLxVo0P7rZPKJgqq6MjlVK+cITNLWLRYUzKFeMSpFvb5iXKFWRf+SGQF6fBf9SQgBhrN xZoedh3A3vXvUSQ1r9cUxrhAzOogpENZxaPE9IemX+aeAYH/5Sqdmzi19RnUxilEyYrC W0Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s3Vv60zrqT++YyiYanL+6/G2oO/cuU/RaWrweHuPjcg=; b=nMtUMJ/qPZCeOPQ7FtI4uwSsXi5GaXFacDgiByXGdj3dXJgnU/pGAEQ5HVp0yPwNSf QpWLQwMRaoXYmu48DnwL/3yJSC+1iuPV7tjYirtB6r2VcRAoYzSkI62gsdg5+ks18sEx k5dqPF4mXAHLRgdQ6xXpT6szTB4tM7rvQ20irdsel0gJOHwokITvAF1eqEYmbtWO7Bmm 8/rTwWzFloKVAbTOM8GAzVtvCKOqkkG5ypormsmEx6gx3HhIHbceQUS3TPhW43sg5ysN 009s8YGsWDwMKjrdhNkmVL85cG/8sf2dfELdkbg6sJTC//Oc5+V57e4m7DrRoUP3ZwGj APkg== X-Gm-Message-State: AOAM531Zu1rz62/B83Bxj2r1U1ZgfV6PLlPeP66IfBG5uX0DE03a7T2P PAemry+tzmOe/hAH0zl9Y7o= X-Google-Smtp-Source: ABdhPJzGr9MXh4M2KzMSknIcRtkfl6GPJENUJYuGpo5rcW+TJEEkwmuLAGPRbIWoz6PPUsXtY3+p3w== X-Received: by 2002:a05:6512:3b85:: with SMTP id g5mr4226680lfv.249.1629248232607; Tue, 17 Aug 2021 17:57:12 -0700 (PDT) Received: from localhost.localdomain (46-138-85-91.dynamic.spd-mgts.ru. [46.138.85.91]) by smtp.gmail.com with ESMTPSA id h19sm335879lfu.138.2021.08.17.17.57.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Aug 2021 17:57:12 -0700 (PDT) From: Dmitry Osipenko To: Jens Axboe , Thierry Reding , Jonathan Hunter , =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= , David Heidelberg , Peter Geis , Ulf Hansson , Adrian Hunter , Christoph Hellwig , Davidlohr Bueso , Rob Herring , Ion Agorria , Svyatoslav Ryhel Cc: linux-tegra@vger.kernel.org, linux-block@vger.kernel.org, linux-efi Subject: [PATCH v5 2/5] mmc: block: Support alternative_gpt_sector() operation Date: Wed, 18 Aug 2021 03:55:44 +0300 Message-Id: <20210818005547.14497-3-digetx@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210818005547.14497-1-digetx@gmail.com> References: <20210818005547.14497-1-digetx@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Support generic alternative_gpt_sector() block device operation by invoking a new platform-specific MMC host hook that is also named alternative_gpt_sector(). Signed-off-by: Dmitry Osipenko --- drivers/mmc/core/block.c | 30 ++++++++++++++++++++++++++++++ include/linux/mmc/host.h | 4 ++++ 2 files changed, 34 insertions(+) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 672cc505ce37..8ad1841f0dbd 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -178,6 +178,7 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, int disable_multi, struct mmc_queue *mq); static void mmc_blk_hsq_req_done(struct mmc_request *mrq); +static struct mmc_card *mmc_bdev_to_card(struct block_device *bdev); static struct mmc_blk_data *mmc_blk_get(struct gendisk *disk) { @@ -801,6 +802,20 @@ static int mmc_blk_compat_ioctl(struct block_device *bdev, fmode_t mode, } #endif +static int mmc_blk_alternative_gpt_sector(struct block_device *bdev, + sector_t *sector) +{ + struct mmc_card *card = mmc_bdev_to_card(bdev); + + if (!card) + return -ENODEV; + + if (!card->host->ops->alternative_gpt_sector) + return -EOPNOTSUPP; + + return card->host->ops->alternative_gpt_sector(card, sector); +} + static const struct block_device_operations mmc_bdops = { .open = mmc_blk_open, .release = mmc_blk_release, @@ -810,8 +825,23 @@ static const struct block_device_operations mmc_bdops = { #ifdef CONFIG_COMPAT .compat_ioctl = mmc_blk_compat_ioctl, #endif + .alternative_gpt_sector = mmc_blk_alternative_gpt_sector, }; +static struct mmc_card *mmc_bdev_to_card(struct block_device *bdev) +{ + struct mmc_blk_data *md; + + if (bdev->bd_disk->fops != &mmc_bdops) + return NULL; + + md = mmc_blk_get(bdev->bd_disk); + if (!md) + return NULL; + + return md->queue.card; +} + static int mmc_blk_part_switch_pre(struct mmc_card *card, unsigned int part_type) { diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 0abd47e9ef9b..18281c444bf6 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -190,6 +190,10 @@ struct mmc_host_ops { /* Initialize an SD express card, mandatory for MMC_CAP2_SD_EXP. */ int (*init_sd_express)(struct mmc_host *host, struct mmc_ios *ios); + + /* Get platform-specific GPT entry location */ + int (*alternative_gpt_sector)(struct mmc_card *card, + sector_t *sector); }; struct mmc_cqe_ops {