From patchwork Fri May 23 12:53:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 30774 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f199.google.com (mail-ig0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D7EDE2066E for ; Fri, 23 May 2014 12:53:31 +0000 (UTC) Received: by mail-ig0-f199.google.com with SMTP id c1sf2033969igq.6 for ; Fri, 23 May 2014 05:53:31 -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=GYla3hSkdgiFMWdw4hZNIW4eLOBok5AgSLzfNTKjg/Y=; b=KtXP9B4djG/tKi2sF+7yg7YZz9yDKUTciEW3mQPCD65m/DRch5nFCoEJrK0WgepSOt aCe1CZY11hbu+y8MY1kkKqJWt4bbJ/nl08VXkMfWt9a2/diEOapc0PUXdOWuMc2uJXrC GsGA3jO43WwEXUS41dVY/sPAfQhC3O21GGh9iuwtDwmASFx0tlRxMroScVjXZhcLZFtQ hoj9SdHSPhEoMST5FkGWHqS0noT8HoiaJBZ7B4yJ5zSdhEVUkP+OAPFmpal3c00anK1a 3YUIdoR/yTvtnL/kNeicria+y1rfWCjpXfjmX/+pc36pra6ePYW7bdYm98dLtCPRdnk/ DAQw== X-Gm-Message-State: ALoCoQmKyfAyPNz+M1v4+jKXMCeN98INX0a0nUvHPtKiN1h0SF6NxAJqZ4FNKbfPOjcSJNRIqB3C X-Received: by 10.182.24.104 with SMTP id t8mr2062135obf.34.1400849611085; Fri, 23 May 2014 05:53:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.4 with SMTP id i4ls1614962qgf.78.gmail; Fri, 23 May 2014 05:53:31 -0700 (PDT) X-Received: by 10.52.227.138 with SMTP id sa10mr3274886vdc.25.1400849611001; Fri, 23 May 2014 05:53:31 -0700 (PDT) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id lo19si1550432vdb.15.2014.05.23.05.53.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 05:53:30 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.176 as permitted sender) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id jz11so6177659veb.35 for ; Fri, 23 May 2014 05:53:30 -0700 (PDT) X-Received: by 10.221.7.71 with SMTP id on7mr3990764vcb.18.1400849610920; Fri, 23 May 2014 05:53:30 -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 ib8csp29081vcb; Fri, 23 May 2014 05:53:30 -0700 (PDT) X-Received: by 10.66.187.38 with SMTP id fp6mr5592049pac.95.1400849609691; Fri, 23 May 2014 05:53:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id oi6si3703641pbb.195.2014.05.23.05.53.29 for ; Fri, 23 May 2014 05:53:29 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S1753227AbaEWMxS (ORCPT + 27 others); Fri, 23 May 2014 08:53:18 -0400 Received: from mail-we0-f176.google.com ([74.125.82.176]:43417 "EHLO mail-we0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753192AbaEWMxP (ORCPT ); Fri, 23 May 2014 08:53:15 -0400 Received: by mail-we0-f176.google.com with SMTP id q59so4873307wes.35 for ; Fri, 23 May 2014 05:53:13 -0700 (PDT) X-Received: by 10.194.184.179 with SMTP id ev19mr1758829wjc.85.1400849593755; Fri, 23 May 2014 05:53:13 -0700 (PDT) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-78-149-4-211.as13285.net. [78.149.4.211]) by mx.google.com with ESMTPSA id vp5sm3804037wjc.31.2014.05.23.05.53.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 May 2014 05:53:12 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: Russell King , Ulf Hansson , linux-mmc@vger.kernel.org Cc: Chris Ball , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linus.walleij@linaro.org, Srinivas Kandagatla Subject: [PATCH v3 13/13] mmc: mmci: Add Qcom specific pio_read function. Date: Fri, 23 May 2014 13:53:09 +0100 Message-Id: <1400849589-7626-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1400849362-7007-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1400849362-7007-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@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.176 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 MCIFIFOCNT register behaviour on Qcom chips is very different than the other pl180 integrations. MCIFIFOCNT register contains the number of words that are still waiting to be transferred through the FIFO. It keeps decrementing once the host CPU reads the MCIFIFO. With the existing logic and the MCIFIFOCNT behaviour, mmci_pio_read will loop forever, as the FIFOCNT register will always return transfer size before reading the FIFO. Also the data sheet states that "This register is only useful for debug purposes and should not be used for normal operation since it does not reflect data which may or may not be in the pipeline". This patch implements qcom_pio_read function so as existing mmci_pio_read is not suitable for Qcom SOCs. qcom_pio_read function is only selected based on qcom_fifo flag in variant data structure. Signed-off-by: Srinivas Kandagatla --- drivers/mmc/host/mmci.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index f6dfd24..51ce493 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -75,6 +75,7 @@ static unsigned int fmax = 515633; * are not ignored. * @explicit_mclk_control: enable explicit mclk control in driver. * @cclk_is_mclk: enable iff card clock is multimedia card adapter clock. + * @qcom_fifo: enables qcom specific fifo pio read function. */ struct variant_data { unsigned int clkreg; @@ -98,6 +99,7 @@ struct variant_data { bool mclk_delayed_writes; bool explicit_mclk_control; bool cclk_is_mclk; + bool qcom_fifo; }; static struct variant_data variant_arm = { @@ -208,6 +210,7 @@ static struct variant_data variant_qcom = { .mclk_delayed_writes = true, .explicit_mclk_control = true, .cclk_is_mclk = true, + .qcom_fifo = true, }; static inline u32 mmci_readl(struct mmci_host *host, u32 off) @@ -1022,6 +1025,40 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd, } } +static int mmci_qcom_pio_read(struct mmci_host *host, char *buffer, + unsigned int remain) +{ + u32 *ptr = (u32 *) buffer; + unsigned int count = 0; + unsigned int words, bytes; + unsigned int fsize = host->variant->fifosize; + + words = remain >> 2; + bytes = remain % 4; + /* read full words followed by leftover bytes */ + if (words) { + while (readl(host->base + MMCISTATUS) & MCI_RXDATAAVLBL) { + *ptr = readl(host->base + MMCIFIFO + (count % fsize)); + ptr++; + count += 4; + words--; + if (!words) + break; + } + } + + if (unlikely(bytes)) { + unsigned char buf[4]; + if (readl(host->base + MMCISTATUS) & MCI_RXDATAAVLBL) { + *buf = readl(host->base + MMCIFIFO + (count % fsize)); + memcpy(ptr, buf, bytes); + count += bytes; + } + } + + return count; +} + static int mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int remain) { void __iomem *base = host->base; @@ -1143,8 +1180,13 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id) remain = sg_miter->length; len = 0; - if (status & MCI_RXACTIVE) - len = mmci_pio_read(host, buffer, remain); + if (status & MCI_RXACTIVE) { + if (variant->qcom_fifo) + len = mmci_qcom_pio_read(host, buffer, remain); + else + len = mmci_pio_read(host, buffer, remain); + } + if (status & MCI_TXACTIVE) len = mmci_pio_write(host, buffer, remain, status);