From patchwork Thu Jun 26 06:23:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Yang X-Patchwork-Id: 4425891 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 0328FBEEAA for ; Thu, 26 Jun 2014 06:23:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 32C602038C for ; Thu, 26 Jun 2014 06:23:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29FF820379 for ; Thu, 26 Jun 2014 06:23:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754389AbaFZGXu (ORCPT ); Thu, 26 Jun 2014 02:23:50 -0400 Received: from mail-pb0-f51.google.com ([209.85.160.51]:60717 "EHLO mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753342AbaFZGXt (ORCPT ); Thu, 26 Jun 2014 02:23:49 -0400 Received: by mail-pb0-f51.google.com with SMTP id rp16so2716632pbb.38 for ; Wed, 25 Jun 2014 23:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rBK0NDAKYeeOWZrv2Q8sTfBny1qZYQxXuIOqQdEqDPE=; b=Bf5zppdHrvjPVqSx3T8drcG3ZPcbKywGEOZjkk5oTEFq1xPDO1Z5p9HcP0DZO8qEEA l7a/L7XwKa/d5N8FEAUTV+vpiVoTCv0C2MVzykA3Ws2rIPkZBQlZ0grXLlnQQ8pVvcJt IU+X3yNpbR0gIrSrYroFF9gyBqyPJVKGBfnRRiSoDQADkN4D8WSD1TENjcWJcUrC9esR pqsbigWtNo73Jr14fJYB4JE7TpMl8rx+RS/uHf9UNzeQ4VbrXYIYNGeWzpoPyCAAnvET g/Sig8Xwm+jewmgyW9MwpfJEZPm1Xe50z455nu3kTdDcQiItHJm186653BDZHumIyUHS cfrA== X-Received: by 10.66.66.72 with SMTP id d8mr19059755pat.8.1403763829151; Wed, 25 Jun 2014 23:23:49 -0700 (PDT) Received: from localhost.localdomain ([124.219.7.128]) by mx.google.com with ESMTPSA id gi1sm8217238pbd.15.2014.06.25.23.23.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Jun 2014 23:23:48 -0700 (PDT) From: Vincent Yang X-Google-Original-From: Vincent Yang To: chris@printf.net, linux-mmc@vger.kernel.org Cc: devicetree@vger.kernel.org, anton@enomsg.org, linuxppc-dev@lists.ozlabs.org, patches@linaro.org, andy.green@linaro.org, jaswinder.singh@linaro.org, Vincent.Yang@tw.fujitsu.com Subject: [RFC PATCH v2 3/6] mmc: sdhci: add quirk for single block transactions Date: Thu, 26 Jun 2014 14:23:29 +0800 Message-Id: <1403763812-5495-4-git-send-email-Vincent.Yang@tw.fujitsu.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1403763812-5495-1-git-send-email-Vincent.Yang@tw.fujitsu.com> References: <1403763812-5495-1-git-send-email-Vincent.Yang@tw.fujitsu.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=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 This patch defines a quirk to disable the block count for single block transactions. It is a preparation and will be used by Fujitsu SDHCI controller f_sdh30 driver. Signed-off-by: Vincent Yang --- drivers/mmc/host/sdhci.c | 8 +++++--- include/linux/mmc/sdhci.h | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 900b4e4..169e17d 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -876,7 +876,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) static void sdhci_set_transfer_mode(struct sdhci_host *host, struct mmc_command *cmd) { - u16 mode; + u16 mode = 0; struct mmc_data *data = cmd->data; if (data == NULL) { @@ -889,9 +889,11 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host, WARN_ON(!host->data); - mode = SDHCI_TRNS_BLK_CNT_EN; + if (!(host->quirks2 & SDHCI_QUIRK2_SUPPORT_SINGLE)) + mode = SDHCI_TRNS_BLK_CNT_EN; + if (mmc_op_multi(cmd->opcode) || data->blocks > 1) { - mode |= SDHCI_TRNS_MULTI; + mode = SDHCI_TRNS_BLK_CNT_EN | SDHCI_TRNS_MULTI; /* * If we are sending CMD23, CMD12 never gets sent * on successful completion (so no Auto-CMD12). diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index bcbad45..72072d1 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -102,6 +102,8 @@ struct sdhci_host { #define SDHCI_QUIRK2_VOLTAGE_SWITCH (1<<8) /* forced tuned clock */ #define SDHCI_QUIRK2_TUNING_WORK_AROUND (1<<9) +/* disable the block count for single block transactions */ +#define SDHCI_QUIRK2_SUPPORT_SINGLE (1<<10) int irq; /* Device IRQ */ void __iomem *ioaddr; /* Mapped address */