Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d48ad66a authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Greg Kroah-Hartman
Browse files

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

[ 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: 25cd5a39 ("ARM: tegra: Add speedo-based process identification")
Link: https://github.com/ClangBuiltLinux/linux/issues/1488


Suggested-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2566c253

drivers/soc/tegra/fuse/fuse-tegra.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -178,7 +178,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;

drivers/soc/tegra/fuse/fuse.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,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);





#ifdef CONFIG_ARCH_TEGRA_2x_SOC

#ifdef CONFIG_ARCH_TEGRA_2x_SOC