Commit ff1a618a authored by Mike Frysinger's avatar Mike Frysinger
Browse files

Blackfin: traps: fix up printf warnings from debug



Cast uint32_t to void* for %p, and use %zu for size_t.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 710aa762
...@@ -150,7 +150,10 @@ int trap_c(struct pt_regs *regs, uint32_t level) ...@@ -150,7 +150,10 @@ int trap_c(struct pt_regs *regs, uint32_t level)
(data ? 'D' : 'I'), (void *)new_cplb_addr); (data ? 'D' : 'I'), (void *)new_cplb_addr);
bfin_panic(regs); bfin_panic(regs);
} else } else
debug("CPLB addr %p matches map 0x%p - 0x%p\n", new_cplb_addr, bfin_memory_map[i].start, bfin_memory_map[i].end); debug("CPLB addr %p matches map 0x%p - 0x%p\n",
(void *)new_cplb_addr,
(void *)bfin_memory_map[i].start,
(void *)bfin_memory_map[i].end);
new_cplb_data = (data ? bfin_memory_map[i].data_flags : bfin_memory_map[i].inst_flags); new_cplb_data = (data ? bfin_memory_map[i].data_flags : bfin_memory_map[i].inst_flags);
if (data) { if (data) {
...@@ -163,16 +166,17 @@ int trap_c(struct pt_regs *regs, uint32_t level) ...@@ -163,16 +166,17 @@ int trap_c(struct pt_regs *regs, uint32_t level)
/* find the next unlocked entry and evict it */ /* find the next unlocked entry and evict it */
i = last_evicted & 0xF; i = last_evicted & 0xF;
debug("last evicted = %i\n", i); debug("last evicted = %zu\n", i);
CPLB_DATA = CPLB_DATA_BASE + i; CPLB_DATA = CPLB_DATA_BASE + i;
while (*CPLB_DATA & CPLB_LOCK) { while (*CPLB_DATA & CPLB_LOCK) {
debug("skipping %i %p - %08X\n", i, CPLB_DATA, *CPLB_DATA); debug("skipping %zu %p - %08X\n", i, CPLB_DATA, *CPLB_DATA);
i = (i + 1) & 0xF; /* wrap around */ i = (i + 1) & 0xF; /* wrap around */
CPLB_DATA = CPLB_DATA_BASE + i; CPLB_DATA = CPLB_DATA_BASE + i;
} }
CPLB_ADDR = CPLB_ADDR_BASE + i; CPLB_ADDR = CPLB_ADDR_BASE + i;
debug("evicting entry %i: 0x%p 0x%08X\n", i, *CPLB_ADDR, *CPLB_DATA); debug("evicting entry %zu: 0x%p 0x%08X\n", i,
(void *)*CPLB_ADDR, *CPLB_DATA);
last_evicted = i + 1; last_evicted = i + 1;
/* need to turn off cplbs whenever we muck with the cplb table */ /* need to turn off cplbs whenever we muck with the cplb table */
...@@ -190,7 +194,8 @@ int trap_c(struct pt_regs *regs, uint32_t level) ...@@ -190,7 +194,8 @@ int trap_c(struct pt_regs *regs, uint32_t level)
CPLB_ADDR = CPLB_ADDR_BASE; CPLB_ADDR = CPLB_ADDR_BASE;
CPLB_DATA = CPLB_DATA_BASE; CPLB_DATA = CPLB_DATA_BASE;
for (i = 0; i < 16; ++i) for (i = 0; i < 16; ++i)
debug("%2i 0x%p 0x%08X\n", i, *CPLB_ADDR++, *CPLB_DATA++); debug("%2zu 0x%p 0x%08X\n", i,
(void *)*CPLB_ADDR++, *CPLB_DATA++);
break; break;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment