From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754453AbbI3Igl (ORCPT ); Wed, 30 Sep 2015 04:36:41 -0400 Received: from mail-by2on0136.outbound.protection.outlook.com ([207.46.100.136]:52832 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754330AbbI3IgP (ORCPT ); Wed, 30 Sep 2015 04:36:15 -0400 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; mentor.com; dkim=none (message not signed) header.d=none;mentor.com; dmarc=none action=none header.from=freescale.com; Date: Wed, 30 Sep 2015 16:35:40 +0800 From: Robin Gong To: Anton Bondarenko CC: , , , , , , Subject: Re: [PATCH v2 3/8] spi: imx: add support for all SPI word width for DMA transfer Message-ID: <20150930083539.GD2709@shlinux2> References: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD055;1:a/deT9YZlEwvnEnWzxhitxt3JULkYDv2DGVQmhQkKWBQz9jS1mC4qCLV2mp7/zDle4UI5bLAs9CoYVOGpFMhzRelqBckk8i3mliNB68v0vlGQYUxdaD/Sd++Da7KXYCTw3byxn4gguP/34duiyePBXxseE7FaDvRkcp6xPtyNSDwG6PimvJFlBQ1W+0lO+skjrP6QcFEnnCRBENYZGQnjS+3lFwZi5MAd2Sn32eLxJS0g/GbpRzc0bOnkenc94Q0PgyooRCMoR4zS5SbiGaAp2l5KZf/IqD0NyaTdeaa77UJUVMURx7VCPM6D21TQSx9OBn42iEmQgzZLuHFTLsSNw== X-Forefront-Antispam-Report: CIP:192.88.158.2;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(24454002)(199003)(19580405001)(19580395003)(50466002)(46102003)(33716001)(105606002)(47776003)(33656002)(106466001)(64706001)(83506001)(189998001)(85426001)(50986999)(76176999)(54356999)(110136002)(5001960100002)(217423001)(97756001)(46406003)(69596002)(87936001)(97736004)(23726002)(62966003)(4001540100001)(81156007)(4001350100001)(77156002)(104016004)(5001830100001)(5001860100001)(11100500001)(6806005)(2950100001)(77096005)(92566002)(5007970100001)(68736005)(5008740100001)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR03MB492;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB492;2:kAynRi5tsrivwl9ofa3EFuDZ3fChG8hoD7t1k5lM5J3cUNFCWq2kLsRcbvQBWwl2IHXA9CLHZzBNF52wHEbWNpGzyeDha4fUzRoIQLeP8siOMtjzpyFd///xtaaCfCRUeBc8/yTgECMM3rhgk5bo+s114WRbTH9clLLHBLPZS7o=;3:6v7YEiuCTWb+74jFuCfQZDCXEHTOVceruwVHdX8vbPmdfp6ehM+xwWZUozNslFTBvovUwmzNZTz6TrKKrCvmqDW2xlYU9ARbyix8yH1ZUoRyX6BDqKuO7EZEEQJgzCAZb36cIFvMq7MccqPmtJb94lCxQBxHQPzmEXRX/Ki1uBdmhViLeZbKbW+3ZW9pCm295YA/MWdkplCTonH9TgZNTGneR3DzstJG2Bh1XUkisIY=;25:rnAh8J77Je0FT+MKEMOLk8wPm4tn3rnt8VeBp0smNQrYuhZvHyZTRdV9+T/8Y2/m3vOCtkY+tjuKNrGf00hH7AXwGjsfFEcSLfECFAlnzDT9gcxGnjhgqzJ8fI3I9Z4BBU/akZmRbkykPyjPF7GB74wnjIAosD5zsm9014htc7e2VpTPkdBcWEGgG1QkBW9qXrfT7PpbS42uZtF//lJNPBD2El8ANEoYKuMPcfX/oElsPT9H7vPNOhoykQ691O+hg2+7jPHKstdKeX+Dx0APnw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB492; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB492;20:8vDPFUg1Qrrewr8mzPWkgY+E1RxTjZ4DgPGsK4VMwzJxCvdy0LTBKYbWfDzvCVlOBVEvDp5u4lhj0HhXvW+5vopFqxsmpc0S1o1stoNkbRnvPiUOmn99kHp1mQoQ99bK/yUAwUCCh+ns1QdR4LdM/9v/TnM95pwPmDxT89BIRCcPjC2hfDAYu+HOpNdcPIv5xvN1LryB6g4SgtP1VBPX8UJLt/JGUvrzwCZaGqARNpwBjim1QBMz7sMSzQtLfw3XeEIH0EfhMuI+sMNHOdk4wfzU6SjoFHP4VW63q/au6z1K9M/l8Odchx9XRFXdZcuXQy5FjyRcxHiocRAqtQRJFE99GZcWIk0KRZ8It48Qh4c=;4:tG+X35iTu7kug5hQxiLVuTZuOf5HvPNM4BbTi2x7Wm39LuRiimCRC3Swo0Fg398MfTeUubemoXIrOtHxan317bagogrk+LSfaN4VUl4W0d8iiiHG3oiKsJ2vijCl2wx9Lfu/hfXb0v2eU1GmWPT7I2IfMJ6xwiZVPzHi1xiWnNLug4DKz4fbMx86QZhQyvZLoNRs/X8R/BZhJyCXBbFJer8656TReGWC0wl4dVJNShOXdZTcKVtDN4aSkxVOcCvEl3fbDTcTIlveuqXfcgVgt2ArXGjAxca88WSBPjEWevVoQGy28oRqumWMD0XSJyONXUAT8GPNtkusHQslKquWElKeYuX/x26E1qm7DuJySaQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(8121501046)(520078)(3002001);SRVR:BY2PR03MB492;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB492; X-Forefront-PRVS: 071518EF63 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR03MB492;23:p8LOLchsr9rdsAabEFUmm+OjOtiUbXD8B/Mj+3RifG?= =?us-ascii?Q?GNtykj29Lt6SHRVmbqF4uUbEVGTRePY8aIW3LwPf59m9GGrvG6aD8XKhLDtE?= =?us-ascii?Q?x+7ZuiuYfagCGu+AvIBfrSYdwX3xs1YlJDsZFLN/JdMsEfsJUh+ZVOVdsZGl?= =?us-ascii?Q?iZy3E1dOw1Bgv8BlCCYoW+tbJUSrr+Cw3XWNWZjHu20KspGAftEzKfccdrCE?= =?us-ascii?Q?MqcFIS/U5LlLDvup/PKlB34dEF3NfIpc9aZ/nHiiEkIaTIkG4aUsQ4w+dMb5?= =?us-ascii?Q?raEmN7wCE+F+4MIs7bGhXhqPq8Tf0VTK5HTJGvOwCU84ghQDMyumghI4ESFB?= =?us-ascii?Q?qHfyTWMzhEoh2zaWtv2q0RUs7/xXKyThcl/TSYGl9iMrhRrBDgYwNYybeFgH?= =?us-ascii?Q?7/P/gEhcMwqhGj6t9OjGYEna22t50wDDcwlrZlzji75GmnNrEsolD2YFkhtc?= =?us-ascii?Q?PcsOmmI0fsFoMFKrdPJvEp5zgspRzKoyKGy/zUedvLyMPgr0QIDs2mso5oCG?= =?us-ascii?Q?F2ExE3HAWVtn6fsc2wMAXFGCoG3gfQ4Vqm+Frnuv9lSrTAAZpBCB5CULUpck?= =?us-ascii?Q?g473CdtKMfqt/DWCXRx0y0aPnYb3Pijccm/26AhLrlBqyQerOEftL2iVXZCo?= =?us-ascii?Q?CImBPO4IbFOoTs3kL+gdIcfptmSqA57JqgOPRBwKH8RSUZ27Fo+u9O7PoyZg?= =?us-ascii?Q?aNA6j4U5o9SU0scX1zu7Nwrazs0kuNAQRSqW9vSDxSRUch0DmzJ7I6qxrnSu?= =?us-ascii?Q?7Y6nxeS3pHsnE98wlatW/vcsLQytzGLxrsGTGJ/Y0kINvR1oup2tbK9qupzs?= =?us-ascii?Q?V7gx9LfHBQTtD0+B11k0inHbSEyBPXknRq0BU6NVT3QjdDExxXnjUoEaH1sI?= =?us-ascii?Q?u3mJSTaDpM9UcRYI+/qFz4N6AiEfLeY5rj6Susqc5hDPvoMgJ7LqCQAxt9hH?= =?us-ascii?Q?Tuoxe0UIxaSzO6XFxD2hu9298szwbVIInwYv2xbGCZ5iLyRVnNGaI3SprViG?= =?us-ascii?Q?1pDpcV+0LUwyQtEtDSmRsu4HhpisEG/uP4WwksNHbQ679HdPW8fvM4HfZSYe?= =?us-ascii?Q?/6aAOCQo9LV8CN6569iiDMoyuvpzQgLJPhiyVtlPADP1Cn9Iff6jspc9Lm9R?= =?us-ascii?Q?ChBXGy9NzFJNP9Gb0dMMVzM7Zd9vRd8TcnWtMkS5C27cN8CXLO9mcphx33LT?= =?us-ascii?Q?lVXioOH5aGMuuDW9121k7g4ybdJaajFwiMCFRU4qlzdKGCSfUm35+r0z17UE?= =?us-ascii?Q?8xPgqTohwTOwC9SLpIsthxe1LGxROuaMNP+QTu5m8M7ERxXVifb7lMX9Ye9a?= =?us-ascii?Q?J09H+Kn0yAvdkErbY8Wisf7gZ/a6NRm+Yn8w67rna0?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB492;5:CJrnScvF18zCbvvoNVWk0mOHTuoeEam1QLGBS1IQ4fd2hlVucMUv48WClaeNxghxZ4KnY5A/l3coquhOjM8uteoP48EJMgk+IYIq/b4558ID7+957qQiy4Xz4mcBMlLVT817d0XX5b8hG0FuNGQ/lA==;24:76RF+8BTMRb998oD7g3R+MwHL65adI8WhNiUM61gxQ8I9aWj1cf/BaKQd2dmD3JLlbDhnvaUDHUcGuPQyZXC3LAUAVYgr4nClFnD4orSJOQ=;20:IHh4zW7Qe209uXhDp+j8tA+xdiWrEOWYNGavUHsfbMigUp+G0JqXUowGZLj7XTq0ROuoTG+cDIWYMddGvqUXcw== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2015 08:36:12.2773 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.158.2];Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB492 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Sep 25, 2015 at 07:57:10PM +0200, Anton Bondarenko wrote: > DMA transfer for SPI was limited to up to 8 bits word size until now. > Sync in SPI burst size and DMA bus width is necessary to correctly > support other BPW supported by HW. > > Signed-off-by: Anton Bondarenko > --- > drivers/spi/spi-imx.c | 121 ++++++++++++++++++++++++++++++++++++-------------- > 1 file changed, 87 insertions(+), 34 deletions(-) > > diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c > index 6c98eda..d9b730d 100644 > --- a/drivers/spi/spi-imx.c > +++ b/drivers/spi/spi-imx.c > @@ -91,11 +91,15 @@ struct spi_imx_data { > > struct completion xfer_done; > void __iomem *base; > + unsigned long base_phys; > + > struct clk *clk_per; > struct clk *clk_ipg; > unsigned long spi_clk; > unsigned int spi_bus_clk; > > + unsigned int bpw_w; > + It's better to change bytes_per_word for clear understanding,since bpw in spi means bits_per_word... > unsigned int count; > void (*tx)(struct spi_imx_data *); > void (*rx)(struct spi_imx_data *); > @@ -201,9 +205,13 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi, > struct spi_transfer *transfer) > { > struct spi_imx_data *spi_imx = spi_master_get_devdata(master); > + unsigned int bpw_w = transfer->bits_per_word; > > - if (spi_imx->dma_is_inited && > - (transfer->len > spi_imx->wml * sizeof(u32))) > + if (!bpw_w) > + bpw_w = spi->bits_per_word; > + > + bpw_w = DIV_ROUND_UP(bpw_w, 8); > + if (spi_imx->dma_is_inited && (transfer->len > spi_imx->wml * bpw_w)) Please remove bpw_w here as I talked in the first patch. > return true; > return false; > } > @@ -761,11 +769,62 @@ static irqreturn_t spi_imx_isr(int irq, void *dev_id) > return IRQ_HANDLED; > } > > +static int spi_imx_sdma_configure(struct spi_master *master) > +{ > + int ret; > + enum dma_slave_buswidth dsb_default = DMA_SLAVE_BUSWIDTH_1_BYTE; > + struct dma_slave_config slave_config = {}; > + struct spi_imx_data *spi_imx = spi_master_get_devdata(master); > + > + switch (spi_imx->bpw_w) { > + case 4: > + dsb_default = DMA_SLAVE_BUSWIDTH_4_BYTES; > + break; > + case 2: > + dsb_default = DMA_SLAVE_BUSWIDTH_2_BYTES; > + break; > + case 1: > + dsb_default = DMA_SLAVE_BUSWIDTH_1_BYTE; > + break; > + default: > + pr_err("Not supported word size %d\n", spi_imx->bpw_w); > + ret = -EINVAL; > + goto err; > + } > + > + slave_config.direction = DMA_MEM_TO_DEV; > + slave_config.dst_addr = spi_imx->base_phys + MXC_CSPITXDATA; > + slave_config.dst_addr_width = dsb_default; > + slave_config.dst_maxburst = spi_imx_get_fifosize(spi_imx) > + - spi_imx->wml; > + ret = dmaengine_slave_config(master->dma_tx, &slave_config); > + if (ret) { > + pr_err("error in TX dma configuration.\n"); > + goto err; > + } > + > + memset(&slave_config, 0, sizeof(slave_config)); > + > + slave_config.direction = DMA_DEV_TO_MEM; > + slave_config.src_addr = spi_imx->base_phys + MXC_CSPIRXDATA; > + slave_config.src_addr_width = dsb_default; > + slave_config.src_maxburst = spi_imx_get_fifosize(spi_imx) > + - spi_imx->wml; > + ret = dmaengine_slave_config(master->dma_rx, &slave_config); > + if (ret) > + pr_err("error in RX dma configuration.\n"); > + > +err: > + return ret; > +} > + > static int spi_imx_setupxfer(struct spi_device *spi, > struct spi_transfer *t) > { > struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master); > struct spi_imx_config config; > + unsigned int bpw_w_new; > + int ret = 0; > > config.bpw = t ? t->bits_per_word : spi->bits_per_word; > config.speed_hz = t ? t->speed_hz : spi->max_speed_hz; > @@ -789,9 +848,18 @@ static int spi_imx_setupxfer(struct spi_device *spi, > spi_imx->tx = spi_imx_buf_tx_u32; > } > > - spi_imx->devtype_data->config(spi_imx, &config); > + bpw_w_new = DIV_ROUND_UP(config.bpw, 8); > + if (spi_imx->dma_is_inited && spi_imx->bpw_w != bpw_w_new) { > + spi_imx->bpw_w = bpw_w_new; > + ret = spi_imx_sdma_configure(spi->master); > + if (ret != 0) > + pr_err("Can't configure SDMA, error %d\n", ret); > + } > > - return 0; > + if (!ret) > + ret = spi_imx->devtype_data->config(spi_imx, &config); > + > + return ret; > } > > static void spi_imx_sdma_exit(struct spi_imx_data *spi_imx) > @@ -812,10 +880,8 @@ static void spi_imx_sdma_exit(struct spi_imx_data *spi_imx) > } > > static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx, > - struct spi_master *master, > - const struct resource *res) > + struct spi_master *master) > { > - struct dma_slave_config slave_config = {}; > int ret; > > /* use pio mode for i.mx6dl chip TKT238285 */ > @@ -832,17 +898,6 @@ static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx, > goto err; > } > > - slave_config.direction = DMA_MEM_TO_DEV; > - slave_config.dst_addr = res->start + MXC_CSPITXDATA; > - slave_config.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; > - slave_config.dst_maxburst = spi_imx_get_fifosize(spi_imx) > - - spi_imx->wml; > - ret = dmaengine_slave_config(master->dma_tx, &slave_config); > - if (ret) { > - dev_err(dev, "error in TX dma configuration.\n"); > - goto err; > - } > - > /* Prepare for RX : */ > master->dma_rx = dma_request_slave_channel(dev, "rx"); > if (!master->dma_rx) { > @@ -851,23 +906,19 @@ static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx, > goto err; > } > > - slave_config.direction = DMA_DEV_TO_MEM; > - slave_config.src_addr = res->start + MXC_CSPIRXDATA; > - slave_config.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; > - slave_config.src_maxburst = spi_imx_get_fifosize(spi_imx) > - - spi_imx->wml; > - ret = dmaengine_slave_config(master->dma_rx, &slave_config); > - if (ret) { > - dev_err(dev, "error in RX dma configuration.\n"); > - goto err; > - } > - > init_completion(&spi_imx->dma_rx_completion); > init_completion(&spi_imx->dma_tx_completion); > master->can_dma = spi_imx_can_dma; > master->max_dma_len = MAX_SDMA_BD_BYTES; > spi_imx->bitbang.master->flags = SPI_MASTER_MUST_RX | > SPI_MASTER_MUST_TX; > + spi_imx->bpw_w = 1; > + ret = spi_imx_sdma_configure(master); > + if (ret) { > + dev_info(dev, "cannot get setup DMA.\n"); > + goto err; > + } > + > spi_imx->dma_is_inited = 1; > > return 0; > @@ -924,7 +975,7 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx, > int ret; > unsigned long timeout; > unsigned long transfer_timeout; > - const int left = transfer->len % spi_imx->wml; > + const int left = transfer->len % (spi_imx->wml * spi_imx->bpw_w); > struct spi_master *master = spi_imx->bitbang.master; > struct sg_table *tx = &transfer->tx_sg, *rx = &transfer->rx_sg; > > @@ -989,7 +1040,7 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx, > dmaengine_terminate_all(master->dma_rx); > } else { > transfer_timeout = spi_imx_calculate_timeout(spi_imx, > - spi_imx->wml * 2); > + spi_imx->bpw_w * spi_imx->wml * 2); > timeout = wait_for_completion_timeout( > &spi_imx->dma_rx_completion, transfer_timeout); > if (!timeout) { > @@ -1007,7 +1058,8 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx, > DMA_FROM_DEVICE); > > spi_imx->rx_buf = pio_buffer; > - spi_imx->txfifo = left; > + spi_imx->txfifo = DIV_ROUND_UP(left, spi_imx->bpw_w); > + Looks not enough here, you have to set 'spi_imx->rx' per the right bpw. > reinit_completion(&spi_imx->xfer_done); > > spi_imx->devtype_data->intctrl(spi_imx, MXC_INT_TCEN); > @@ -1207,6 +1259,7 @@ static int spi_imx_probe(struct platform_device *pdev) > ret = PTR_ERR(spi_imx->base); > goto out_master_put; > } > + spi_imx->base_phys = res->start; > > irq = platform_get_irq(pdev, 0); > if (irq < 0) { > @@ -1246,8 +1299,8 @@ static int spi_imx_probe(struct platform_device *pdev) > * Only validated on i.mx6 now, can remove the constrain if validated on > * other chips. > */ > - if (spi_imx->devtype_data == &imx51_ecspi_devtype_data > - && spi_imx_sdma_init(&pdev->dev, spi_imx, master, res)) > + if (spi_imx->devtype_data == &imx51_ecspi_devtype_data && > + spi_imx_sdma_init(&pdev->dev, spi_imx, master)) > dev_err(&pdev->dev, "dma setup error,use pio instead\n"); > > spi_imx->devtype_data->reset(spi_imx); > -- > 2.5.2 >