Skip to content

Commit 7063c0d

Browse files
ftang1glikely
authored andcommitted
spi/dw_spi: add DMA support
dw_spi driver in upstream only supports PIO mode, and this patch will support it to cowork with the Designware dma controller used on Intel Moorestown platform, at the same time it provides a general framework to support dw_spi core to cowork with dma controllers on other platforms It has been tested with a Option GTM501L 3G modem and Infenion 60x60 modem. To use DMA mode, DMA controller 2 of Moorestown has to be enabled Also change the dma interface suggested by Linus Walleij. Acked-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Feng Tang <feng.tang@intel.com> [Typo fix and renames to match intel_mid_dma renaming] Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
1 parent 79290a2 commit 7063c0d

File tree

6 files changed

+283
-24
lines changed

6 files changed

+283
-24
lines changed

drivers/spi/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,10 @@ config SPI_DW_PCI
382382
tristate "PCI interface driver for DW SPI core"
383383
depends on SPI_DESIGNWARE && PCI
384384

385+
config SPI_DW_MID_DMA
386+
bool "DMA support for DW SPI controller on Intel Moorestown platform"
387+
depends on SPI_DW_PCI && INTEL_MID_DMAC
388+
385389
config SPI_DW_MMIO
386390
tristate "Memory-mapped io interface driver for DW SPI core"
387391
depends on SPI_DESIGNWARE && HAVE_CLK

drivers/spi/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ obj-$(CONFIG_SPI_BUTTERFLY) += spi_butterfly.o
1717
obj-$(CONFIG_SPI_COLDFIRE_QSPI) += coldfire_qspi.o
1818
obj-$(CONFIG_SPI_DAVINCI) += davinci_spi.o
1919
obj-$(CONFIG_SPI_DESIGNWARE) += dw_spi.o
20-
obj-$(CONFIG_SPI_DW_PCI) += dw_spi_pci.o
20+
obj-$(CONFIG_SPI_DW_PCI) += dw_spi_midpci.o
21+
dw_spi_midpci-objs := dw_spi_pci.o dw_spi_mid.o
2122
obj-$(CONFIG_SPI_DW_MMIO) += dw_spi_mmio.o
2223
obj-$(CONFIG_SPI_EP93XX) += ep93xx_spi.o
2324
obj-$(CONFIG_SPI_GPIO) += spi_gpio.o

drivers/spi/dw_spi.c

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,10 @@ static void *next_transfer(struct dw_spi *dws)
288288
*/
289289
static int map_dma_buffers(struct dw_spi *dws)
290290
{
291-
if (!dws->cur_msg->is_dma_mapped || !dws->dma_inited
292-
|| !dws->cur_chip->enable_dma)
291+
if (!dws->cur_msg->is_dma_mapped
292+
|| !dws->dma_inited
293+
|| !dws->cur_chip->enable_dma
294+
|| !dws->dma_ops)
293295
return 0;
294296

295297
if (dws->cur_transfer->tx_dma)
@@ -341,7 +343,7 @@ static void int_error_stop(struct dw_spi *dws, const char *msg)
341343
tasklet_schedule(&dws->pump_transfers);
342344
}
343345

344-
static void transfer_complete(struct dw_spi *dws)
346+
void dw_spi_xfer_done(struct dw_spi *dws)
345347
{
346348
/* Update total byte transfered return count actual bytes read */
347349
dws->cur_msg->actual_length += dws->len;
@@ -356,6 +358,7 @@ static void transfer_complete(struct dw_spi *dws)
356358
} else
357359
tasklet_schedule(&dws->pump_transfers);
358360
}
361+
EXPORT_SYMBOL_GPL(dw_spi_xfer_done);
359362

360363
static irqreturn_t interrupt_transfer(struct dw_spi *dws)
361364
{
@@ -387,7 +390,7 @@ static irqreturn_t interrupt_transfer(struct dw_spi *dws)
387390
if (dws->tx_end > dws->tx)
388391
spi_umask_intr(dws, SPI_INT_TXEI);
389392
else
390-
transfer_complete(dws);
393+
dw_spi_xfer_done(dws);
391394
}
392395

393396
return IRQ_HANDLED;
@@ -422,11 +425,7 @@ static void poll_transfer(struct dw_spi *dws)
422425
*/
423426
dws->read(dws);
424427

425-
transfer_complete(dws);
426-
}
427-
428-
static void dma_transfer(struct dw_spi *dws, int cs_change)
429-
{
428+
dw_spi_xfer_done(dws);
430429
}
431430

