From patchwork Wed Mar 2 08:55:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Wodkowski X-Patchwork-Id: 8479451 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6119AC0553 for ; Wed, 2 Mar 2016 09:06:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 869D320107 for ; Wed, 2 Mar 2016 09:06:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9EE4E20122 for ; Wed, 2 Mar 2016 09:06:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754287AbcCBJGu (ORCPT ); Wed, 2 Mar 2016 04:06:50 -0500 Received: from mga03.intel.com ([134.134.136.65]:16191 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753504AbcCBJGs (ORCPT ); Wed, 2 Mar 2016 04:06:48 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 02 Mar 2016 01:06:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,527,1449561600"; d="scan'208";a="899221737" Received: from gklab-246-016.igk.intel.com (HELO olimp) ([10.217.246.16]) by orsmga001.jf.intel.com with SMTP; 02 Mar 2016 01:06:45 -0800 Received: by olimp (sSMTP sendmail emulation); Wed, 02 Mar 2016 10:01:09 +0100 From: Pawel Wodkowski To: linux-block@vger.kernel.org Cc: Mateusz Nowak , linux-mmc@vger.kernel.org Subject: [PATCH 2/2] mmc/block: Override default max_dev_sectors. Date: Wed, 2 Mar 2016 09:55:02 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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: Mateusz Nowak Fixes: ca369d51b3e1 ("block/sd: Fix device-imposed transfer length limits") introduced max_dev_sectors as upper limit for max_hw_sectors. This caused limitation of maximum block size to default max_dev_sectors value - 127, causing performance degradation with higher block sizes. This patch is overriding max_dev_sectors value, so it will be set to maximum possible value to be used with set block count command, so 0xffff for eMMC cards, and 0xffffffff for SD cards. Fixes: ca369d51b3e1 ("block/sd: Fix device-imposed transfer length limits") Cc: linux-mmc@vger.kernel.org Signed-off-by: Mateusz Nowak --- drivers/mmc/card/queue.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index 6f4323c6d653..9175b8cd54de 100644 --- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c @@ -212,6 +212,16 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, if (mmc_can_erase(card)) mmc_queue_setup_discard(mq->queue, card); + /* + * Set maximum block count accepted by the card. + * For eMMC, this can be 16 bit value, + * for SD, this can be 32 bit value + */ + if (mmc_card_mmc(card)) + blk_queue_max_dev_sectors(mq->queue, 0xffff); + else if (mmc_card_sd(card)) + blk_queue_max_dev_sectors(mq->queue, 0xffffffff); + #ifdef CONFIG_MMC_BLOCK_BOUNCE if (host->max_segs == 1) { unsigned int bouncesz;