From patchwork Fri May 16 19:46:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 30345 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f69.google.com (mail-qg0-f69.google.com [209.85.192.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6545F20A25 for ; Fri, 16 May 2014 19:46:10 +0000 (UTC) Received: by mail-qg0-f69.google.com with SMTP id f51sf6753592qge.0 for ; Fri, 16 May 2014 12:46:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=qzHZRv8RT26s7gsqP0+PxFo66Ei5q0hqxRkgyF3L9jk=; b=BrFGfbBkdmWLsDtzGnVahvykpO2nsVPSh4FYgeYbw6/fSexl4QVwisLdkjpjRKJ3IS FWdjO79Km4sAAGsci42uKJhA1ll2ozuUBO69+9n7dJ2I5ys5SvfEhTO303S4oqKV1Alq L26MUnCDha/ekmfD1aGEbIfFijrs9EGHIGUOZUysSTwyLfvI1ZRYyzns2PjN0hrQIuE5 z2TWt29tTRwaUlC6+ICIrDgjKNt4FwDnl78gZTaOpW06n1YHjTbYfdwNfyEiIjWL4jxH JCzm77ZsAwR1f1T2v98BZf1nz9oCnoxpnpatg8Ihz+cqxdlw6NuZb9oIEcO9ei/921GH NIdA== X-Gm-Message-State: ALoCoQnuxsx4cWNaIOzYeZJMFnvpMwyHAcv/kUmhaIvAgWd/UT1eGvMupkGLnDs56UjJPePWTFFo X-Received: by 10.236.85.131 with SMTP id u3mr7832211yhe.40.1400269570194; Fri, 16 May 2014 12:46:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.49 with SMTP id z46ls887559qge.50.gmail; Fri, 16 May 2014 12:46:10 -0700 (PDT) X-Received: by 10.52.173.165 with SMTP id bl5mr13042688vdc.13.1400269569987; Fri, 16 May 2014 12:46:09 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id bo2si1850355veb.44.2014.05.16.12.46.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 May 2014 12:46:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id db11so3660149veb.22 for ; Fri, 16 May 2014 12:46:09 -0700 (PDT) X-Received: by 10.58.154.10 with SMTP id vk10mr15658921veb.18.1400269569897; Fri, 16 May 2014 12:46:09 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp78818vcb; Fri, 16 May 2014 12:46:08 -0700 (PDT) X-Received: by 10.68.135.42 with SMTP id pp10mr23484745pbb.58.1400269568166; Fri, 16 May 2014 12:46:08 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ro7si10255501pab.172.2014.05.16.12.46.07; Fri, 16 May 2014 12:46:07 -0700 (PDT) Received-SPF: none (google.com: linux-arm-msm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992437AbaEPTqG (ORCPT + 3 others); Fri, 16 May 2014 15:46:06 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:63233 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992456AbaEPTqF (ORCPT ); Fri, 16 May 2014 15:46:05 -0400 Received: by mail-wg0-f45.google.com with SMTP id m15so5309580wgh.28 for ; Fri, 16 May 2014 12:46:03 -0700 (PDT) X-Received: by 10.194.63.196 with SMTP id i4mr15755439wjs.50.1400269563780; Fri, 16 May 2014 12:46:03 -0700 (PDT) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-78-144-123-164.as13285.net. [78.144.123.164]) by mx.google.com with ESMTPSA id l12sm3067493wjr.35.2014.05.16.12.46.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 May 2014 12:46:03 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: agross@quicinc.com Cc: linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH RFC 3/4] mmc: mmci: Add qcom dml support to the driver. Date: Fri, 16 May 2014 20:46:00 +0100 Message-Id: <1400269560-15533-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1400269500-15408-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1400269500-15408-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: srinivas.kandagatla@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Srinivas Kandagatla On Qualcomm APQ8064 SOCs, SD card controller has an additional glue called DML (Data Mover Local/Lite) to do dma transfers between Controller and DMA engine. This hardware needs to be setup before any dma transfer is requested. This patch adds the code necessary to intialize the hardware and setup before doing any dma transfers. Please Note: this is a just a first version of the patch, so there is a scope of improvement on this. Signed-off-by: Srinivas Kandagatla --- drivers/mmc/host/Kconfig | 11 +++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/mmci.c | 12 ++++ drivers/mmc/host/qcom_dml.c | 170 ++++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/qcom_dml.h | 17 +++++ 5 files changed, 211 insertions(+) create mode 100644 drivers/mmc/host/qcom_dml.c create mode 100644 drivers/mmc/host/qcom_dml.h diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 8aaf8c1..55cb57b 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -14,6 +14,17 @@ config MMC_ARMMMCI If unsure, say N. +config MMC_QCOM_DML + tristate "Qualcomm Data Mover for SD Card Controller" + depends on MMC_ARMMMCI + default y + help + This selects the Qualcomm Data Mover lite/local on SD Card controller. + This option will enable the dma to work correctly, if you are using + Qcom SOCs and MMC, you would probably need this option to get DMA working. + + if unsure, say N. + config MMC_PXA tristate "Intel PXA25x/26x/27x Multimedia Card Interface support" depends on ARCH_PXA diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 0c8aa5e..07ea02a 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -3,6 +3,7 @@ # obj-$(CONFIG_MMC_ARMMMCI) += mmci.o +obj-$(CONFIG_MMC_QCOM_DML) += qcom_dml.o obj-$(CONFIG_MMC_PXA) += pxamci.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_MXS) += mxs-mmc.o diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 94b99d6..847a4ba 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -43,6 +43,7 @@ #include #include "mmci.h" +#include "qcom_dml.h" #define DRIVER_NAME "mmci-pl18x" @@ -78,6 +79,7 @@ static unsigned int fmax = 515633; * @explicit_mclk_control: enable explicit mclk control in driver. * @qcom_cclk_is_mclk: enable iff card clock is multimedia card adapter clock. * @qcom_fifo: enables qcom specific fifo pio read function. + * @qcom_dml: enables qcom specific dml glue for dma transfers. */ struct variant_data { unsigned int clkreg; @@ -103,6 +105,7 @@ struct variant_data { bool explicit_mclk_control; bool qcom_cclk_is_mclk; bool qcom_fifo; + bool qcom_dml; }; static struct variant_data variant_arm = { @@ -214,6 +217,7 @@ static struct variant_data variant_qcom = { .explicit_mclk_control = true, .qcom_cclk_is_mclk = true, .qcom_fifo = true, + .qcom_dml = true, }; static inline u32 mmci_readl(struct mmci_host *host, u32 off) @@ -664,6 +668,9 @@ static int mmci_dma_start_data(struct mmci_host *host, unsigned int datactrl) dmaengine_submit(host->dma_desc_current); dma_async_issue_pending(host->dma_current); + if (host->variant->qcom_dml) + dml_start_xfer(host, data); + datactrl |= MCI_DPSM_DMAENABLE; /* Trigger the DMA transfer */ @@ -1702,6 +1709,11 @@ static int mmci_probe(struct amba_device *dev, mmci_dma_setup(host); + if (variant->qcom_dml && host->dma_rx_channel && host->dma_tx_channel) { + if (dml_hw_init(host, np)) + variant->qcom_dml = false; + } + pm_runtime_set_autosuspend_delay(&dev->dev, 50); pm_runtime_use_autosuspend(&dev->dev); pm_runtime_put(&dev->dev); diff --git a/drivers/mmc/host/qcom_dml.c b/drivers/mmc/host/qcom_dml.c new file mode 100644 index 0000000..5d61e4c --- /dev/null +++ b/drivers/mmc/host/qcom_dml.c @@ -0,0 +1,170 @@ +#include +#include +#include +#include +#include "mmci.h" + +/* DML config register defination */ +#define DML_CONFIG 0x00 +#define PRODUCER_CRCI_DIS 0x00 +#define PRODUCER_CRCI_X_SEL 0x01 +#define PRODUCER_CRCI_Y_SEL 0x02 +#define PRODUCER_CRCI_MSK 0x3 +#define CONSUMER_CRCI_DIS (0x00 << 2) +#define CONSUMER_CRCI_X_SEL (0x01 << 2) +#define CONSUMER_CRCI_Y_SEL (0x02 << 2) +#define CONSUMER_CRCI_MSK (0x3 << 2) +#define PRODUCER_TRANS_END_EN (1 << 4) +#define BYPASS (1 << 16) +#define DIRECT_MODE (1 << 17) +#define INFINITE_CONS_TRANS (1 << 18) + +#define DML_SW_RESET 0x08 +#define DML_PRODUCER_START 0x0C +#define DML_CONSUMER_START 0x10 +#define DML_PRODUCER_PIPE_LOGICAL_SIZE 0x14 +#define DML_CONSUMER_PIPE_LOGICAL_SIZE 0x18 +#define DML_PIPE_ID 0x1C +#define DML_PRODUCER_BAM_BLOCK_SIZE 0x24 +#define DML_PRODUCER_BAM_TRANS_SIZE 0x28 +#define PRODUCER_PIPE_ID_SHFT 0 +#define PRODUCER_PIPE_ID_MSK 0x1f +#define CONSUMER_PIPE_ID_SHFT 16 +#define CONSUMER_PIPE_ID_MSK (0x1f << 16) +/* other definations */ +#define PRODUCER_PIPE_LOGICAL_SIZE 4096 +#define CONSUMER_PIPE_LOGICAL_SIZE 4096 + +#define DML_OFFSET 0x800 + +void dml_start_xfer(struct mmci_host *host, struct mmc_data *data) +{ + u32 config; + void __iomem *dml_base; + dml_base = host->base + DML_OFFSET; + + if (data->flags & MMC_DATA_READ) { + /* Read operation: configure DML for producer operation */ + /* Set producer CRCI-x and disable consumer CRCI */ + config = readl(dml_base + DML_CONFIG); + config = (config & ~PRODUCER_CRCI_MSK) | PRODUCER_CRCI_X_SEL; + config = (config & ~CONSUMER_CRCI_MSK) | CONSUMER_CRCI_DIS; + writel(config, (dml_base + DML_CONFIG)); + + /* Set the Producer BAM block size */ + writel(data->blksz, (dml_base + + DML_PRODUCER_BAM_BLOCK_SIZE)); + + /* Set Producer BAM Transaction size */ + writel(data->blocks * data->blksz, + (dml_base + DML_PRODUCER_BAM_TRANS_SIZE)); + /* Set Producer Transaction End bit */ + writel((readl_relaxed(dml_base + DML_CONFIG) + | PRODUCER_TRANS_END_EN), + (dml_base + DML_CONFIG)); + /* Trigger producer */ + writel(1, (dml_base + DML_PRODUCER_START)); + } else { + /* Write operation: configure DML for consumer operation */ + /* Set consumer CRCI-x and disable producer CRCI*/ + config = readl(dml_base + DML_CONFIG); + config = (config & ~CONSUMER_CRCI_MSK) | CONSUMER_CRCI_X_SEL; + config = (config & ~PRODUCER_CRCI_MSK) | PRODUCER_CRCI_DIS; + + config = 0x4; + writel(config, (dml_base + DML_CONFIG)); + /* Clear Producer Transaction End bit */ + writel((readl_relaxed(dml_base + DML_CONFIG) + & ~PRODUCER_TRANS_END_EN), + (dml_base + DML_CONFIG)); + /* Trigger consumer */ + writel(1, (dml_base + DML_CONSUMER_START)); + } +} + +static int of_get_dml_pipe_index(struct device_node *np, const char *name) +{ + int count, i; + const char *s; + struct of_phandle_args dma_spec; + + if (!np || !name) + return -ENODEV; + + count = of_property_count_strings(np, "dma-names"); + if (count < 0) + return -ENODEV; + + for (i = 0; i < count; i++) { + + if (of_property_read_string_index(np, "dma-names", i, &s)) + continue; + + if (strcmp(name, s)) + continue; + + if (of_parse_phandle_with_args(np, "dmas", "#dma-cells", i, + &dma_spec)) + continue; + + if (dma_spec.args_count) + return dma_spec.args[0]; + } + + return -ENODEV; +} + +/* Initialize the dml hardware connectd to SD Card controller */ +int dml_hw_init(struct mmci_host *host, struct device_node *np) +{ + u32 config = 0; + void __iomem *dml_base; + u32 consumer_id = 0, producer_id = 0; + + consumer_id = of_get_dml_pipe_index(np, "tx"); + producer_id = of_get_dml_pipe_index(np, "rx"); + + if (IS_ERR_VALUE(producer_id) || IS_ERR_VALUE(consumer_id)) + return -ENODEV; + + dml_base = host->base + DML_OFFSET; + + /* Reset the DML block */ + writel(1, (dml_base + DML_SW_RESET)); + + /* Disable the producer and consumer CRCI */ + config = (PRODUCER_CRCI_DIS | CONSUMER_CRCI_DIS); + /* + * Disable the bypass mode. Bypass mode will only be used + * if data transfer is to happen in PIO mode and don't + * want the BAM interface to connect with SDCC-DML. + */ + config &= ~BYPASS; + /* + * Disable direct mode as we don't DML to MASTER the AHB bus. + * BAM connected with DML should MASTER the AHB bus. + */ + config &= ~DIRECT_MODE; + /* + * Disable infinite mode transfer as we won't be doing any + * infinite size data transfers. All data transfer will be + * of finite data size. + */ + config &= ~INFINITE_CONS_TRANS; + writel(config, (dml_base + DML_CONFIG)); + + /* + * Initialize the logical BAM pipe size for producer + * and consumer. + */ + writel(PRODUCER_PIPE_LOGICAL_SIZE, + (dml_base + DML_PRODUCER_PIPE_LOGICAL_SIZE)); + writel(CONSUMER_PIPE_LOGICAL_SIZE, + (dml_base + DML_CONSUMER_PIPE_LOGICAL_SIZE)); + + /* Initialize Producer/consumer pipe id */ + writel(producer_id | (consumer_id << CONSUMER_PIPE_ID_SHFT), + (dml_base + DML_PIPE_ID)); + + return 0; +} diff --git a/drivers/mmc/host/qcom_dml.h b/drivers/mmc/host/qcom_dml.h new file mode 100644 index 0000000..d2c5aa45 --- /dev/null +++ b/drivers/mmc/host/qcom_dml.h @@ -0,0 +1,17 @@ +#ifndef __MMC_QCOM_DML_H__ +#define __MMC_QCOM_DML_H__ + +#ifdef CONFIG_MMC_QCOM_DML +int dml_hw_init(struct mmci_host *host, struct device_node *np); +void dml_start_xfer(struct mmci_host *host, struct mmc_data *data); +#else +static inline int dml_hw_init(struct mmci_host *host, struct device_node *np) +{ + return -ENOSYS; +} +static inline void dml_start_xfer(struct mmci_host *host, struct mmc_data *data) +{ +} +#endif /* CONFIG_MMC_QCOM_DML */ + +#endif /* __MMC_QCOM_DML_H__ */