search for: config_arm

...e changed, 40 insertions(+), 2 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 50b740f..df36d43 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -28,6 +28,9 @@ #include <public/memory.h> #include <xsm/xsm.h> #include <xen/trace.h> +#ifdef CONFIG_ARM +#include <asm/platform.h> +#endif struct memop_args { /* INPUT */ @@ -90,7 +93,7 @@ static void increase_reservation(struct memop_args *a) static void populate_physmap(struct memop_args *a) { - struct page_info *page; + struct page_info *page = NULL; unsigned long i, j...

...+ * non-coherent DMA when the host *is* actually coherent, but has >>>> + * forgotten to tell us, is going to break badly; since this situation >>>> + * already exists in the wild, maintain the old behaviour there. >>>> */ >>>> - if (IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) >>>> + if ((IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) && >>>> + device_get_dma_attr(&vdev->dev) == DEV_DMA_COHERENT) >>>> return !virtio_has_feature(vdev, VIRTIO_F_VERSION_1); >>>> >>...

...+ * non-coherent DMA when the host *is* actually coherent, but has >>>> + * forgotten to tell us, is going to break badly; since this situation >>>> + * already exists in the wild, maintain the old behaviour there. >>>> */ >>>> - if (IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) >>>> + if ((IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) && >>>> + device_get_dma_attr(&vdev->dev) == DEV_DMA_COHERENT) >>>> return !virtio_has_feature(vdev, VIRTIO_F_VERSION_1); >>>> >>...

...0644 --- a/drm/nouveau/nvkm/engine/device/pci.c +++ b/drm/nouveau/nvkm/engine/device/pci.c @@ -1614,6 +1614,7 @@ nvkm_device_pci_func = { .fini = nvkm_device_pci_fini, .resource_addr = nvkm_device_pci_resource_addr, .resource_size = nvkm_device_pci_resource_size, + .cpu_coherent = !IS_ENABLED(CONFIG_ARM), }; int diff --git a/drm/nouveau/nvkm/engine/device/tegra.c b/drm/nouveau/nvkm/engine/device/tegra.c index 939682f..9b638bd 100644 --- a/drm/nouveau/nvkm/engine/device/tegra.c +++ b/drm/nouveau/nvkm/engine/device/tegra.c @@ -245,6 +245,7 @@ nvkm_device_tegra_func = { .fini = nvkm_device_tegr...

...es. However, using > > + * non-coherent DMA when the host *is* actually coherent, but has > > + * forgotten to tell us, is going to break badly; since this situation > > + * already exists in the wild, maintain the old behaviour there. > > */ > > - if (IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) > > + if ((IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) && > > + device_get_dma_attr(&vdev->dev) == DEV_DMA_COHERENT) > > return !virtio_has_feature(vdev, VIRTIO_F_VERSION_1); > > > > return false; > &g...

...es. However, using > > + * non-coherent DMA when the host *is* actually coherent, but has > > + * forgotten to tell us, is going to break badly; since this situation > > + * already exists in the wild, maintain the old behaviour there. > > */ > > - if (IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) > > + if ((IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) && > > + device_get_dma_attr(&vdev->dev) == DEV_DMA_COHERENT) > > return !virtio_has_feature(vdev, VIRTIO_F_VERSION_1); > > > > return false; > &g...

...t + * thing, so always use them with legacy devices. However, using + * non-coherent DMA when the host *is* actually coherent, but has + * forgotten to tell us, is going to break badly; since this situation + * already exists in the wild, maintain the old behaviour there. */ - if (IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) + if ((IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) && + device_get_dma_attr(&vdev->dev) == DEV_DMA_COHERENT) return !virtio_has_feature(vdev, VIRTIO_F_VERSION_1); return false; -- 2.11.0.dirty

...t + * thing, so always use them with legacy devices. However, using + * non-coherent DMA when the host *is* actually coherent, but has + * forgotten to tell us, is going to break badly; since this situation + * already exists in the wild, maintain the old behaviour there. */ - if (IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) + if ((IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) && + device_get_dma_attr(&vdev->dev) == DEV_DMA_COHERENT) return !virtio_has_feature(vdev, VIRTIO_F_VERSION_1); return false; -- 2.11.0.dirty

...0644 --- a/drm/nouveau/nvkm/engine/device/pci.c +++ b/drm/nouveau/nvkm/engine/device/pci.c @@ -1614,7 +1614,7 @@ nvkm_device_pci_func = { .fini = nvkm_device_pci_fini, .resource_addr = nvkm_device_pci_resource_addr, .resource_size = nvkm_device_pci_resource_size, - .cpu_coherent = !IS_ENABLED(CONFIG_ARM), + .cpu_coherent = !IS_ENABLED(CONFIG_ARM) && !IS_ENABLED(CONFIG_ARM64), }; int -- 2.7.2

...++ b/drm/nouveau/nvkm/engine/device/pci.c > @@ -1614,6 +1614,7 @@ nvkm_device_pci_func = { > .fini = nvkm_device_pci_fini, > .resource_addr = nvkm_device_pci_resource_addr, > .resource_size = nvkm_device_pci_resource_size, > + .cpu_coherent = !IS_ENABLED(CONFIG_ARM), > }; > > int > diff --git a/drm/nouveau/nvkm/engine/device/tegra.c b/drm/nouveau/nvkm/engine/device/tegra.c > index 939682f..9b638bd 100644 > --- a/drm/nouveau/nvkm/engine/device/tegra.c > +++ b/drm/nouveau/nvkm/engine/device/tegra.c > @@ -245,6 +245,7 @@ nvkm_device_teg...

...y once for each function it appears in .. and more Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 46de6cd..273d2b9 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -1,8 +1,8 @@ ifneq ($(CONFIG_ARM),y) -obj-y += manage.o balloon.o +obj-y += manage.o balloon.o fallback.o obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o endif -obj-y += grant-table.o features.o events.o fallback.o +obj-y += grant-table.o features.o events.o obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector)

...legacy systems. */ - return !virtio_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM); + if (virtio_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) + return false; + + /* + * fastboot emulator for ARM puts virtio devices behind an SMMU + * and never bypasses it for legacy devices. + */ + if (IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) + return virtio_has_feature(vdev, VIRTIO_F_VERSION_1); + + return true; } static inline diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 519eff3..affa973 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -443,6 +443,...

...legacy systems. */ - return !virtio_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM); + if (virtio_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) + return false; + + /* + * fastboot emulator for ARM puts virtio devices behind an SMMU + * and never bypasses it for legacy devices. + */ + if (IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) + return virtio_has_feature(vdev, VIRTIO_F_VERSION_1); + + return true; } static inline diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 519eff3..affa973 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -443,6 +443,...

...host *is* actually coherent, but has > > > > > + * forgotten to tell us, is going to break badly; since this situation > > > > > + * already exists in the wild, maintain the old behaviour there. > > > > > */ > > > > > - if (IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) > > > > > + if ((IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) && > > > > > + device_get_dma_attr(&vdev->dev) == DEV_DMA_COHERENT) > > > > > return !virtio_has_feature(vdev, VIRTIO_F_VERSION_1); &...

...se them with legacy devices. However, using > + * non-coherent DMA when the host *is* actually coherent, but has > + * forgotten to tell us, is going to break badly; since this situation > + * already exists in the wild, maintain the old behaviour there. > */ > - if (IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) > + if ((IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) && > + device_get_dma_attr(&vdev->dev) == DEV_DMA_COHERENT) > return !virtio_has_feature(vdev, VIRTIO_F_VERSION_1); > > return false; This is exactly what I feared....

From: Ian Campbell <ian.campbell@citrix.com> The zImage compatible binary is the useful one on real hardware. The relocated ELF thing is only really useful when booting directly on Fast Models. The customary suffix for that case is .axf so provide that as a target. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Cc: Wookey <wookey@linaro.org> --- xen/arch/arm/Makefile |

...eeedfe5..06b91e29d1b7 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -159,6 +159,10 @@ static bool vring_use_dma_api(struct virtio_device *vdev) if (xen_domain()) return true; + /* On ARM-based machines, the DMA ops will do the right thing */ + if (IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) + return true; + return false; } -- 2.1.4

...eeedfe5..06b91e29d1b7 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -159,6 +159,10 @@ static bool vring_use_dma_api(struct virtio_device *vdev) if (xen_domain()) return true; + /* On ARM-based machines, the DMA ops will do the right thing */ + if (IS_ENABLED(CONFIG_ARM) || IS_ENABLED(CONFIG_ARM64)) + return true; + return false; } -- 2.1.4

...0644 --- a/drm/nouveau/nvkm/engine/device/pci.c +++ b/drm/nouveau/nvkm/engine/device/pci.c @@ -1614,7 +1614,7 @@ nvkm_device_pci_func = { .fini = nvkm_device_pci_fini, .resource_addr = nvkm_device_pci_resource_addr, .resource_size = nvkm_device_pci_resource_size, - .cpu_coherent = !IS_ENABLED(CONFIG_ARM) && !IS_ENABLED(CONFIG_ARM64), + .cpu_coherent = !IS_ENABLED(CONFIG_ARM), }; int diff --git a/lib/include/nvif/os.h b/lib/include/nvif/os.h index 831110904fee..1eda53aa8f45 100644 --- a/lib/include/nvif/os.h +++ b/lib/include/nvif/os.h @@ -130,12 +130,6 @@ typedef dma_addr_t resource_si...

...0644 > --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c > @@ -105,6 +105,11 @@ nvkm_device_tegra_probe_iommu(struct nvkm_device_tegra *tdev) > unsigned long pgsize_bitmap; > int ret; > > +#if IS_ENABLED(CONFIG_ARM) Wouldn't CONFIG_ARM_DMA_USE_IOMMU be even more appropriate? > + /* make sure we can use the IOMMU exclusively */ > + arm_dma_iommu_detach_device(dev); As before, I would just use the existing infrastructure the same way the Exynos DRM driver currently does in __exynos_iommu_attach()...