On Fri, Sep 19, 2014 at 04:51:26PM +0100, Mark Salter wrote:
> diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
> index 4164c5a..0e26bd7 100644
[...]
> @@ -316,8 +318,18 @@ static int dma_bus_notifier(struct notifier_block *nb,
> if (event != BUS_NOTIFY_ADD_DEVICE)
> return NOTIFY_DONE;
>
> - if (of_property_read_bool(dev->of_node, "dma-coherent"))
> - set_dma_ops(dev, &coherent_swiotlb_dma_ops);
> + /*
> + * Some devices won't have an of_node but a bus controller/bridge will.
> + * Search up the device chain until we find an of_node to check.
> + */
> + while (dev) {
> + if (dev->of_node) {
> + if (of_dma_is_coherent(dev->of_node))
> + set_dma_ops(_dev, &coherent_swiotlb_dma_ops);
> + break;
> + }
> + dev = dev->parent;
> + }
>
> return NOTIFY_OK;
> }
For AMBA (with an additional patch) and platform devices, we can do the
same as ARM and rely on set_arch_dma_coherent_ops(), so most of the
notifier code removed. So we leave the above notifier for PCI only.
> static int __init swiotlb_late_init(void)
> @@ -341,6 +357,7 @@ static int __init swiotlb_late_init(void)
> */
> bus_register_notifier(&platform_bus_type, &platform_bus_nb);
> bus_register_notifier(&amba_bustype, &amba_bus_nb);
> + bus_register_notifier(&pci_bus_type, &pci_bus_nb);
Does this compile when CONFIG_PCI is disabled?
--
Catalin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
