From patchwork Fri May 23 12:51:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 30766 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0EF642066E for ; Fri, 23 May 2014 12:51:54 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id x3sf15560261qcv.11 for ; Fri, 23 May 2014 05:51:53 -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=0DV73anHBc4CklEUuObTdAGTARP1n+0QgMmV9OBI6w8=; b=dJ1dkVdZkt5lcun96125yXNQR1PQ9G+oR3ZaB5d1qDG+h1PBCcu54qRNf0/HYl3L/C V+PQu4tqDdW/GWXd6RWKyXQO+e9RcCZec964BJVdtIKB2l9NcPyLZg/+T3WoTuGShRec 67vrTGbCcoeqvSauO06rct3EN75a7gpAOwf5DC58OYpeAsha0aESZHyiLd43NVTmbdt4 UMFk4iaSmdvpshlL0QQaRnJBlXW9uhRu6dqTRB7STZIPImV+l5kQwZh6YmTisS1Ukkaj rGdXIMI0wxbONUCBSYvIaBRIOgQWC/b8hSxS+TYR2iEso8W77aOXQXQOZLDRRvKC/8VZ jeKg== X-Gm-Message-State: ALoCoQlfPIKsti3RbmD0wX1lSA1OaZ1uAnVBd6QMFyIhKyaEMxL2Ap9T5geGIbbcUY4BEHcy3RrC X-Received: by 10.236.39.175 with SMTP id d35mr1762383yhb.12.1400849513558; Fri, 23 May 2014 05:51:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.225 with SMTP id b88ls1660159qgb.32.gmail; Fri, 23 May 2014 05:51:53 -0700 (PDT) X-Received: by 10.58.178.115 with SMTP id cx19mr191343vec.70.1400849513412; Fri, 23 May 2014 05:51:53 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id ua6si1552639vcb.14.2014.05.23.05.51.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 05:51:53 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id oz11so6163634veb.16 for ; Fri, 23 May 2014 05:51:53 -0700 (PDT) X-Received: by 10.52.173.165 with SMTP id bl5mr3260286vdc.13.1400849513332; Fri, 23 May 2014 05:51:53 -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 ib8csp28970vcb; Fri, 23 May 2014 05:51:52 -0700 (PDT) X-Received: by 10.68.241.68 with SMTP id wg4mr5857182pbc.66.1400849512374; Fri, 23 May 2014 05:51:52 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pm3si3754460pbb.64.2014.05.23.05.51.51 for ; Fri, 23 May 2014 05:51:51 -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 S1752688AbaEWMvm (ORCPT + 27 others); Fri, 23 May 2014 08:51:42 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:42331 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752243AbaEWMvj (ORCPT ); Fri, 23 May 2014 08:51:39 -0400 Received: by mail-wi0-f171.google.com with SMTP id cc10so781186wib.16 for ; Fri, 23 May 2014 05:51:38 -0700 (PDT) X-Received: by 10.180.185.244 with SMTP id ff20mr3142807wic.42.1400849498448; Fri, 23 May 2014 05:51:38 -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 ho2sm2802360wib.15.2014.05.23.05.51.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 May 2014 05:51:37 -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 05/13] mmc: mmci: Add register read/write wrappers. Date: Fri, 23 May 2014 13:51:34 +0100 Message-Id: <1400849494-7261-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.171 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 This patch adds wrappers for readl/writel functions used in the driver. The reason for this wrappers is to accommodate SOCs like Qualcomm which has requirement for delaying the write for few cycles when writing to its SD Card Controller registers. Signed-off-by: Srinivas Kandagatla Reviewed-by: Linus Walleij --- drivers/mmc/host/mmci.c | 110 ++++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 51 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 324a886..881bb24 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -173,6 +173,16 @@ static struct variant_data variant_qcom = { .pwrreg_powerup = MCI_PWR_UP, }; +static inline u32 mmci_readl(struct mmci_host *host, u32 off) +{ + return readl(host->base + off); +} + +static inline void mmci_writel(struct mmci_host *host, u32 data, u32 off) +{ + writel(data, host->base + off); +} + static int mmci_card_busy(struct mmc_host *mmc) { struct mmci_host *host = mmc_priv(mmc); @@ -182,7 +192,7 @@ static int mmci_card_busy(struct mmc_host *mmc) pm_runtime_get_sync(mmc_dev(mmc)); spin_lock_irqsave(&host->lock, flags); - if (readl(host->base + MMCISTATUS) & MCI_ST_CARDBUSY) + if (mmci_readl(host, MMCISTATUS) & MCI_ST_CARDBUSY) busy = 1; spin_unlock_irqrestore(&host->lock, flags); @@ -232,7 +242,7 @@ static void mmci_write_clkreg(struct mmci_host *host, u32 clk) { if (host->clk_reg != clk) { host->clk_reg = clk; - writel(clk, host->base + MMCICLOCK); + mmci_writel(host, clk, MMCICLOCK); } } @@ -243,7 +253,7 @@ static void mmci_write_pwrreg(struct mmci_host *host, u32 pwr) { if (host->pwr_reg != pwr) { host->pwr_reg = pwr; - writel(pwr, host->base + MMCIPOWER); + mmci_writel(host, pwr, MMCIPOWER); } } @@ -257,7 +267,7 @@ static void mmci_write_datactrlreg(struct mmci_host *host, u32 datactrl) if (host->datactrl_reg != datactrl) { host->datactrl_reg = datactrl; - writel(datactrl, host->base + MMCIDATACTRL); + mmci_writel(host, datactrl, MMCIDATACTRL); } } @@ -323,7 +333,7 @@ static void mmci_set_clkreg(struct mmci_host *host, unsigned int desired) static void mmci_request_end(struct mmci_host *host, struct mmc_request *mrq) { - writel(0, host->base + MMCICOMMAND); + mmci_writel(host, 0, MMCICOMMAND); BUG_ON(host->data); @@ -338,18 +348,16 @@ mmci_request_end(struct mmci_host *host, struct mmc_request *mrq) static void mmci_set_mask1(struct mmci_host *host, unsigned int mask) { - void __iomem *base = host->base; - if (host->singleirq) { - unsigned int mask0 = readl(base + MMCIMASK0); + unsigned int mask0 = mmci_readl(host, MMCIMASK0); mask0 &= ~MCI_IRQ1MASK; mask0 |= mask; - writel(mask0, base + MMCIMASK0); + mmci_writel(host, mask0, MMCIMASK0); } - writel(mask, base + MMCIMASK1); + mmci_writel(host, mask, MMCIMASK1); } static void mmci_stop_data(struct mmci_host *host) @@ -478,7 +486,7 @@ static void mmci_dma_finalize(struct mmci_host *host, struct mmc_data *data) /* Wait up to 1ms for the DMA to complete */ for (i = 0; ; i++) { - status = readl(host->base + MMCISTATUS); + status = mmci_readl(host, MMCISTATUS); if (!(status & MCI_RXDATAAVLBLMASK) || i >= 100) break; udelay(10); @@ -617,8 +625,8 @@ static int mmci_dma_start_data(struct mmci_host *host, unsigned int datactrl) * to fire next DMA request. When that happens, MMCI will * call mmci_data_end() */ - writel(readl(host->base + MMCIMASK0) | MCI_DATAENDMASK, - host->base + MMCIMASK0); + mmci_writel(host, mmci_readl(host, MMCIMASK0) | MCI_DATAENDMASK, + MMCIMASK0); return 0; } @@ -736,8 +744,8 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data) timeout = data->timeout_clks + (unsigned int)clks; base = host->base; - writel(timeout, base + MMCIDATATIMER); - writel(host->size, base + MMCIDATALENGTH); + mmci_writel(host, timeout, MMCIDATATIMER); + mmci_writel(host, host->size, MMCIDATALENGTH); blksz_bits = ffs(data->blksz) - 1; BUG_ON(1 << blksz_bits != data->blksz); @@ -811,20 +819,19 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data) } mmci_write_datactrlreg(host, datactrl); - writel(readl(base + MMCIMASK0) & ~MCI_DATAENDMASK, base + MMCIMASK0); + mmci_writel(host, mmci_readl(host, MMCIMASK0) & ~MCI_DATAENDMASK, + MMCIMASK0); mmci_set_mask1(host, irqmask); } static void mmci_start_command(struct mmci_host *host, struct mmc_command *cmd, u32 c) { - void __iomem *base = host->base; - dev_dbg(mmc_dev(host->mmc), "op %02x arg %08x flags %08x\n", cmd->opcode, cmd->arg, cmd->flags); - if (readl(base + MMCICOMMAND) & MCI_CPSM_ENABLE) { - writel(0, base + MMCICOMMAND); + if (mmci_readl(host, MMCICOMMAND) & MCI_CPSM_ENABLE) { + mmci_writel(host, 0, MMCICOMMAND); udelay(1); } @@ -839,8 +846,8 @@ mmci_start_command(struct mmci_host *host, struct mmc_command *cmd, u32 c) host->cmd = cmd; - writel(cmd->arg, base + MMCIARGUMENT); - writel(c, base + MMCICOMMAND); + mmci_writel(host, cmd->arg, MMCIARGUMENT); + mmci_writel(host, c, MMCICOMMAND); } static void @@ -865,7 +872,7 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data, * can be as much as a FIFO-worth of data ahead. This * matters for FIFO overruns only. */ - remain = readl(host->base + MMCIDATACNT); + remain = mmci_readl(host, MMCIDATACNT); success = data->blksz * data->blocks - remain; dev_dbg(mmc_dev(host->mmc), "MCI ERROR IRQ, status 0x%08x at 0x%08x\n", @@ -947,10 +954,10 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd, } else if (status & MCI_CMDCRCFAIL && cmd->flags & MMC_RSP_CRC) { cmd->error = -EILSEQ; } else { - cmd->resp[0] = readl(base + MMCIRESPONSE0); - cmd->resp[1] = readl(base + MMCIRESPONSE1); - cmd->resp[2] = readl(base + MMCIRESPONSE2); - cmd->resp[3] = readl(base + MMCIRESPONSE3); + cmd->resp[0] = mmci_readl(host, MMCIRESPONSE0); + cmd->resp[1] = mmci_readl(host, MMCIRESPONSE1); + cmd->resp[2] = mmci_readl(host, MMCIRESPONSE2); + cmd->resp[3] = mmci_readl(host, MMCIRESPONSE3); } if ((!sbc && !cmd->data) || cmd->error) { @@ -1061,11 +1068,10 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id) struct mmci_host *host = dev_id; struct sg_mapping_iter *sg_miter = &host->sg_miter; struct variant_data *variant = host->variant; - void __iomem *base = host->base; unsigned long flags; u32 status; - status = readl(base + MMCISTATUS); + status = mmci_readl(host, MMCISTATUS); dev_dbg(mmc_dev(host->mmc), "irq1 (pio) %08x\n", status); @@ -1105,7 +1111,7 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id) if (remain) break; - status = readl(base + MMCISTATUS); + status = mmci_readl(host, MMCISTATUS); } while (1); sg_miter_stop(sg_miter); @@ -1127,7 +1133,9 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id) */ if (host->size == 0) { mmci_set_mask1(host, 0); - writel(readl(base + MMCIMASK0) | MCI_DATAENDMASK, base + MMCIMASK0); + mmci_writel(host, + mmci_readl(host, MMCIMASK0) | MCI_DATAENDMASK, + MMCIMASK0); } return IRQ_HANDLED; @@ -1148,10 +1156,10 @@ static irqreturn_t mmci_irq(int irq, void *dev_id) struct mmc_command *cmd; struct mmc_data *data; - status = readl(host->base + MMCISTATUS); + status = mmci_readl(host, MMCISTATUS); if (host->singleirq) { - if (status & readl(host->base + MMCIMASK1)) + if (status & mmci_readl(host, MMCIMASK1)) mmci_pio_irq(irq, dev_id); status &= ~MCI_IRQ1MASK; @@ -1162,8 +1170,8 @@ static irqreturn_t mmci_irq(int irq, void *dev_id) * enabled) since the HW seems to be triggering the IRQ on both * edges while monitoring DAT0 for busy completion. */ - status &= readl(host->base + MMCIMASK0); - writel(status, host->base + MMCICLEAR); + status &= mmci_readl(host, MMCIMASK0); + mmci_writel(host, status, MMCICLEAR); dev_dbg(mmc_dev(host->mmc), "irq0 (data+cmd) %08x\n", status); @@ -1561,9 +1569,9 @@ static int mmci_probe(struct amba_device *dev, spin_lock_init(&host->lock); - writel(0, host->base + MMCIMASK0); - writel(0, host->base + MMCIMASK1); - writel(0xfff, host->base + MMCICLEAR); + mmci_writel(host, 0, MMCIMASK0); + mmci_writel(host, 0, MMCIMASK1); + mmci_writel(host, 0xfff, MMCICLEAR); /* If DT, cd/wp gpios must be supplied through it. */ if (!np && gpio_is_valid(plat->gpio_cd)) { @@ -1591,7 +1599,7 @@ static int mmci_probe(struct amba_device *dev, goto clk_disable; } - writel(MCI_IRQENABLE, host->base + MMCIMASK0); + mmci_writel(host, MCI_IRQENABLE, MMCIMASK0); amba_set_drvdata(dev, mmc); @@ -1632,11 +1640,11 @@ static int mmci_remove(struct amba_device *dev) mmc_remove_host(mmc); - writel(0, host->base + MMCIMASK0); - writel(0, host->base + MMCIMASK1); + mmci_writel(host, 0, MMCIMASK0); + mmci_writel(host, 0, MMCIMASK1); - writel(0, host->base + MMCICOMMAND); - writel(0, host->base + MMCIDATACTRL); + mmci_writel(host, 0, MMCICOMMAND); + mmci_writel(host, 0, MMCIDATACTRL); mmci_dma_release(host); clk_disable_unprepare(host->clk); @@ -1653,11 +1661,11 @@ static void mmci_save(struct mmci_host *host) spin_lock_irqsave(&host->lock, flags); - writel(0, host->base + MMCIMASK0); + mmci_writel(host, 0, MMCIMASK0); if (host->variant->pwrreg_nopower) { - writel(0, host->base + MMCIDATACTRL); - writel(0, host->base + MMCIPOWER); - writel(0, host->base + MMCICLOCK); + mmci_writel(host, 0, MMCIDATACTRL); + mmci_writel(host, 0, MMCIPOWER); + mmci_writel(host, 0, MMCICLOCK); } mmci_reg_delay(host); @@ -1671,11 +1679,11 @@ static void mmci_restore(struct mmci_host *host) spin_lock_irqsave(&host->lock, flags); if (host->variant->pwrreg_nopower) { - writel(host->clk_reg, host->base + MMCICLOCK); - writel(host->datactrl_reg, host->base + MMCIDATACTRL); - writel(host->pwr_reg, host->base + MMCIPOWER); + mmci_writel(host, host->clk_reg, MMCICLOCK); + mmci_writel(host, host->datactrl_reg, MMCIDATACTRL); + mmci_writel(host, host->pwr_reg, MMCIPOWER); } - writel(MCI_IRQENABLE, host->base + MMCIMASK0); + mmci_writel(host, MCI_IRQENABLE, MMCIMASK0); mmci_reg_delay(host); spin_unlock_irqrestore(&host->lock, flags);