From patchwork Mon May 11 17:32:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Gong X-Patchwork-Id: 11540087 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 08E7C913 for ; Mon, 11 May 2020 09:33:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DF7DA207FF for ; Mon, 11 May 2020 09:33:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="MCJ8eAau" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729498AbgEKJdB (ORCPT ); Mon, 11 May 2020 05:33:01 -0400 Received: from mail-eopbgr00042.outbound.protection.outlook.com ([40.107.0.42]:29601 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729305AbgEKJdA (ORCPT ); Mon, 11 May 2020 05:33:00 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RhQT+LB0Z9mAW1gC73DiFyvnghh+FgbIBfAZtd6u/t8kkzf0rcqsped2xyKuc23hpq92jZosUe/kbdFS1uJCIC1OZCOWej+do1OdJc6HKGc8oLn+GJHLvwhUpM5qaWsFvKiq4gxGmvCpKTcyROKWcqC2VJD9nsZ5Hjy9kskA9MkkDp4o8IQkcSHLxoikoS5kqmnKTsUHUwIQk4BsFDfjbyyncN2m+PSKS7vK9G4uc092RXRa5npA/67BGWwetJ6ttpL5Sg7nINYPmHkBNNej6bQq+/vqUa6/BENKWHssuuk8fmVLDPP6nMNU3Cjnarzx/XA34Gmk8fsgNJ5kBeXdVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DPH6fqwENpMZpDGmX3HfiPkXiAHYaZSKePf7Hki9OEA=; b=bez35XE2ICexpi+DKVVxiGzLGcHGUTYs/J+j6G3D4nm5smdf49IqEuR8X4copIUnKKu7gJAwuIJC6okjYeMHd2B3ZpTDQ0OOrWfZXuP/xgt5Q4qQfxa5aG/hBy3+T28MccOQHvikTCeCmAVjFoDvVcRNJmV1DYa9UsP+tkgDory7AE3nHjQ5AMjwaisUyJTEytSY2j4fO+XPBdOE+LEJis0XmqPSG3qiZcWpHQWe6dQ35KSo6X+Bo42NnTKyFPvsUqXhmGnHltoS78nFu0zAuqtvp+0pezBDh8DJdMXr3Pr7bxugMqaDAxZI3ZqqT2ikQeEuMmqC0jgkpfsHtlIy7A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DPH6fqwENpMZpDGmX3HfiPkXiAHYaZSKePf7Hki9OEA=; b=MCJ8eAau6nNogXbFH1bTgYekJTir/tEzK8S1WkrhcYUdEwpFrF/9S1rGvm4rBGPY89rrBlv0VSL5FoIXjsTVB/AXXX4hmlqO7IEtu4gU8HU72vyAhb6+wTP+fxGYuxrfT2AWsPvUJA/v2gO4JjxSS0UurMH/AOrF+BmawlHTs9E= Authentication-Results: pengutronix.de; dkim=none (message not signed) header.d=none;pengutronix.de; dmarc=none action=none header.from=nxp.com; Received: from VE1PR04MB6638.eurprd04.prod.outlook.com (2603:10a6:803:119::15) by VE1PR04MB6637.eurprd04.prod.outlook.com (2603:10a6:803:126::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.33; Mon, 11 May 2020 09:32:57 +0000 Received: from VE1PR04MB6638.eurprd04.prod.outlook.com ([fe80::d5f0:c948:6ab0:c2aa]) by VE1PR04MB6638.eurprd04.prod.outlook.com ([fe80::d5f0:c948:6ab0:c2aa%4]) with mapi id 15.20.2979.033; Mon, 11 May 2020 09:32:57 +0000 From: Robin Gong To: s.hauer@pengutronix.de, vkoul@kernel.org, shawnguo@kernel.org, u.kleine-koenig@pengutronix.de, robh+dt@kernel.org, festevam@gmail.com, dan.j.williams@intel.com, mark.rutland@arm.com, catalin.marinas@arm.com Cc: will.deacon@arm.com, l.stach@pengutronix.de, martin.fuzzey@flowbird.group, kernel@pengutronix.de, linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-imx@nxp.com, dmaengine@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v7 RESEND 07/13] spi: imx: fix ERR009165 Date: Tue, 12 May 2020 01:32:30 +0800 Message-Id: <1589218356-17475-8-git-send-email-yibin.gong@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1589218356-17475-1-git-send-email-yibin.gong@nxp.com> References: <1589218356-17475-1-git-send-email-yibin.gong@nxp.com> X-ClientProxiedBy: SG2PR06CA0141.apcprd06.prod.outlook.com (2603:1096:1:1f::19) To VE1PR04MB6638.eurprd04.prod.outlook.com (2603:10a6:803:119::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from robin-OptiPlex-790.ap.freescale.net (119.31.174.66) by SG2PR06CA0141.apcprd06.prod.outlook.com (2603:1096:1:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2979.27 via Frontend Transport; Mon, 11 May 2020 09:32:52 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [119.31.174.66] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0b55bd47-d644-4538-d2f5-08d7f58e49d9 X-MS-TrafficTypeDiagnostic: VE1PR04MB6637:|VE1PR04MB6637: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 04004D94E2 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +m98Q/b8yXtGLoG3r80vIGEP/FLRryTtCxX0YJx7p6Twv3LLqFR0bvoCgoW+m8/IpX9Q3NbzmjWReJzJcvgx7mr/ueNP3eYNmmmra0EVxYPqyYCSh7HDz4d0YQjuVGkemZGUovhJRBBza0veXhXnNC6aMZbxY2BvRXsT5A96SB0GiQueGUEZxPHIboPwwBjkfroQtgA+VciDOjtFXyuwZtuQE7qKfJ/+GcXlukjg8bGNIk+Bzk5HL+4UCoD+yKBbedHE0sfeRTzJ4V+OoNtNDEKVwllpglKlont8288L5XbrvQGJNgZ778rWbJpicvrdJqhK/wnrh8uPQV54qsAxirFKBYRV/xB+SrWFD7exzHIgv/yxikRo4NIzTlvWON0fxSPX3MwVs5IFD/WHCXH8Rsbcc7gI1Dgz2KIhTP36wnSa0efRLzkZYizQ2tplpKNV9weDk5x4+dinwW0VE6aUBvsNF8YKKakgWWFmt7VazFe7hRl09yD79Kt5F/97owUsvfR0PyMA0Xx8ljyjZsdto0NJKYHwNczOHYScpEQhBo9/N/9ZtxQqNct7ZkyqfjZeK08kEKvn32/lyxJXtqp1uwYoCP5AzYofns0kwlsYP0M= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6638.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(39860400002)(136003)(376002)(346002)(396003)(366004)(33430700001)(8936002)(26005)(52116002)(6506007)(16526019)(2616005)(186003)(956004)(6666004)(6512007)(7416002)(5660300002)(2906002)(4326008)(6486002)(33440700001)(66476007)(8676002)(66946007)(66556008)(478600001)(86362001)(316002)(966005)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 4h5U8aDX+ZpLI0POZpSU1ps55ov7C88GnFL2FfpgdWZ3Jn8IZ9Il2TUNx0wVkHe/2a/4dtfEgKj54KW/+5OsRyCCPNtYhgz8f/XR7Tg7gPeYSl6BcORwPsqrylXyG6C5gmtQFJ6gkvmaMzXap+Fo9FgULph0Z8Q2Vb7Grb1Na7+QBXtDtzOrRUivzIeG1eGklElNr3lNkVbg/GYrdY4TxpJrYwGM8SXsQHvDuOyZ0PMEH5MDgi97qHS0JU+kUMBqALOTzFevyzzDGXIbYB4vznGNOsNw8pRr3kBWQZ1ZfPkBW66LlquGUPc0UXK7qgJNQszOdOQI5mOd9uFal3zUkd1BfWjyvCO2tznQRxvb/0+jZjKMDVMfSzeHuWJRwZee0Vt7T6AeFFabIDnW9cUl6WPJqIYZ2s8cZMNnCLjwlzQtLud3Qf7k5l6glXESGrUBqSiTjqMCk0Vb8b636pWFmmijYHzJ9DVDKQmv+FgaxeQ= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b55bd47-d644-4538-d2f5-08d7f58e49d9 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2020 09:32:57.1466 (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: 9v6g47BCZkM0lp6e3JKLMEWkfUfKpBfAlyxY2LEXMI23zbLcU06GEbW5ATixTOnj1hTwfzarPrrUuDulnuyWJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6637 Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@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 Acked-by: Mark Brown --- drivers/spi/spi-imx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index f4f28a4..70df8e6 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -585,8 +585,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); @@ -617,7 +617,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); @@ -1171,7 +1171,11 @@ static int spi_imx_dma_configure(struct spi_master *master) tx.direction = DMA_MEM_TO_DEV; tx.dst_addr = spi_imx->base_phys + MXC_CSPITXDATA; tx.dst_addr_width = buswidth; - tx.dst_maxburst = spi_imx->wml; + /* + * For ERR009165 with tx_wml = 0 could enlarge burst size to fifo size + * to speed up fifo filling as possible. + */ + tx.dst_maxburst = spi_imx->devtype_data->fifo_size; ret = dmaengine_slave_config(master->dma_tx, &tx); if (ret) { dev_err(spi_imx->dev, "TX dma configuration failed with %d\n", ret); @@ -1265,10 +1269,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: */