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;
From:   Robin Gong <yibin.gong@nxp.com>
To:     mark.rutland@arm.com, broonie@kernel.org, robh+dt@kernel.org,
        catalin.marinas@arm.com, vkoul@kernel.org, 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, r.schwebel@pengutronix.de
Cc:     linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org,
        devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        kernel@pengutronix.de, dmaengine@vger.kernel.org, linux-imx@nxp.com
Subject: [PATCH v12 07/12] spi: imx: fix ERR009165
Date:   Tue, 11 Aug 2020 23:53:46 +0800
Message-Id: <1597161231-32303-8-git-send-email-yibin.gong@nxp.com>
In-Reply-To: <1597161231-32303-1-git-send-email-yibin.gong@nxp.com>
References: <1597161231-32303-1-git-send-email-yibin.gong@nxp.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from robin-OptiPlex-790.ap.freescale.net (119.31.174.67) by SG2P153CA0014.APCP153.PROD.OUTLOOK.COM (2603:1096::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3305.2 via Frontend Transport; Tue, 11 Aug 2020 07:40:25 +0000
X-Mailer: git-send-email 2.7.4
X-Originating-IP: [119.31.174.67]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 245fdb99-6b3a-42dd-8ef5-08d83dc9d2db
X-MS-TrafficTypeDiagnostic: AM6PR0402MB3464:
X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <AM6PR0402MB346445046D589353EFDD0DC789450@AM6PR0402MB3464.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:5236;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: vkixeMoeylYQMRkWfsPDd9BL4/coImsXcTTNJprU6EAXGHStQfElVCZ8u6OwX4+/gkv5ZNCpe1N1zIvoC3xGA7MquRfGFlgbvUFhG+SupAvP3Px2Z5EACYo+7pVw0CZK8rvKKLSUch2D1SWR8BA3+A0heUdBxLEWcYgmxDeN+yNtVt3O5msbcQwOQEZyxYZb5F/DKZlI7fphDygUaWidU06SsGI13Zit4KZAcAuKweGcKhr5495bpG+mwnpZHYAQGJX8jHve27EAlQUUU+rdScsdQ6BVpZ3o9B/U6hYCiO4wM4ylU6vIYXDiHdDhQ0h+FIQInsiLpW3KStXQSEzbbrfRi0SDQj9F25ab+MXsi1gNpMJRD0GkuRIAREpPbIfxoV53t5d+W13erlXtjC0ij2vyVIf5N8lHXXeDtiap2Y4le7f6OZKDgbiXl57T5NQowNQ8sDf+4mj0+FsqPOhYTQ==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6630.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(376002)(396003)(136003)(366004)(39860400002)(346002)(4326008)(5660300002)(52116002)(66476007)(66556008)(86362001)(956004)(66946007)(6486002)(2616005)(7416002)(316002)(966005)(36756003)(186003)(2906002)(8676002)(6506007)(6666004)(6512007)(8936002)(26005)(478600001)(83380400001)(16526019)(921003);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: zKcm9oS00WtLeC/9JCw+hSG1q8HsMynsNSCZ5rXcV8fVoXStGUamJ8r+KNVUg3OpIOLIwjTe076dCb3RD3YhfrrRlAru996spo18RU3srLxJvcS6MJeZTMHUaY5Ep5XF9SiQAjKoRUCbKx2DgXkCxvrJwsWevYg4RrOqFgiZEYTo0sqEK5b+snPfmFjWLFge8CL7TMJrwf85KvrBY1rzLloW/UmZ37enDYRgru/GBbirW6IPHfJsP9IYPYGxeFniB+aLpw6WW77TkZwx4EJSwwpLqioMVr3obEduf/OycfAdJSyJkKv9U5dRCCstVu4Dtef1hQ748wEaw7v1RICyiEbfgZnNnuoqBmIhyf4r+BkW6MuV1Nyd8g42TvXEC7pQ6J18D9gs6Df/ZU6NzAytCUlCfULNLXr7tDiX+KgIMwR9jiCtYPXpk6/6vYq6OlZ6S3PzJlI0rl+OHnS1P5go1Hv83sFwW3k/QY/gwcs0aoVSO6lVQPZI240i/xyxoZRTPUrk81onnigiyjDIuPsOAuGETSHMEUq6ObXBchroQ//n+RTWGVZEFH933jJ0p5ZgJrx4gaQzTAHhmdGswy/PS3tUM3jcZi2M1LfWfUiOrvNvrHuyqWnf3inQoHC6NaZAeclY1y9sTiN8gZdTxA+3nQ==
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 245fdb99-6b3a-42dd-8ef5-08d83dc9d2db
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6630.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2020 07:40:31.0419
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: eVO+BGZLivzoyXrqq9Dg2pcosA/pCzguESwE76DmTtFxjWesno2ZRWCVkVz6heltcWeTVRGVtaaG91XxnWRb8g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3464
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Change to XCH  mode even in dma mode, please refer to the below
errata:
https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Mark Brown <broonie@kernel.org>
---
 drivers/spi/spi-imx.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 2b8d339..873be5e 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -591,8 +591,8 @@ 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;
 
-	if (spi_imx->usedma)
-		ctrl |= MX51_ECSPI_CTRL_SMC;
+	/* ERR009165: work in XHC mode as PIO */
+	ctrl &= ~MX51_ECSPI_CTRL_SMC;
 
 	writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL);
 
@@ -623,7 +623,7 @@ static void mx51_setup_wml(struct spi_imx_data *spi_imx)
 	 * and enable DMA request.
 	 */
 	writel(MX51_ECSPI_DMA_RX_WML(spi_imx->wml - 1) |
-		MX51_ECSPI_DMA_TX_WML(spi_imx->wml) |
+		MX51_ECSPI_DMA_TX_WML(0) |
 		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);
@@ -1273,10 +1273,6 @@ static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx,
 {
 	int ret;
 
-	/* use pio mode for i.mx6dl chip TKT238285 */
-	if (of_machine_is_compatible("fsl,imx6dl"))
-		return 0;
-
 	spi_imx->wml = spi_imx->devtype_data->fifo_size / 2;
 
 	/* Prepare for TX DMA: */
-- 
2.7.4