From patchwork Tue Jan 24 10:17:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 92323 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp1624330obz; Tue, 24 Jan 2017 02:18:22 -0800 (PST) X-Received: by 10.84.179.99 with SMTP id a90mr9676769plc.139.1485253102290; Tue, 24 Jan 2017 02:18:22 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m1si7259622pfb.261.2017.01.24.02.18.22; Tue, 24 Jan 2017 02:18:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750954AbdAXKSV (ORCPT + 5 others); Tue, 24 Jan 2017 05:18:21 -0500 Received: from mail-lf0-f50.google.com ([209.85.215.50]:35499 "EHLO mail-lf0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750945AbdAXKSU (ORCPT ); Tue, 24 Jan 2017 05:18:20 -0500 Received: by mail-lf0-f50.google.com with SMTP id n124so107881650lfd.2 for ; Tue, 24 Jan 2017 02:18:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TLG/8Sbek+9PqeabAok0kUevFGjbn1kN0evrnvSBmGM=; b=Sj1Fa97MtObMn5SZ5jH0GdcpWEA4rTHFTNOCufzFaaxgFyf6hpTi70XEP/1A+OSPi5 xCvTWdK+VZ2P4EOt0/L2+lX9JiPFEJWe6NoxbN7rEwofvzvN5puYbcZYpQ+870rSSet0 rHJTBBLA0TIov51cNvUZpP698zrJk4LG3DoC4= 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; bh=TLG/8Sbek+9PqeabAok0kUevFGjbn1kN0evrnvSBmGM=; b=nfbVmN9FiT+EWQfu0XSNybgumhWt+/kRKbl4XQBLikXNegJ7MWBfqBllu1wD1RHO0U hjb+VzFKdJzK/S6GwnHhQ/smW8ASbP76lwpP543zy2YiD+VpEYbgmfJAuZuKJTT41ooc gyh0HhxgUOqxYSLQ1otsX+v5hBuL3xF1evTDHJr95UKQMAzIG0ueagJ+dykV2j5aRz7Z 8IZiwRkILldPNRJXJvZYeoLu9M2b0rJ9ildP8WXeo3yVG0crEyh9VOc/YZ3i2Ge91+uW PRBKe0rDiPu8cES1ivQqMSp75B3GArU8j8l4abXpYO9Cxgm8I5WKE3K6lpYthnS8D5Ig mubQ== X-Gm-Message-State: AIkVDXL5Xbi+FxwJeBnYi3FO2hDEnxMLPj2taIPuVksg1yj+bxA8MuvnBdTF+2+pvZ8snnxe X-Received: by 10.25.104.20 with SMTP id d20mr10802715lfc.108.1485253098571; Tue, 24 Jan 2017 02:18:18 -0800 (PST) Received: from gnarp.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id o91sm7410797lfg.17.2017.01.24.02.18.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 02:18:17 -0800 (PST) From: Linus Walleij To: linux-mmc@vger.kernel.org, linux-block@vger.kernel.org, Ulf Hansson Cc: Chunyan Zhang , Baolin Wang , Paolo Valente , Linus Walleij Subject: [PATCH 4/6] mmc: block: inline command abortions Date: Tue, 24 Jan 2017 11:17:55 +0100 Message-Id: <20170124101757.19676-5-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170124101757.19676-1-linus.walleij@linaro.org> References: <20170124101757.19676-1-linus.walleij@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Setting rqc to NULL followed by a goto to cmd_abort is just a way to do unconditional abort without starting any new command. Inline the calls to mmc_blk_rw_cmd_abort() and return immediately in those cases. As a result, mmc_blk_rw_start_new() is not called with NULL requests, and we can remove the NULL check in the beginning of this function. Add some comments to the code flow so it is clear that this is where the asynchronous requests come back in and the result of them gets handled. Signed-off-by: Linus Walleij --- drivers/mmc/core/block.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 13e6fe060f26..4bbb3d16c09b 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1612,9 +1612,6 @@ static void mmc_blk_rw_cmd_abort(struct mmc_card *card, struct request *req) static void mmc_blk_rw_start_new(struct mmc_queue *mq, struct mmc_card *card, struct request *req) { - if (!req) - return; - if (mmc_card_removed(card)) { req->rq_flags |= RQF_QUIET; blk_end_request_all(req, -EIO); @@ -1649,9 +1646,8 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) !IS_ALIGNED(blk_rq_sectors(rqc), 8)) { pr_err("%s: Transfer size is not 4KB sector size aligned\n", rqc->rq_disk->disk_name); - req = rqc; - rqc = NULL; - goto cmd_abort; + mmc_blk_rw_cmd_abort(card, rqc); + return 0; } mmc_blk_rw_rq_prep(mq->mqrq_cur, card, 0, mq); @@ -1660,11 +1656,20 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) areq = NULL; areq = mmc_start_req(card->host, areq, &status); if (!areq) { + /* + * We have just put the first request into the pipeline + * and there is nothing more to do until it is + * complete. + */ if (status == MMC_BLK_NEW_REQUEST) mq->flags |= MMC_QUEUE_NEW_REQUEST; return 0; } + /* + * An asynchronous request has been completed and we proceed + * to handle the result of it. + */ mq_rq = container_of(areq, struct mmc_queue_req, mmc_active); brq = &mq_rq->brq; req = mq_rq->req; @@ -1691,8 +1696,8 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) pr_err("%s BUG rq_tot %d d_xfer %d\n", __func__, blk_rq_bytes(req), brq->data.bytes_xfered); - rqc = NULL; - goto cmd_abort; + mmc_blk_rw_cmd_abort(card, req); + return 0; } break; case MMC_BLK_CMD_ERR: