Commit 20b9c4eb authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman

bfa: Fix undefined bit shift on big-endian architectures with 32-bit DMA address

commit 03a6c3ff upstream.

bfa_swap_words() shifts its argument (assumed to be 64-bit) by 32 bits
each way.  In two places the argument type is dma_addr_t, which may be
32-bit, in which case the effect of the bit shift is undefined:

drivers/scsi/bfa/bfa_fcpim.c: In function 'bfa_ioim_send_ioreq':
drivers/scsi/bfa/bfa_fcpim.c:2497:4: warning: left shift count >= width of type [enabled by default]
    addr = bfa_sgaddr_le(sg_dma_address(sg));
    ^
drivers/scsi/bfa/bfa_fcpim.c:2497:4: warning: right shift count >= width of type [enabled by default]
drivers/scsi/bfa/bfa_fcpim.c:2509:4: warning: left shift count >= width of type [enabled by default]
    addr = bfa_sgaddr_le(sg_dma_address(sg));
    ^
drivers/scsi/bfa/bfa_fcpim.c:2509:4: warning: right shift count >= width of type [enabled by default]

Avoid this by adding casts to u64 in bfa_swap_words().

Compile-tested only.
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Acked-by: default avatarAnil Gurumurthy <anil.gurumurthy@qlogic.com>
Fixes: f16a1750 ('[SCSI] bfa: remove all OS wrappers')
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 41183881
...@@ -72,7 +72,7 @@ struct bfa_sge_s { ...@@ -72,7 +72,7 @@ struct bfa_sge_s {
} while (0) } while (0)
#define bfa_swap_words(_x) ( \ #define bfa_swap_words(_x) ( \
((_x) << 32) | ((_x) >> 32)) ((u64)(_x) << 32) | ((u64)(_x) >> 32))
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
#define bfa_sge_to_be(_x) #define bfa_sge_to_be(_x)
......
Markdown is supported
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