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=-8.3 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,URIBL_BLOCKED,USER_AGENT_SANE_1 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 3E727C18E5B for ; Tue, 10 Mar 2020 08:03:00 +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 083892467D for ; Tue, 10 Mar 2020 08:03:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="a71VdW0A" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 083892467D 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+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:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZjqUw+ZY1lj1EweJ0WEkeMTTQYlqpE/7538m8fatLb4=; b=a71VdW0ACBx0Bn cjN1d5co25HQOozqifm3ebB9bnNj5uTqOqiZI6qGjEsTV+049rdGn8TLzWyeBVW67OY3ZGYB8zxdA Z84STnxJSmxtWK5WtrR+bMYc8Ie2nQgHKICZbrDlvRAEhVCLN48Z59cQRSp6QL7x4GNvWzuk4lkkm mMSP3B53KmNpHOdhV4n0Xwb6FJ1mtLXiE/gNRy3Bf9dzCHAdJ2KSo1LsuFbrc4dW8eXKZDgJuyPjr 2WPH1O4qaUBWYguPeIcEBq8+1EJq7sNEIO91pSd0byJBu6H1991fc3IYwEjJ5YOKWuCpxmVuqRR5m 4DancEw+VoMeXmFnN7GA==; 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 1jBZqq-00019Y-Tt; Tue, 10 Mar 2020 08:02:56 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jBZqm-000192-Nm for linux-arm-kernel@lists.infradead.org; Tue, 10 Mar 2020 08:02:54 +0000 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jBZqd-0003q9-DC; Tue, 10 Mar 2020 09:02:43 +0100 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1jBZqb-000205-1H; Tue, 10 Mar 2020 09:02:41 +0100 Date: Tue, 10 Mar 2020 09:02:41 +0100 From: Sascha Hauer To: Robin Gong Subject: Re: [RESEND v6 07/13] spi: imx: remove ERR009165 workaround on i.mx6ul Message-ID: <20200310080240.GS3335@pengutronix.de> References: <1583839922-22699-1-git-send-email-yibin.gong@nxp.com> <1583839922-22699-8-git-send-email-yibin.gong@nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1583839922-22699-8-git-send-email-yibin.gong@nxp.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 08:40:21 up 19 days, 15:10, 46 users, load average: 0.37, 0.19, 0.18 User-Agent: Mutt/1.10.1 (2018-07-13) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: sha@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-20200310_010252_773702_A2442407 X-CRM114-Status: GOOD ( 21.78 ) 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: mark.rutland@arm.com, devicetree@vger.kernel.org, catalin.marinas@arm.com, kernel@pengutronix.de, shawnguo@kernel.org, will.deacon@arm.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, linux-spi@vger.kernel.org, vkoul@kernel.org, broonie@kernel.org, linux-imx@nxp.com, martin.fuzzey@flowbird.group, u.kleine-koenig@pengutronix.de, dmaengine@vger.kernel.org, dan.j.williams@intel.com, festevam@gmail.com, linux-arm-kernel@lists.infradead.org, l.stach@pengutronix.de 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 On Tue, Mar 10, 2020 at 07:31:56PM +0800, Robin Gong wrote: > 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://www.nxp.com/ . > > 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 | 50 +++++++++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 45 insertions(+), 5 deletions(-) > > diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c > index 842a86e..f7ee2ec 100644 > --- a/drivers/spi/spi-imx.c > +++ b/drivers/spi/spi-imx.c > @@ -57,6 +57,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 */ > }; > > struct spi_imx_data; > @@ -75,6 +76,11 @@ struct spi_imx_devtype_data { > bool has_slavemode; > unsigned int fifo_size; > bool dynamic_burst; > + /* > + * ERR009165 fixed or not: > + * https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf > + */ > + bool tx_glitch_fixed; > enum spi_imx_devtype devtype; > }; > > @@ -128,7 +134,8 @@ static inline int is_imx35_cspi(struct spi_imx_data *d) > > static inline int is_imx51_ecspi(struct spi_imx_data *d) > { > - return d->devtype_data->devtype == IMX51_ECSPI; > + return d->devtype_data->devtype == IMX51_ECSPI || > + d->devtype_data->devtype == IMX6UL_ECSPI; > } Erm, no. A i.MX51 ECSPI is a i.MX51 ECSPI and not a i.MX6UL ECSPI. If you want to handle them equally somewhere then explicitly test for i.MX6ul *and* i.MX51 there. > > static inline int is_imx53_ecspi(struct spi_imx_data *d) > @@ -585,9 +592,16 @@ 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 */ > - if (spi_imx->usedma) > - 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) { > + if (spi_imx->devtype_data->tx_glitch_fixed) > + ctrl |= MX51_ECSPI_CTRL_SMC; > + else > + ctrl &= ~MX51_ECSPI_CTRL_SMC; > + } Changed again, but the PIO case still not honoured. This should look like 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); > > @@ -615,6 +629,8 @@ 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; That explains the variable introduced in the last patch, ok. I have the impression that splitting up 06/13 and 07/13 into two patches doesn't make it easier to review. Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel