2021-10-14 18:11:25

by Greg Kroah-Hartman

Subject: [PATCH 5.14 05/30] interconnect: qcom: sdm660: Add missing a2noc qos clocks

From: Shawn Guo <[email protected]>

[ Upstream commit 13404ac8882f5225af07545215f4975a564c3740 ]

It adds the missing a2noc clocks required for QoS registers programming
per downstream kernel[1]. Otherwise, qcom_icc_noc_set_qos_priority()
call on mas_ufs or mas_usb_hs node will simply result in a hardware hang
on SDM660 SoC.

[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 <[email protected]>
Tested-by: Bjorn Andersson <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Georgi Djakov <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
---
drivers/interconnect/qcom/sdm660.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)

diff --git a/drivers/interconnect/qcom/sdm660.c b/drivers/interconnect/qcom/sdm660.c
index 99eef7e2d326..fb23a5b780a4 100644
--- a/drivers/interconnect/qcom/sdm660.c
+++ b/drivers/interconnect/qcom/sdm660.c
@@ -173,6 +173,16 @@ static const struct clk_bulk_data bus_mm_clocks[] = {
{ .id = "iface" },
};

+static const struct clk_bulk_data bus_a2noc_clocks[] = {
+ { .id = "bus" },
+ { .id = "bus_a" },
+ { .id = "ipa" },
+ { .id = "ufs_axi" },
+ { .id = "aggre2_ufs_axi" },
+ { .id = "aggre2_usb3_axi" },
+ { .id = "cfg_noc_usb2_axi" },
+};
+
/**
* struct qcom_icc_provider - Qualcomm specific interconnect provider
* @provider: generic interconnect provider
@@ -809,6 +819,10 @@ static int qnoc_probe(struct platform_device *pdev)
qp->bus_clks = devm_kmemdup(dev, bus_mm_clocks,
sizeof(bus_mm_clocks), GFP_KERNEL);
qp->num_clks = ARRAY_SIZE(bus_mm_clocks);
+ } else if (of_device_is_compatible(dev->of_node, "qcom,sdm660-a2noc")) {
+ qp->bus_clks = devm_kmemdup(dev, bus_a2noc_clocks,
+ sizeof(bus_a2noc_clocks), GFP_KERNEL);
+ qp->num_clks = ARRAY_SIZE(bus_a2noc_clocks);
} else {
if (of_device_is_compatible(dev->of_node, "qcom,sdm660-bimc"))
qp->is_bimc_node = true;
--
2.33.0

2021-10-15 20:01:39

by Georgi Djakov

Subject: Re: [PATCH 5.14 05/30] interconnect: qcom: sdm660: Add missing a2noc qos clocks

Hi Greg,

On 14.10.21 17:54, Greg Kroah-Hartman wrote:
> From: Shawn Guo <[email protected]>
>
> [ Upstream commit 13404ac8882f5225af07545215f4975a564c3740 ]
>
> It adds the missing a2noc clocks required for QoS registers programming
> per downstream kernel[1]. Otherwise, qcom_icc_noc_set_qos_priority()
> call on mas_ufs or mas_usb_hs node will simply result in a hardware hang
> on SDM660 SoC.
>
> [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 <[email protected]>
> Tested-by: Bjorn Andersson <[email protected]>
> Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
> Link: https://lore.kernel.org/r/[email protected]
> Signed-off-by: Georgi Djakov <[email protected]>
> Signed-off-by: Sasha Levin <[email protected]>

There is no benefit to backport this change, as devices that
needed it, would not boot on v5.14 anyways. Please drop it.

Thanks,
Georgi

> ---
> drivers/interconnect/qcom/sdm660.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/drivers/interconnect/qcom/sdm660.c b/drivers/interconnect/qcom/sdm660.c
> index 99eef7e2d326..fb23a5b780a4 100644
> --- a/drivers/interconnect/qcom/sdm660.c
> +++ b/drivers/interconnect/qcom/sdm660.c
> @@ -173,6 +173,16 @@ static const struct clk_bulk_data bus_mm_clocks[] = {
> { .id = "iface" },
> };
>
> +static const struct clk_bulk_data bus_a2noc_clocks[] = {
> + { .id = "bus" },
> + { .id = "bus_a" },
> + { .id = "ipa" },
> + { .id = "ufs_axi" },
> + { .id = "aggre2_ufs_axi" },
> + { .id = "aggre2_usb3_axi" },
> + { .id = "cfg_noc_usb2_axi" },
> +};
> +
> /**
> * struct qcom_icc_provider - Qualcomm specific interconnect provider
> * @provider: generic interconnect provider
> @@ -809,6 +819,10 @@ static int qnoc_probe(struct platform_device *pdev)
> qp->bus_clks = devm_kmemdup(dev, bus_mm_clocks,
> sizeof(bus_mm_clocks), GFP_KERNEL);
> qp->num_clks = ARRAY_SIZE(bus_mm_clocks);
> + } else if (of_device_is_compatible(dev->of_node, "qcom,sdm660-a2noc")) {
> + qp->bus_clks = devm_kmemdup(dev, bus_a2noc_clocks,
> + sizeof(bus_a2noc_clocks), GFP_KERNEL);
> + qp->num_clks = ARRAY_SIZE(bus_a2noc_clocks);
> } else {
> if (of_device_is_compatible(dev->of_node, "qcom,sdm660-bimc"))
> qp->is_bimc_node = true;
>

2021-10-15 21:14:20

by Greg Kroah-Hartman

Subject: Re: [PATCH 5.14 05/30] interconnect: qcom: sdm660: Add missing a2noc qos clocks

On Fri, Oct 15, 2021 at 02:24:52PM +0300, Georgi Djakov wrote:
> Hi Greg,
>
> On 14.10.21 17:54, Greg Kroah-Hartman wrote:
> > From: Shawn Guo <[email protected]>
> >
> > [ Upstream commit 13404ac8882f5225af07545215f4975a564c3740 ]
> >
> > It adds the missing a2noc clocks required for QoS registers programming
> > per downstream kernel[1]. Otherwise, qcom_icc_noc_set_qos_priority()
> > call on mas_ufs or mas_usb_hs node will simply result in a hardware hang
> > on SDM660 SoC.
> >
> > [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 <[email protected]>
> > Tested-by: Bjorn Andersson <[email protected]>
> > Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
> > Link: https://lore.kernel.org/r/[email protected]
> > Signed-off-by: Georgi Djakov <[email protected]>
> > Signed-off-by: Sasha Levin <[email protected]>
>
> There is no benefit to backport this change, as devices that
> needed it, would not boot on v5.14 anyways. Please drop it.

Now dropped, thanks!

greg k-h