From patchwork Mon Aug 7 01:32:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Lin X-Patchwork-Id: 9884197 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BFBDB603F2 for ; Mon, 7 Aug 2017 01:33:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1E0B28577 for ; Mon, 7 Aug 2017 01:33:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A64112857B; Mon, 7 Aug 2017 01:33:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C526528577 for ; Mon, 7 Aug 2017 01:33:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751407AbdHGBdY (ORCPT ); Sun, 6 Aug 2017 21:33:24 -0400 Received: from lucky1.263xmail.com ([211.157.147.131]:55981 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751375AbdHGBdX (ORCPT ); Sun, 6 Aug 2017 21:33:23 -0400 Received: from shawn.lin?rock-chips.com (unknown [192.168.167.12]) by lucky1.263xmail.com (Postfix) with ESMTP id C04538F94A; Mon, 7 Aug 2017 09:33:18 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.263.net (Postfix) with ESMTPA id 2367B3DE; Mon, 7 Aug 2017 09:33:18 +0800 (CST) X-RL-SENDER: shawn.lin@rock-chips.com X-FST-TO: ulf.hansson@linaro.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: shawn.lin@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: lintao@rock-chips.com X-DNS-TYPE: 0 Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.263.net (Postfix) whith ESMTP id 767879XX6P; Mon, 07 Aug 2017 09:33:19 +0800 (CST) From: Shawn Lin To: Ulf Hansson Cc: linux-mmc@vger.kernel.org, Shawn Guo , Wolfram Sang , Shawn Lin Subject: [PATCH] mmc: block: prevent propagating R1_OUT_OF_RANGE for open-ending mode Date: Mon, 7 Aug 2017 09:32:45 +0800 Message-Id: <1502069565-114396-1-git-send-email-shawn.lin@rock-chips.com> X-Mailer: git-send-email 1.9.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We to some extent should tolerate R1_OUT_OF_RANGE for open-ending mode as it is expected behaviour and most of the backup partition tables should be located near some the last blocks which will always make open-ending read exceed the capcity of cards. Fixes: 9820a5b11101 ("mmc: core: for data errors, take response of stop cmd into account") Fixes: a04e6bae9e6f (mmc: core: check also R1 response for stop commands) Signed-off-by: Shawn Lin Tested-by: Shawn Guo --- drivers/mmc/core/block.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 40f0d59..25343aa 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1369,10 +1369,19 @@ static inline void mmc_apply_rel_rw(struct mmc_blk_request *brq, R1_CC_ERROR | /* Card controller error */ \ R1_ERROR) /* General/unknown error */ -static bool mmc_blk_has_cmd_err(struct mmc_command *cmd) +static bool mmc_blk_has_cmd_err(struct mmc_card *card, struct mmc_command *cmd) { - if (!cmd->error && cmd->resp[0] & CMD_ERRORS) - cmd->error = -EIO; + struct mmc_blk_data *md = dev_get_drvdata(&card->dev); + + if (!cmd->error && cmd->resp[0] & CMD_ERRORS) { + /* + * Prevent the OUT_OF_RANGE error for open-ending + * multiple block operations as it's normal behaviour. + */ + if (!(!(md->flags & MMC_BLK_CMD23) && + cmd->resp[0] & R1_OUT_OF_RANGE)) + cmd->error = -EIO; + } return cmd->error; } @@ -1398,8 +1407,8 @@ static enum mmc_blk_status mmc_blk_err_check(struct mmc_card *card, * stop.error indicates a problem with the stop command. Data * may have been transferred, or may still be transferring. */ - if (brq->sbc.error || brq->cmd.error || mmc_blk_has_cmd_err(&brq->stop) || - brq->data.error) { + if (brq->sbc.error || brq->cmd.error || + mmc_blk_has_cmd_err(card, &brq->stop) || brq->data.error) { switch (mmc_blk_cmd_recovery(card, req, brq, &ecc_err, &gen_err)) { case ERR_RETRY: return MMC_BLK_RETRY;