crypto: sahara: fix 64-bit dma_addr_t compilation
PATCH 1/2 crypto: sahara: fix 64-bit dma_addr_t compilation
The sahara hardware uses DMA descriptors with 32-bit addresses, but dma_addr_t is variable size depending on whether we want to support any devices that use 64-bit DMA addresses in hardware.
This means that the definition of the DMA descriptor structure is wrong, and we helpfully get a compiler warning about them too:
drivers/crypto/sahara.c:423:372: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=]
This changes the definition of the sahara_hw_desc and sahara_hw_link structures to only contain fixed-length members, which is required to make the driver work on ARM LPAE mode, and avoids most of the gcc warnings we get.
--- drivers/crypto/sahara.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/crypto/sahara.c +9 -9
@@ -130,18 +130,18 @@#define SAHARA_REG_IDAR 0x20struct sahara_hw_desc { -u32 hdr; -u32 len1; -dma_addr_t p1; -u32 len2; -dma_addr_t p2; -dma_addr_t next; +u32 hdr; +u32 len1; +u32 p1; +u32 len2; +u32 p2; +u32 next; };struct sahara_hw_link { -u32 len; -dma_addr_t p; -dma_addr_t next; +u32 len; +u32 p; +u32 next; };struct sahara_ctx {
Signature · 1 line
2.1.0.rc2
PATCH 2/2 crypto: sahara: fix debug output for 64-bit dma_addr_t
The sahara_dump_descriptors and sahara_dump_links functions attempt to print a dma_addr_t value with a 0x%08x format string, which produces a warning when dma_addr_t is 64-bit wide:
drivers/crypto/sahara.c:419:120: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=]
This changes the code to use the %pad format string that is meant for dma_addr_t, which avoids the warning and gives us the correct output in all configurations.
--- drivers/crypto/sahara.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/crypto/sahara.c +4 -4
@@ -416,8 +416,8 @@ static void sahara_dump_descriptors(struct sahara_dev *dev)return ;for (i =0 ; i <SAHARA_MAX_HW_DESC ; i++) { -dev_dbg (dev->device,"Descriptor (%d) (0x%08x):\n" , - i, dev->hw_phys_desc[i]); +dev_dbg (dev->device,"Descriptor (%d) (%pad):\n" , + i, &dev->hw_phys_desc[i]);dev_dbg (dev->device,"\thdr = 0x%08x\n" , dev->hw_desc[i]->hdr);dev_dbg (dev->device,"\tlen1 = %u\n" , dev->hw_desc[i]->len1);dev_dbg (dev->device,"\tp1 = 0x%08x\n" , dev->hw_desc[i]->p1);
@@ -437,8 +437,8 @@ static void sahara_dump_links(struct sahara_dev *dev)return ;for (i =0 ; i <SAHARA_MAX_HW_LINK ; i++) { -dev_dbg (dev->device,"Link (%d) (0x%08x):\n" , - i, dev->hw_phys_link[i]); +dev_dbg (dev->device,"Link (%d) (%pad):\n" , + i, &dev->hw_phys_link[i]);dev_dbg (dev->device,"\tlen = %u\n" , dev->hw_link[i]->len);dev_dbg (dev->device,"\tp = 0x%08x\n" , dev->hw_link[i]->p); dev_dbg(dev->device, "\tnext = 0x%08x\n",
Signature · 1 line
2.1.0.rc2
Herbert Xu
maintainerQuoted 6 lines · Arnd Bergmann
The sahara hardware uses DMA descriptors with 32-bit addresses, but
dma_addr_tis variable size depending on whether we want to support any devices that use 64-bit DMA addresses in hardware.
This means that the definition of the DMA descriptor structure is wrong, and we helpfully get a compiler warning about them too:
Quoted 8 lines
drivers/crypto/sahara.c:423:372: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'dma_addr_t{aka long long unsigned int}' [-Wformat=]This changes the definition of the
sahara_hw_descandsahara_hw_linkstructures to only contain fixed-length members, which is required to make the driver work on ARM LPAE mode, and avoids most of the gcc warnings we get.Signed-off-by Arnd Bergmann <[email protected]>
Both patches applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt