[GIT,PULL] Allwinner clock fixes for 4.11, bis

Submitted by Maxime Ripard on April 6, 2017, 7:41 a.m.

Details

Message ID 20170406074121.tkivdvghbr27tr54@lukather
State New
Headers show

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-fixes-for-4.11-2

Commit Message

Maxime Ripard April 6, 2017, 7:41 a.m.
Hi Mike, Stephen,

Please pull the following changes for one of the 4.11-rc's

Thanks!
Maxime

The following changes since commit b467e08a15563dede0d37d3233baa24fb97a7310:

  clk: sunxi-ng: fix recalc_rate formula of NKMP clocks (2017-03-20 10:34:05 +0100)

are available in the git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-fixes-for-4.11-2

for you to fetch changes up to d054a839a0986136374d49f9f9fbc264abae9c4c:

  clk: sunxi-ng: fix build error without CONFIG_RESET_CONTROLLER (2017-03-27 13:37:05 +0200)

----------------------------------------------------------------
Allwinner clock fixes for 4.11, bis

A few patches to fix a build error and a few minor typos and bugs in the
sunxi-ng code

----------------------------------------------------------------
Chen-Yu Tsai (3):
      clk: sunxi-ng: use 1 as fallback for minimum multiplier
      clk: sunxi-ng: Fix round_rate/set_rate multiplier minimum mismatch
      clk: sunxi-ng: a80: Fix audio PLL comment not matching actual code

Tobias Regnery (1):
      clk: sunxi-ng: fix build error without CONFIG_RESET_CONTROLLER

 drivers/clk/sunxi-ng/Kconfig         | 1 +
 drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 3 +--
 drivers/clk/sunxi-ng/ccu_nk.c        | 8 ++++----
 drivers/clk/sunxi-ng/ccu_nkm.c       | 8 ++++----
 drivers/clk/sunxi-ng/ccu_nkmp.c      | 8 ++++----
 drivers/clk/sunxi-ng/ccu_nm.c        | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

Comments

Stephen Boyd April 6, 2017, 11:10 p.m.
On 04/06, Maxime Ripard wrote:
> Hi Mike, Stephen,
> 
> Please pull the following changes for one of the 4.11-rc's
> 
> Thanks!
> Maxime
> 
> The following changes since commit b467e08a15563dede0d37d3233baa24fb97a7310:
> 
>   clk: sunxi-ng: fix recalc_rate formula of NKMP clocks (2017-03-20 10:34:05 +0100)
> 
> are available in the git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-fixes-for-4.11-2
> 
> for you to fetch changes up to d054a839a0986136374d49f9f9fbc264abae9c4c:
> 
>   clk: sunxi-ng: fix build error without CONFIG_RESET_CONTROLLER (2017-03-27 13:37:05 +0200)
> 
> ----------------------------------------------------------------
> Allwinner clock fixes for 4.11, bis
> 
> A few patches to fix a build error and a few minor typos and bugs in the
> sunxi-ng code
> 
> ----------------------------------------------------------------
> Chen-Yu Tsai (3):
>       clk: sunxi-ng: use 1 as fallback for minimum multiplier
>       clk: sunxi-ng: Fix round_rate/set_rate multiplier minimum mismatch
>       clk: sunxi-ng: a80: Fix audio PLL comment not matching actual code
> 
> Tobias Regnery (1):
>       clk: sunxi-ng: fix build error without CONFIG_RESET_CONTROLLER
> 

Two of these are fixes for regressions in v4.10? Why are these
critical for the v4.11 release? The comment patch is totally
bogus, it's not fixing any sort of regression that is causing
problems for people so I'm not sure why it was put into this pull
request. Am I right in assuming that the only real patch we need
out of here is the last one for the build error from randconfigs?
If so I can cherry-pick that from the branch into fixes and the
rest can go the next merge window.

Not pulling for now.
Maxime Ripard April 10, 2017, 8 a.m.
On Thu, Apr 06, 2017 at 04:10:03PM -0700, Stephen Boyd wrote:
> On 04/06, Maxime Ripard wrote:
> > Hi Mike, Stephen,
> > 
> > Please pull the following changes for one of the 4.11-rc's
> > 
> > Thanks!
> > Maxime
> > 
> > The following changes since commit b467e08a15563dede0d37d3233baa24fb97a7310:
> > 
> >   clk: sunxi-ng: fix recalc_rate formula of NKMP clocks (2017-03-20 10:34:05 +0100)
> > 
> > are available in the git repository at:
> > 
> >   https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-fixes-for-4.11-2
> > 
> > for you to fetch changes up to d054a839a0986136374d49f9f9fbc264abae9c4c:
> > 
> >   clk: sunxi-ng: fix build error without CONFIG_RESET_CONTROLLER (2017-03-27 13:37:05 +0200)
> > 
> > ----------------------------------------------------------------
> > Allwinner clock fixes for 4.11, bis
> > 
> > A few patches to fix a build error and a few minor typos and bugs in the
> > sunxi-ng code
> > 
> > ----------------------------------------------------------------
> > Chen-Yu Tsai (3):
> >       clk: sunxi-ng: use 1 as fallback for minimum multiplier
> >       clk: sunxi-ng: Fix round_rate/set_rate multiplier minimum mismatch
> >       clk: sunxi-ng: a80: Fix audio PLL comment not matching actual code
> > 
> > Tobias Regnery (1):
> >       clk: sunxi-ng: fix build error without CONFIG_RESET_CONTROLLER
> > 
> 
> Two of these are fixes for regressions in v4.10? Why are these
> critical for the v4.11 release? The comment patch is totally
> bogus, it's not fixing any sort of regression that is causing
> problems for people so I'm not sure why it was put into this pull
> request. Am I right in assuming that the only real patch we need
> out of here is the last one for the build error from randconfigs?
> If so I can cherry-pick that from the branch into fixes and the
> rest can go the next merge window.
> 
> Not pulling for now.

Actually, all of them but the comment fix are real fix.

"clk: sunxi-ng: use 1 as fallback for minimum multiplier" can lead to
a multiplier set to 0 in some cases (depending on the rate asked for),
and "clk: sunxi-ng: Fix round_rate/set_rate multiplier minimum
mismatch" will prevent inconsistensies in factors selection between
round_rate and set_rate.

So, yes, they are not critical fixes in the sense that it will fix a
panic. but still those are bugs.

Maxime
Stephen Boyd April 10, 2017, 6:24 p.m.
On 04/10, Maxime Ripard wrote:
> On Thu, Apr 06, 2017 at 04:10:03PM -0700, Stephen Boyd wrote:
> > On 04/06, Maxime Ripard wrote:
> > > Hi Mike, Stephen,
> > > 
> > > Please pull the following changes for one of the 4.11-rc's
> > > 
> > > Thanks!
> > > Maxime
> > > 
> > > The following changes since commit b467e08a15563dede0d37d3233baa24fb97a7310:
> > > 
> > >   clk: sunxi-ng: fix recalc_rate formula of NKMP clocks (2017-03-20 10:34:05 +0100)
> > > 
> > > are available in the git repository at:
> > > 
> > >   https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-fixes-for-4.11-2
> > > 
> > > for you to fetch changes up to d054a839a0986136374d49f9f9fbc264abae9c4c:
> > > 
> > >   clk: sunxi-ng: fix build error without CONFIG_RESET_CONTROLLER (2017-03-27 13:37:05 +0200)
> > > 
> > > ----------------------------------------------------------------
> > > Allwinner clock fixes for 4.11, bis
> > > 
> > > A few patches to fix a build error and a few minor typos and bugs in the
> > > sunxi-ng code
> > > 
> > > ----------------------------------------------------------------
> > > Chen-Yu Tsai (3):
> > >       clk: sunxi-ng: use 1 as fallback for minimum multiplier
> > >       clk: sunxi-ng: Fix round_rate/set_rate multiplier minimum mismatch
> > >       clk: sunxi-ng: a80: Fix audio PLL comment not matching actual code
> > > 
> > > Tobias Regnery (1):
> > >       clk: sunxi-ng: fix build error without CONFIG_RESET_CONTROLLER
> > > 
> > 
> > Two of these are fixes for regressions in v4.10? Why are these
> > critical for the v4.11 release? The comment patch is totally
> > bogus, it's not fixing any sort of regression that is causing
> > problems for people so I'm not sure why it was put into this pull
> > request. Am I right in assuming that the only real patch we need
> > out of here is the last one for the build error from randconfigs?
> > If so I can cherry-pick that from the branch into fixes and the
> > rest can go the next merge window.
> > 
> > Not pulling for now.
> 
> Actually, all of them but the comment fix are real fix.
> 
> "clk: sunxi-ng: use 1 as fallback for minimum multiplier" can lead to
> a multiplier set to 0 in some cases (depending on the rate asked for),
> and "clk: sunxi-ng: Fix round_rate/set_rate multiplier minimum
> mismatch" will prevent inconsistensies in factors selection between
> round_rate and set_rate.
> 
> So, yes, they are not critical fixes in the sense that it will fix a
> panic. but still those are bugs.

