powerpc: rename swiotlb_dma_ops
We'll need that name for a generic implementation soon. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Christian König <christian.koenig@amd.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
parent
fde25dd4c7
commit
a37a3710f3
4 changed files with 5 additions and 5 deletions
|
@ -13,7 +13,7 @@
|
|||
|
||||
#include <linux/swiotlb.h>
|
||||
|
||||
extern const struct dma_map_ops swiotlb_dma_ops;
|
||||
extern const struct dma_map_ops powerpc_swiotlb_dma_ops;
|
||||
|
||||
extern unsigned int ppc_swiotlb_enable;
|
||||
int __init swiotlb_setup_bus_notifier(void);
|
||||
|
|
|
@ -46,7 +46,7 @@ static u64 swiotlb_powerpc_get_required(struct device *dev)
|
|||
* map_page, and unmap_page on highmem, use normal dma_ops
|
||||
* for everything else.
|
||||
*/
|
||||
const struct dma_map_ops swiotlb_dma_ops = {
|
||||
const struct dma_map_ops powerpc_swiotlb_dma_ops = {
|
||||
.alloc = __dma_nommu_alloc_coherent,
|
||||
.free = __dma_nommu_free_coherent,
|
||||
.mmap = dma_nommu_mmap_coherent,
|
||||
|
@ -89,7 +89,7 @@ static int ppc_swiotlb_bus_notify(struct notifier_block *nb,
|
|||
|
||||
/* May need to bounce if the device can't address all of DRAM */
|
||||
if ((dma_get_mask(dev) + 1) < memblock_end_of_DRAM())
|
||||
set_dma_ops(dev, &swiotlb_dma_ops);
|
||||
set_dma_ops(dev, &powerpc_swiotlb_dma_ops);
|
||||
|
||||
return NOTIFY_DONE;
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ static u64 __maybe_unused get_pfn_limit(struct device *dev)
|
|||
struct dev_archdata __maybe_unused *sd = &dev->archdata;
|
||||
|
||||
#ifdef CONFIG_SWIOTLB
|
||||
if (sd->max_direct_dma_addr && dev->dma_ops == &swiotlb_dma_ops)
|
||||
if (sd->max_direct_dma_addr && dev->dma_ops == &powerpc_swiotlb_dma_ops)
|
||||
pfn = min_t(u64, pfn, sd->max_direct_dma_addr >> PAGE_SHIFT);
|
||||
#endif
|
||||
|
||||
|
|
|
@ -118,7 +118,7 @@ static void setup_swiotlb_ops(struct pci_controller *hose)
|
|||
{
|
||||
if (ppc_swiotlb_enable) {
|
||||
hose->controller_ops.dma_dev_setup = pci_dma_dev_setup_swiotlb;
|
||||
set_pci_dma_ops(&swiotlb_dma_ops);
|
||||
set_pci_dma_ops(&powerpc_swiotlb_dma_ops);
|
||||
}
|
||||
}
|
||||
#else
|
||||
|
|
Loading…
Add table
Reference in a new issue