Re: [PATCH v10 4/6] scsi: ufs: Add core reset support

[Marc Gonzalez]

On 23/10/2018 06:35, Can Guo wrote:

> From: Dov Levenglick 
> 
> Enables core reset support. Add full initialization of the PHY and the
> controller before initializing UFS PHY and during link recovery.
> 
> Signed-off-by: Dov Levenglick 
> Signed-off-by: Amit Nischal 
> Signed-off-by: Subhash Jadavani 
> Signed-off-by: Can Guo 

FWIW, this patch does not apply cleanly on top of v4.20-rc4 because
it clashes with df032bf27a414acf61c957ec2fad22a57d903b39
("scsi: ufs: Add a bsg endpoint that supports UPIUs").

Seems git's 3-way merge is smart enough to handle the conflict.

Regards.

Re: [PATCH v10 0/6] Support for Qualcomm UFS QMP PHY on SDM845

[Marc Gonzalez]

On 05/12/2018 08:01, Vivek Gautam wrote:

> On Tue, Oct 23, 2018 at 10:07 AM Can Guo  wrote:
>>
>> This patch series adds support for UFS QMP PHY on SDM845 and the
>> compatible string for it. This patch series depends on the current
>> proposed QMP V3 USB3 UNI PHY support for sdm845 driver [1], on
>> the DT bindings for the QMP V3 USB3 PHYs based dirver [2], and also
>> rebased on updated pipe_clk initialization sequence [3]. This series
>> can only be merged once the dependent patches do.
>> [1] 
>> http://lists-archives.com/linux-kernel/29071659-dt-bindings-phy-qcom-qmp-update-bindings-for-sdm845.html
>> [2] 
>> http://lists-archives.com/linux-kernel/29071660-phy-qcom-qmp-add-qmp-v3-usb3-uni-phy-support-for-sdm845.html
>> [3] https://patchwork.kernel.org/patch/10376551/
> 
> Besides my comment for PATCH 4/6, I have already reviewed the entire series,
> and it looks good.
> If adding new bindings for sdm845 needs a further review, can you separate out
> just the phy patches from this series (patch 1, 2, 3 & 6), and re-send them.
> We can ask Kishon if he can pull them in for this merge window.
> Thanks.

I'm confused. I was trying to 'git am' this series on top of v4.20 but it
has been partly merged AFAICT.

commit 0d58280cf1e61b06cb4d4aab672efccdc28794f6
Author: Can Guo 
AuthorDate: Thu Sep 20 21:27:54 2018 -0700
Commit: Kishon Vijay Abraham I 
CommitDate: Tue Sep 25 16:10:13 2018 +0530

commit 6b04526812ac41ba82317caa8df3549dda2cab97
Author: Can Guo 
AuthorDate: Thu Sep 20 21:27:55 2018 -0700
Commit: Kishon Vijay Abraham I 
CommitDate: Tue Sep 25 16:10:14 2018 +0530

commit cc31cdbef9b7166fe42e08267349cfbaa32696b6
Author: Can Guo 
AuthorDate: Thu Sep 20 21:27:56 2018 -0700
Commit: Kishon Vijay Abraham I 
CommitDate: Tue Sep 25 16:10:14 2018 +0530

Can't find
[PATCH v10 4/6] scsi: ufs: Add core reset support
[PATCH v10 5/6] scsi: ufs: Power on phy after it is initialized

commit 99c7c7364b714e1de54a25c3642d991de1675e27
Author: Can Guo 
AuthorDate: Tue Sep 25 12:10:12 2018 +0530
Commit: Kishon Vijay Abraham I 
CommitDate: Tue Sep 25 16:10:14 2018 +0530


So basically, only patches 4 and 5 have not landed yet?
(Are they perhaps in someone's -next tree?)

Regards.