* [PATCH] dmaengine: mv_xor_v2: Fix -Wshift-negative-value
@ 2019-06-12 22:54 Nathan Huckleberry
2019-06-12 23:14 ` Nick Desaulniers
0 siblings, 1 reply; 5+ messages in thread
From: Nathan Huckleberry @ 2019-06-12 22:54 UTC (permalink / raw)
To: dan.j.williams, vkoul
Cc: dmaengine, linux-kernel, Nathan Huckleberry, clang-built-linux
Clang produces the following warning
drivers/dma/mv_xor_v2.c:264:40: warning: shifting a negative signed value
is undefined [-Wshift-negative-value]
reg &= (~MV_XOR_V2_DMA_IMSG_THRD_MASK <<
MV_XOR_V2_DMA_IMSG_THRD_SHIFT);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
drivers/dma/mv_xor_v2.c:271:46: warning: shifting a negative signed value
is undefined [-Wshift-negative-value]
reg &= (~MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK <<
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
Upon further investigation MV_XOR_V2_DMA_IMSG_THRD_SHIFT and
MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT are both 0. Since shifting by 0 does
nothing, these variables can be removed.
Cc: clang-built-linux@googlegroups.com
Link: https://github.com/ClangBuiltLinux/linux/issues/521
Signed-off-by: Nathan Huckleberry <nhuck@google.com>
---
drivers/dma/mv_xor_v2.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/dma/mv_xor_v2.c b/drivers/dma/mv_xor_v2.c
index fa5dab481203..5d2e0d1f3ec9 100644
--- a/drivers/dma/mv_xor_v2.c
+++ b/drivers/dma/mv_xor_v2.c
@@ -33,7 +33,6 @@
#define MV_XOR_V2_DMA_IMSG_CDAT_OFF 0x014
#define MV_XOR_V2_DMA_IMSG_THRD_OFF 0x018
#define MV_XOR_V2_DMA_IMSG_THRD_MASK 0x7FFF
-#define MV_XOR_V2_DMA_IMSG_THRD_SHIFT 0x0
#define MV_XOR_V2_DMA_IMSG_TIMER_EN BIT(18)
#define MV_XOR_V2_DMA_DESQ_AWATTR_OFF 0x01C
/* Same flags as MV_XOR_V2_DMA_DESQ_ARATTR_OFF */
@@ -50,7 +49,6 @@
#define MV_XOR_V2_DMA_DESQ_ADD_OFF 0x808
#define MV_XOR_V2_DMA_IMSG_TMOT 0x810
#define MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK 0x1FFF
-#define MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT 0
/* XOR Global registers */
#define MV_XOR_V2_GLOB_BW_CTRL 0x4
@@ -261,16 +259,15 @@ void mv_xor_v2_enable_imsg_thrd(struct mv_xor_v2_device *xor_dev)
/* Configure threshold of number of descriptors, and enable timer */
reg = readl(xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_THRD_OFF);
- reg &= (~MV_XOR_V2_DMA_IMSG_THRD_MASK << MV_XOR_V2_DMA_IMSG_THRD_SHIFT);
- reg |= (MV_XOR_V2_DONE_IMSG_THRD << MV_XOR_V2_DMA_IMSG_THRD_SHIFT);
+ reg &= (~MV_XOR_V2_DMA_IMSG_THRD_MASK);
+ reg |= (MV_XOR_V2_DONE_IMSG_THRD);
reg |= MV_XOR_V2_DMA_IMSG_TIMER_EN;
writel(reg, xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_THRD_OFF);
/* Configure Timer Threshold */
reg = readl(xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_TMOT);
- reg &= (~MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK <<
- MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT);
- reg |= (MV_XOR_V2_TIMER_THRD << MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT);
+ reg &= (~MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK);
+ reg |= (MV_XOR_V2_TIMER_THRD);
writel(reg, xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_TMOT);
}
--
2.22.0.rc2.383.gf4fbbf30c2-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] dmaengine: mv_xor_v2: Fix -Wshift-negative-value
2019-06-12 22:54 [PATCH] dmaengine: mv_xor_v2: Fix -Wshift-negative-value Nathan Huckleberry
@ 2019-06-12 23:14 ` Nick Desaulniers
2019-08-13 17:34 ` [PATCH v2] " Nathan Huckleberry
0 siblings, 1 reply; 5+ messages in thread
From: Nick Desaulniers @ 2019-06-12 23:14 UTC (permalink / raw)
To: Nathan Huckleberry
Cc: Dan Williams, vkoul, dmaengine, LKML, clang-built-linux
On Wed, Jun 12, 2019 at 3:54 PM 'Nathan Huckleberry' via Clang Built
Linux <clang-built-linux@googlegroups.com> wrote:
> Upon further investigation MV_XOR_V2_DMA_IMSG_THRD_SHIFT and
> MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT are both 0. Since shifting by 0 does
> nothing, these variables can be removed.
>
> Cc: clang-built-linux@googlegroups.com
> Link: https://github.com/ClangBuiltLinux/linux/issues/521
> Signed-off-by: Nathan Huckleberry <nhuck@google.com>
> ---
> drivers/dma/mv_xor_v2.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/dma/mv_xor_v2.c b/drivers/dma/mv_xor_v2.c
> index fa5dab481203..5d2e0d1f3ec9 100644
> --- a/drivers/dma/mv_xor_v2.c
> +++ b/drivers/dma/mv_xor_v2.c
> @@ -261,16 +259,15 @@ void mv_xor_v2_enable_imsg_thrd(struct mv_xor_v2_device *xor_dev)
>
> /* Configure threshold of number of descriptors, and enable timer */
> reg = readl(xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_THRD_OFF);
> - reg &= (~MV_XOR_V2_DMA_IMSG_THRD_MASK << MV_XOR_V2_DMA_IMSG_THRD_SHIFT);
> - reg |= (MV_XOR_V2_DONE_IMSG_THRD << MV_XOR_V2_DMA_IMSG_THRD_SHIFT);
> + reg &= (~MV_XOR_V2_DMA_IMSG_THRD_MASK);
> + reg |= (MV_XOR_V2_DONE_IMSG_THRD);
> reg |= MV_XOR_V2_DMA_IMSG_TIMER_EN;
> writel(reg, xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_THRD_OFF);
>
> /* Configure Timer Threshold */
> reg = readl(xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_TMOT);
> - reg &= (~MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK <<
> - MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT);
> - reg |= (MV_XOR_V2_TIMER_THRD << MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT);
> + reg &= (~MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK);
> + reg |= (MV_XOR_V2_TIMER_THRD);
Don't need the parentheses anymore. Please send a v2.
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] dmaengine: mv_xor_v2: Fix -Wshift-negative-value
2019-06-12 23:14 ` Nick Desaulniers
@ 2019-08-13 17:34 ` Nathan Huckleberry
2019-08-13 20:43 ` Nick Desaulniers
2019-08-20 11:36 ` Vinod Koul
0 siblings, 2 replies; 5+ messages in thread
From: Nathan Huckleberry @ 2019-08-13 17:34 UTC (permalink / raw)
To: dan.j.williams, vkoul
Cc: dmaengine, linux-kernel, Nathan Huckleberry, clang-built-linux
Clang produces the following warning
drivers/dma/mv_xor_v2.c:264:40: warning: shifting a negative signed value
is undefined [-Wshift-negative-value]
reg &= (~MV_XOR_V2_DMA_IMSG_THRD_MASK <<
MV_XOR_V2_DMA_IMSG_THRD_SHIFT);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
drivers/dma/mv_xor_v2.c:271:46: warning: shifting a negative signed value
is undefined [-Wshift-negative-value]
reg &= (~MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK <<
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
Upon further investigation MV_XOR_V2_DMA_IMSG_THRD_SHIFT and
MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT are both 0. Since shifting by 0 does
nothing, these variables can be removed.
Cc: clang-built-linux@googlegroups.com
Link: https://github.com/ClangBuiltLinux/linux/issues/521
Signed-off-by: Nathan Huckleberry <nhuck@google.com>
---
drivers/dma/mv_xor_v2.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/dma/mv_xor_v2.c b/drivers/dma/mv_xor_v2.c
index fa5dab481203..e3850f04f676 100644
--- a/drivers/dma/mv_xor_v2.c
+++ b/drivers/dma/mv_xor_v2.c
@@ -33,7 +33,6 @@
#define MV_XOR_V2_DMA_IMSG_CDAT_OFF 0x014
#define MV_XOR_V2_DMA_IMSG_THRD_OFF 0x018
#define MV_XOR_V2_DMA_IMSG_THRD_MASK 0x7FFF
-#define MV_XOR_V2_DMA_IMSG_THRD_SHIFT 0x0
#define MV_XOR_V2_DMA_IMSG_TIMER_EN BIT(18)
#define MV_XOR_V2_DMA_DESQ_AWATTR_OFF 0x01C
/* Same flags as MV_XOR_V2_DMA_DESQ_ARATTR_OFF */
@@ -50,7 +49,6 @@
#define MV_XOR_V2_DMA_DESQ_ADD_OFF 0x808
#define MV_XOR_V2_DMA_IMSG_TMOT 0x810
#define MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK 0x1FFF
-#define MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT 0
/* XOR Global registers */
#define MV_XOR_V2_GLOB_BW_CTRL 0x4
@@ -261,16 +259,15 @@ void mv_xor_v2_enable_imsg_thrd(struct mv_xor_v2_device *xor_dev)
/* Configure threshold of number of descriptors, and enable timer */
reg = readl(xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_THRD_OFF);
- reg &= (~MV_XOR_V2_DMA_IMSG_THRD_MASK << MV_XOR_V2_DMA_IMSG_THRD_SHIFT);
- reg |= (MV_XOR_V2_DONE_IMSG_THRD << MV_XOR_V2_DMA_IMSG_THRD_SHIFT);
+ reg &= ~MV_XOR_V2_DMA_IMSG_THRD_MASK;
+ reg |= MV_XOR_V2_DONE_IMSG_THRD;
reg |= MV_XOR_V2_DMA_IMSG_TIMER_EN;
writel(reg, xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_THRD_OFF);
/* Configure Timer Threshold */
reg = readl(xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_TMOT);
- reg &= (~MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK <<
- MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT);
- reg |= (MV_XOR_V2_TIMER_THRD << MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT);
+ reg &= ~MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK;
+ reg |= MV_XOR_V2_TIMER_THRD;
writel(reg, xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_TMOT);
}
--
2.23.0.rc1.153.gdeed80330f-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] dmaengine: mv_xor_v2: Fix -Wshift-negative-value
2019-08-13 17:34 ` [PATCH v2] " Nathan Huckleberry
@ 2019-08-13 20:43 ` Nick Desaulniers
2019-08-20 11:36 ` Vinod Koul
1 sibling, 0 replies; 5+ messages in thread
From: Nick Desaulniers @ 2019-08-13 20:43 UTC (permalink / raw)
To: Nathan Huckleberry
Cc: Dan Williams, Vinod Koul, dmaengine, LKML, clang-built-linux
On Tue, Aug 13, 2019 at 10:35 AM 'Nathan Huckleberry' via Clang Built
Linux <clang-built-linux@googlegroups.com> wrote:
>
> Clang produces the following warning
>
> drivers/dma/mv_xor_v2.c:264:40: warning: shifting a negative signed value
> is undefined [-Wshift-negative-value]
> reg &= (~MV_XOR_V2_DMA_IMSG_THRD_MASK <<
> MV_XOR_V2_DMA_IMSG_THRD_SHIFT);
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
> drivers/dma/mv_xor_v2.c:271:46: warning: shifting a negative signed value
> is undefined [-Wshift-negative-value]
> reg &= (~MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK <<
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
>
> Upon further investigation MV_XOR_V2_DMA_IMSG_THRD_SHIFT and
> MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT are both 0. Since shifting by 0 does
> nothing, these variables can be removed.
>
> Cc: clang-built-linux@googlegroups.com
> Link: https://github.com/ClangBuiltLinux/linux/issues/521
> Signed-off-by: Nathan Huckleberry <nhuck@google.com>
Thanks for sending a v2:
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> ---
> drivers/dma/mv_xor_v2.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/dma/mv_xor_v2.c b/drivers/dma/mv_xor_v2.c
> index fa5dab481203..e3850f04f676 100644
> --- a/drivers/dma/mv_xor_v2.c
> +++ b/drivers/dma/mv_xor_v2.c
> @@ -33,7 +33,6 @@
> #define MV_XOR_V2_DMA_IMSG_CDAT_OFF 0x014
> #define MV_XOR_V2_DMA_IMSG_THRD_OFF 0x018
> #define MV_XOR_V2_DMA_IMSG_THRD_MASK 0x7FFF
> -#define MV_XOR_V2_DMA_IMSG_THRD_SHIFT 0x0
> #define MV_XOR_V2_DMA_IMSG_TIMER_EN BIT(18)
> #define MV_XOR_V2_DMA_DESQ_AWATTR_OFF 0x01C
> /* Same flags as MV_XOR_V2_DMA_DESQ_ARATTR_OFF */
> @@ -50,7 +49,6 @@
> #define MV_XOR_V2_DMA_DESQ_ADD_OFF 0x808
> #define MV_XOR_V2_DMA_IMSG_TMOT 0x810
> #define MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK 0x1FFF
> -#define MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT 0
>
> /* XOR Global registers */
> #define MV_XOR_V2_GLOB_BW_CTRL 0x4
> @@ -261,16 +259,15 @@ void mv_xor_v2_enable_imsg_thrd(struct mv_xor_v2_device *xor_dev)
>
> /* Configure threshold of number of descriptors, and enable timer */
> reg = readl(xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_THRD_OFF);
> - reg &= (~MV_XOR_V2_DMA_IMSG_THRD_MASK << MV_XOR_V2_DMA_IMSG_THRD_SHIFT);
> - reg |= (MV_XOR_V2_DONE_IMSG_THRD << MV_XOR_V2_DMA_IMSG_THRD_SHIFT);
> + reg &= ~MV_XOR_V2_DMA_IMSG_THRD_MASK;
> + reg |= MV_XOR_V2_DONE_IMSG_THRD;
> reg |= MV_XOR_V2_DMA_IMSG_TIMER_EN;
> writel(reg, xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_THRD_OFF);
>
> /* Configure Timer Threshold */
> reg = readl(xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_TMOT);
> - reg &= (~MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK <<
> - MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT);
> - reg |= (MV_XOR_V2_TIMER_THRD << MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT);
> + reg &= ~MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK;
> + reg |= MV_XOR_V2_TIMER_THRD;
> writel(reg, xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_TMOT);
> }
>
> --
> 2.23.0.rc1.153.gdeed80330f-goog
>
> --
> You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to clang-built-linux+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20190813173448.109859-1-nhuck%40google.com.
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] dmaengine: mv_xor_v2: Fix -Wshift-negative-value
2019-08-13 17:34 ` [PATCH v2] " Nathan Huckleberry
2019-08-13 20:43 ` Nick Desaulniers
@ 2019-08-20 11:36 ` Vinod Koul
1 sibling, 0 replies; 5+ messages in thread
From: Vinod Koul @ 2019-08-20 11:36 UTC (permalink / raw)
To: Nathan Huckleberry
Cc: dan.j.williams, dmaengine, linux-kernel, clang-built-linux
On 13-08-19, 10:34, Nathan Huckleberry wrote:
> Clang produces the following warning
>
> drivers/dma/mv_xor_v2.c:264:40: warning: shifting a negative signed value
> is undefined [-Wshift-negative-value]
> reg &= (~MV_XOR_V2_DMA_IMSG_THRD_MASK <<
> MV_XOR_V2_DMA_IMSG_THRD_SHIFT);
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
> drivers/dma/mv_xor_v2.c:271:46: warning: shifting a negative signed value
> is undefined [-Wshift-negative-value]
> reg &= (~MV_XOR_V2_DMA_IMSG_TIMER_THRD_MASK <<
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
>
> Upon further investigation MV_XOR_V2_DMA_IMSG_THRD_SHIFT and
> MV_XOR_V2_DMA_IMSG_TIMER_THRD_SHIFT are both 0. Since shifting by 0 does
> nothing, these variables can be removed.
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-08-20 11:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-12 22:54 [PATCH] dmaengine: mv_xor_v2: Fix -Wshift-negative-value Nathan Huckleberry
2019-06-12 23:14 ` Nick Desaulniers
2019-08-13 17:34 ` [PATCH v2] " Nathan Huckleberry
2019-08-13 20:43 ` Nick Desaulniers
2019-08-20 11:36 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).