Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp445304pxb; Thu, 9 Sep 2021 04:46:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwm67k+ZDcoUNozutxnzNaezWx87GlqaGlJ0gr5M8f+X7ugHvuH1eO5kGvnDz1v1mi5o1OF X-Received: by 2002:a92:d388:: with SMTP id o8mr1998446ilo.110.1631187972308; Thu, 09 Sep 2021 04:46:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631187972; cv=none; d=google.com; s=arc-20160816; b=WTFRRXy8CYWYDVteXRWZA+HqED3lkGhwQMNUoDhOQNkqgiJYsAi8zg6sQsBVtpnJYA fjmXzkSmUm61x0KwkD628XXdV5j+EP2U+18R83oMgFVqQrr8+Ckpkll/+KIOvt9uQvna x8f4gy4PMVVc071PY1xKOa6c2Uss9c9FddDl5u2EpoNt8UR1mJ96yqtEYSgW8WP1Zikk EmgO/ozxSWJd5G4HKBX8a+E+3j24jzD37o5pZwbEALxWqhn+5sBI2DiEsh2Jo2CSahRd xuwXPCDkm8SoUZhZLjalA7zbDWnW5gWaJi/zZiwxym8u/VqsvPrjknjTb5xs+FdXkAqH GRcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SZGVmugDqO83e8CEKYAKgcK/AYErdmGHyEh/Gk0VCPY=; b=c6WBoSrrDl+/vv85D2eEzxO4f0BPjM/sgi20DoUcCvpZmnh5fE23fOYmKdZBDLrfyc hTrJuS7nGtGf0aXpnMZyOZ77ZCsuZpyc5ucvgH6BsuNmvy1PVHSq7kGvI7tvETmxjwDu JRBmqbi8HXOwtgymLdSkMFg+09PfP4T1f8W/Wbqh3G8bQJ1aU8ag5lwdxYpUXF84SOb/ 6rUb3UarY636Bck+DUYpWwCjyAOTWbKRb1kpJEvP+iSFA/5gxL8vSiV8Dlh+2ZK9j00M zHjxbpqD2U1HKDwZWIxJVryNHYsWTTQNIL4tTe4m0U5QmNHjS6+b9cwpg7G2NA3NyXlu zT7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=A4F+Efvz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y6si1370947ion.66.2021.09.09.04.46.01; Thu, 09 Sep 2021 04:46:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=A4F+Efvz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240835AbhIILqT (ORCPT + 99 others); Thu, 9 Sep 2021 07:46:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:47118 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239460AbhIILoO (ORCPT ); Thu, 9 Sep 2021 07:44:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 87917611C3; Thu, 9 Sep 2021 11:42:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187742; bh=Bvn6bDDf4+9ZzIUM7chp45+Ixzgdft8nY8rjATv1N7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A4F+EfvzXMkaI51d44+RhrgGMCLaQ2031c4L8rx9c7Ixf0KVDuZkqPHvaJZkjNPGM Jxoddp53inzMzjASWQVfvyQYP56QCGioJVKYGddMZ27FfHguDDGfcGQy/FBStfbLKa jGMk36AWkQNgYHoJt7xfY/GU4Ll0UOhXjdnJ2gPmKz8kjc7W+MLkpQ45vFlZbK6xlR WevcoQplBFVuj2OaypLHgdqOlGBXb9qX5wcws0QKkmqbIM7BUis8x3cEq/QnRb7jy+ 8LKqBHvdCnA9dZuH+FM+7HMlUmTDgZJwazh1mQ6D8Krf4AJycCaDSVjc4sple1Ctlv z4Q155xOSxXRw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Robin Gong , Lucas Stach , Mark Brown , Shawn Guo , Sasha Levin , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.14 059/252] spi: imx: remove ERR009165 workaround on i.mx6ul Date: Thu, 9 Sep 2021 07:37:53 -0400 Message-Id: <20210909114106.141462-59-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robin Gong [ Upstream commit 8eb1252bbedfb0e800bbbd3e9055a7db0ae2cac9 ] 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 Reviewed-by: Lucas Stach Acked-by: Mark Brown Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- drivers/spi/spi-imx.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index d89b11205815..289ed3d4eda2 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -77,6 +77,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; }; @@ -622,8 +627,14 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx, ctrl |= mx51_ecspi_clkdiv(spi_imx, spi_imx->spi_bus_clk, &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); @@ -632,12 +643,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); @@ -1028,6 +1043,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 = IMX51_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, }, @@ -1036,6 +1068,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); -- 2.30.2