From patchwork Thu Nov 3 13:31:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 80660 Delivered-To: patch@linaro.org Received: by 10.80.170.210 with SMTP id r18csp621746edc; Thu, 3 Nov 2016 06:32:25 -0700 (PDT) X-Received: by 10.107.44.137 with SMTP id s131mr6768662ios.212.1478179945151; Thu, 03 Nov 2016 06:32:25 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xs9si8030476pab.86.2016.11.03.06.32.24; Thu, 03 Nov 2016 06:32:25 -0700 (PDT) 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 S1754225AbcKCNcY (ORCPT + 3 others); Thu, 3 Nov 2016 09:32:24 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:34893 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752503AbcKCNcX (ORCPT ); Thu, 3 Nov 2016 09:32:23 -0400 Received: by mail-pf0-f182.google.com with SMTP id i88so31897571pfk.2 for ; Thu, 03 Nov 2016 06:32:23 -0700 (PDT) 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=T0dq0Wf9Yb6Puyo8jEujF+YG1JTo2PNYwQn1vxDumtU=; b=M+D90ozUI+usQTN3GqdzJHWlVhPGYiwuwZWBlYMI/FJAUyZjhyUtVNw86YZTOGZdIq HmaWqpXzcC9hV3MFqRdD0pkHT8XXiKRiG5Zla6k89I96inXMb5TO9GHT6RRT7z2xKiqe lsj0p8e4sQZTC2Tc+HsTl27bwMQ0ae1IPirDw= 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=T0dq0Wf9Yb6Puyo8jEujF+YG1JTo2PNYwQn1vxDumtU=; b=No2XHgzuNC+Th3rSqEAxxPBIr73iyIDZTZo+8Kco5mpMUkNb1CjIH7O7iZ9fcfxEK9 jY3BswniAxtaEapp5fEL4GcpyKWRVVkybwGD2lJTNfh4D/CKBfJ3yuAHi76NqVgZFIWH vLrUMK17+eegamJxNlZG2EUar1ioBt63tgHkWivqczIyEz+nSyK/ltzWPff7d1VSoRLm nsutAM5DtxRBOHbypJlvnS+LY7NgVf7Oxv2Ub9B5PFdKoVhMUDZVxDbdzqHsK5kx0e/9 24mKmVCq/QMTGqRmfxTBCCI/o4Q+kUIutu+GlY12sODbdByAVaj7cO3/aPY2PsHzm1OX 48Fw== X-Gm-Message-State: ABUngvcTeB0FmYMhIgqHRjtkRo9R6ztS46fx6I1oX0OxMuDEV5SVTNQvnM+SO5wrPdOPAls9 X-Received: by 10.99.167.67 with SMTP id w3mr14090560pgo.1.1478179942935; Thu, 03 Nov 2016 06:32:22 -0700 (PDT) Received: from localhost.localdomain ([188.42.252.253]) by smtp.gmail.com with ESMTPSA id j192sm12926803pfc.60.2016.11.03.06.32.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Nov 2016 06:32:22 -0700 (PDT) From: Jun Nie To: shawn.guo@linaro.org, xie.baoyou@zte.com.cn Cc: ulf.hansson@linaro.org, jh80.chung@samsung.com, jason.liu@linaro.org, linux-mmc@vger.kernel.org, Jun Nie Subject: [PATCH v3 5/5] mmc: dw: Add fifo watermark alignment property Date: Thu, 3 Nov 2016 21:31:41 +0800 Message-Id: <1478179901-25645-6-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1478179901-25645-1-git-send-email-jun.nie@linaro.org> References: <1478179901-25645-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 --- 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 696b5e6..6d85ca6 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1111,11 +1111,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 { /* @@ -2957,6 +2961,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 17cb95a..ee4bb30 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -108,6 +108,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. @@ -156,6 +158,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;