Skip to content

Commit 97f9f97

Browse files
Christoph Hellwigpaulburton
Christoph Hellwig
authored and
paulburton
committed
MIPS: Octeon: refactor swiotlb code
Share a common set of swiotlb operations, and to instead branch out in __phys_to_dma/__dma_to_phys for the PCI vs non-PCI case. Also use const structures for the PCI methods so that attackers can't use them as exploit vectors. Signed-off-by: Christoph Hellwig <hch@lst.de> Patchwork: https://patchwork.linux-mips.org/patch/19532/ Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: David Daney <david.daney@cavium.com> Cc: Kevin Cernekee <cernekee@gmail.com> Cc: Jiaxun Yang <jiaxun.yang@flygoat.com> Cc: Tom Bogendoerfer <tsbogend@alpha.franken.de> Cc: Huacai Chen <chenhc@lemote.com> Cc: iommu@lists.linux-foundation.org Cc: linux-mips@linux-mips.org
1 parent e20c507 commit 97f9f97

File tree

3 files changed

+71
-94
lines changed

3 files changed

+71
-94
lines changed

‎arch/mips/cavium-octeon/dma-octeon.c

Lines changed: 71 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,16 @@
2323
#include <asm/octeon/octeon.h>
2424

2525
#ifdef CONFIG_PCI
26+
#include <linux/pci.h>
2627
#include <asm/octeon/pci-octeon.h>
2728
#include <asm/octeon/cvmx-npi-defs.h>
2829
#include <asm/octeon/cvmx-pci-defs.h>
2930

31+
struct octeon_dma_map_ops {
32+
dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);
33+
phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);
34+
};
35+
3036
static dma_addr_t octeon_hole_phys_to_dma(phys_addr_t paddr)
3137
{
3238
if (paddr >= CVMX_PCIE_BAR1_PHYS_BASE && paddr < (CVMX_PCIE_BAR1_PHYS_BASE + CVMX_PCIE_BAR1_PHYS_SIZE))
@@ -60,6 +66,11 @@ static phys_addr_t octeon_gen1_dma_to_phys(struct device *dev, dma_addr_t daddr)
6066
return daddr;
6167
}
6268

69+
static const struct octeon_dma_map_ops octeon_gen1_ops = {
70+
.phys_to_dma = octeon_gen1_phys_to_dma,
71+
.dma_to_phys = octeon_gen1_dma_to_phys,
72+
};
73+
6374
static dma_addr_t octeon_gen2_phys_to_dma(struct device *dev, phys_addr_t paddr)
6475
{
6576
return octeon_hole_phys_to_dma(paddr);
@@ -70,6 +81,11 @@ static phys_addr_t octeon_gen2_dma_to_phys(struct device *dev, dma_addr_t daddr)
7081
return octeon_hole_dma_to_phys(daddr);
7182
}
7283

84+
static const struct octeon_dma_map_ops octeon_gen2_ops = {
85+
.phys_to_dma = octeon_gen2_phys_to_dma,
86+
.dma_to_phys = octeon_gen2_dma_to_phys,
87+
};
88+
7389
static dma_addr_t octeon_big_phys_to_dma(struct device *dev, phys_addr_t paddr)
7490
{
7591
if (paddr >= 0x410000000ull && paddr < 0x420000000ull)
@@ -92,6 +108,11 @@ static phys_addr_t octeon_big_dma_to_phys(struct device *dev, dma_addr_t daddr)
92108
return daddr;
93109
}
94110

