Commit beecadea authored by Xi Wang's avatar Xi Wang Committed by James Bottomley

[SCSI] mvsas: fix undefined bit shift

The macro bit(n) is defined as ((u32)1 << n), and thus it doesn't work
with n >= 32, such as in mvs_94xx_assign_reg_set():

	if (i >= 32) {
		mvi->sata_reg_set |= bit(i);
		...
	}

The shift ((u32)1 << n) with n >= 32 also leads to undefined behavior.
The result varies depending on the architecture.

This patch changes bit(n) to do a 64-bit shift.  It also simplifies
mv_ffc64() using __ffs64(), since invoking ffz() with ~0 is undefined.
Signed-off-by: default avatarXi Wang <xi.wang@gmail.com>
Acked-by: default avatarXiangliang Yu <yuxiangl@marvell.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 072f19b4
...@@ -258,21 +258,11 @@ enum sas_sata_phy_regs { ...@@ -258,21 +258,11 @@ enum sas_sata_phy_regs {
#define SPI_ADDR_VLD_94XX (1U << 1) #define SPI_ADDR_VLD_94XX (1U << 1)
#define SPI_CTRL_SpiStart_94XX (1U << 0) #define SPI_CTRL_SpiStart_94XX (1U << 0)
#define mv_ffc(x) ffz(x)
static inline int static inline int
mv_ffc64(u64 v) mv_ffc64(u64 v)
{ {
int i; u64 x = ~v;
i = mv_ffc((u32)v); return x ? __ffs64(x) : -1;
if (i >= 0)
return i;
i = mv_ffc((u32)(v>>32));
if (i != 0)
return 32 + i;
return -1;
} }
#define r_reg_set_enable(i) \ #define r_reg_set_enable(i) \
......
...@@ -69,7 +69,7 @@ extern struct kmem_cache *mvs_task_list_cache; ...@@ -69,7 +69,7 @@ extern struct kmem_cache *mvs_task_list_cache;
#define DEV_IS_EXPANDER(type) \ #define DEV_IS_EXPANDER(type) \
((type == EDGE_DEV) || (type == FANOUT_DEV)) ((type == EDGE_DEV) || (type == FANOUT_DEV))
#define bit(n) ((u32)1 << n) #define bit(n) ((u64)1 << n)
#define for_each_phy(__lseq_mask, __mc, __lseq) \ #define for_each_phy(__lseq_mask, __mc, __lseq) \
for ((__mc) = (__lseq_mask), (__lseq) = 0; \ for ((__mc) = (__lseq_mask), (__lseq) = 0; \
......
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