From patchwork Wed Sep 3 02:10:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 4829851 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A5D949F2ED for ; Wed, 3 Sep 2014 02:10:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E03CE201E4 for ; Wed, 3 Sep 2014 02:10:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B2EE201EF for ; Wed, 3 Sep 2014 02:10:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753101AbaICCKW (ORCPT ); Tue, 2 Sep 2014 22:10:22 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:40248 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752691AbaICCKW (ORCPT ); Tue, 2 Sep 2014 22:10:22 -0400 Received: by mail-pd0-f177.google.com with SMTP id r10so9955249pdi.36 for ; Tue, 02 Sep 2014 19:10:21 -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:mime-version:to:cc :in-reply-to:references:content-type; bh=aNT9lHzqZf1rINczCPcfX7b+c51nILB0bobNpQ/u0cs=; b=k5BZ3H2sAAXT8F8Md5h9xTtUdVQ7Bwak0ESggf8fzBJxJPfQD76SvPCEmANKgXlt6B Bx17nla9jpyttWoz0By9KNHS/13fsv5B1NbKjGNwo9uoRD9KZowFr0SmmAdj3vlH85ee MRgrmYdeo2yuN+bUlOU5Wn0fBk7exPF8Y/EZzGdHwfHEFkVQqlRCCCDcAe+k72DMQ97R l2Ht37jdqUZmPKuOqGQB0zdL0rWccjUb2WoW2716q/PZ+Hoe0y8hIwE8hu+sFRCBsVve XIUvcdY1nofcWUs9rlU0V9OFgZ75m8R5yC8hLaTsWIjc1nEIXhkoFcS+bcc2iMT9wY6h wESA== X-Received: by 10.66.161.169 with SMTP id xt9mr52574864pab.102.1409710221571; Tue, 02 Sep 2014 19:10:21 -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 pa2sm7248416pdb.84.2014.09.02.19.10.19 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Sep 2014 19:10:21 -0700 (PDT) Date: Tue, 02 Sep 2014 19:10:21 -0700 (PDT) Message-ID: <871trt78tx.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH 7/7 v3] mmc: remove MMC_CAP2_NO_MULTI_READ flags User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") To: Ulf Hansson , Chris Ball , Simon Cc: Kuninori Morimoto , Linux-SH , linux-mmc In-Reply-To: <87bnqx78xr.wl%kuninori.morimoto.gx@gmail.com> References: <87r3zvzohj.wl%kuninori.morimoto.gx@gmail.com> <87bnqx78xr.wl%kuninori.morimoto.gx@gmail.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-8.5 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=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: 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 --- v2 -> v3 - 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 bfcf673..db4b4eb 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 | \