111+
static const struct octeon_dma_map_ops octeon_big_ops = {
112+
.phys_to_dma = octeon_big_phys_to_dma,
113+
.dma_to_phys = octeon_big_dma_to_phys,
114+
};
115+
95116
static dma_addr_t octeon_small_phys_to_dma(struct device *dev,
96117
phys_addr_t paddr)
97118
{
@@ -120,6 +141,32 @@ static phys_addr_t octeon_small_dma_to_phys(struct device *dev,
120141
return daddr;
121142
}
122143

144+
static const struct octeon_dma_map_ops octeon_small_ops = {
145+
.phys_to_dma = octeon_small_phys_to_dma,
146+
.dma_to_phys = octeon_small_dma_to_phys,
147+
};
148+
149+
static const struct octeon_dma_map_ops *octeon_pci_dma_ops;
150+
151+
void __init octeon_pci_dma_init(void)
152+
{
153+
switch (octeon_dma_bar_type) {
154+
case OCTEON_DMA_BAR_TYPE_PCIE:
155+
octeon_pci_dma_ops = &octeon_gen1_ops;
156+
break;
157+
case OCTEON_DMA_BAR_TYPE_PCIE2:
158+
octeon_pci_dma_ops = &octeon_gen2_ops;
159+
break;
160+
case OCTEON_DMA_BAR_TYPE_BIG:
161+
octeon_pci_dma_ops = &octeon_big_ops;
162+
break;
163+
case OCTEON_DMA_BAR_TYPE_SMALL:
164+
octeon_pci_dma_ops = &octeon_small_ops;
165+
break;
166+
default:
167+
BUG();
168+
}
169+
}
123170
#endif /* CONFIG_PCI */
124171

125172
static dma_addr_t octeon_dma_map_page(struct device *dev, struct page *page,
@@ -165,57 +212,37 @@ static void *octeon_dma_alloc_coherent(struct device *dev, size_t size,
165212
return ret;
166213
}
167214

168-
static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
169-
{
170-
return paddr;
171-
}
172-
173-
static phys_addr_t octeon_unity_dma_to_phys(struct device *dev, dma_addr_t daddr)
174-
{
175-
return daddr;
176-
}
177-
178-
struct octeon_dma_map_ops {
179-
const struct dma_map_ops dma_map_ops;
180-
dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);
181-
phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);
182-
};
183-
184215
dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr)
185216
{
186-
struct octeon_dma_map_ops *ops = container_of(get_dma_ops(dev),
187-
struct octeon_dma_map_ops,
188-
dma_map_ops);
189-
190-
return ops->phys_to_dma(dev, paddr);
217+
#ifdef CONFIG_PCI
218+
if (dev && dev_is_pci(dev))
219+
return octeon_pci_dma_ops->phys_to_dma(dev, paddr);
220+
#endif
221+
return paddr;
191222
}
192223

193224
phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr)
194225
{
195-
struct octeon_dma_map_ops *ops = container_of(get_dma_ops(dev),
196-
struct octeon_dma_map_ops,
197-
dma_map_ops);
198-
199-
return ops->dma_to_phys(dev, daddr);
226+
#ifdef CONFIG_PCI
227+
if (dev && dev_is_pci(dev))
228+
return octeon_pci_dma_ops->dma_to_phys(dev, daddr);
229+
#endif
230+
return daddr;
200231
}
201232

