diff options
| author | Hiroshi Doyu <hdoyu@nvidia.com> | 2013-12-09 13:07:46 +0200 |
|---|---|---|
| committer | Hiroshi Doyu <hdoyu@nvidia.com> | 2013-12-11 14:08:32 -0800 |
| commit | e8cfbdc1452262691058f57a35c208863fe164a2 (patch) | |
| tree | 1be5bd03d1e39822b4cf26ac8852523a32d1f6ff | |
| parent | 16028e7c8f23e3d2815d9963bf3fa4c6dfff02bd (diff) | |
ARM: dma-mapping: Use %pa for {dma,phys}_addr_t
The data size varis depending on LPAE, 32 or 64. Modified to support
both without any build warnings.
Change-Id: Iacb8cbbffdab9f7148a62315e011c9a3a74d9030
Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
Reviewed-on: http://git-master/r/339861
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 18 | ||||
| -rw-r--r-- | include/trace/events/dmadebug.h | 4 |
2 files changed, 12 insertions, 10 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 713ec2eb3602..983488edb35f 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1035,19 +1035,21 @@ static void seq_print_dma_areas(struct seq_file *s, void *bitmap, size_t pos = find_first_bit(bitmap, bits), end; for (; pos < bits; pos = find_next_bit(bitmap, bits, end + 1)) { + dma_addr_t start_addr, end_addr; + end = find_next_zero_bit(bitmap, bits, pos); - seq_printf(s, " 0x%08x-0x%08x pages=%d\n", - bit_to_addr(pos, base, order), - bit_to_addr(end, base, order) - 1, - (end - pos) << order); + start_addr = bit_to_addr(pos, base, order); + end_addr = bit_to_addr(end, base, order); + seq_printf(s, " %pa-%pa pages=%d\n", + &start_addr, &end_addr, (end - pos) << order); } } static void seq_print_mapping(struct seq_file *s, struct dma_iommu_mapping *mapping) { - seq_printf(s, " memory map: base=0x%x size=%d order=%d domain=%p\n", - mapping->base, mapping->end - mapping->base, + seq_printf(s, " memory map: base=%pa size=%lld order=%d domain=%p\n", + &mapping->base, (u64)(mapping->end - mapping->base), mapping->order, mapping->domain); seq_print_dma_areas(s, mapping->bitmap, mapping->base, mapping->bits, @@ -1657,7 +1659,7 @@ static void *__iommu_alloc_atomic(struct device *dev, size_t size, if (*handle == DMA_ERROR_CODE) goto err_mapping; - dev_dbg(dev, "%s() %08x(%x)\n", __func__, *handle, size); + dev_dbg(dev, "%s() %pa(%x)\n", __func__, handle, size); return addr; err_mapping: @@ -1671,7 +1673,7 @@ static void __iommu_free_atomic(struct device *dev, void *cpu_addr, { __iommu_remove_mapping(dev, handle, size, attrs); __free_from_pool(cpu_addr, size); - dev_dbg(dev, "%s() %08x(%x)\n", __func__, handle, size); + dev_dbg(dev, "%s() %pa(%x)\n", __func__, &handle, size); } static void *arm_iommu_alloc_attrs(struct device *dev, size_t size, diff --git a/include/trace/events/dmadebug.h b/include/trace/events/dmadebug.h index 615151434640..0cf45b33ccde 100644 --- a/include/trace/events/dmadebug.h +++ b/include/trace/events/dmadebug.h @@ -52,8 +52,8 @@ DECLARE_EVENT_CLASS(dmadebug, __entry->page = page; ), - TP_printk("device=%s, addr=0x%08x, size=%d page=%p platformdata=%s", - dev_name(__entry->dev), __entry->dma_addr, + TP_printk("device=%s, addr=%p, size=%d page=%pa platformdata=%s", + dev_name(__entry->dev), &__entry->dma_addr, __entry->size, __entry->page, debug_dma_platformdata(__entry->dev)) ); |