From patchwork Tue Jul 22 05:34:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 4599621 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1845EC0515 for ; Tue, 22 Jul 2014 05:34:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 307E020120 for ; Tue, 22 Jul 2014 05:34:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 19F8E20125 for ; Tue, 22 Jul 2014 05:34:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752063AbaGVFeH (ORCPT ); Tue, 22 Jul 2014 01:34:07 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:50427 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751745AbaGVFeG (ORCPT ); Tue, 22 Jul 2014 01:34:06 -0400 Received: by mail-pa0-f48.google.com with SMTP id et14so11277377pad.35 for ; Mon, 21 Jul 2014 22:34:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:to:cc:in-reply-to:references:from:subject :user-agent:mime-version:content-type; bh=dilxKPY8yXl2zF1qfqwWO1+Vt7k/vkygzHkGJ2vCNiM=; b=zJv0pX7Y7RtZT4JxXnwNYzLcIv6mb7dVH+hy32e8do5FYtaIzMPbYiUwLYCtDJtNRZ 8wNgMUj9VHrptyl0SXlanOvDHiL5zOE2y4tfj3U+fWO39mw1qRNxxPf7SuGHokga92VY 1VFc4Xw1/nKycokuftVqq7G6zg2daiFD2rkGTSOP2DRKfM658J0FOogBfOruNF47VtR1 EQerCtwolXEIG7VdCDAsm6Afb0Up5Iu9o0vjaCPbOJ9cpFFfxaGsCAHkqKEat2+Iya1d A1cx4p85mq7Oa+j/sBRzSfabWuKGahr+UQc06y+PXkuk8nlSVeCH91kjv+Zkicdfo/WI fGYg== X-Received: by 10.66.148.196 with SMTP id tu4mr9015169pab.122.1406007245508; Mon, 21 Jul 2014 22:34:05 -0700 (PDT) Received: from remon.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id d3sm14042370pdi.49.2014.07.21.22.34.03 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 21 Jul 2014 22:34:05 -0700 (PDT) Date: Mon, 21 Jul 2014 22:34:05 -0700 (PDT) Message-ID: <87bnsihs8l.wl%kuninori.morimoto.gx@renesas.com> To: Simon , Ian Molton , Chris Ball Cc: TOSHIAKI KOMATSU , NAOYA SHIIBA , Magnus , Linux-SH , (Renesas) goda , linux-mmc@vger.kernel.org, ryo.kataoka.wt@renesas.com, shinobu.uehara.xc@renesas.com, kouei.abe.cp@renesas.com In-Reply-To: <87egxehsec.wl%kuninori.morimoto.gx@gmail.com> References: <87simtenpi.wl%kuninori.morimoto.gx@renesas.com> <87pphxe2q0.wl%kuninori.morimoto.gx@renesas.com> <53AD638C.5060907@renesas.com> <87egxehsec.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH 02/10] mmc: block: add block number limitation flag for multiple block read User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Shinobu Uehara In some controllers, when performing a multiple block read of one or two blocks, depending on the timing with which the response register is read, the response value may not be read properly. MMC_CAP2_NO_MULTI_READ flags disable all multiple block read, but, it is over-kill for this issue. This patch adds new MMC_CAP2_2BLKS_LIMIT to use single block read when it was two blocks. This is additional option of MMC_CAP2_NO_MULTI_READ [Kuninori Morimoto: tidyup for upstreaming, and cared mach-shmobile] Signed-off-by: Shinobu Uehara Signed-off-by: Kuninori Morimoto --- arch/arm/mach-shmobile/board-koelsch.c | 6 +++--- arch/arm/mach-shmobile/board-lager.c | 4 ++-- drivers/mmc/card/block.c | 19 +++++++++++++++++-- drivers/mmc/host/sh_mobile_sdhi.c | 2 +- include/linux/mmc/host.h | 3 +++ 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c index 2cd3194..4936436 100644 --- a/arch/arm/mach-shmobile/board-koelsch.c +++ b/arch/arm/mach-shmobile/board-koelsch.c @@ -333,7 +333,7 @@ SDHI_REGULATOR(2, RCAR_GP_PIN(7, 19), RCAR_GP_PIN(2, 26)); static struct sh_mobile_sdhi_info sdhi0_info __initdata = { .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD, - .tmio_caps2 = MMC_CAP2_NO_MULTI_READ, + .tmio_caps2 = MMC_CAP2_NO_2BLKS_READ, .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT, }; @@ -346,7 +346,7 @@ static struct resource sdhi0_resources[] __initdata = { static struct sh_mobile_sdhi_info sdhi1_info __initdata = { .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD, - .tmio_caps2 = MMC_CAP2_NO_MULTI_READ, + .tmio_caps2 = MMC_CAP2_NO_2BLKS_READ, .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT, }; @@ -359,7 +359,7 @@ static struct resource sdhi1_resources[] __initdata = { static struct sh_mobile_sdhi_info sdhi2_info __initdata = { .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD, - .tmio_caps2 = MMC_CAP2_NO_MULTI_READ, + .tmio_caps2 = MMC_CAP2_NO_2BLKS_READ, .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, }; diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index b8b2b44..ad85f9d 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c @@ -634,7 +634,7 @@ static void __init lager_add_rsnd_device(void) static struct sh_mobile_sdhi_info sdhi0_info __initdata = { .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD, - .tmio_caps2 = MMC_CAP2_NO_MULTI_READ, + .tmio_caps2 = MMC_CAP2_NO_2BLKS_READ, .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, }; @@ -648,7 +648,7 @@ static struct resource sdhi0_resources[] __initdata = { static struct sh_mobile_sdhi_info sdhi2_info __initdata = { .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD, - .tmio_caps2 = MMC_CAP2_NO_MULTI_READ, + .tmio_caps2 = MMC_CAP2_NO_2BLKS_READ, .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, }; diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 452782b..f3cbe37 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1400,8 +1400,23 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, /* Some controllers can't do multiblock reads due to hw bugs */ if (card->host->caps2 & MMC_CAP2_NO_MULTI_READ && - rq_data_dir(req) == READ) - brq->data.blocks = 1; + rq_data_dir(req) == READ) { + + if (card->host->caps2 & MMC_CAP2_2BLKS_LIMIT) { + /* + * In some controllers, when performing a + * multiple block read of one or two blocks, + * depending on the timing with which the + * response register is read, the response + * value may not be read properly. + * Use single block read for this HW bug + */ + if (brq->data.blocks == 2) + brq->data.blocks = 1; + } else { + brq->data.blocks = 1; + } + } } if (brq->data.blocks > 1 || do_rel_wr) { diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index 18cf462..90b1ee2 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -55,7 +55,7 @@ static const struct sh_mobile_sdhi_of_data of_rcar_gen1_compatible = { static const struct sh_mobile_sdhi_of_data of_rcar_gen2_compatible = { .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, - .capabilities2 = MMC_CAP2_NO_MULTI_READ, + .capabilities2 = MMC_CAP2_NO_2BLKS_READ, }; static const struct of_device_id sh_mobile_sdhi_of_match[] = { diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 7960424..3510fba 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -266,6 +266,9 @@ struct mmc_host { #define MMC_CAP2_BOOTPART_NOACC (1 << 0) /* Boot partition no access */ #define MMC_CAP2_FULL_PWR_CYCLE (1 << 2) /* Can do full power cycle */ #define MMC_CAP2_NO_MULTI_READ (1 << 3) /* Multiblock reads don't work */ +#define MMC_CAP2_2BLKS_LIMIT (1 << 4) /* 2 blocks limit for multi read */ +#define MMC_CAP2_NO_2BLKS_READ (MMC_CAP2_NO_MULTI_READ | \ + MMC_CAP2_2BLKS_LIMIT) #define MMC_CAP2_HS200_1_8V_SDR (1 << 5) /* can support */ #define MMC_CAP2_HS200_1_2V_SDR (1 << 6) /* can support */ #define MMC_CAP2_HS200 (MMC_CAP2_HS200_1_8V_SDR | \