diff options
author | Vinod Koul <vinod.koul@intel.com> | 2013-02-12 12:15:02 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2013-02-13 11:09:37 -0500 |
commit | 5fa422c922c2599dbfd960faf6dfca2411cc3f99 (patch) | |
tree | 52ae231ffae2032fcf26b39a7c1b4e121bc37710 /drivers/dma | |
parent | 4dec23d7718e6f1f5e1773698d112025169e7d49 (diff) |
dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c
as requested by Rob
Suggested-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/Kconfig | 4 | ||||
-rw-r--r-- | drivers/dma/Makefile | 2 | ||||
-rw-r--r-- | drivers/dma/of-dma.c | 264 |
3 files changed, 270 insertions, 0 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 0b408bbb6a17..e92b5f0f8a5f 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
@@ -325,6 +325,10 @@ config DMA_ENGINE | |||
325 | config DMA_VIRTUAL_CHANNELS | 325 | config DMA_VIRTUAL_CHANNELS |
326 | tristate | 326 | tristate |
327 | 327 | ||
328 | config DMA_OF | ||
329 | def_bool y | ||
330 | depends on OF | ||
331 | |||
328 | comment "DMA Clients" | 332 | comment "DMA Clients" |
329 | depends on DMA_ENGINE | 333 | depends on DMA_ENGINE |
330 | 334 | ||
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index 7428feaa8705..c1ed644be9e2 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile | |||
@@ -3,6 +3,8 @@ ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG | |||
3 | 3 | ||
4 | obj-$(CONFIG_DMA_ENGINE) += dmaengine.o | 4 | obj-$(CONFIG_DMA_ENGINE) += dmaengine.o |
5 | obj-$(CONFIG_DMA_VIRTUAL_CHANNELS) += virt-dma.o | 5 | obj-$(CONFIG_DMA_VIRTUAL_CHANNELS) += virt-dma.o |
6 | obj-$(CONFIG_DMA_OF) += of-dma.o | ||
7 | |||
6 | obj-$(CONFIG_NET_DMA) += iovlock.o | 8 | obj-$(CONFIG_NET_DMA) += iovlock.o |
7 | obj-$(CONFIG_INTEL_MID_DMAC) += intel_mid_dma.o | 9 | obj-$(CONFIG_INTEL_MID_DMAC) += intel_mid_dma.o |
8 | obj-$(CONFIG_DMATEST) += dmatest.o | 10 | obj-$(CONFIG_DMATEST) += dmatest.o |
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c new file mode 100644 index 000000000000..59631b2c4666 --- /dev/null +++ b/drivers/dma/of-dma.c | |||
@@ -0,0 +1,264 @@ | |||
1 | /* | ||
2 | * Device tree helpers for DMA request / controller | ||
3 | * | ||
4 | * Based on of_gpio.c | ||
5 | * | ||
6 | * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #include <linux/device.h> | ||
14 | #include <linux/err.h> | ||
15 | #include <linux/module.h> | ||
16 | #include <linux/rculist.h> | ||
17 | #include <linux/slab.h> | ||
18 | #include <linux/of.h> | ||
19 | #include <linux/of_dma.h> | ||
20 | |||
21 | static LIST_HEAD(of_dma_list); | ||
22 | static DEFINE_SPINLOCK(of_dma_lock); | ||
23 | |||
24 | /** | ||
25 | * of_dma_get_controller - Get a DMA controller in DT DMA helpers list | ||
26 | * @dma_spec: pointer to DMA specifier as found in the device tree | ||
27 | * | ||
28 | * Finds a DMA controller with matching device node and number for dma cells | ||
29 | * in a list of registered DMA controllers. If a match is found the use_count | ||
30 | * variable is increased and a valid pointer to the DMA data stored is retuned. | ||
31 | * A NULL pointer is returned if no match is found. | ||
32 | */ | ||
33 | static struct of_dma *of_dma_get_controller(struct of_phandle_args *dma_spec) | ||
34 | { | ||
35 | struct of_dma *ofdma; | ||
36 | |||
37 | spin_lock(&of_dma_lock); | ||
38 | |||
39 | if (list_empty(&of_dma_list)) { | ||
40 | spin_unlock(&of_dma_lock); | ||
41 | return NULL; | ||
42 | } | ||
43 | |||
44 | list_for_each_entry(ofdma, &of_dma_list, of_dma_controllers) | ||
45 | if ((ofdma->of_node == dma_spec->np) && | ||
46 | (ofdma->of_dma_nbcells == dma_spec->args_count)) { | ||
47 | ofdma->use_count++; | ||
48 | spin_unlock(&of_dma_lock); | ||
49 | return ofdma; | ||
50 | } | ||
51 | |||
52 | spin_unlock(&of_dma_lock); | ||
53 | |||
54 | pr_debug("%s: can't find DMA controller %s\n", __func__, | ||
55 | dma_spec->np->full_name); | ||
56 | |||
57 | return NULL; | ||
58 | } | ||
59 | |||
60 | /** | ||
61 | * of_dma_put_controller - Decrement use count for a registered DMA controller | ||
62 | * @of_dma: pointer to DMA controller data | ||
63 | * | ||
64 | * Decrements the use_count variable in the DMA data structure. This function | ||
65 | * should be called only when a valid pointer is returned from | ||
66 | * of_dma_get_controller() and no further accesses to data referenced by that | ||
67 | * pointer are needed. | ||
68 | */ | ||
69 | static void of_dma_put_controller(struct of_dma *ofdma) | ||
70 | { | ||
71 | spin_lock(&of_dma_lock); | ||
72 | ofdma->use_count--; | ||
73 | spin_unlock(&of_dma_lock); | ||
74 | } | ||
75 | |||
76 | /** | ||
77 | * of_dma_controller_register - Register a DMA controller to DT DMA helpers | ||
78 | * @np: device node of DMA controller | ||
79 | * @of_dma_xlate: translation function which converts a phandle | ||
80 | * arguments list into a dma_chan structure | ||
81 | * @data pointer to controller specific data to be used by | ||
82 | * translation function | ||
83 | * | ||
84 | * Returns 0 on success or appropriate errno value on error. | ||
85 | * | ||
86 | * Allocated memory should be freed with appropriate of_dma_controller_free() | ||
87 | * call. | ||
88 | */ | ||
89 | int of_dma_controller_register(struct device_node *np, | ||
90 | struct dma_chan *(*of_dma_xlate) | ||
91 | (struct of_phandle_args *, struct of_dma *), | ||
92 | void *data) | ||
93 | { | ||
94 | struct of_dma *ofdma; | ||
95 | int nbcells; | ||
96 | |||
97 | if (!np || !of_dma_xlate) { | ||
98 | pr_err("%s: not enough information provided\n", __func__); | ||
99 | return -EINVAL; | ||
100 | } | ||
101 | |||
102 | ofdma = kzalloc(sizeof(*ofdma), GFP_KERNEL); | ||
103 | if (!ofdma) | ||
104 | return -ENOMEM; | ||
105 | |||
106 | nbcells = be32_to_cpup(of_get_property(np, "#dma-cells", NULL)); | ||
107 | if (!nbcells) { | ||
108 | pr_err("%s: #dma-cells property is missing or invalid\n", | ||
109 | __func__); | ||
110 | return -EINVAL; | ||
111 | } | ||
112 | |||
113 | ofdma->of_node = np; | ||
114 | ofdma->of_dma_nbcells = nbcells; | ||
115 | ofdma->of_dma_xlate = of_dma_xlate; | ||
116 | ofdma->of_dma_data = data; | ||
117 | ofdma->use_count = 0; | ||
118 | |||
119 | /* Now queue of_dma controller structure in list */ | ||
120 | list_add_tail(&ofdma->of_dma_controllers, &of_dma_list); | ||
121 | |||
122 | return 0; | ||
123 | } | ||
124 | EXPORT_SYMBOL_GPL(of_dma_controller_register); | ||
125 | |||
126 | /** | ||
127 | * of_dma_controller_free - Remove a DMA controller from DT DMA helpers list | ||
128 | * @np: device node of DMA controller | ||
129 | * | ||
130 | * Memory allocated by of_dma_controller_register() is freed here. | ||
131 | */ | ||
132 | int of_dma_controller_free(struct device_node *np) | ||
133 | { | ||
134 | struct of_dma *ofdma; | ||
135 | |||
136 | spin_lock(&of_dma_lock); | ||
137 | |||
138 | if (list_empty(&of_dma_list)) { | ||
139 | spin_unlock(&of_dma_lock); | ||
140 | return -ENODEV; | ||
141 | } | ||
142 | |||
143 | list_for_each_entry(ofdma, &of_dma_list, of_dma_controllers) | ||
144 | if (ofdma->of_node == np) { | ||
145 | if (ofdma->use_count) { | ||
146 | spin_unlock(&of_dma_lock); | ||
147 | return -EBUSY; | ||
148 | } | ||
149 | |||
150 | list_del(&ofdma->of_dma_controllers); | ||
151 | spin_unlock(&of_dma_lock); | ||
152 | kfree(ofdma); | ||
153 | return 0; | ||
154 | } | ||
155 | |||
156 | spin_unlock(&of_dma_lock); | ||
157 | return -ENODEV; | ||
158 | } | ||
159 | EXPORT_SYMBOL_GPL(of_dma_controller_free); | ||
160 | |||
161 | /** | ||
162 | * of_dma_match_channel - Check if a DMA specifier matches name | ||
163 | * @np: device node to look for DMA channels | ||
164 | * @name: channel name to be matched | ||
165 | * @index: index of DMA specifier in list of DMA specifiers | ||
166 | * @dma_spec: pointer to DMA specifier as found in the device tree | ||
167 | * | ||
168 | * Check if the DMA specifier pointed to by the index in a list of DMA | ||
169 | * specifiers, matches the name provided. Returns 0 if the name matches and | ||
170 | * a valid pointer to the DMA specifier is found. Otherwise returns -ENODEV. | ||
171 | */ | ||
172 | static int of_dma_match_channel(struct device_node *np, char *name, int index, | ||
173 | struct of_phandle_args *dma_spec) | ||
174 | { | ||
175 | const char *s; | ||
176 | |||
177 | if (of_property_read_string_index(np, "dma-names", index, &s)) | ||
178 | return -ENODEV; | ||
179 | |||
180 | if (strcmp(name, s)) | ||
181 | return -ENODEV; | ||
182 | |||
183 | if (of_parse_phandle_with_args(np, "dmas", "#dma-cells", index, | ||
184 | dma_spec)) | ||
185 | return -ENODEV; | ||
186 | |||
187 | return 0; | ||
188 | } | ||
189 | |||
190 | /** | ||
191 | * of_dma_request_slave_channel - Get the DMA slave channel | ||
192 | * @np: device node to get DMA request from | ||
193 | * @name: name of desired channel | ||
194 | * | ||
195 | * Returns pointer to appropriate dma channel on success or NULL on error. | ||
196 | */ | ||
197 | struct dma_chan *of_dma_request_slave_channel(struct device_node *np, | ||
198 | char *name) | ||
199 | { | ||
200 | struct of_phandle_args dma_spec; | ||
201 | struct of_dma *ofdma; | ||
202 | struct dma_chan *chan; | ||
203 | int count, i; | ||
204 | |||
205 | if (!np || !name) { | ||
206 | pr_err("%s: not enough information provided\n", __func__); | ||
207 | return NULL; | ||
208 | } | ||
209 | |||
210 | count = of_property_count_strings(np, "dma-names"); | ||
211 | if (count < 0) { | ||
212 | pr_err("%s: dma-names property missing or empty\n", __func__); | ||
213 | return NULL; | ||
214 | } | ||
215 | |||
216 | for (i = 0; i < count; i++) { | ||
217 | if (of_dma_match_channel(np, name, i, &dma_spec)) | ||
218 | continue; | ||
219 | |||
220 | ofdma = of_dma_get_controller(&dma_spec); | ||
221 | |||
222 | if (!ofdma) | ||
223 | continue; | ||
224 | |||
225 | chan = ofdma->of_dma_xlate(&dma_spec, ofdma); | ||
226 | |||
227 | of_dma_put_controller(ofdma); | ||
228 | |||
229 | of_node_put(dma_spec.np); | ||
230 | |||
231 | if (chan) | ||
232 | return chan; | ||
233 | } | ||
234 | |||
235 | return NULL; | ||
236 | } | ||
237 | |||
238 | /** | ||
239 | * of_dma_simple_xlate - Simple DMA engine translation function | ||
240 | * @dma_spec: pointer to DMA specifier as found in the device tree | ||
241 | * @of_dma: pointer to DMA controller data | ||
242 | * | ||
243 | * A simple translation function for devices that use a 32-bit value for the | ||
244 | * filter_param when calling the DMA engine dma_request_channel() function. | ||
245 | * Note that this translation function requires that #dma-cells is equal to 1 | ||
246 | * and the argument of the dma specifier is the 32-bit filter_param. Returns | ||
247 | * pointer to appropriate dma channel on success or NULL on error. | ||
248 | */ | ||
249 | struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec, | ||
250 | struct of_dma *ofdma) | ||
251 | { | ||
252 | int count = dma_spec->args_count; | ||
253 | struct of_dma_filter_info *info = ofdma->of_dma_data; | ||
254 | |||
255 | if (!info || !info->filter_fn) | ||
256 | return NULL; | ||
257 | |||
258 | if (count != 1) | ||
259 | return NULL; | ||
260 | |||
261 | return dma_request_channel(info->dma_cap, info->filter_fn, | ||
262 | &dma_spec->args[0]); | ||
263 | } | ||
264 | EXPORT_SYMBOL_GPL(of_dma_simple_xlate); | ||