Re: [GIT PULL] commits for Linux 4.16

[Tero Kristo <t-kristo@ti.com>]

On 10/05/18 14:50, Sam Protsenko wrote:
> On 10 May 2018 at 13:47, Greg KH <gregkh@linuxfoundation.org> wrote:
>> On Thu, May 10, 2018 at 01:36:14PM +0300, Sam Protsenko wrote:
>>> On 10 May 2018 at 08:47, Greg KH <gregkh@linuxfoundation.org> wrote:
>>>> Hi,
>>>>
>>>> First off, properly trim your quoting, I had to dig for your response...
>>>>
>>>
>>> Got it, sorry.
>>>
>>>> On Thu, May 10, 2018 at 12:44:21AM +0300, Sam Protsenko wrote:
>>>>>> Tero Kristo (1):
>>>>>>        clk: ti: fix flag space conflict with clkctrl clocks
>>>>>>
>>>>>
>>>>> Hi Greg,
>>>>>
>>>>> Can we please pull this one to 4.16-stable? It fixes boot on
>>>>> BeagleBone Black. This bug was mentioned here: [1].
>>>>>
>>>>> Thanks!
>>>>>
>>>>> [1] https://www.spinics.net/lists/arm-kernel/msg643873.html
>>>>
>>>> What is the git commit id of the patch?  I need that to get this merged
>>>> properly.
>>>>
>>>
>>> 1. Patch that fixes BBB (in mainline, between 4.16 and 4.17) -- it's
>>> the one that should be merged:
>>>
>>>      269bd202bc0fd04e841cb123867fd3f49e04ace9
>>>      clk: ti: fix flag space conflict with clkctrl clocks
>>>
>>> 2. Patch that breaks BBB (in mainline, between 4.15 and 4.16) -- just
>>> for information:
>>>
>>>      c083dc5f3738d394223baa0f90705397b0844acd
>>>      clk: ti: am33xx: add set-rate-parent support for display clkctrl clock
>>
>> Why does the patch say:
>>          Fixes: 49159a9dc3da ("clk: ti: add support for CLK_SET_RATE_PARENT flag")
>> instead of c083dc5f3738 ("clk: ti: am33xx: add set-rate-parent support for display clkctrl clock")
>> ?
>>
> 
> + Tero Kristo
> 
> Using bisect I found that c083dc5f3738 is the first patch after which
> BBB boot is broken. So I can suppose that either:
>    1. 49159a9dc3da is actual bug and c083dc5f3738 is just revealing it
>    2. or mentioned patch 269bd202bc0f fixes both bugs (c083dc5f3738 and
> 49159a9dc3da)

Well, both commits you list are broken in reality, and are fixed by the 
same patch. The data change done initially in c083dc5f3738 surfaces one 
specific problem for BBB (boot failure with multi-v7), but the code 
change in c083dc5f3738 is the TI SoC global issue which can cause some 
other interesting side effects.

If you go nitpicking things, the patch also fixes this one:
762790b75210f5219c68 ("clk: ti: am43xx: add set-rate-parent support for 
display clkctrl clock"). I just picked the generic code change item for 
the "fixes" field, which impacts everything.

-Tero

> 
> Best way to know the answer would be to ask Tero Kristo, who
> implemented the fix.
> 
>> Anyway, I'll go queue up 269bd202bc0fd04e841cb123867fd3f49e04ace9,
> 
> Thank you!
> 
>> thanks.
>>
>> greg k-h

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki