Revision d3e01c51598b2639a4830549058500e5f2ace86f authored by Sricharan R on 27 May 2017, 13:47:45 UTC, committed by Joerg Roedel on 30 May 2017, 09:31:34 UTC
arch_teardown_dma_ops() being the inverse of arch_setup_dma_ops()
,dma_ops should be cleared in the teardown path. Currently, only the
device's iommu mapping structures are cleared in arch_teardown_dma_ops,
but not the dma_ops. So on the next reprobe, dma_ops left in place is
stale from the first IOMMU setup, but iommu mappings has been disposed
of. This is a problem when the probe of the device is deferred and
recalled with the IOMMU probe deferral.
So for fixing this, slightly refactor by moving the code from
__arm_iommu_detach_device to arm_iommu_detach_device and cleanup
the former. This takes care of resetting the dma_ops in the teardown
path.
Fixes: 09515ef5ddad ("of/acpi: Configure dma operations at probe time for platform/amba/pci bus devices")
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent 4dac321
| File | Mode | Size |
|---|---|---|
| partitions | ||
| Kconfig | -rw-r--r-- | 6.1 KB |
| Kconfig.iosched | -rw-r--r-- | 2.7 KB |
| Makefile | -rw-r--r-- | 1.4 KB |
| badblocks.c | -rw-r--r-- | 14.5 KB |
| bfq-cgroup.c | -rw-r--r-- | 30.2 KB |
| bfq-iosched.c | -rw-r--r-- | 162.0 KB |
| bfq-iosched.h | -rw-r--r-- | 30.7 KB |
| bfq-wf2q.c | -rw-r--r-- | 48.9 KB |
| bio-integrity.c | -rw-r--r-- | 14.3 KB |
| bio.c | -rw-r--r-- | 50.5 KB |
| blk-cgroup.c | -rw-r--r-- | 37.6 KB |
| blk-core.c | -rw-r--r-- | 91.9 KB |
| blk-exec.c | -rw-r--r-- | 2.9 KB |
| blk-flush.c | -rw-r--r-- | 16.5 KB |
| blk-integrity.c | -rw-r--r-- | 12.1 KB |
| blk-ioc.c | -rw-r--r-- | 10.9 KB |
| blk-lib.c | -rw-r--r-- | 9.4 KB |
| blk-map.c | -rw-r--r-- | 5.9 KB |
| blk-merge.c | -rw-r--r-- | 20.0 KB |
| blk-mq-cpumap.c | -rw-r--r-- | 2.3 KB |
| blk-mq-debugfs.c | -rw-r--r-- | 20.9 KB |
| blk-mq-debugfs.h | -rw-r--r-- | 2.1 KB |
| blk-mq-pci.c | -rw-r--r-- | 1.5 KB |
| blk-mq-sched.c | -rw-r--r-- | 13.9 KB |
| blk-mq-sched.h | -rw-r--r-- | 3.7 KB |
| blk-mq-sysfs.c | -rw-r--r-- | 8.2 KB |
| blk-mq-tag.c | -rw-r--r-- | 11.1 KB |
| blk-mq-tag.h | -rw-r--r-- | 2.3 KB |
| blk-mq-virtio.c | -rw-r--r-- | 1.7 KB |
| blk-mq.c | -rw-r--r-- | 69.9 KB |
| blk-mq.h | -rw-r--r-- | 4.4 KB |
| blk-settings.c | -rw-r--r-- | 28.8 KB |
| blk-softirq.c | -rw-r--r-- | 4.3 KB |
| blk-stat.c | -rw-r--r-- | 5.5 KB |
| blk-stat.h | -rw-r--r-- | 5.5 KB |
| blk-sysfs.c | -rw-r--r-- | 23.1 KB |
| blk-tag.c | -rw-r--r-- | 10.0 KB |
| blk-throttle.c | -rw-r--r-- | 67.0 KB |
| blk-timeout.c | -rw-r--r-- | 5.9 KB |
| blk-wbt.c | -rw-r--r-- | 17.6 KB |
| blk-wbt.h | -rw-r--r-- | 4.0 KB |
| blk-zoned.c | -rw-r--r-- | 7.6 KB |
| blk.h | -rw-r--r-- | 10.2 KB |
| bounce.c | -rw-r--r-- | 5.8 KB |
| bsg-lib.c | -rw-r--r-- | 6.7 KB |
| bsg.c | -rw-r--r-- | 22.9 KB |
| cfq-iosched.c | -rw-r--r-- | 127.0 KB |
| cmdline-parser.c | -rw-r--r-- | 4.9 KB |
| compat_ioctl.c | -rw-r--r-- | 20.7 KB |
| deadline-iosched.c | -rw-r--r-- | 11.2 KB |
| elevator.c | -rw-r--r-- | 26.6 KB |
| genhd.c | -rw-r--r-- | 45.6 KB |
| ioctl.c | -rw-r--r-- | 15.0 KB |
| ioprio.c | -rw-r--r-- | 5.0 KB |
| kyber-iosched.c | -rw-r--r-- | 21.0 KB |
| mq-deadline.c | -rw-r--r-- | 16.8 KB |
| noop-iosched.c | -rw-r--r-- | 2.6 KB |
| opal_proto.h | -rw-r--r-- | 9.3 KB |
| partition-generic.c | -rw-r--r-- | 16.3 KB |
| scsi_ioctl.c | -rw-r--r-- | 19.8 KB |
| sed-opal.c | -rw-r--r-- | 57.7 KB |
| t10-pi.c | -rw-r--r-- | 4.9 KB |
Computing file changes ...
