diff options
| author | ian <ian@FreeBSD.org> | 2014-05-14 01:35:43 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-05-14 01:35:43 +0000 |
| commit | ae2bbb5100a71ca9712eebe64ce4a80b680f030b (patch) | |
| tree | 1c4d065284f91caf3dc2c3a2e356b290feec78db /sys/powerpc/pseries | |
| parent | 147aa314a7ea59fab69a92349cee312e49cae2bb (diff) | |
| download | FreeBSD-src-ae2bbb5100a71ca9712eebe64ce4a80b680f030b.zip FreeBSD-src-ae2bbb5100a71ca9712eebe64ce4a80b680f030b.tar.gz | |
MFC r257334, r257336, r257337, r257338, r257341, r257342, r257343, r257370,
r257368, r257416
Hints-only devices should return BUS_PROBE_NOWILDCARD from their probe
methods.
Diffstat (limited to 'sys/powerpc/pseries')
| -rw-r--r-- | sys/powerpc/pseries/plpar_iommu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/powerpc/pseries/plpar_iommu.c b/sys/powerpc/pseries/plpar_iommu.c index ccf00c9..8db374c 100644 --- a/sys/powerpc/pseries/plpar_iommu.c +++ b/sys/powerpc/pseries/plpar_iommu.c @@ -69,7 +69,7 @@ struct dma_window { }; int -phyp_iommu_set_dma_tag(device_t dev, device_t child, bus_dma_tag_t tag) +phyp_iommu_set_dma_tag(device_t bus, device_t dev, bus_dma_tag_t tag) { device_t p; phandle_t node; @@ -77,7 +77,7 @@ phyp_iommu_set_dma_tag(device_t dev, device_t child, bus_dma_tag_t tag) struct iommu_map *i; int cell; - for (p = child; p != NULL; p = device_get_parent(p)) { + for (p = dev; device_get_parent(p) != NULL; p = device_get_parent(p)) { if (ofw_bus_has_prop(p, "ibm,my-dma-window")) break; if (ofw_bus_has_prop(p, "ibm,dma-window")) @@ -150,7 +150,7 @@ phyp_iommu_set_dma_tag(device_t dev, device_t child, bus_dma_tag_t tag) papr_supports_stuff_tce = !(phyp_hcall(H_STUFF_TCE, window->map->iobn, 0, 0, 0) == H_FUNCTION); - bus_dma_tag_set_iommu(tag, dev, window); + bus_dma_tag_set_iommu(tag, bus, window); return (0); } |
