Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

gpu: host1x: Silence a few warnings with LPAE=y

When building with LPAE=y (64-bit dma_addr_t), the following warnings are seen:

drivers/gpu/host1x/hw/cdma_hw.c:57:3: warning: format '%x' expects
argument of type 'unsigned int', but argument 5 has type 'dma_addr_t'

drivers/gpu/host1x/hw/debug_hw.c:167:10: warning: format '%x' expects
argument of type 'unsigned int', but argument 3 has type 'dma_addr_t'

The agreed-to solution for this is upcast to u64 and using %llx.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Thierry Reding <treding@nvidia.com>

authored by

Olof Johansson and committed by
Thierry Reding
43dd5554 6ce4eac1

+4 -4
+2 -2
drivers/gpu/host1x/hw/cdma_hw.c
··· 54 54 u32 *p = (u32 *)((u32)pb->mapped + getptr); 55 55 *(p++) = HOST1X_OPCODE_NOP; 56 56 *(p++) = HOST1X_OPCODE_NOP; 57 - dev_dbg(host1x->dev, "%s: NOP at 0x%x\n", __func__, 58 - pb->phys + getptr); 57 + dev_dbg(host1x->dev, "%s: NOP at %#llx\n", __func__, 58 + (u64)pb->phys + getptr); 59 59 getptr = (getptr + 8) & (pb->size_bytes - 1); 60 60 } 61 61 wmb();
+2 -2
drivers/gpu/host1x/hw/debug_hw.c
··· 163 163 continue; 164 164 } 165 165 166 - host1x_debug_output(o, " GATHER at %08x+%04x, %d words\n", 167 - g->base, g->offset, g->words); 166 + host1x_debug_output(o, " GATHER at %#llx+%04x, %d words\n", 167 + (u64)g->base, g->offset, g->words); 168 168 169 169 show_gather(o, g->base + g->offset, g->words, cdma, 170 170 g->base, mapped);