From patchwork Fri Jan 6 04:24:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 90100 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp9284612qgi; Thu, 5 Jan 2017 20:25:08 -0800 (PST) X-Received: by 10.84.217.80 with SMTP id e16mr154831185plj.120.1483676708679; Thu, 05 Jan 2017 20:25:08 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q10si78073817pge.19.2017.01.05.20.25.08; Thu, 05 Jan 2017 20:25:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939473AbdAFEZH (ORCPT + 5 others); Thu, 5 Jan 2017 23:25:07 -0500 Received: from mail-pf0-f181.google.com ([209.85.192.181]:33893 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937881AbdAFEZG (ORCPT ); Thu, 5 Jan 2017 23:25:06 -0500 Received: by mail-pf0-f181.google.com with SMTP id 127so11415595pfg.1 for ; Thu, 05 Jan 2017 20:25:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xOfHo6D1Za7G6kgyTVLTcqYvyJGvfwM8wxIpwa9lk/A=; b=dFj4tOLGY3uZyeahJMbXC1IMjuDjoGKxch8s7ox/nQxhwSJWs28ZACsjJaOJYEjdkU UTjWTjFWDxadesrC2jLiIrH1uRt08i/Oxd3nT9fK2j1ePlMUYzJZaUgFfNJbCHXjRMDi ApnHIYTuVTI2/qoH00hBbR/HAynIYY3FVfnmw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xOfHo6D1Za7G6kgyTVLTcqYvyJGvfwM8wxIpwa9lk/A=; b=YFx0iAKs88LUP3L042eiUTBFYut0kZi2hbazvxoX0WPxyASDWJSSMo2Qbj0wUOh+1c 1du+GMJhKuOKlXg7KE3ZC65gD5QcRDvFVxQ0QgwJDCVprnG86swacc9pW7z/LMlyoHEg hRGCtpaQ2qdsAEraYvBQhgbtDwz/p1mFUZzV261rV142EZVdbIYRV0xUy0c0RMiQPnNx eumLhGf4mlQrhO22buSFca71SfW47DVziKlfoInQTZMIgLzm2M8ljgEXZDdjXVh+KdNe Yr7v3ladOaLa7rdvkeKj8XZ4h0dMBkyUDd6KfcELYRBwDuWhEAugKKYb89eswFSDcF/6 7joQ== X-Gm-Message-State: AIkVDXKmuy5iSqF51k8jibQsmw91A6Z964OyPQUADwLFx55J5pJmIZvi9TnA5lcp6MDsv9hV X-Received: by 10.84.217.2 with SMTP id o2mr147533961pli.99.1483676706211; Thu, 05 Jan 2017 20:25:06 -0800 (PST) Received: from localhost.localdomain (125-227-70-105.HINET-IP.hinet.net. [125.227.70.105]) by smtp.gmail.com with ESMTPSA id t25sm158142586pgo.9.2017.01.05.20.25.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Jan 2017 20:25:05 -0800 (PST) From: Jun Nie To: robh+dt@kernel.org, mark.rutland@arm.com, shawn.guo@linaro.org, xie.baoyou@zte.com.cn, devicetree@vger.kernel.org Cc: ulf.hansson@linaro.org, jh80.chung@samsung.com, jason.liu@linaro.org, chen.chaokai@zte.com.cn, lai.binz@zte.com.cn, linux-mmc@vger.kernel.org, Jun Nie Subject: [PATCH v9 3/5] mmc: dw: Add fifo watermark alignment property Date: Fri, 6 Jan 2017 12:24:44 +0800 Message-Id: <1483676686-17011-4-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1483676686-17011-1-git-send-email-jun.nie@linaro.org> References: <1483676686-17011-1-git-send-email-jun.nie@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Data done irq is expected if data length is less than watermark in PIO mode. But fifo watermark is requested to be aligned with data length in some SoC so that TX/RX irq can be generated with data done irq. Add the watermark alignment to mark this requirement and force fifo watermark setting accordingly. Signed-off-by: Jun Nie Reviewed-by: Shawn Lin --- drivers/mmc/host/dw_mmc.c | 11 +++++++++-- include/linux/mmc/dw_mmc.h | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index b600170..e890a45 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1113,11 +1113,15 @@ static void dw_mci_submit_data(struct dw_mci *host, struct mmc_data *data) mci_writel(host, CTRL, temp); /* - * Use the initial fifoth_val for PIO mode. + * Use the initial fifoth_val for PIO mode. If wm_algined + * is set, we set watermark same as data size. * If next issued data may be transfered by DMA mode, * prev_blksz should be invalidated. */ - mci_writel(host, FIFOTH, host->fifoth_val); + if (host->wm_aligned) + dw_mci_adjust_fifoth(host, data); + else + mci_writel(host, FIFOTH, host->fifoth_val); host->prev_blksz = 0; } else { /* @@ -2979,6 +2983,9 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) of_property_read_u32(np, "data-addr", &host->data_addr_override); + if (of_get_property(np, "fifo-watermark-aligned", NULL)) + host->wm_aligned = true; + if (!of_property_read_u32(np, "clock-frequency", &clock_frequency)) pdata->bus_hz = clock_frequency; diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index 1c09cca..cc7da85 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -114,6 +114,8 @@ struct dw_mci_dma_slave { * @slot: Slots sharing this MMC controller. * @fifo_depth: depth of FIFO. * @data_addr_override: override fifo reg offset with this value. + * @wm_aligned: force fifo watermark equal with data length in PIO mode. + * Set as true if alignment is needed. * @data_shift: log2 of FIFO item size. * @part_buf_start: Start index in part_buf. * @part_buf_count: Bytes of partial data in part_buf. @@ -162,6 +164,7 @@ struct dw_mci { void __iomem *regs; void __iomem *fifo_reg; u32 data_addr_override; + bool wm_aligned; struct scatterlist *sg; struct sg_mapping_iter sg_miter;