From patchwork Mon Oct 8 15:07:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 10630941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0F141112B for ; Mon, 8 Oct 2018 15:07:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F33282964C for ; Mon, 8 Oct 2018 15:07:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E52A229665; Mon, 8 Oct 2018 15:07:53 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,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 53EB82964C for ; Mon, 8 Oct 2018 15:07:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726563AbeJHWUC (ORCPT ); Mon, 8 Oct 2018 18:20:02 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33871 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726078AbeJHWUB (ORCPT ); Mon, 8 Oct 2018 18:20:01 -0400 Received: by mail-wr1-f65.google.com with SMTP id z4-v6so21230383wrb.1 for ; Mon, 08 Oct 2018 08:07:50 -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:mime-version :content-transfer-encoding; bh=VXBUpAkkYPX8cO3N2FChaknAMzBoXZAG1ajsLPueNXs=; b=DJc6fUG2+/YhuiXdRETJ0GpKsufh6NnzSrYGxGscFBvZuEmSS31r7TokOiQ7RC2wcs vSGr4LNc+QE50Jp0qeLNP+qz43bmz6AhCcOUO7wEZSSCX7AD46QPKOfyPdWhg1RgDrhS 0mp69dzvsbwAn9WFg8MC9Yozoq1sXz8S3yw2m8+eEIoYJ28g6E3VNpt6wicIcGNqeQCl Fuw+6XZBVpXJ5J8yT9Bq6hvqXF7BSRMtyfgapbmm1wl6RMkcAXEu7VrhXhcXk0pu9nW5 7/X/Yo6mqH0SX+klklPFrY25x8IPuRqYBvvzxXC+X2JWLmzyKRletQbHHZbSVSNd4iOG 7ULg== 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:mime-version :content-transfer-encoding; bh=VXBUpAkkYPX8cO3N2FChaknAMzBoXZAG1ajsLPueNXs=; b=TnU9GsMMOp//Zz+h5qjPLJW6W+hkMR96QNBpjl48aaPLPcjRnaJASjwDreI+OkpISW Kshshrud4nY3TBrd5pHKdVdyFiY7qqHPJHlU5REz7fmFqFtftEQCgIPA5YdT2vdag8ba XXPfp41RFUc+1TIy5VBDNU4wz17UA6xbtG8aLZl7WFB3WuYGTlsLppgMVsI7cxLKnYZr SeaVPZrqvkWIBaHUgHPIVDgewqACKXCZq8Rc8ybxGAxBdJ91kMrjcZutHHBOqbj4qGWf ShSPFCOT7/N4dLqzJMcrMAvUyUJWW7j5KdfPYDwSx0c1BOIRbGQmN3H3m4/lvFrjZP6V K/hw== X-Gm-Message-State: ABuFfohxD0YyyafdfaN/2ix2kF8Iep8m8J7JFPvj773e+TSiAwhrNQQl AJ5okbMQ4UbEUYx51NzzDjQ= X-Google-Smtp-Source: ACcGV60wNGyUhWETylfxXbY2ENuMSUZZYP8lHAfNKJWOXUgsZvSWnSl+rWL4NRrOJxbpSwDEuvudxA== X-Received: by 2002:a05:6000:1201:: with SMTP id e1mr18212569wrx.157.1539011269745; Mon, 08 Oct 2018 08:07:49 -0700 (PDT) Received: from localhost.localdomain (static-css-cqn-141161.business.bouyguestelecom.com. [176.149.141.161]) by smtp.gmail.com with ESMTPSA id v10-v6sm14873710wrp.0.2018.10.08.08.07.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Oct 2018 08:07:49 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Adrian Hunter , Linus Walleij , Shawn Lin , Jan Luebbe , Bastian Stender , linux-mmc@vger.kernel.org Cc: Chris Boot , =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= Subject: [PATCH v2] mmc: block: avoid multiblock reads for the last sector in SPI mode Date: Mon, 8 Oct 2018 17:07:30 +0200 Message-Id: <20181008150730.8638-1-peron.clem@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 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 From: Chris Boot On some SD cards over SPI, reading with the multiblock read command the last sector will leave the card in a bad state. Remove last sectors from the multiblock reading cmd. Signed-off-by: Chris Boot Signed-off-by: Clément Péron --- v2: - Change commit log - Indent properly drivers/mmc/core/block.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index a0b9102c4c6e..e201ccb3fda4 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1370,6 +1370,16 @@ static void mmc_blk_data_prep(struct mmc_queue *mq, struct mmc_queue_req *mqrq, brq->data.blocks = card->host->max_blk_count; if (brq->data.blocks > 1) { + /* + * Some SD cards in SPI mode return a CRC error or even lock up + * completely when trying to read the last block using a + * multiblock read command. + */ + if (mmc_host_is_spi(card->host) && (rq_data_dir(req) == READ) && + (blk_rq_pos(req) + blk_rq_sectors(req) == + get_capacity(md->disk))) + brq->data.blocks--; + /* * After a read error, we redo the request one sector * at a time in order to accurately determine which