Messages in this thread | | | Date | Fri, 15 Oct 2021 14:24:52 +0300 | Subject | Re: [PATCH 5.14 05/30] interconnect: qcom: sdm660: Add missing a2noc qos clocks | From | Georgi Djakov <> |
| |
Hi Greg,
On 14.10.21 17:54, Greg Kroah-Hartman wrote: > From: Shawn Guo <shawn.guo@linaro.org> > > [ 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 <shawn.guo@linaro.org> > Tested-by: Bjorn Andersson <bjorn.andersson@linaro.org> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org> > Link: https://lore.kernel.org/r/20210824043435.23190-3-shawn.guo@linaro.org > Signed-off-by: Georgi Djakov <djakov@kernel.org> > Signed-off-by: Sasha Levin <sashal@kernel.org>
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; >
| |