2023-11-18 15:57:00

by Yury Norov

Subject: [PATCH 34/34] sh: rework ilsel_enable()

Fix opencoded find_and_set_bit(), which also suppresses potential
KCSAN warning.

Signed-off-by: Yury Norov <[email protected]>
---
arch/sh/boards/mach-x3proto/ilsel.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/sh/boards/mach-x3proto/ilsel.c b/arch/sh/boards/mach-x3proto/ilsel.c
index f0d5eb41521a..7fadc479a80b 100644
--- a/arch/sh/boards/mach-x3proto/ilsel.c
+++ b/arch/sh/boards/mach-x3proto/ilsel.c
@@ -99,8 +99,8 @@ int ilsel_enable(ilsel_source_t set)
}

do {
- bit = find_first_zero_bit(&ilsel_level_map, ILSEL_LEVELS);
- } while (test_and_set_bit(bit, &ilsel_level_map));
+ bit = find_and_set_bit(&ilsel_level_map, ILSEL_LEVELS);
+ } while (bit >= ILSEL_LEVELS);

__ilsel_enable(set, bit);

--
2.39.2

2023-11-18 16:17:10

by John Paul Adrian Glaubitz

Subject: Re: [PATCH 34/34] sh: rework ilsel_enable()

Hello Yury!

On Sat, 2023-11-18 at 07:51 -0800, Yury Norov wrote:
> Fix opencoded find_and_set_bit(), which also suppresses potential
> KCSAN warning.
>
> Signed-off-by: Yury Norov <[email protected]>
> ---
> arch/sh/boards/mach-x3proto/ilsel.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/sh/boards/mach-x3proto/ilsel.c b/arch/sh/boards/mach-x3proto/ilsel.c
> index f0d5eb41521a..7fadc479a80b 100644
> --- a/arch/sh/boards/mach-x3proto/ilsel.c
> +++ b/arch/sh/boards/mach-x3proto/ilsel.c
> @@ -99,8 +99,8 @@ int ilsel_enable(ilsel_source_t set)
> }
>
> do {
> - bit = find_first_zero_bit(&ilsel_level_map, ILSEL_LEVELS);
> - } while (test_and_set_bit(bit, &ilsel_level_map));
> + bit = find_and_set_bit(&ilsel_level_map, ILSEL_LEVELS);
> + } while (bit >= ILSEL_LEVELS);
>
> __ilsel_enable(set, bit);
>

The subject should mention the subsystem, i.e. "sh: mach-x3proto:".

Adrian

--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer
`. `' Physicist
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913

2023-11-21 13:43:22

by Yury Norov

Subject: Re: [PATCH 34/34] sh: rework ilsel_enable()

On Sat, Nov 18, 2023 at 05:15:57PM +0100, John Paul Adrian Glaubitz wrote:
> Hello Yury!
>
> On Sat, 2023-11-18 at 07:51 -0800, Yury Norov wrote:
> > Fix opencoded find_and_set_bit(), which also suppresses potential
> > KCSAN warning.
> >
> > Signed-off-by: Yury Norov <[email protected]>
> > ---
> > arch/sh/boards/mach-x3proto/ilsel.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/sh/boards/mach-x3proto/ilsel.c b/arch/sh/boards/mach-x3proto/ilsel.c
> > index f0d5eb41521a..7fadc479a80b 100644
> > --- a/arch/sh/boards/mach-x3proto/ilsel.c
> > +++ b/arch/sh/boards/mach-x3proto/ilsel.c
> > @@ -99,8 +99,8 @@ int ilsel_enable(ilsel_source_t set)
> > }
> >
> > do {
> > - bit = find_first_zero_bit(&ilsel_level_map, ILSEL_LEVELS);
> > - } while (test_and_set_bit(bit, &ilsel_level_map));
> > + bit = find_and_set_bit(&ilsel_level_map, ILSEL_LEVELS);
> > + } while (bit >= ILSEL_LEVELS);
> >
> > __ilsel_enable(set, bit);
> >
>
> The subject should mention the subsystem, i.e. "sh: mach-x3proto:".

OK, will do in v2