After some initial confusion, we've finally settled how the UFS ref
clocks are used.
The first patch fixes the UFS controller and PHY nodes so that they
reflect the hardware. This one should go in 6.1-rc where the two
previous attempts to address this are heading.
Note this patch depends on first updating the clock driver to reflect
that the device ref clock is fed from CXO. This is needed as the UFS
controller driver requires a valid frequency for the ref clock. A patch
that addresses the this has been submitted, but a v2 is in the works.
[1]
The second patch updates the UFS PHY nodes so that they reflect the
fixed UFS PHY binding that is now in linux-next. This one is 6.2
material but depends on first fixing the clocks.
So to summarise the dependency order:
1. clock driver should be fixed in 6.1-rc
2. patch 1/2 should go in 6.1-rc (after 1)
3. patch 2/2 should go in 6.2 (after 1 and 2)
Johan
[1] https://lore.kernel.org/r/[email protected]
Johan Hovold (2):
arm64: dts: qcom: sc8280xp: fix UFS reference clocks
arm64: dts: qcom: sc8280xp: update UFS PHY nodes
arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 57 ++++++++++----------------
1 file changed, 21 insertions(+), 36 deletions(-)
--
2.37.3
There are three UFS reference clocks on SC8280XP which are used as
follows:
- The GCC_UFS_REF_CLKREF_CLK clock is fed to any UFS device connected
to either controller.
- The GCC_UFS_1_CARD_CLKREF_CLK and GCC_UFS_CARD_CLKREF_CLK clocks
provide reference clocks to the two PHYs.
Note that this depends on first updating the clock driver to reflect
that all three clocks are sourced from CXO. Specifically, the UFS
controller driver expects the device reference clock to have a valid
frequency:
ufshcd-qcom 1d84000.ufs: invalid ref_clk setting = 0
Fixes: 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")
Fixes: 8d6b458ce6e9 ("arm64: dts: qcom: sc8280xp: fix ufs_card_phy ref clock")
Fixes: f3aa975e230e ("arm64: dts: qcom: sc8280xp: correct ref clock for ufs_mem_phy")
Link: https://lore.kernel.org/lkml/[email protected]/
Cc: [email protected] # 5.20
Signed-off-by: Johan Hovold <[email protected]>
---
arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index 21ac119e0382..e0d0fb6994b5 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -912,7 +912,7 @@ ufs_mem_hc: ufs@1d84000 {
<&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
<&gcc GCC_UFS_PHY_AHB_CLK>,
<&gcc GCC_UFS_PHY_UNIPRO_CORE_CLK>,
- <&rpmhcc RPMH_CXO_CLK>,
+ <&gcc GCC_UFS_REF_CLKREF_CLK>,
<&gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>,
<&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>,
<&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>;
@@ -943,7 +943,7 @@ ufs_mem_phy: phy@1d87000 {
ranges;
clock-names = "ref",
"ref_aux";
- clocks = <&gcc GCC_UFS_REF_CLKREF_CLK>,
+ clocks = <&gcc GCC_UFS_CARD_CLKREF_CLK>,
<&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
resets = <&ufs_mem_hc 0>;
@@ -980,7 +980,7 @@ ufs_card_hc: ufs@1da4000 {
<&gcc GCC_AGGRE_UFS_CARD_AXI_CLK>,
<&gcc GCC_UFS_CARD_AHB_CLK>,
<&gcc GCC_UFS_CARD_UNIPRO_CORE_CLK>,
- <&rpmhcc RPMH_CXO_CLK>,
+ <&gcc GCC_UFS_REF_CLKREF_CLK>,
<&gcc GCC_UFS_CARD_TX_SYMBOL_0_CLK>,
<&gcc GCC_UFS_CARD_RX_SYMBOL_0_CLK>,
<&gcc GCC_UFS_CARD_RX_SYMBOL_1_CLK>;
@@ -1011,7 +1011,7 @@ ufs_card_phy: phy@1da7000 {
ranges;
clock-names = "ref",
"ref_aux";
- clocks = <&gcc GCC_UFS_REF_CLKREF_CLK>,
+ clocks = <&gcc GCC_UFS_1_CARD_CLKREF_CLK>,
<&gcc GCC_UFS_CARD_PHY_AUX_CLK>;
resets = <&ufs_card_hc 0>;
--
2.37.3
On Fri, Nov 04, 2022 at 10:20:44AM +0100, Johan Hovold wrote:
> There are three UFS reference clocks on SC8280XP which are used as
> follows:
>
> - The GCC_UFS_REF_CLKREF_CLK clock is fed to any UFS device connected
> to either controller.
>
> - The GCC_UFS_1_CARD_CLKREF_CLK and GCC_UFS_CARD_CLKREF_CLK clocks
> provide reference clocks to the two PHYs.
>
> Note that this depends on first updating the clock driver to reflect
> that all three clocks are sourced from CXO. Specifically, the UFS
> controller driver expects the device reference clock to have a valid
> frequency:
>
> ufshcd-qcom 1d84000.ufs: invalid ref_clk setting = 0
>
> Fixes: 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")
> Fixes: 8d6b458ce6e9 ("arm64: dts: qcom: sc8280xp: fix ufs_card_phy ref clock")
> Fixes: f3aa975e230e ("arm64: dts: qcom: sc8280xp: correct ref clock for ufs_mem_phy")
> Link: https://lore.kernel.org/lkml/[email protected]/
> Cc: [email protected] # 5.20
> Signed-off-by: Johan Hovold <[email protected]>
Reviewed-by: Brian Masney <[email protected]>
Note that there was no 5.20 kernel; that should be 6.0. Bjorn should be
able to fix this up during merge.
https://en.wikipedia.org/wiki/Linux_kernel_version_history
On Mon, Nov 07, 2022 at 06:09:12AM -0500, Brian Masney wrote:
> On Fri, Nov 04, 2022 at 10:20:44AM +0100, Johan Hovold wrote:
> > There are three UFS reference clocks on SC8280XP which are used as
> > follows:
> >
> > - The GCC_UFS_REF_CLKREF_CLK clock is fed to any UFS device connected
> > to either controller.
> >
> > - The GCC_UFS_1_CARD_CLKREF_CLK and GCC_UFS_CARD_CLKREF_CLK clocks
> > provide reference clocks to the two PHYs.
> >
> > Note that this depends on first updating the clock driver to reflect
> > that all three clocks are sourced from CXO. Specifically, the UFS
> > controller driver expects the device reference clock to have a valid
> > frequency:
> >
> > ufshcd-qcom 1d84000.ufs: invalid ref_clk setting = 0
> >
> > Fixes: 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")
> > Fixes: 8d6b458ce6e9 ("arm64: dts: qcom: sc8280xp: fix ufs_card_phy ref clock")
> > Fixes: f3aa975e230e ("arm64: dts: qcom: sc8280xp: correct ref clock for ufs_mem_phy")
> > Link: https://lore.kernel.org/lkml/[email protected]/
> > Cc: [email protected] # 5.20
> > Signed-off-by: Johan Hovold <[email protected]>
>
> Reviewed-by: Brian Masney <[email protected]>
>
> Note that there was no 5.20 kernel; that should be 6.0. Bjorn should be
> able to fix this up during merge.
Good catch. I based this on a tag created before 6.0 was released and
failed to notice.
Johan
On Fri, 4 Nov 2022 10:20:43 +0100, Johan Hovold wrote:
> After some initial confusion, we've finally settled how the UFS ref
> clocks are used.
>
> The first patch fixes the UFS controller and PHY nodes so that they
> reflect the hardware. This one should go in 6.1-rc where the two
> previous attempts to address this are heading.
>
> [...]
Applied, thanks!
[1/2] arm64: dts: qcom: sc8280xp: fix UFS reference clocks
commit: f446022b932aff1d6a308ca5d537ec2b512debdc
Best regards,
--
Bjorn Andersson <[email protected]>
On Fri, 4 Nov 2022 10:20:43 +0100, Johan Hovold wrote:
> After some initial confusion, we've finally settled how the UFS ref
> clocks are used.
>
> The first patch fixes the UFS controller and PHY nodes so that they
> reflect the hardware. This one should go in 6.1-rc where the two
> previous attempts to address this are heading.
>
> [...]
Applied, thanks!
[2/2] arm64: dts: qcom: sc8280xp: update UFS PHY nodes
commit: 33c4e6588e4f018abc43381ee21fe2bed37e34a5
Best regards,
--
Bjorn Andersson <[email protected]>