aboutsummaryrefslogtreecommitdiff
path: root/drivers/soc/ti/knav_qmss.h
diff options
context:
space:
mode:
authorGravatar Arnd Bergmann <arnd@arndb.de> 2015-12-07 15:46:59 +0100
committerGravatar Arnd Bergmann <arnd@arndb.de> 2016-02-26 17:53:06 +0100
commitcc0336ec8a0cc7f83588019850ebe97df32c304c (patch)
tree7971bb2799b4654a1010452eed422e9740b7ad0a /drivers/soc/ti/knav_qmss.h
parentMerge tag 'davinci-for-v4.6/fixes' of git://git.kernel.org/pub/scm/linux/kern... (diff)
downloadlinux-cc0336ec8a0cc7f83588019850ebe97df32c304c.tar.gz
linux-cc0336ec8a0cc7f83588019850ebe97df32c304c.tar.bz2
linux-cc0336ec8a0cc7f83588019850ebe97df32c304c.zip
soc: TI knav_qmss: fix dma_addr_t printing
The knav_qmss driver is currently broken when CONFIG_LPAE is set, which is a bit surprising because I'd expect that any serious users of this platforms would have more than 2GB of RAM and require LPAE. The compiler clearly warns about an incorrect use of dma_addr_t in the debug kernel messages: ti/knav_qmss_queue.c: In function 'knav_queue_setup_region': ti/knav_qmss_queue.c:1025:117: warning: format '%x' expects argument of type 'unsigned int', but argument 9 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=] ti/knav_qmss_queue.c:1025:117: warning: format '%x' expects argument of type 'unsigned int', but argument 10 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=] ti/knav_qmss_queue.c: In function 'knav_queue_setup_link_ram': ti/knav_qmss_queue.c:1175:118: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=] This patch changes all the debugging output to use the correct %pad format string that works with both 32-bit and 64-bit dma_addr_t. As the variable naming is somewhat confusing here, I also change all *_phys names to *_dma when they refer to bus addresses that are used for DMA rather than a physical memory address as seen from the CPU. This is particularly important on keystone, because the two things are not the same there. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc/ti/knav_qmss.h')
-rw-r--r--drivers/soc/ti/knav_qmss.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/ti/knav_qmss.h b/drivers/soc/ti/knav_qmss.h
index 6ff936cacb70..905b974d1bdc 100644
--- a/drivers/soc/ti/knav_qmss.h
+++ b/drivers/soc/ti/knav_qmss.h
@@ -93,13 +93,13 @@ struct knav_reg_pdsp_regs {
struct knav_reg_acc_command {
u32 command;
u32 queue_mask;
- u32 list_phys;
+ u32 list_dma;
u32 queue_num;
u32 timer_config;
};
struct knav_link_ram_block {
- dma_addr_t phys;
+ dma_addr_t dma;
void *virt;
size_t size;
};