Ok so it sounds like we agree that this can all wait until v4.12.
Stephen Boyd April 19, 2017, 4:06 p.m.
On 04/10, Stephen Boyd wrote:
> On 04/10, Maxime Ripard wrote:
> > On Thu, Apr 06, 2017 at 04:10:03PM -0700, Stephen Boyd wrote:
> > > On 04/06, Maxime Ripard wrote:
> > > > Hi Mike, Stephen,
> > > > 
> > > > Please pull the following changes for one of the 4.11-rc's
> > > > 
> > > > Thanks!
> > > > Maxime
> > > > 
> > > > The following changes since commit b467e08a15563dede0d37d3233baa24fb97a7310:
> > > > 
> > > >   clk: sunxi-ng: fix recalc_rate formula of NKMP clocks (2017-03-20 10:34:05 +0100)
> > > > 
> > > > are available in the git repository at:
> > > > 
> > > >   https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-clk-fixes-for-4.11-2
> > > > 
> > > > for you to fetch changes up to d054a839a0986136374d49f9f9fbc264abae9c4c:
> > > > 
> > > >   clk: sunxi-ng: fix build error without CONFIG_RESET_CONTROLLER (2017-03-27 13:37:05 +0200)
> > > > 
> > > > ----------------------------------------------------------------
> > > > Allwinner clock fixes for 4.11, bis
> > > > 
> > > > A few patches to fix a build error and a few minor typos and bugs in the
> > > > sunxi-ng code
> > > > 
> > > > ----------------------------------------------------------------
> > > > Chen-Yu Tsai (3):
> > > >       clk: sunxi-ng: use 1 as fallback for minimum multiplier
> > > >       clk: sunxi-ng: Fix round_rate/set_rate multiplier minimum mismatch
> > > >       clk: sunxi-ng: a80: Fix audio PLL comment not matching actual code
> > > > 
> > > > Tobias Regnery (1):
> > > >       clk: sunxi-ng: fix build error without CONFIG_RESET_CONTROLLER
> > > > 
> > > 
> > > Two of these are fixes for regressions in v4.10? Why are these
> > > critical for the v4.11 release? The comment patch is totally
> > > bogus, it's not fixing any sort of regression that is causing
> > > problems for people so I'm not sure why it was put into this pull
> > > request. Am I right in assuming that the only real patch we need
> > > out of here is the last one for the build error from randconfigs?
> > > If so I can cherry-pick that from the branch into fixes and the
> > > rest can go the next merge window.
> > > 
> > > Not pulling for now.
> > 
> > Actually, all of them but the comment fix are real fix.
> > 
> > "clk: sunxi-ng: use 1 as fallback for minimum multiplier" can lead to
> > a multiplier set to 0 in some cases (depending on the rate asked for),
> > and "clk: sunxi-ng: Fix round_rate/set_rate multiplier minimum
> > mismatch" will prevent inconsistensies in factors selection between
> > round_rate and set_rate.
> > 
> > So, yes, they are not critical fixes in the sense that it will fix a
> > panic. but still those are bugs.
> 
> Ok so it sounds like we agree that this can all wait until v4.12.
> 

Will you resend the few patches in here that aren't in the redone
PR for fixes or the PR for v4.12?