[PATCH] clk: sunxi-ng: fix order of arguments in clock macro

[PATCH] clk: sunxi-ng: fix order of arguments in clock macro

[Andre Przywara]

When introducing the SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT macro, the order
of the last two arguments was different between the users and the
definition: features became flags and flags became features.

This just didn't end up in a desaster yet because most users ended up
passing 0 for both arguments, and other clocks (for the new A523 SoC) are
not yet used.

Swap the order of the arguments in the definition, so that users stay
untouched.

Fixes: cdbb9d0d09db ("clk: sunxi-ng: mp: provide wrappers for setting feature flags")
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
 drivers/clk/sunxi-ng/ccu_mp.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/clk/sunxi-ng/ccu_mp.h b/drivers/clk/sunxi-ng/ccu_mp.h
index b35aeec70484d..8fc7fdb7ef494 100644
--- a/drivers/clk/sunxi-ng/ccu_mp.h
+++ b/drivers/clk/sunxi-ng/ccu_mp.h
@@ -109,8 +109,7 @@ struct ccu_mp {
 					     _mshift, _mwidth,		\
 					     _pshift, _pwidth,		\
 					     _muxshift, _muxwidth,	\
-					     _gate, _features,		\
-					     _flags)			\
+					     _gate, _flags, _features)	\
 	struct ccu_mp _struct = {					\
 		.enable	= _gate,					\
 		.m	= _SUNXI_CCU_DIV(_mshift, _mwidth),		\
-- 
2.25.1

Re: [PATCH] clk: sunxi-ng: fix order of arguments in clock macro

[Jernej Škrabec]

Dne sreda, 30. april 2025 ob 11:53:25 Srednjeevropski poletni čas je Andre Przywara napisal(a):
> When introducing the SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT macro, the order
> of the last two arguments was different between the users and the
> definition: features became flags and flags became features.
> 
> This just didn't end up in a desaster yet because most users ended up
> passing 0 for both arguments, and other clocks (for the new A523 SoC) are
> not yet used.
> 
> Swap the order of the arguments in the definition, so that users stay
> untouched.
> 
> Fixes: cdbb9d0d09db ("clk: sunxi-ng: mp: provide wrappers for setting feature flags")
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>

Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>

Best regards,
Jernej

Re: [PATCH] clk: sunxi-ng: fix order of arguments in clock macro

[Chen-Yu Tsai]

On Wed, Apr 30, 2025 at 5:53 PM Andre Przywara <andre.przywara@arm.com> wrote:
>
> When introducing the SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT macro, the order
> of the last two arguments was different between the users and the
> definition: features became flags and flags became features.
>
> This just didn't end up in a desaster yet because most users ended up

                               ^ typo?

Will fix when applying.

ChenYu

> passing 0 for both arguments, and other clocks (for the new A523 SoC) are
> not yet used.
>
> Swap the order of the arguments in the definition, so that users stay
> untouched.
>
> Fixes: cdbb9d0d09db ("clk: sunxi-ng: mp: provide wrappers for setting feature flags")
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> ---
>  drivers/clk/sunxi-ng/ccu_mp.h | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/clk/sunxi-ng/ccu_mp.h b/drivers/clk/sunxi-ng/ccu_mp.h
> index b35aeec70484d..8fc7fdb7ef494 100644
> --- a/drivers/clk/sunxi-ng/ccu_mp.h
> +++ b/drivers/clk/sunxi-ng/ccu_mp.h
> @@ -109,8 +109,7 @@ struct ccu_mp {
>                                              _mshift, _mwidth,          \
>                                              _pshift, _pwidth,          \
>                                              _muxshift, _muxwidth,      \
> -                                            _gate, _features,          \
> -                                            _flags)                    \
> +                                            _gate, _flags, _features)  \
>         struct ccu_mp _struct = {                                       \
>                 .enable = _gate,                                        \
>                 .m      = _SUNXI_CCU_DIV(_mshift, _mwidth),             \
> --
> 2.25.1
>
>

Re: [PATCH] clk: sunxi-ng: fix order of arguments in clock macro

[Chen-Yu Tsai]

On Wed, 30 Apr 2025 10:53:25 +0100, Andre Przywara wrote:
> When introducing the SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT macro, the order
> of the last two arguments was different between the users and the
> definition: features became flags and flags became features.
> 
> This just didn't end up in a desaster yet because most users ended up
> passing 0 for both arguments, and other clocks (for the new A523 SoC) are
> not yet used.
> 
> [...]

Applied to clk-fixes-for-6.15 in git@github.com:linux-sunxi/linux-sunxi.git, thanks!

[1/1] clk: sunxi-ng: fix order of arguments in clock macro
      commit: 4a9c3c3215491f25bc66d615faa921c814b1a479

Best regards,
-- 
Chen-Yu Tsai <wens@csie.org>

Re: [PATCH] clk: sunxi-ng: fix order of arguments in clock macro

[Andre Przywara]

On Thu, 1 May 2025 20:14:24 +0800
Chen-Yu Tsai <wens@csie.org> wrote:

Hi,

> On Wed, 30 Apr 2025 10:53:25 +0100, Andre Przywara wrote:
> > When introducing the SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT macro, the order
> > of the last two arguments was different between the users and the
> > definition: features became flags and flags became features.
> > 
> > This just didn't end up in a desaster yet because most users ended up
> > passing 0 for both arguments, and other clocks (for the new A523 SoC) are
> > not yet used.
> > 
> > [...]  
> 
> Applied to clk-fixes-for-6.15 in git@github.com:linux-sunxi/linux-sunxi.git, thanks!

thanks for that, but the URL here is not correct, is it? Should be the
kernel.org repo instead? Saw this already in other "applied" emails.

Cheers,
Andre


> 
> [1/1] clk: sunxi-ng: fix order of arguments in clock macro
>       commit: 4a9c3c3215491f25bc66d615faa921c814b1a479
> 
> Best regards,

b4 thank-you letter shows incorrect repo URL

[Chen-Yu Tsai]

(dropped most people and lists from CC; added Konstantin and kernel.org users)

On Thu, May 1, 2025 at 8:22 PM Andre Przywara <andre.przywara@arm.com> wrote:
>
> On Thu, 1 May 2025 20:14:24 +0800
> Chen-Yu Tsai <wens@csie.org> wrote:
>
> Hi,
>
> > On Wed, 30 Apr 2025 10:53:25 +0100, Andre Przywara wrote:
> > > When introducing the SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT macro, the order
> > > of the last two arguments was different between the users and the
> > > definition: features became flags and flags became features.
> > >
> > > This just didn't end up in a desaster yet because most users ended up
> > > passing 0 for both arguments, and other clocks (for the new A523 SoC) are
> > > not yet used.
> > >
> > > [...]
> >
> > Applied to clk-fixes-for-6.15 in git@github.com:linux-sunxi/linux-sunxi.git, thanks!
>
> thanks for that, but the URL here is not correct, is it? Should be the
> kernel.org repo instead? Saw this already in other "applied" emails.

That's weird. It is correctly pushed to the kernel.org repo [1].
Maybe it's because the git-config remote entry for korg repo's  is called
"sunxi-korg", and the linux-sunxi one on GitHub is called "sunxi", and
somehow b4 is getting confused?

Konstantin, have you heard of such reports? FYI my b4 is version 0.14.2.


Thanks
ChenYu

[1] https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/clk-fixes-for-6.15

> Cheers,
> Andre
>
>
> >
> > [1/1] clk: sunxi-ng: fix order of arguments in clock macro
> >       commit: 4a9c3c3215491f25bc66d615faa921c814b1a479
> >
> > Best regards,
>

Re: b4 thank-you letter shows incorrect repo URL

[Konstantin Ryabitsev]

On Thu, May 01, 2025 at 10:06:22PM +0800, Chen-Yu Tsai wrote:
> (dropped most people and lists from CC; added Konstantin and kernel.org users)

Note, it should go to tools@kernel.org, not users@kernel.org.

> > > Applied to clk-fixes-for-6.15 in git@github.com:linux-sunxi/linux-sunxi.git, thanks!
> >
> > thanks for that, but the URL here is not correct, is it? Should be the
> > kernel.org repo instead? Saw this already in other "applied" emails.
> 
> That's weird. It is correctly pushed to the kernel.org repo [1].
> Maybe it's because the git-config remote entry for korg repo's  is called
> "sunxi-korg", and the linux-sunxi one on GitHub is called "sunxi", and
> somehow b4 is getting confused?
> 
> Konstantin, have you heard of such reports? FYI my b4 is version 0.14.2.

This is coming from your custom template, not from b4 itself. By default, b4
just says "Applied to ${branch}".

Regards,
-K

Re: b4 thank-you letter shows incorrect repo URL

[Chen-Yu Tsai]

On Thu, May 1, 2025 at 10:26 PM Konstantin Ryabitsev
<konstantin@linuxfoundation.org> wrote:
>
> On Thu, May 01, 2025 at 10:06:22PM +0800, Chen-Yu Tsai wrote:
> > (dropped most people and lists from CC; added Konstantin and kernel.org users)
>
> Note, it should go to tools@kernel.org, not users@kernel.org.

Ack. Dropping users@kernel.org.

> > > > Applied to clk-fixes-for-6.15 in git@github.com:linux-sunxi/linux-sunxi.git, thanks!
> > >
> > > thanks for that, but the URL here is not correct, is it? Should be the
> > > kernel.org repo instead? Saw this already in other "applied" emails.
> >
> > That's weird. It is correctly pushed to the kernel.org repo [1].
> > Maybe it's because the git-config remote entry for korg repo's  is called
> > "sunxi-korg", and the linux-sunxi one on GitHub is called "sunxi", and
> > somehow b4 is getting confused?
> >
> > Konstantin, have you heard of such reports? FYI my b4 is version 0.14.2.
>
> This is coming from your custom template, not from b4 itself. By default, b4
> just says "Applied to ${branch}".

My template is: "Applied to ${branch} in ${treename}, thanks!"

My .git/config is as follows:

[remote "sunxi"]
        url = git@github.com:linux-sunxi/linux-sunxi.git
        tagopt = --no-tags
        fetch = +refs/heads/*:refs/remotes/sunxi-github/*
[remote "sunxi-korg"]
        url = https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
        pushURL = git@gitolite.kernel.org:pub/scm/linux/kernel/git/sunxi/linux
        fetch = +refs/heads/*:refs/remotes/sunxi-korg/*
        tagopt = --no-tags
        b4-commit-url-mask = https://git.kernel.org/sunxi/linux/c/%.12s

Also, the branch I applied it to is named "sunxi/clk-fixes-for-6.15",
both locally and in the kernel.org repo, not "clk-fixes-for-6.15" as
shown in the original thank-you email.

I think there is a parsing error somewhere. Maybe b4 isn't dealing with
nested branch names correctly and somehow thinks the "sunxi/" part is
actually the remote name.

If I rename the "sunxi" remote to "sunxi-github", `b4 ty` now generates:

    Applied to sunxi/clk-fixes-for-6.15 in local tree, thanks!

Again this seems to point to accidentally treating part of the branch name
as the remote name.


ChenYu

Re: b4 thank-you letter shows incorrect repo URL

[Chen-Yu Tsai]

On Thu, May 1, 2025 at 11:45 PM Chen-Yu Tsai <wens@csie.org> wrote:
>
> On Thu, May 1, 2025 at 10:26 PM Konstantin Ryabitsev
> <konstantin@linuxfoundation.org> wrote:
> >
> > On Thu, May 01, 2025 at 10:06:22PM +0800, Chen-Yu Tsai wrote:
> > > (dropped most people and lists from CC; added Konstantin and kernel.org users)
> >
> > Note, it should go to tools@kernel.org, not users@kernel.org.
>
> Ack. Dropping users@kernel.org.
>
> > > > > Applied to clk-fixes-for-6.15 in git@github.com:linux-sunxi/linux-sunxi.git, thanks!
> > > >
> > > > thanks for that, but the URL here is not correct, is it? Should be the
> > > > kernel.org repo instead? Saw this already in other "applied" emails.
> > >
> > > That's weird. It is correctly pushed to the kernel.org repo [1].
> > > Maybe it's because the git-config remote entry for korg repo's  is called
> > > "sunxi-korg", and the linux-sunxi one on GitHub is called "sunxi", and
> > > somehow b4 is getting confused?
> > >
> > > Konstantin, have you heard of such reports? FYI my b4 is version 0.14.2.
> >
> > This is coming from your custom template, not from b4 itself. By default, b4
> > just says "Applied to ${branch}".
>
> My template is: "Applied to ${branch} in ${treename}, thanks!"
>
> My .git/config is as follows:
>
> [remote "sunxi"]
>         url = git@github.com:linux-sunxi/linux-sunxi.git
>         tagopt = --no-tags
>         fetch = +refs/heads/*:refs/remotes/sunxi-github/*
> [remote "sunxi-korg"]
>         url = https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
>         pushURL = git@gitolite.kernel.org:pub/scm/linux/kernel/git/sunxi/linux
>         fetch = +refs/heads/*:refs/remotes/sunxi-korg/*
>         tagopt = --no-tags
>         b4-commit-url-mask = https://git.kernel.org/sunxi/linux/c/%.12s
>
> Also, the branch I applied it to is named "sunxi/clk-fixes-for-6.15",
> both locally and in the kernel.org repo, not "clk-fixes-for-6.15" as
> shown in the original thank-you email.
>
> I think there is a parsing error somewhere. Maybe b4 isn't dealing with
> nested branch names correctly and somehow thinks the "sunxi/" part is
> actually the remote name.
>
> If I rename the "sunxi" remote to "sunxi-github", `b4 ty` now generates:
>
>     Applied to sunxi/clk-fixes-for-6.15 in local tree, thanks!
>
> Again this seems to point to accidentally treating part of the branch name
> as the remote name.

Also, I found a thank-you letter that is correct that is from Jan. 2025:

    https://lore.kernel.org/linux-sunxi/173617837421.3282465.589306007023383641.b4-ty@csie.org/

The next one that I found was incorrect. This one is from Feb. 2025:

    https://lore.kernel.org/linux-sunxi/173909140135.1184685.5784910677727356231.b4-ty@csie.org/

Though it could be I upgraded something on my workstation some time
in between.


ChenYu

Re: b4 thank-you letter shows incorrect repo URL

[Konstantin Ryabitsev]

On Thu, May 01, 2025 at 11:49:38PM +0800, Chen-Yu Tsai wrote:
> > > This is coming from your custom template, not from b4 itself. By default, b4
> > > just says "Applied to ${branch}".
> >
> > My template is: "Applied to ${branch} in ${treename}, thanks!"
> >
> > My .git/config is as follows:
> >
> > [remote "sunxi"]
> >         url = git@github.com:linux-sunxi/linux-sunxi.git
> >         tagopt = --no-tags
> >         fetch = +refs/heads/*:refs/remotes/sunxi-github/*
> > [remote "sunxi-korg"]
> >         url = https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
> >         pushURL = git@gitolite.kernel.org:pub/scm/linux/kernel/git/sunxi/linux
> >         fetch = +refs/heads/*:refs/remotes/sunxi-korg/*
> >         tagopt = --no-tags
> >         b4-commit-url-mask = https://git.kernel.org/sunxi/linux/c/%.12s
> >
> > Also, the branch I applied it to is named "sunxi/clk-fixes-for-6.15",
> > both locally and in the kernel.org repo, not "clk-fixes-for-6.15" as
> > shown in the original thank-you email.
> >
> > I think there is a parsing error somewhere. Maybe b4 isn't dealing with
> > nested branch names correctly and somehow thinks the "sunxi/" part is
> > actually the remote name.
> >
> > If I rename the "sunxi" remote to "sunxi-github", `b4 ty` now generates:
> >
> >     Applied to sunxi/clk-fixes-for-6.15 in local tree, thanks!
> >
> > Again this seems to point to accidentally treating part of the branch name
> > as the remote name.
> 
> Also, I found a thank-you letter that is correct that is from Jan. 2025:
> 
>     https://lore.kernel.org/linux-sunxi/173617837421.3282465.589306007023383641.b4-ty@csie.org/
> 
> The next one that I found was incorrect. This one is from Feb. 2025:
> 
>     https://lore.kernel.org/linux-sunxi/173909140135.1184685.5784910677727356231.b4-ty@csie.org/
> 
> Though it could be I upgraded something on my workstation some time
> in between.

Yes, I think there's a substring/partial match that causes this.

I'll take a look.

bugspray tag me

-K

Re: b4 thank-you letter shows incorrect repo URL

[Bugspray Bot]

Hello:

This conversation is now tracked by Kernel.org Bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=220079

There is no need to do anything else, just keep talking.
-- 
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (bugspray 0.1-dev)