From patchwork Mon Dec 5 02:29:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 86484 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1275707qgi; Sun, 4 Dec 2016 18:30:52 -0800 (PST) X-Received: by 10.98.57.144 with SMTP id u16mr54947567pfj.142.1480905052545; Sun, 04 Dec 2016 18:30:52 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w17si12870432pge.203.2016.12.04.18.30.52; Sun, 04 Dec 2016 18:30:52 -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 S1751576AbcLECan (ORCPT + 5 others); Sun, 4 Dec 2016 21:30:43 -0500 Received: from mail-pg0-f45.google.com ([74.125.83.45]:34171 "EHLO mail-pg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751547AbcLECaC (ORCPT ); Sun, 4 Dec 2016 21:30:02 -0500 Received: by mail-pg0-f45.google.com with SMTP id x23so130946937pgx.1 for ; Sun, 04 Dec 2016 18:30:01 -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=SUGoNSsVF2efOW4xrgfwurqpmHjEjqIKjvEVfpDwCQOCQwOz5yNXQGBTO4MqdCBdA2 oWBekG0ljBNHy+IJC6Ta8JKILhVwMsR7hw00iqK6JPD/YTkTWgXenl0qObu25gOGqwqD XysgQH7eNX0rZXNS+d/ByAJgL0SE9uNpWawSE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xOfHo6D1Za7G6kgyTVLTcqYvyJGvfwM8wxIpwa9lk/A=; b=ISbfcbuJL8+PGGahkzncbwjubULEe1XxAr48OKXZG2PzAPE8VE3ZP8kbvMpHzcRJfD xVSA/A3Yv8lJBUtTHXEvF7bXvorlbV3c93n6eubWUJYVxMIYk93gNnSLbyeaaFQiUit1 3V6+TeKDCktAK3bG2OrXliHovOihBf4RbqQkfI36/CgY4pMx/u4m8Rlce0abG6GhFdsu Psb9q3CagI2NVRDC2Nep4tKT6LgLSO4K6UGMgYQHp8VMXF5oBxikyIGzNrFLfVUnOZK+ 1CUh5fKpi3Qpudie/PqVRZoGRtLd/Yp4yPe1Ti5WaBKWx5z7eDLLF+55VHX3+7onkCa9 r/7g== X-Gm-Message-State: AKaTC00enPqKoI7pALsUxP3owBOyeIXeGq7SZluPG+DCZWe3N3YLyt8VctrBWGSx9rGL1yGj X-Received: by 10.99.138.75 with SMTP id y72mr98152121pgd.90.1480905001294; Sun, 04 Dec 2016 18:30:01 -0800 (PST) Received: from localhost.localdomain (118-163-207-41.HINET-IP.hinet.net. [118.163.207.41]) by smtp.gmail.com with ESMTPSA id w125sm22818670pfb.8.2016.12.04.18.29.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 04 Dec 2016 18:30:00 -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 v7 5/5] mmc: dw: Add fifo watermark alignment property Date: Mon, 5 Dec 2016 10:29:36 +0800 Message-Id: <1480904976-7081-6-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1480904976-7081-1-git-send-email-jun.nie@linaro.org> References: <1480904976-7081-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;