From patchwork Fri Jul 2 13:42:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 469553 Delivered-To: patches@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp1400747jao; Fri, 2 Jul 2021 06:42:49 -0700 (PDT) X-Received: by 2002:a19:c706:: with SMTP id x6mr4019238lff.265.1625233369094; Fri, 02 Jul 2021 06:42:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625233369; cv=none; d=google.com; s=arc-20160816; b=zaNpEuyWHMmHCOdfZEy/RK96LlMW016+Bg+3H/pbNVxIcWtfYhz2dEVMRuw2O89miD Uaoz9wFyC0jPiPsfwUDzr5Oa4xWtOHLV4Gan0InEwGQ2vUUlKOtn3a8THN25AG+57Ngz GmKJQ4dkaAt2xnc6cIoacWV1tQ286E6pXogWJ+YHdAKJfQ7upJrQZgsfGMb/K7XsFiG/ j5FzLzDY5maPxSNMmS6xkSUdvGlwbkNbbmOcYtfiYDKXnEI/8lBgOVj0EKHZkqDJ6oCR E87ziRSTy23TnYii4ZT0ziF3HVNrsqSY/90THx0hHcizbeN2oevRYLNAAoGCgC4ygxO8 xKag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=u3UbKE7Xbmdhqfi5jFjBOgqg0YH0MVXVTmeGRno/rGo=; b=KTi8r39M1B/4xK1lh5dZxKqrzRD5hu/M4TYchr68NE935N5+TGuiJsADcbKIf7j+3o ZPJNgOBLQsyDPvSUk5gsQBBDXr0Yt9osJooinPuXoS0MIVbB564jLQVPzi7RFO4/nBU8 cE0FCCeWROI0PYgvNysFRnOwptITJu5klr+dA5dR39bkM69xmndoVj4seMaCgnOZSoBm SliwIh9HOYDA/LGB4CY62CQ7sjNCox4cvl84NoW4oioKIRtUgx/gYuHmwfFm9byh1+PT 1w2ZJCWzePViHEiMYTeSEFpVTkhuG+6GreybXd3WHCkiplo89bDbyQSL+NQpWJbEjSfh 6nBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nonR9oDG; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id j9sor1433184ljg.73.2021.07.02.06.42.48 for (Google Transport Security); Fri, 02 Jul 2021 06:42:49 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nonR9oDG; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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 :mime-version:content-transfer-encoding; bh=u3UbKE7Xbmdhqfi5jFjBOgqg0YH0MVXVTmeGRno/rGo=; b=nonR9oDGaUwZHLxPGUO7VPq0gAx71iFtzBCyEZsdo3PrQtXmxWmG9N4RTL1CD/cBas 24G0m29y4NqNUazzcpH2laPVeSh1Sq/NfSb9wwCiGipk7ks2T1AuuGWWlU3dY6m1yXS9 blwO9jElKTaFJ9SrBpB128eH4DdDxvbWeiDDROczpYjD786sVmpf0siLwxKqe81ev6H4 0hsT5q0aUPoHvt8LZrl/S37S2UtZEW3wGgDG4nprj4yAbuClr6rxaQDbWglOjOwT1tKe Lp+RfozgL8cenqU8kt01Njmgv0k9yLj4R4kESzx/8LCs3O0XHjsAznhODDHyKQpLM+yn tfnA== 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=u3UbKE7Xbmdhqfi5jFjBOgqg0YH0MVXVTmeGRno/rGo=; b=mWtwbu0v5oYrwaXEapj2upgP4IOEuJvEMkUhUL3Et42KxR1hfPWW7W15iShRorK/io x2wri1sttJFRyXqEUC5SPKZ04Abeo4Hve02yiGhLc0Swo63FoFKnu4fSLVexeaFhbkhL FRhV5Ndg92V3TnMN8IwS8qc9i+SpxNP1Opg87if9Fjf5q+jbqBQr2+8KROYOw8QgsIp+ 2hsCqchmv7v1Qt/HWn1+21KjZAP5NAP6fiybp0gnCpkmCeuEb5F1txLeat2dNuw9rmSA pNM0PrHmFWW6Sor67gbkKout4Iz8CfJJlbyMc4J5A4sQpOjYYynnGR3dAgEih8M0ZTAc p5Mg== X-Gm-Message-State: AOAM5339eIN8YpCa4hqwkC4KR+QZ+JyvieYCNuqDx1J7H4IXGRnXLiBl YrwfK0FTVkqMJC5KfglDVXAM9hh1 X-Google-Smtp-Source: ABdhPJyQXgCSbpp5kouEiFuJMVySK7ItUJ3kUJyLaC/nXtWIYudghZPPUp+yZp0lFiEVA6bd8/4ePg== X-Received: by 2002:a2e:a4ae:: with SMTP id g14mr4057839ljm.354.1625233368740; Fri, 02 Jul 2021 06:42:48 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-155-4-129-146.NA.cust.bahnhof.se. [155.4.129.146]) by smtp.gmail.com with ESMTPSA id u5sm277486lfg.268.2021.07.02.06.42.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jul 2021 06:42:47 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Adrian Hunter , Linus Walleij , Wolfram Sang , Shawn Lin , Christian Lohle , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] mmc: core: Avoid hogging the CPU while polling for busy after I/O writes Date: Fri, 2 Jul 2021 15:42:29 +0200 Message-Id: <20210702134229.357717-4-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210702134229.357717-1-ulf.hansson@linaro.org> References: <20210702134229.357717-1-ulf.hansson@linaro.org> MIME-Version: 1.0 When mmc_blk_card_busy() calls card_busy_detect() to poll for the card's state with CMD13, this is done without any delays in between the commands being sent. Rather than fixing card_busy_detect() in this regards, let's instead convert into using the common __mmc_poll_for_busy(), which also helps us to avoid open-coding. Signed-off-by: Ulf Hansson --- drivers/mmc/core/block.c | 69 ++++++++++++++++---------------------- drivers/mmc/core/mmc_ops.c | 1 + 2 files changed, 30 insertions(+), 40 deletions(-) -- 2.25.1 diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 0f9044cf3aab..c692f2af77f2 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -97,6 +97,11 @@ static int max_devices; static DEFINE_IDA(mmc_blk_ida); static DEFINE_IDA(mmc_rpmb_ida); +struct mmc_blk_busy_data { + struct mmc_card *card; + u32 status; +}; + /* * There is one mmc_blk_data per slot. */ @@ -411,42 +416,6 @@ static int mmc_blk_ioctl_copy_to_user(struct mmc_ioc_cmd __user *ic_ptr, return 0; } -static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms, - u32 *resp_errs) -{ - unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms); - int err = 0; - u32 status; - - do { - bool done = time_after(jiffies, timeout); - - err = __mmc_send_status(card, &status, 5); - if (err) { - dev_err(mmc_dev(card->host), - "error %d requesting status\n", err); - return err; - } - - /* Accumulate any response error bits seen */ - if (resp_errs) - *resp_errs |= status; - - /* - * Timeout if the device never becomes ready for data and never - * leaves the program state. - */ - if (done) { - dev_err(mmc_dev(card->host), - "Card stuck in wrong state! %s status: %#x\n", - __func__, status); - return -ETIMEDOUT; - } - } while (!mmc_ready_for_data(status)); - - return err; -} - static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md, struct mmc_blk_ioc_data *idata) { @@ -1846,28 +1815,48 @@ static inline bool mmc_blk_rq_error(struct mmc_blk_request *brq) brq->data.error || brq->cmd.resp[0] & CMD_ERRORS; } +static int mmc_blk_busy_cb(void *cb_data, bool *busy) +{ + struct mmc_blk_busy_data *data = cb_data; + u32 status = 0; + int err; + + err = mmc_send_status(data->card, &status); + if (err) + return err; + + /* Accumulate response error bits. */ + data->status |= status; + + *busy = !mmc_ready_for_data(status); + return 0; +} + static int mmc_blk_card_busy(struct mmc_card *card, struct request *req) { struct mmc_queue_req *mqrq = req_to_mmc_queue_req(req); - u32 status = 0; + struct mmc_blk_busy_data cb_data; int err; if (mmc_host_is_spi(card->host) || rq_data_dir(req) == READ) return 0; - err = card_busy_detect(card, MMC_BLK_TIMEOUT_MS, &status); + cb_data.card = card; + cb_data.status = 0; + err = __mmc_poll_for_busy(card, MMC_BLK_TIMEOUT_MS, &mmc_blk_busy_cb, + &cb_data); /* * Do not assume data transferred correctly if there are any error bits * set. */ - if (status & mmc_blk_stop_err_bits(&mqrq->brq)) { + if (cb_data.status & mmc_blk_stop_err_bits(&mqrq->brq)) { mqrq->brq.data.bytes_xfered = 0; err = err ? err : -EIO; } /* Copy the exception bit so it will be seen later on */ - if (mmc_card_mmc(card) && status & R1_EXCEPTION_EVENT) + if (mmc_card_mmc(card) && cb_data.status & R1_EXCEPTION_EVENT) mqrq->brq.cmd.resp[0] |= R1_EXCEPTION_EVENT; return err; diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index e2c431c0ce5d..90d213a2203f 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -510,6 +510,7 @@ int __mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, return 0; } +EXPORT_SYMBOL_GPL(__mmc_poll_for_busy); int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, bool retry_crc_err, enum mmc_busy_cmd busy_cmd)