| Message ID | 20210823095603.5538-4-shawn.guo@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add missing A2NoC QoS clocks for SDM660 interconnect driver | expand |
On Mon, 23 Aug 2021 at 12:56, Shawn Guo <shawn.guo@linaro.org> wrote: > > It adds the missing a2noc clocks required for QoS registers programming > per downstream kernel[1]. > > [1] https://source.codeaurora.org/quic/la/kernel/msm-4.4/tree/arch/arm/boot/dts/qcom/sdm660-bus.dtsi?h=LA.UM.8.2.r1-04800-sdm660.0#n43 > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > --- > arch/arm64/boot/dts/qcom/sdm630.dtsi | 17 ++++++++++++++--- > 1 file changed, 14 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi > index 9153e6616ba4..b3a7f3bf1560 100644 > --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi > @@ -652,11 +652,22 @@ > > a2noc: interconnect@1704000 { > compatible = "qcom,sdm660-a2noc"; > - reg = <0x01704000 0xc100>; > + reg = <0x01704000 0x1c000>; Shawn, as you are at it, do we want to keep these nocs shifted compared to the downstream dtsi (so that the offset of QoS registers is 0) or we'd better introduce QoS register offset and move noc start address to the same address as in downstream? > #interconnect-cells = <1>; > - clock-names = "bus", "bus_a"; > + clock-names = "bus", > + "bus_a", > + "ipa", > + "ufs_axi", > + "aggre2_ufs_axi", > + "aggre2_usb3_axi", > + "cfg_noc_usb2_axi"; > clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>, > - <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>; > + <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>, > + <&rpmcc RPM_SMD_IPA_CLK>, > + <&gcc GCC_UFS_AXI_CLK>, > + <&gcc GCC_AGGRE2_UFS_AXI_CLK>, > + <&gcc GCC_AGGRE2_USB3_AXI_CLK>, > + <&gcc GCC_CFG_NOC_USB2_AXI_CLK>; > }; > > mnoc: interconnect@1745000 { > -- > 2.17.1 >
On Mon, Aug 23, 2021 at 07:51:32PM +0300, Dmitry Baryshkov wrote: > On Mon, 23 Aug 2021 at 12:56, Shawn Guo <shawn.guo@linaro.org> wrote: > > > > It adds the missing a2noc clocks required for QoS registers programming > > per downstream kernel[1]. > > > > [1] https://source.codeaurora.org/quic/la/kernel/msm-4.4/tree/arch/arm/boot/dts/qcom/sdm660-bus.dtsi?h=LA.UM.8.2.r1-04800-sdm660.0#n43 > > > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > > --- > > arch/arm64/boot/dts/qcom/sdm630.dtsi | 17 ++++++++++++++--- > > 1 file changed, 14 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi > > index 9153e6616ba4..b3a7f3bf1560 100644 > > --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi > > @@ -652,11 +652,22 @@ > > > > a2noc: interconnect@1704000 { > > compatible = "qcom,sdm660-a2noc"; > > - reg = <0x01704000 0xc100>; > > + reg = <0x01704000 0x1c000>; > > Shawn, as you are at it, do we want to keep these nocs shifted > compared to the downstream dtsi (so that the offset of QoS registers > is 0) or we'd better introduce QoS register offset and move noc start > address to the same address as in downstream? Dmitry, thanks for spotting this! This is really an unintended leftover from debugging. I will drop it in v2. For address alignment with downstream, I do not really have a strong opinion and I can live with either of them :) Shawn > > #interconnect-cells = <1>; > > - clock-names = "bus", "bus_a"; > > + clock-names = "bus", > > + "bus_a", > > + "ipa", > > + "ufs_axi", > > + "aggre2_ufs_axi", > > + "aggre2_usb3_axi", > > + "cfg_noc_usb2_axi"; > > clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>, > > - <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>; > > + <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>, > > + <&rpmcc RPM_SMD_IPA_CLK>, > > + <&gcc GCC_UFS_AXI_CLK>, > > + <&gcc GCC_AGGRE2_UFS_AXI_CLK>, > > + <&gcc GCC_AGGRE2_USB3_AXI_CLK>, > > + <&gcc GCC_CFG_NOC_USB2_AXI_CLK>; > > }; > > > > mnoc: interconnect@1745000 { > > -- > > 2.17.1 > > > > > -- > With best wishes > Dmitry
diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 9153e6616ba4..b3a7f3bf1560 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -652,11 +652,22 @@ a2noc: interconnect@1704000 { compatible = "qcom,sdm660-a2noc"; - reg = <0x01704000 0xc100>; + reg = <0x01704000 0x1c000>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; + clock-names = "bus", + "bus_a", + "ipa", + "ufs_axi", + "aggre2_ufs_axi", + "aggre2_usb3_axi", + "cfg_noc_usb2_axi"; clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>, - <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>; + <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>, + <&rpmcc RPM_SMD_IPA_CLK>, + <&gcc GCC_UFS_AXI_CLK>, + <&gcc GCC_AGGRE2_UFS_AXI_CLK>, + <&gcc GCC_AGGRE2_USB3_AXI_CLK>, + <&gcc GCC_CFG_NOC_USB2_AXI_CLK>; }; mnoc: interconnect@1745000 {
It adds the missing a2noc clocks required for QoS registers programming per downstream kernel[1]. [1] https://source.codeaurora.org/quic/la/kernel/msm-4.4/tree/arch/arm/boot/dts/qcom/sdm660-bus.dtsi?h=LA.UM.8.2.r1-04800-sdm660.0#n43 Signed-off-by: Shawn Guo <shawn.guo@linaro.org> --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)