From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751961AbdHGQCE (ORCPT ); Mon, 7 Aug 2017 12:02:04 -0400 Received: from lelnx194.ext.ti.com ([198.47.27.80]:16498 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751904AbdHGQCB (ORCPT ); Mon, 7 Aug 2017 12:02:01 -0400 From: Kishon Vijay Abraham I To: Ulf Hansson , Tony Lindgren , Rob Herring , Adrian Hunter CC: , , , , , Subject: [RFC PATCH 2/7] mmc: sdhci: Add quirk to indicate controller supports ADMA2 Date: Mon, 7 Aug 2017 21:31:37 +0530 Message-ID: <20170807160142.12134-3-kishon@ti.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170807160142.12134-1-kishon@ti.com> References: <20170807160142.12134-1-kishon@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org TI's implementation of sdhci controller used in DRA7 SoC's doesn't have SDHCI_CAN_DO_ADMA2 set in CAPA register though it supports ADMA2. Add quirk to support using ADMA2 even if the controller reports incorrect capability in CAPA. Signed-off-by: Kishon Vijay Abraham I --- drivers/mmc/host/sdhci.c | 3 ++- drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index ece3751d2a25..fff0baadbc3e 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3264,7 +3264,8 @@ int sdhci_setup_host(struct sdhci_host *host) } if ((host->version >= SDHCI_SPEC_200) && - (host->caps & SDHCI_CAN_DO_ADMA2)) + ((host->caps & SDHCI_CAN_DO_ADMA2) || + (host->quirks2 & SDHCI_QUIRK2_FORCE_ADMA))) host->flags |= SDHCI_USE_ADMA; if ((host->quirks & SDHCI_QUIRK_BROKEN_ADMA) && diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 6905131f603d..d778034e324d 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -437,6 +437,8 @@ struct sdhci_host { #define SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN (1<<15) /* Controller does not have CRC stripped in Command Response */ #define SDHCI_QUIRK2_NO_CRC_STRIPPING (1<<16) +/* Controller has bad caps bits, but really supports DMA */ +#define SDHCI_QUIRK2_FORCE_ADMA (1<<17) int irq; /* Device IRQ */ void __iomem *ioaddr; /* Mapped address */ -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kishon Vijay Abraham I Subject: [RFC PATCH 2/7] mmc: sdhci: Add quirk to indicate controller supports ADMA2 Date: Mon, 7 Aug 2017 21:31:37 +0530 Message-ID: <20170807160142.12134-3-kishon@ti.com> References: <20170807160142.12134-1-kishon@ti.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <20170807160142.12134-1-kishon@ti.com> Sender: linux-kernel-owner@vger.kernel.org To: Ulf Hansson , Tony Lindgren , Rob Herring , Adrian Hunter Cc: kishon@ti.com, nsekhar@ti.com, linux-omap@vger.kernel.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: devicetree@vger.kernel.org TI's implementation of sdhci controller used in DRA7 SoC's doesn't have SDHCI_CAN_DO_ADMA2 set in CAPA register though it supports ADMA2. Add quirk to support using ADMA2 even if the controller reports incorrect capability in CAPA. Signed-off-by: Kishon Vijay Abraham I --- drivers/mmc/host/sdhci.c | 3 ++- drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index ece3751d2a25..fff0baadbc3e 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3264,7 +3264,8 @@ int sdhci_setup_host(struct sdhci_host *host) } if ((host->version >= SDHCI_SPEC_200) && - (host->caps & SDHCI_CAN_DO_ADMA2)) + ((host->caps & SDHCI_CAN_DO_ADMA2) || + (host->quirks2 & SDHCI_QUIRK2_FORCE_ADMA))) host->flags |= SDHCI_USE_ADMA; if ((host->quirks & SDHCI_QUIRK_BROKEN_ADMA) && diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 6905131f603d..d778034e324d 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -437,6 +437,8 @@ struct sdhci_host { #define SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN (1<<15) /* Controller does not have CRC stripped in Command Response */ #define SDHCI_QUIRK2_NO_CRC_STRIPPING (1<<16) +/* Controller has bad caps bits, but really supports DMA */ +#define SDHCI_QUIRK2_FORCE_ADMA (1<<17) int irq; /* Device IRQ */ void __iomem *ioaddr; /* Mapped address */ -- 2.11.0