432431
static void pump_transfers(unsigned long data)
@@ -608,7 +607,7 @@ static void pump_transfers(unsigned long data)
608607
}
609608

610609
if (dws->dma_mapped)
611-
dma_transfer(dws, cs_change);
610+
dws->dma_ops->dma_transfer(dws, cs_change);
612611

613612
if (chip->poll_mode)
614613
poll_transfer(dws);
@@ -904,11 +903,17 @@ int __devinit dw_spi_add_host(struct dw_spi *dws)
904903
master->setup = dw_spi_setup;
905904
master->transfer = dw_spi_transfer;
906905

907-
dws->dma_inited = 0;
908-
909906
/* Basic HW init */
910907
spi_hw_init(dws);
911908

909+
if (dws->dma_ops && dws->dma_ops->dma_init) {
910+
ret = dws->dma_ops->dma_init(dws);
911+
if (ret) {
912+
dev_warn(&master->dev, "DMA init failed\n");
913+
dws->dma_inited = 0;
914+
}
915+
}
916+
912917
/* Initial and start queue */
913918
ret = init_queue(dws);
914919
if (ret) {
@@ -933,6 +938,8 @@ int __devinit dw_spi_add_host(struct dw_spi *dws)
933938

934939
err_queue_alloc:
935940
destroy_queue(dws);
941+
if (dws->dma_ops && dws->dma_ops->dma_exit)
942+
dws->dma_ops->dma_exit(dws);
936943
err_diable_hw:
937944
spi_enable_chip(dws, 0);
938945
free_irq(dws->irq, dws);
@@ -957,6 +964,8 @@ void __devexit dw_spi_remove_host(struct dw_spi *dws)
957964
dev_err(&dws->master->dev, "dw_spi_remove: workqueue will not "
958965
"complete, message memory not freed\n");
959966

967+
if (dws->dma_ops && dws->dma_ops->dma_exit)
968+
dws->dma_ops->dma_exit(dws);
960969
spi_enable_chip(dws, 0);
961970
/* Disable clk */
962971
spi_set_clk(dws, 0);

drivers/spi/dw_spi_mid.c

Lines changed: 223 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,223 @@
1+
/*
2+
* dw_spi_mid.c - special handling for DW core on Intel MID platform
3+
*
4+
* Copyright (c) 2009, Intel Corporation.
5+
*
6+
* This program is free software; you can redistribute it and/or modify it
7+
* under the terms and conditions of the GNU General Public License,
8+
* version 2, as published by the Free Software Foundation.
9+
*
10+
* This program is distributed in the hope it will be useful, but WITHOUT
11+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
13+
* more details.
14+
*
15+
* You should have received a copy of the GNU General Public License along
16+
* with this program; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
18+
*/
19+
20+
#include <linux/dma-mapping.h>
21+
#include <linux/dmaengine.h>
22+
#include <linux/interrupt.h>
23+
#include <linux/slab.h>
24+
#include <linux/spi/spi.h>
25+
#include <linux/spi/dw_spi.h>
26+
27+
#ifdef CONFIG_SPI_DW_MID_DMA
28+
#include <linux/intel_mid_dma.h>
29+
#include <linux/pci.h>
30+
31+
struct mid_dma {
32+
struct intel_mid_dma_slave dmas_tx;
33+
struct intel_mid_dma_slave dmas_rx;
34+
};
35+
36+
static bool mid_spi_dma_chan_filter(struct dma_chan *chan, void *param)
37+
{
38+
struct dw_spi *dws = param;
39+
40+
return dws->dmac && (&dws->dmac->dev == chan->device->dev);
41+
}
42+
43+
static int mid_spi_dma_init(struct dw_spi *dws)
44+
{
45+
struct mid_dma *dw_dma = dws->dma_priv;
46+
struct intel_mid_dma_slave *rxs, *txs;
47+
dma_cap_mask_t mask;
48+
49+
/*
50+
* Get pci device for DMA controller, currently it could only
51+
* be the DMA controller of either Moorestown or Medfield
52+
*/
53+
dws->dmac = pci_get_device(PCI_VENDOR_ID_INTEL, 0x0813, NULL);
54+
if (!dws->dmac)
55+
dws->dmac = pci_get_device(PCI_VENDOR_ID_INTEL, 0x0827, NULL);
56+
57+
dma_cap_zero(mask);
58+
dma_cap_set(DMA_SLAVE, mask);
59+
60+
/* 1. Init rx channel */
61+
dws->rxchan = dma_request_channel(mask, mid_spi_dma_chan_filter, dws);
62+
if (!dws->rxchan)
63+
goto err_exit;
64+
rxs = &dw_dma->dmas_rx;
65+
rxs->hs_mode = LNW_DMA_HW_HS;
66+
rxs->cfg_mode = LNW_DMA_PER_TO_MEM;
67+
dws->rxchan->private = rxs;
68+
69+
/* 2. Init tx channel */
70+
dws->txchan = dma_request_channel(mask, mid_spi_dma_chan_filter, dws);
71+
if (!dws->txchan)
72+
goto free_rxchan;
73+
txs = &dw_dma->dmas_tx;
74+
txs->hs_mode = LNW_DMA_HW_HS;
75+
txs->cfg_mode = LNW_DMA_MEM_TO_PER;
76+
dws->txchan->private = txs;
77+
78+
dws->dma_inited = 1;
79+
return 0;
80+
81+
free_rxchan:
82+
dma_release_channel(dws->rxchan);
83+
err_exit:
84+
return -1;
85+
86+
}
87+
88+
static void mid_spi_dma_exit(struct dw_spi *dws)
89+
{
90+
dma_release_channel(dws->txchan);
91+
dma_release_channel(dws->rxchan);
92+
}
93+
94+
/*
95+
* dws->dma_chan_done is cleared before the dma transfer starts,
96+
* callback for rx/tx channel will each increment it by 1.
97+
* Reaching 2 means the whole spi transaction is done.
98+
*/
99+
static void dw_spi_dma_done(void *arg)
100+
{
101+
struct dw_spi *dws = arg;
102+
103+
if (++dws->dma_chan_done != 2)
104+
return;
105+
dw_spi_xfer_done(dws);
106+
}
107+
108+
static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
109+
{
110+
struct dma_async_tx_descriptor *txdesc = NULL, *rxdesc = NULL;
111+
struct dma_chan *txchan, *rxchan;
112+
struct dma_slave_config txconf, rxconf;
113+
u16 dma_ctrl = 0;
114+
115+
/* 1. setup DMA related registers */
116+
if (cs_change) {
117+
spi_enable_chip(dws, 0);
118+
dw_writew(dws, dmardlr, 0xf);
119+
dw_writew(dws, dmatdlr, 0x10);
120+
if (dws->tx_dma)
121+
dma_ctrl |= 0x2;
122+
if (dws->rx_dma)
123+
dma_ctrl |= 0x1;
124+
dw_writew(dws, dmacr, dma_ctrl);
125+
spi_enable_chip(dws, 1);
126+
}
127+
128+
dws->dma_chan_done = 0;
129+
txchan = dws->txchan;
130+
rxchan = dws->rxchan;
131+
132+
/* 2. Prepare the TX dma transfer */
133+
txconf.direction = DMA_TO_DEVICE;
134+
txconf.dst_addr = dws->dma_addr;
135+
txconf.dst_maxburst = LNW_DMA_MSIZE_16;
136+
txconf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
137+
txconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
138+
139+
txchan->device->device_control(txchan, DMA_SLAVE_CONFIG,
140+
(unsigned long) &txconf);
141+
142+
memset(&dws->tx_sgl, 0, sizeof(dws->tx_sgl));
143+
dws->tx_sgl.dma_address = dws->tx_dma;
144+
dws->tx_sgl.length = dws->len;
145+
146+
txdesc = txchan->device->device_prep_slave_sg(txchan,
147+
&dws->tx_sgl,
148+
1,
149+
DMA_TO_DEVICE,
150+
DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_DEST_UNMAP);
151+
txdesc->callback = dw_spi_dma_done;
152+
txdesc->callback_param = dws;
153+
154+
/* 3. Prepare the RX dma transfer */
155+
rxconf.direction = DMA_FROM_DEVICE;
156+
rxconf.src_addr = dws->dma_addr;
157+
rxconf.src_maxburst = LNW_DMA_MSIZE_16;
158+
rxconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
159+
rxconf.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
160+
161+
rxchan->device->device_control(rxchan, DMA_SLAVE_CONFIG,
162+
(unsigned long) &rxconf);
163+
164+
memset(&dws->rx_sgl, 0, sizeof(dws->rx_sgl));
165+
dws->rx_sgl.dma_address = dws->rx_dma;
166+
dws->rx_sgl.length = dws->len;
167+
168+
rxdesc = rxchan->device->device_prep_slave_sg(rxchan,
169+
&dws->rx_sgl,
170+
1,
171+
DMA_FROM_DEVICE,
172+
DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_DEST_UNMAP);
173+
rxdesc->callback = dw_spi_dma_done;
174+
rxdesc->callback_param = dws;
175+
176+
/* rx must be started before tx due to spi instinct */
177+
rxdesc->tx_submit(rxdesc);
178+
txdesc->tx_submit(txdesc);
179+
return 0;
180+
}
181+
182+
static struct dw_spi_dma_ops mid_dma_ops = {
183+
.dma_init = mid_spi_dma_init,
184+
.dma_exit = mid_spi_dma_exit,
185+
.dma_transfer = mid_spi_dma_transfer,
186+
};
187+
#endif
188+
189+
/* Some specific info for SPI0 controller on Moorestown */
190+
191+
/* HW info for MRST CLk Control Unit, one 32b reg */
192+
#define MRST_SPI_CLK_BASE 100000000 /* 100m */
193+
#define MRST_CLK_SPI0_REG 0xff11d86c
194+
#define CLK_SPI_BDIV_OFFSET 0
195+
#define CLK_SPI_BDIV_MASK 0x00000007
196+
#define CLK_SPI_CDIV_OFFSET 9
197+
#define CLK_SPI_CDIV_MASK 0x00000e00
198+
#define CLK_SPI_DISABLE_OFFSET 8
199+
200+
int dw_spi_mid_init(struct dw_spi *dws)
201+
{
202+
u32 *clk_reg, clk_cdiv;
203+
204+
clk_reg = ioremap_nocache(MRST_CLK_SPI0_REG, 16);
205+
if (!clk_reg)
206+
return -ENOMEM;
207+
208+
/* get SPI controller operating freq info */
209+
clk_cdiv = (readl(clk_reg) & CLK_SPI_CDIV_MASK) >> CLK_SPI_CDIV_OFFSET;
210+
dws->max_freq = MRST_SPI_CLK_BASE / (clk_cdiv + 1);
211+
iounmap(clk_reg);
212+
213+
dws->num_cs = 16;
214+
dws->fifo_len = 40; /* FIFO has 40 words buffer */
215+
216+
#ifdef CONFIG_SPI_DW_MID_DMA
217+
dws->dma_priv = kzalloc(sizeof(struct mid_dma), GFP_KERNEL);
218+
if (!dws->dma_priv)
219+
return -ENOMEM;
220+
dws->dma_ops = &mid_dma_ops;
221+
#endif
222+
return 0;
223+
}

drivers/spi/dw_spi_pci.c

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* mrst_spi_pci.c - PCI interface driver for DW SPI Core
2+
* dw_spi_pci.c - PCI interface driver for DW SPI Core
33
*
44
* Copyright (c) 2009, Intel Corporation.
55
*
@@ -26,8 +26,8 @@
2626
#define DRIVER_NAME "dw_spi_pci"
2727

2828
struct dw_spi_pci {
29-
struct pci_dev *pdev;
30-
struct dw_spi dws;
29+
struct pci_dev *pdev;
30+
struct dw_spi dws;
3131
};
3232

3333
static int __devinit spi_pci_probe(struct pci_dev *pdev,
@@ -72,9 +72,17 @@ static int __devinit spi_pci_probe(struct pci_dev *pdev,
7272
dws->parent_dev = &pdev->dev;
7373
dws->bus_num = 0;
7474
dws->num_cs = 4;
75-
dws->max_freq = 25000000; /* for Moorestwon */
7675
dws->irq = pdev->irq;
77-
dws->fifo_len = 40; /* FIFO has 40 words buffer */
76+
77+
/*
78+
* Specific handling for Intel MID paltforms, like dma setup,
79+
* clock rate, FIFO depth.
80+
*/
81+
if (pdev->device == 0x0800) {
82+
ret = dw_spi_mid_init(dws);
83+
if (ret)
84+
goto err_unmap;
85+
}
7886

7987
ret = dw_spi_add_host(dws);
8088
if (ret)
@@ -140,7 +148,7 @@ static int spi_resume(struct pci_dev *pdev)
140148
#endif
141149

142150
static const struct pci_device_id pci_ids[] __devinitdata = {
143-
/* Intel Moorestown platform SPI controller 0 */
151+
/* Intel MID platform SPI controller 0 */
144152
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
145153
{},
146154
};

0 commit comments

Comments
 (0)