202-
static struct octeon_dma_map_ops octeon_linear_dma_map_ops = {
203-
.dma_map_ops = {
204-
.alloc = octeon_dma_alloc_coherent,
205-
.free = swiotlb_free,
206-
.map_page = octeon_dma_map_page,
207-
.unmap_page = swiotlb_unmap_page,
208-
.map_sg = octeon_dma_map_sg,
209-
.unmap_sg = swiotlb_unmap_sg_attrs,
210-
.sync_single_for_cpu = swiotlb_sync_single_for_cpu,
211-
.sync_single_for_device = octeon_dma_sync_single_for_device,
212-
.sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
213-
.sync_sg_for_device = octeon_dma_sync_sg_for_device,
214-
.mapping_error = swiotlb_dma_mapping_error,
215-
.dma_supported = swiotlb_dma_supported
216-
},
217-
.phys_to_dma = octeon_unity_phys_to_dma,
218-
.dma_to_phys = octeon_unity_dma_to_phys
233+
static const struct dma_map_ops octeon_swiotlb_ops = {
234+
.alloc = octeon_dma_alloc_coherent,
235+
.free = swiotlb_free,
236+
.map_page = octeon_dma_map_page,
237+
.unmap_page = swiotlb_unmap_page,
238+
.map_sg = octeon_dma_map_sg,
239+
.unmap_sg = swiotlb_unmap_sg_attrs,
240+
.sync_single_for_cpu = swiotlb_sync_single_for_cpu,
241+
.sync_single_for_device = octeon_dma_sync_single_for_device,
242+
.sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
243+
.sync_sg_for_device = octeon_dma_sync_sg_for_device,
244+
.mapping_error = swiotlb_dma_mapping_error,
245+
.dma_supported = swiotlb_dma_supported
219246
};
220247

221248
char *octeon_swiotlb;
@@ -281,51 +308,5 @@ void __init plat_swiotlb_setup(void)
281308
if (swiotlb_init_with_tbl(octeon_swiotlb, swiotlb_nslabs, 1) == -ENOMEM)
282309
panic("Cannot allocate SWIOTLB buffer");
283310

284-
mips_dma_map_ops = &octeon_linear_dma_map_ops.dma_map_ops;
311+
mips_dma_map_ops = &octeon_swiotlb_ops;
285312
}
286-
287-
#ifdef CONFIG_PCI
288-
static struct octeon_dma_map_ops _octeon_pci_dma_map_ops = {
289-
.dma_map_ops = {
290-
.alloc = octeon_dma_alloc_coherent,
291-
.free = swiotlb_free,
292-
.map_page = octeon_dma_map_page,
293-
.unmap_page = swiotlb_unmap_page,
294-
.map_sg = octeon_dma_map_sg,
295-
.unmap_sg = swiotlb_unmap_sg_attrs,
296-
.sync_single_for_cpu = swiotlb_sync_single_for_cpu,
297-
.sync_single_for_device = octeon_dma_sync_single_for_device,
298-
.sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
299-
.sync_sg_for_device = octeon_dma_sync_sg_for_device,
300-
.mapping_error = swiotlb_dma_mapping_error,
301-
.dma_supported = swiotlb_dma_supported
302-
},
303-
};
304-
305-
const struct dma_map_ops *octeon_pci_dma_map_ops;
306-
307-
void __init octeon_pci_dma_init(void)
308-
{
309-
switch (octeon_dma_bar_type) {
310-
case OCTEON_DMA_BAR_TYPE_PCIE2:
311-
_octeon_pci_dma_map_ops.phys_to_dma = octeon_gen2_phys_to_dma;
312-
_octeon_pci_dma_map_ops.dma_to_phys = octeon_gen2_dma_to_phys;
313-
break;
314-
case OCTEON_DMA_BAR_TYPE_PCIE:
315-
_octeon_pci_dma_map_ops.phys_to_dma = octeon_gen1_phys_to_dma;
316-
_octeon_pci_dma_map_ops.dma_to_phys = octeon_gen1_dma_to_phys;
317-
break;
318-
case OCTEON_DMA_BAR_TYPE_BIG:
319-
_octeon_pci_dma_map_ops.phys_to_dma = octeon_big_phys_to_dma;
320-
_octeon_pci_dma_map_ops.dma_to_phys = octeon_big_dma_to_phys;
321-
break;
322-
case OCTEON_DMA_BAR_TYPE_SMALL:
323-
_octeon_pci_dma_map_ops.phys_to_dma = octeon_small_phys_to_dma;
324-
_octeon_pci_dma_map_ops.dma_to_phys = octeon_small_dma_to_phys;
325-
break;
326-
default:
327-
BUG();
328-
}
329-
octeon_pci_dma_map_ops = &_octeon_pci_dma_map_ops.dma_map_ops;
330-
}
331-
#endif /* CONFIG_PCI */

‎arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
7272
dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr);
7373
phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr);
7474

75-
struct dma_map_ops;
76-
extern const struct dma_map_ops *octeon_pci_dma_map_ops;
7775
extern char *octeon_swiotlb;
7876

7977
#endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */

‎arch/mips/pci/pci-octeon.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
166166
pci_write_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, dconfig);
167167
}
168168

169-
dev->dev.dma_ops = octeon_pci_dma_map_ops;
170-
171169
return 0;
172170
}
173171

0 commit comments

Comments
 (0)