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=-14.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 51C70C07E99 for ; Mon, 12 Jul 2021 09:33:20 +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 1FB956102A for ; Mon, 12 Jul 2021 09:33:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1FB956102A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:Cc: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=68r2S/G0L0r0SKAzMcM/Y0FRHYXyg6trxlLNaxcphdc=; b=0qL+wQjdDg2pBq J67WFL/yTmrZXgAOISrQC90eZxF9ExuljWGZf6Sdtg/pB6bCdLNTg+bdwQGreD2HOLSl5rqu5DWiZ P259vb3e+17rRF1gNBl4qDUC8uP+5ohgr2d6A22R3SYg+STe9VccoTVzmyFao5SUfnHKMC1ALpzIg Kmqf+1wX0NV/hzzJx/+HWGjvfZZ4OU0jM3QbyXxyx6BkFbKY/wxX6BRZd8Z3uF/5bo2a79KsFTZCh RAzBOW6mw6TrXKiP/FUcYOYl172GYnoptCEzZ+zch7RWlOwqSeg1fdwfCYceUq8w4jio36NK96Dr5 WfrlF27F0UVBt6n22thw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2sHm-006k9G-9h; Mon, 12 Jul 2021 09:31:34 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2sHh-006k8C-Jh for linux-arm-kernel@lists.infradead.org; Mon, 12 Jul 2021 09:31:32 +0000 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[IPv6:::1]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1m2sHJ-0006Os-Q5; Mon, 12 Jul 2021 11:31:05 +0200 Message-ID: <7ca4554c58908618705768e01239409d19f83d17.camel@pengutronix.de> Subject: Re: [PATCH v14 08/12] spi: imx: remove ERR009165 workaround on i.mx6ul From: Lucas Stach To: Robin Gong , "vkoul@kernel.org" , "mark.rutland@arm.com" , "broonie@kernel.org" , "robh+dt@kernel.org" , "catalin.marinas@arm.com" , "will.deacon@arm.com" , "shawnguo@kernel.org" , "festevam@gmail.com" , "s.hauer@pengutronix.de" , "martin.fuzzey@flowbird.group" , "u.kleine-koenig@pengutronix.de" , "dan.j.williams@intel.com" , "matthias.schiffer@ew.tq-group.com" , "frieder.schrempf@kontron.de" , "m.felsch@pengutronix.de" , Clark Wang Cc: "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-spi@vger.kernel.org" , dl-linux-imx , "kernel@pengutronix.de" , "dmaengine@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" Date: Mon, 12 Jul 2021 11:30:58 +0200 In-Reply-To: References: <1617809456-17693-1-git-send-email-yibin.gong@nxp.com> <1617809456-17693-9-git-send-email-yibin.gong@nxp.com> User-Agent: Evolution 3.40.1 (3.40.1-1.fc34) MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210712_023129_869839_2798E368 X-CRM114-Status: GOOD ( 33.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Am Montag, dem 12.07.2021 um 03:48 +0000 schrieb Robin Gong: > On 09/07/21 17:42 Lucas Stach wrote: > > Am Mittwoch, dem 07.04.2021 um 23:30 +0800 schrieb Robin Gong: > > > ERR009165 fixed on i.mx6ul/6ull/6sll. All other i.mx6/7 and i.mx8m/8mm > > > still need this errata. Please refer to nxp official errata document > > > from > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.n > > xp.com%2F&data=04%7C01%7Cyibin.gong%40nxp.com%7C48156bc93d > > c84ac26e9d08d942bdc0ac%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0% > > 7C1%7C637614205017900475%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4 > > wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&a > > mp;sdata=keYQubzt1jWrKhaxXr40RL41vzFuIn7x1Sasa3p%2F9Xo%3D&res > > erved=0 . > > > > > > For removing workaround on those chips. Add new i.mx6ul type. > > > > > > Signed-off-by: Robin Gong > > > Acked-by: Mark Brown > > > --- > > > drivers/spi/spi-imx.c | 47 > > > +++++++++++++++++++++++++++++++++++++++++++---- > > > 1 file changed, 43 insertions(+), 4 deletions(-) > > > > > > diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index > > > cf235b9..d18ee25 100644 > > > --- a/drivers/spi/spi-imx.c > > > +++ b/drivers/spi/spi-imx.c > > > @@ -59,6 +59,7 @@ enum spi_imx_devtype { > > > IMX35_CSPI, /* CSPI on all i.mx except above */ > > > IMX51_ECSPI, /* ECSPI on i.mx51 */ > > > IMX53_ECSPI, /* ECSPI on i.mx53 and later */ > > > + IMX6UL_ECSPI, /* ERR009165 fix from i.mx6ul */ > > > > This patch could be a lot smaller if you didn't introduce a new devtype. You > > could just use the IMX51_ECSPI in imx6ul_ecspi_devtype_data, as all you care > > about as a relevant difference is the tx_glitch_fixed property, which isn't tied > > to the devtype. > I knew tx_glitch_fixed was enough but I still prefer to add new 'IMX6UL_ECSPI' because > we can clearly choose the right IP which has fix the issue while legacy IMX51 if it's not > fixed by dts. > Sorry, I don't follow this reasoning. You are not using the new IMX6UL_ECSPI devtype in any way in this patch, other than a single location, where you just handle it the same as the IMX51_ECSPI devtype. Regards, Lucas > > > > > }; > > > > > > struct spi_imx_data; > > > @@ -78,6 +79,11 @@ struct spi_imx_devtype_data { > > > bool has_slavemode; > > > unsigned int fifo_size; > > > bool dynamic_burst; > > > + /* > > > + * ERR009165 fixed or not: > > > + * > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.n > > xp.com%2Fdocs%2Fen%2Ferrata%2FIMX6DQCE.pdf&data=04%7C01%7C > > yibin.gong%40nxp.com%7C48156bc93dc84ac26e9d08d942bdc0ac%7C686ea > > 1d3bc2b4c6fa92cd99c5c301635%7C0%7C1%7C637614205017900475%7CU > > nknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6 > > Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=J9iZb93uN1VEriN%2F2GAE > > TWxdv4n%2FD6ZXteMCFkB8KHM%3D&reserved=0 > > > + */ > > > + bool tx_glitch_fixed; > > > enum spi_imx_devtype devtype; > > > }; > > > > > > @@ -134,6 +140,11 @@ static inline int is_imx51_ecspi(struct spi_imx_data > > *d) > > > return d->devtype_data->devtype == IMX51_ECSPI; } > > > > > > +static inline int is_imx6ul_ecspi(struct spi_imx_data *d) { > > > + return d->devtype_data->devtype == IMX6UL_ECSPI; } > > > + > > > static inline int is_imx53_ecspi(struct spi_imx_data *d) { > > > return d->devtype_data->devtype == IMX53_ECSPI; @@ -593,8 +604,14 > > @@ > > > static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx, > > > ctrl |= mx51_ecspi_clkdiv(spi_imx, t->speed_hz, &clk); > > > spi_imx->spi_bus_clk = clk; > > > > > > - /* ERR009165: work in XHC mode as PIO */ > > > - ctrl &= ~MX51_ECSPI_CTRL_SMC; > > > + /* > > > + * ERR009165: work in XHC mode instead of SMC as PIO on the chips > > > + * before i.mx6ul. > > > + */ > > > + if (spi_imx->usedma && spi_imx->devtype_data->tx_glitch_fixed) > > > + ctrl |= MX51_ECSPI_CTRL_SMC; > > > + else > > > + ctrl &= ~MX51_ECSPI_CTRL_SMC; > > > > > > writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL); > > > > > > @@ -620,12 +637,16 @@ static int mx51_ecspi_prepare_transfer(struct > > > spi_imx_data *spi_imx, > > > > > > static void mx51_setup_wml(struct spi_imx_data *spi_imx) { > > > + u32 tx_wml = 0; > > > + > > > + if (spi_imx->devtype_data->tx_glitch_fixed) > > > + tx_wml = spi_imx->wml; > > > /* > > > * Configure the DMA register: setup the watermark > > > * and enable DMA request. > > > */ > > > writel(MX51_ECSPI_DMA_RX_WML(spi_imx->wml - 1) | > > > - MX51_ECSPI_DMA_TX_WML(0) | > > > + MX51_ECSPI_DMA_TX_WML(tx_wml) | > > > MX51_ECSPI_DMA_RXT_WML(spi_imx->wml) | > > > MX51_ECSPI_DMA_TEDEN | MX51_ECSPI_DMA_RXDEN | > > > MX51_ECSPI_DMA_RXTDEN, spi_imx->base + MX51_ECSPI_DMA); > > @@ -1019,6 > > > +1040,23 @@ static struct spi_imx_devtype_data > > imx53_ecspi_devtype_data = { > > > .devtype = IMX53_ECSPI, > > > }; > > > > > > +static struct spi_imx_devtype_data imx6ul_ecspi_devtype_data = { > > > + .intctrl = mx51_ecspi_intctrl, > > > + .prepare_message = mx51_ecspi_prepare_message, > > > + .prepare_transfer = mx51_ecspi_prepare_transfer, > > > + .trigger = mx51_ecspi_trigger, > > > + .rx_available = mx51_ecspi_rx_available, > > > + .reset = mx51_ecspi_reset, > > > + .setup_wml = mx51_setup_wml, > > > + .fifo_size = 64, > > > + .has_dmamode = true, > > > + .dynamic_burst = true, > > > + .has_slavemode = true, > > > + .tx_glitch_fixed = true, > > > + .disable = mx51_ecspi_disable, > > > + .devtype = IMX6UL_ECSPI, > > > +}; > > > + > > > static const struct of_device_id spi_imx_dt_ids[] = { > > > { .compatible = "fsl,imx1-cspi", .data = &imx1_cspi_devtype_data, }, > > > { .compatible = "fsl,imx21-cspi", .data = &imx21_cspi_devtype_data, > > > }, @@ -1027,6 +1065,7 @@ static const struct of_device_id spi_imx_dt_ids[] > > = { > > > { .compatible = "fsl,imx35-cspi", .data = &imx35_cspi_devtype_data, }, > > > { .compatible = "fsl,imx51-ecspi", .data = &imx51_ecspi_devtype_data, }, > > > { .compatible = "fsl,imx53-ecspi", .data = > > > &imx53_ecspi_devtype_data, }, > > > + { .compatible = "fsl,imx6ul-ecspi", .data = > > > +&imx6ul_ecspi_devtype_data, }, > > > { /* sentinel */ } > > > }; > > > MODULE_DEVICE_TABLE(of, spi_imx_dt_ids); @@ -1604,7 +1643,7 @@ > > static > > > int spi_imx_probe(struct platform_device *pdev) > > > spi_imx->bitbang.master->mode_bits = SPI_CPOL | SPI_CPHA | > > SPI_CS_HIGH \ > > > | SPI_NO_CS; > > > if (is_imx35_cspi(spi_imx) || is_imx51_ecspi(spi_imx) || > > > - is_imx53_ecspi(spi_imx)) > > > + is_imx53_ecspi(spi_imx) || is_imx6ul_ecspi(spi_imx)) > > > spi_imx->bitbang.master->mode_bits |= SPI_LOOP | SPI_READY; > > > > > > spi_imx->spi_drctl = spi_drctl; > > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel