From patchwork Tue Sep 9 06:46:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 4866531 Return-Path: X-Original-To: patchwork-linux-sh@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 C31F4C0338 for ; Tue, 9 Sep 2014 06:46:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E81562014A for ; Tue, 9 Sep 2014 06:46:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 230AD20149 for ; Tue, 9 Sep 2014 06:46:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751927AbaIIGqv (ORCPT ); Tue, 9 Sep 2014 02:46:51 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:52607 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751747AbaIIGqv (ORCPT ); Tue, 9 Sep 2014 02:46:51 -0400 Received: by mail-pd0-f169.google.com with SMTP id fp1so2801246pdb.0 for ; Mon, 08 Sep 2014 23:46:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:message-id:from:subject:user-agent:to:cc:in-reply-to :references:mime-version:content-type; bh=97uROna/0q0FQoTiMhXv9b9ra4zYOA/xrgZvhwESkiU=; b=q5DY3Nj6PU/70XfhwsoinGrM1aYfzHiKREmfDYMtjgQpZsVwxkwIh0wmqRLJaY8YPb gCkxT5tIaXPrAjj5Ml98L9mXgIScjBfo4ETtk/T+S6uCZ7pTA0SgPq6YPfGvsYNvpIYf ybT0ANB+aZ5veHT9ERHbLalKoCgzrpjvhusvXDOMwqsGjQGzyK6F7ORfbVtq1jm15BFM 0XD4ZEsk1GoA0k1p1/YflKPstObpt7dXQgYoBWBZ0M6I96S74vgDzbP5GgMiTVosEyIv iiesdJvnG/3y/aGjfxfAIbeKmPBhK3QUZAJYD0seHD3wV/8Ub1goISsCzCeujRLT7hR5 23Jg== X-Received: by 10.70.22.163 with SMTP id e3mr12232745pdf.157.1410245210852; Mon, 08 Sep 2014 23:46:50 -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 y4sm10755567pdm.1.2014.09.08.23.46.48 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 08 Sep 2014 23:46:49 -0700 (PDT) Date: Mon, 08 Sep 2014 23:46:49 -0700 (PDT) Message-ID: <87bnqp70ko.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH 6/6 v4] mmc: remove MMC_CAP2_NO_MULTI_READ flags User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 To: Ulf Hansson , Chris Ball , Simon Cc: Kuninori Morimoto , Linux-SH , linux-mmc In-Reply-To: <87k35d70pz.wl%kuninori.morimoto.gx@gmail.com> References: <87r3zvzohj.wl%kuninori.morimoto.gx@gmail.com> <87k35d70pz.wl%kuninori.morimoto.gx@gmail.com> MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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: Kuninori Morimoto Now, mmc framework uses multi_io_quirk for I/O HW bug workaround. MMC_CAP2_NO_MULTI_READ flag is no longer needed Signed-off-by: Kuninori Morimoto --- v3 -> v4 - no change drivers/mmc/card/block.c | 5 ----- include/linux/mmc/host.h | 1 - 2 files changed, 6 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index adab903..413f984 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1398,11 +1398,6 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, if (disable_multi) brq->data.blocks = 1; - /* 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; - /* * Some controllers have HW issues while operating * in multiple I/O mode diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 10e2bd6..797ae65 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -272,7 +272,6 @@ 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_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 | \