xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

soc/tegra: fuse: Fix bitwise vs. logical OR warning

Browse Source 
[ Upstream commit a7083763619f7485ccdade160deb81737cf2732f ]

A new warning in clang points out two instances where boolean
expressions are being used with a bitwise OR instead of logical OR:

drivers/soc/tegra/fuse/speedo-tegra20.c:72:9: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical]
                reg = tegra_fuse_read_spare(i) |
                      ^~~~~~~~~~~~~~~~~~~~~~~~~~
                                               ||
drivers/soc/tegra/fuse/speedo-tegra20.c:72:9: note: cast one or both operands to int to silence this warning
drivers/soc/tegra/fuse/speedo-tegra20.c:87:9: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical]
                reg = tegra_fuse_read_spare(i) |
                      ^~~~~~~~~~~~~~~~~~~~~~~~~~
                                               ||
drivers/soc/tegra/fuse/speedo-tegra20.c:87:9: note: cast one or both operands to int to silence this warning
2 warnings generated.

The motivation for the warning is that logical operations short circuit
while bitwise operations do not.

In this instance, tegra_fuse_read_spare() is not semantically returning
a boolean, it is returning a bit value. Use u32 for its return type so
that it can be used with either bitwise or boolean operators without any
warnings.

Fixes: 25cd5a3914 ("ARM: tegra: Add speedo-based process identification")
Link: https://github.com/ClangBuiltLinux/linux/issues/1488
Suggested-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Nathan Chancellor
2021-12-10 09:55:29 -07:00
committed by Greg Kroah-Hartman
parent 451f1eded7
commit 12c1938870
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/soc/tegra/fuse/fuse-tegra.c
View File

@@ -260,7 +260,7 @@ static struct platform_driver tegra_fuse_driver = {
}; };
builtin_platform_driver(tegra_fuse_driver); builtin_platform_driver(tegra_fuse_driver);
bool __init tegra_fuse_read_spare(unsigned int spare) u32 __init tegra_fuse_read_spare(unsigned int spare)
{ {
unsigned int offset = fuse->soc->info->spare + spare * 4; unsigned int offset = fuse->soc->info->spare + spare * 4;

2
drivers/soc/tegra/fuse/fuse.h
View File

@@ -63,7 +63,7 @@ struct tegra_fuse {
void tegra_init_revision(void); void tegra_init_revision(void);
void tegra_init_apbmisc(void); void tegra_init_apbmisc(void);
bool __init tegra_fuse_read_spare(unsigned int spare); u32 __init tegra_fuse_read_spare(unsigned int spare);
u32 __init tegra_fuse_read_early(unsigned int offset); u32 __init tegra_fuse_read_early(unsigned int offset);
u8 tegra_get_major_rev(void); u8 tegra_get_major_rev(void);