From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, URIBL_DBL_ABUSE_MALW,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B948C35247 for ; Tue, 4 Feb 2020 01:02:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 196752084E for ; Tue, 4 Feb 2020 01:02:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HqNcsVU/"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="YyT8l6/X" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 196752084E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TvWUTPDa6KsKtNXWUwEZfRsOntRehqTnSvoNrcIHh00=; b=HqNcsVU/XJfd5p weV+VFiKxTvnOliXRWf2+D7B9siTFkZv1F5RLkPK4Q4d6g1EBOs05CUL+rMzJ8vWFdCMy7PbSv0Xu 4AD3NU44VCb2CVx94ROKX2vTxyaDC0+Ef2M4mo9mfGT/3aHF2INRc44TYEAA97stCcwe5eYcCKGGY 4eKwgyVuxPTIqgex7w7dmHd/UT2JS277y6pSFnuZC+A055HduhkrFlFdQP6SfSVqYCHI3fDWQMLrJ GP6NfvIxnv5HnH3uvpDFt7129eKdC1PlsQ6OzebynJpHXwy9p6N6PXkOYu7TzVeBF6TUbu33tqqKv QtsGDWUFkxklaMsVQUHQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iymbQ-0005LM-Om; Tue, 04 Feb 2020 01:02:08 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iymbN-0005KX-En; Tue, 04 Feb 2020 01:02:07 +0000 X-UUID: c0485041b8e2451f99704625bfdbdbcf-20200203 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=J/91P7CsnkCfrObHmsk/huS8R8VqXI101se7q3U3Jvw=; b=YyT8l6/XiHcPJQCKsI+5tm8ijZTR0/XwfCP5v1vRVeQAljQRsK/EudF9jgvtb7SgYEWFBTK87b3yc07d/7Q6ofwnKZI0EYJX7Fl+iBG78ZCHHWKmRHwjYWah2gGGBf9hBfa4J6CDZRdSVR/TA8dT0MRLuLbxc/3pT5vyY30+vp8=; X-UUID: c0485041b8e2451f99704625bfdbdbcf-20200203 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1738461016; Mon, 03 Feb 2020 17:02:03 -0800 Received: from MTKMBS02N2.mediatek.inc (172.21.101.101) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 3 Feb 2020 17:02:00 -0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 4 Feb 2020 09:00:39 +0800 Received: from [172.21.77.33] (172.21.77.33) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 4 Feb 2020 09:01:34 +0800 Message-ID: <1580778114.4621.12.camel@mtkswgap22> Subject: Re: [PATCH 2/3] [2/3] mmc: mediatek: command queue support From: Chun-Hung Wu To: Ulf Hansson Date: Tue, 4 Feb 2020 09:01:54 +0800 In-Reply-To: References: <1572590582-11056-1-git-send-email-chun-hung.wu@mediatek.com> <1572590582-11056-2-git-send-email-chun-hung.wu@mediatek.com> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-TM-SNTS-SMTP: A03969DB743984CCCAD83D7D39F1CD9720AC81AF73C55804F3669539F8D05F262000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200203_170205_512801_9B9F78F9 X-CRM114-Status: GOOD ( 23.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wsd_upstream@mediatek.com, "linux-mmc@vger.kernel.org" , Pan Bian , Kuohong Wang , Linux Kernel Mailing List , linux-mediatek@lists.infradead.org, Linux ARM , Matthias Brugger , Stanley Chu , Chaotian Jing Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Ulf Hansson: Thanks for your review in details. I will update v2 patch based on your suggestion by this week. By the way, I have replied your question below, please take a look and provide feedback if any. Regards, Chun-Hung Wu On Mon, 2019-11-11 at 14:37 +0100, Ulf Hansson wrote: + Trimmed cc list (please do that as well for your next submission). > > On Fri, 1 Nov 2019 at 07:43, Chun-Hung Wu wrote: > > > > Support command queue for mt6779 platform. > > A lot of changes summarized on only one line. I would appreciate some > more information here, please. > -> Will provide more information for v2 driver. > > > > Change-Id: I56b866fa4097a3c0bee77f53486c470e4f1944b9 > > Feature: > > Drop these please. > > > Signed-off-by: Chun-Hung Wu > > For the next submission, please add the maintainers for the cqhci > driver. They may have some valuable feedback for you. > -> ok > Below follows a few review comments, which are more from a patch > formatting point of view, than technical. > > > --- > > drivers/mmc/host/mtk-sd.c | 151 +++++++++++++++++++++++++++++++++++++++++++--- > > 1 file changed, 141 insertions(+), 10 deletions(-) > > > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > > index 189e426..b132397 100644 > > --- a/drivers/mmc/host/mtk-sd.c > > +++ b/drivers/mmc/host/mtk-sd.c > > @@ -31,6 +31,8 @@ > > #include > > #include > > > > +#include "cqhci.h" > > + > > #define MAX_BD_NUM 1024 > > > > /*--------------------------------------------------------------------------*/ > > @@ -151,6 +153,7 @@ > > #define MSDC_INT_DMA_BDCSERR (0x1 << 17) /* W1C */ > > #define MSDC_INT_DMA_GPDCSERR (0x1 << 18) /* W1C */ > > #define MSDC_INT_DMA_PROTECT (0x1 << 19) /* W1C */ > > +#define MSDC_INT_CMDQ (0x1 << 28) /* W1C */ > > > > /* MSDC_INTEN mask */ > > #define MSDC_INTEN_MMCIRQ (0x1 << 0) /* RW */ > > @@ -181,6 +184,7 @@ > > /* SDC_CFG mask */ > > #define SDC_CFG_SDIOINTWKUP (0x1 << 0) /* RW */ > > #define SDC_CFG_INSWKUP (0x1 << 1) /* RW */ > > +#define SDC_CFG_WRDTOC (0x1fff << 2) /* RW */ > > #define SDC_CFG_BUSWIDTH (0x3 << 16) /* RW */ > > #define SDC_CFG_SDIO (0x1 << 19) /* RW */ > > #define SDC_CFG_SDIOIDE (0x1 << 20) /* RW */ > > @@ -228,6 +232,7 @@ > > #define MSDC_PATCH_BIT_SPCPUSH (0x1 << 29) /* RW */ > > #define MSDC_PATCH_BIT_DECRCTMO (0x1 << 30) /* RW */ > > > > +#define MSDC_PB1_BUSY_CHECK_SEL (0x1 << 7) /* RW */ > > #define MSDC_PATCH_BIT1_STOP_DLY (0xf << 8) /* RW */ > > > > #define MSDC_PATCH_BIT2_CFGRESP (0x1 << 15) /* RW */ > > @@ -431,6 +436,7 @@ struct msdc_host { > > struct msdc_save_para save_para; /* used when gate HCLK */ > > struct msdc_tune_para def_tune_para; /* default tune setting */ > > struct msdc_tune_para saved_tune_para; /* tune result of CMD21/CMD19 */ > > + struct cqhci_host *cq_host; > > }; > > > > static const struct mtk_mmc_compatible mt8135_compat = { > > @@ -527,6 +533,18 @@ struct msdc_host { > > .use_internal_cd = true, > > }; > > > > +static const struct mtk_mmc_compatible mt6779_compat = { > > + .clk_div_bits = 12, > > + .hs400_tune = false, > > + .pad_tune_reg = MSDC_PAD_TUNE0, > > + .async_fifo = true, > > + .data_tune = true, > > + .busy_check = true, > > + .stop_clk_fix = true, > > + .enhance_rx = true, > > + .support_64g = true, > > +}; > > + > > static const struct of_device_id msdc_of_ids[] = { > > { .compatible = "mediatek,mt8135-mmc", .data = &mt8135_compat}, > > { .compatible = "mediatek,mt8173-mmc", .data = &mt8173_compat}, > > @@ -536,6 +554,7 @@ struct msdc_host { > > { .compatible = "mediatek,mt7622-mmc", .data = &mt7622_compat}, > > { .compatible = "mediatek,mt8516-mmc", .data = &mt8516_compat}, > > { .compatible = "mediatek,mt7620-mmc", .data = &mt7620_compat}, > > + { .compatible = "mediatek,mt6779-mmc", .data = &mt6779_compat}, > > {} > > }; > > MODULE_DEVICE_TABLE(of, msdc_of_ids); > > @@ -698,21 +717,21 @@ static void msdc_unprepare_data(struct msdc_host *host, struct mmc_request *mrq) > > } > > } > > > > -/* clock control primitives */ > > -static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks) > > +static u64 msdc_timeout_cal(struct msdc_host *host, u64 ns, u64 clks) > > { > > - u32 timeout, clk_ns; > > + u64 timeout, clk_ns; > > u32 mode = 0; > > > > - host->timeout_ns = ns; > > - host->timeout_clks = clks; > > if (host->mmc->actual_clock == 0) { > > timeout = 0; > > } else { > > - clk_ns = 1000000000UL / host->mmc->actual_clock; > > - timeout = (ns + clk_ns - 1) / clk_ns + clks; > > + clk_ns = 1000000000ULL; > > + do_div(clk_ns, host->mmc->actual_clock); > > + timeout = ns + clk_ns - 1; > > + do_div(timeout, clk_ns); > > + timeout += clks; > > /* in 1048576 sclk cycle unit */ > > - timeout = (timeout + (0x1 << 20) - 1) >> 20; > > + timeout = DIV_ROUND_UP(timeout, (0x1 << 20)); > > if (host->dev_comp->clk_div_bits == 8) > > sdr_get_field(host->base + MSDC_CFG, > > MSDC_CFG_CKMOD, &mode); > > @@ -722,9 +741,30 @@ static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks) > > /*DDR mode will double the clk cycles for data timeout */ > > timeout = mode >= 2 ? timeout * 2 : timeout; > > timeout = timeout > 1 ? timeout - 1 : 0; > > - timeout = timeout > 255 ? 255 : timeout; > > } > > - sdr_set_field(host->base + SDC_CFG, SDC_CFG_DTOC, timeout); > > + return timeout; > > +} > > + > > +/* clock control primitives */ > > +static void msdc_set_timeout(struct msdc_host *host, u64 ns, u64 clks) > > +{ > > + u64 timeout; > > + > > + host->timeout_ns = ns; > > + host->timeout_clks = clks; > > + > > + timeout = msdc_timeout_cal(host, ns, clks); > > + sdr_set_field(host->base + SDC_CFG, SDC_CFG_DTOC, > > + (u32)(timeout > 255 ? 255 : timeout)); > > +} > > Does the above changes make sense to split out in a separate patch? > > It looks to me, that these are generic clock updates to the driver > that really doesn't have to be included in $subject patch. > > -> thanks, it's ok to separate the clock things to another patch > + > > +static void msdc_set_busy_timeout(struct msdc_host *host, u64 ns, u64 clks) > > +{ > > + u64 timeout; > > + > > + timeout = msdc_timeout_cal(host, ns, clks); > > + sdr_set_field(host->base + SDC_CFG, SDC_CFG_WRDTOC, > > + (u32)(timeout > 8191 ? 8191 : timeout)); > > } > > > > static void msdc_gate_clock(struct msdc_host *host) > > @@ -1413,6 +1453,36 @@ static void msdc_enable_sdio_irq(struct mmc_host *mmc, int enb) > > pm_runtime_put_noidle(host->dev); > > } > > > > +#if IS_ENABLED(CONFIG_MMC_CQHCI) > > Other drivers Kconfig option, uses "select MMC_CQHCI". Would that make > this more simple and allowing to remove the "if IS_ENABLED" thingy? > ->We support both CQHCI and legacy(non-CQHCI). And function cqhci_irq() ->induce compile error if CONFIG_MMC_CQHCI not defined. We need this ->option here. > > +static irqreturn_t msdc_cmdq_irq(struct msdc_host *host, u32 intsts) > > +{ > > + int cmd_err = 0, dat_err = 0; > > + > > + if (intsts & MSDC_INT_RSPCRCERR) { > > + cmd_err = (unsigned int)-EILSEQ; > > + dev_err(host->dev, "%s: CMD CRC ERR", __func__); > > + } else if (intsts & MSDC_INT_CMDTMO) { > > + cmd_err = (unsigned int)-ETIMEDOUT; > > + dev_err(host->dev, "%s: CMD TIMEOUT ERR", __func__); > > + } > > + > > + if (intsts & MSDC_INT_DATCRCERR) { > > + dat_err = (unsigned int)-EILSEQ; > > + dev_err(host->dev, "%s: DATA CRC ERR", __func__); > > + } else if (intsts & MSDC_INT_DATTMO) { > > + dat_err = (unsigned int)-ETIMEDOUT; > > + dev_err(host->dev, "%s: DATA TIMEOUT ERR", __func__); > > + } > > + > > + if (cmd_err || dat_err) { > > + dev_err(host->dev, "cmd_err = %d, dat_err =%d, intsts = 0x%x", > > + cmd_err, dat_err, intsts); > > + } > > + > > + return cqhci_irq(host->mmc, 0, cmd_err, dat_err); > > +} > > +#endif > > + > > static irqreturn_t msdc_irq(int irq, void *dev_id) > > { > > struct msdc_host *host = (struct msdc_host *) dev_id; > > @@ -1449,6 +1519,16 @@ static irqreturn_t msdc_irq(int irq, void *dev_id) > > if (!(events & (event_mask & ~MSDC_INT_SDIOIRQ))) > > break; > > > > +#if IS_ENABLED(CONFIG_MMC_CQHCI) > > Again, please to avoid these "IS_ENABLED". > ->We support both CQHCI and legacy(non-CQHCI). And function cqhci_irq() ->induce compile error if CONFIG_MMC_CQHCI not defined. We need this ->option here. > > + if ((host->mmc->caps2 & MMC_CAP2_CQE) && > > + (events & MSDC_INT_CMDQ)) { > > + msdc_cmdq_irq(host, events); > > + /* clear interrupts */ > > + writel(events, host->base + MSDC_INT); > > + return IRQ_HANDLED; > > + } > > +#endif > > + > > if (!mrq) { > > dev_err(host->dev, > > "%s: MRQ=NULL; events=%08X; event_mask=%08X\n", > > @@ -2132,6 +2212,36 @@ static int msdc_get_cd(struct mmc_host *mmc) > > return !val; > > } > > > > +static void msdc_cqe_enable(struct mmc_host *mmc) > > +{ > > + struct msdc_host *host = mmc_priv(mmc); > > + > > + /* enable cmdq irq */ > > + writel(MSDC_INT_CMDQ, host->base + MSDC_INTEN); > > + /* enable busy check */ > > + sdr_set_bits(host->base + MSDC_PATCH_BIT1, MSDC_PB1_BUSY_CHECK_SEL); > > + /* default write data / busy timeout 20s */ > > + msdc_set_busy_timeout(host, 20 * 1000000000ULL, 0); > > + /* default read data timeout 1s */ > > + msdc_set_timeout(host, 1000000000ULL, 0); > > Some magic timeout values here. Can you elaborate why these values? > ->The value is from current msdc specs and calculate a timeout value >> ->read/write timeout spec > > +} > > + > > +void msdc_cqe_disable(struct mmc_host *mmc, bool recovery) > > +{ > > + struct msdc_host *host = mmc_priv(mmc); > > + > > + /* disable cmdq irq */ > > + sdr_clr_bits(host->base + MSDC_INTEN, MSDC_INT_CMDQ); > > + /* disable busy check */ > > + sdr_clr_bits(host->base + MSDC_PATCH_BIT1, MSDC_PB1_BUSY_CHECK_SEL); > > + > > + if (recovery) { > > + sdr_set_field(host->base + MSDC_DMA_CTRL, > > + MSDC_DMA_CTRL_STOP, 1); > > + msdc_reset_hw(host); > > + } > > +} > > + > > static const struct mmc_host_ops mt_msdc_ops = { > > .post_req = msdc_post_req, > > .pre_req = msdc_pre_req, > > @@ -2148,6 +2258,11 @@ static int msdc_get_cd(struct mmc_host *mmc) > > .hw_reset = msdc_hw_reset, > > The hw_reset callback is really for resetting the card, but it seems > like you are using it to reset the controller. No? > > I notice there are some other drivers abusing the callback as well, > but I am wondering whether it's time to really look into what's going > on here. > > Can you elaborate on why you need this? > ->We did reset card in msdc_hw_reset() not controller. The bit we set in ->the function is to reset card. > > }; > > > > +static const struct cqhci_host_ops msdc_cmdq_ops = { > > + .enable = msdc_cqe_enable, > > + .disable = msdc_cqe_disable, > > +}; > > + > > static void msdc_of_property_parse(struct platform_device *pdev, > > struct msdc_host *host) > > { > > @@ -2299,6 +2414,22 @@ static int msdc_drv_probe(struct platform_device *pdev) > > host->dma_mask = DMA_BIT_MASK(32); > > mmc_dev(mmc)->dma_mask = &host->dma_mask; > > > > +#if IS_ENABLED(CONFIG_MMC_CQHCI) > > + if (mmc->caps2 & MMC_CAP2_CQE) { > > + host->cq_host = devm_kzalloc(host->mmc->parent, > > + sizeof(*host->cq_host), > > + GFP_KERNEL); > > + host->cq_host->caps |= CQHCI_TASK_DESC_SZ_128; > > + host->cq_host->mmio = host->base + 0x800; > > + host->cq_host->ops = &msdc_cmdq_ops; > > + cqhci_init(host->cq_host, mmc, true); > > + mmc->max_segs = 128; > > + /* cqhci 16bit length */ > > + /* 0 size, means 65536 so we don't have to -1 here */ > > + mmc->max_seg_size = 64 * 1024; > > + } > > +#endif > > + > > host->timeout_clks = 3 * 1048576; > > host->dma.gpd = dma_alloc_coherent(&pdev->dev, > > 2 * sizeof(struct mt_gpdma_desc), > > -- > > 1.9.1 > > > > Kind regards > Uffe > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel