From patchwork Mon Aug 23 09:56:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 12452255 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD2C0C4338F for ; Mon, 23 Aug 2021 09:56:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B683961378 for ; Mon, 23 Aug 2021 09:56:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235866AbhHWJ5I (ORCPT ); Mon, 23 Aug 2021 05:57:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232956AbhHWJ5H (ORCPT ); Mon, 23 Aug 2021 05:57:07 -0400 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD6E5C06175F for ; Mon, 23 Aug 2021 02:56:24 -0700 (PDT) Received: by mail-pl1-x636.google.com with SMTP id c4so9818900plh.7 for ; Mon, 23 Aug 2021 02:56:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YgI5dSo1rEo/T5lu/F1tJ8HTg39LuCdrSBpCETyTyKc=; b=fCVgWBkqqxB2VWxndj2ZNMXH/u9E53XphBp7R9cM0AosvnjzbBlwVUm6Z8ClH1UUki lba1retD9gqFz4AD+A1bRjssUR5FG38+dNphX6kLgLTNGPAlaRWOC9IxENZTFuQSCyHW Fu7icMrnpqzxug0ECpFphrKq22JWcqCt75t+iB9dsrTw2JNIbWlsdTtPA8H/1WmJm+qK xvUIYVHLMJX/jHmZhO0OWESPJJnwsK4SEwh4hhaECxANTSApsZYK7zhQb6FRnh5w+8PG FQsefcrAyYzRhthlGy5jGapJ2v2NbaLTD354pxsREul/54yvCPsGNpb2gH13HhZRbS3v Gxgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YgI5dSo1rEo/T5lu/F1tJ8HTg39LuCdrSBpCETyTyKc=; b=nbtF4oxebeEPXiQKx42Vw/zYAUDtzBdPiJ5Y0CJrS/lTdOz2XeRd587JiMms0T9Nii BJHjoHNkTMMQgOflTb592zQDAZwFC+nvCrSy60NwV1lT7ag2Rm++qW7E7pkq7BW6mUWh e/ia3bJDjpEfii8kQqggFZLOq1e3uOTT8Urk9N2TewyLBrOSAvbaigFUzLWoI6mS611p 4v7Rfqf7UNQ+WCWaJdjFvBU2ovKPo3AAxyjkmd9+jPkXVbnu0ug0431eCaB0LFR0YldL VPCb22svucClN8gUJzRggEEa5bt4Bg5C1FovCK6lVq8Exma7vURe7JdnPia0MTpE6iw4 DGWQ== X-Gm-Message-State: AOAM530mFA+8xoQ/Xti9nzM5n9iEnaEfUzcoIs9sOECbCpnXOT2oXwQx HyW0pdyX0LaioyhGKLIYQje3ag== X-Google-Smtp-Source: ABdhPJzXhpIwSbmq3vyin7oSjRPegikoV1A3ObQFHtjf4gYuy+4iaQDvZLveI+G10hrf5CZsbCiw3A== X-Received: by 2002:a17:903:31cd:b0:134:5b6f:2ff8 with SMTP id v13-20020a17090331cd00b001345b6f2ff8mr3956135ple.46.1629712584447; Mon, 23 Aug 2021 02:56:24 -0700 (PDT) Received: from localhost.localdomain (80.251.214.228.16clouds.com. [80.251.214.228]) by smtp.gmail.com with ESMTPSA id z24sm18708230pjq.43.2021.08.23.02.56.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 02:56:24 -0700 (PDT) From: Shawn Guo To: Georgi Djakov Cc: AngeloGioacchino Del Regno , Bjorn Andersson , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, Shawn Guo Subject: [PATCH 2/3] interconnect: qcom: sdm660: Add missing a2noc qos clocks Date: Mon, 23 Aug 2021 17:56:02 +0800 Message-Id: <20210823095603.5538-3-shawn.guo@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210823095603.5538-1-shawn.guo@linaro.org> References: <20210823095603.5538-1-shawn.guo@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 Tested-by: Bjorn Andersson --- 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 c89c991a80a0..661eb3635d21 100644 --- a/drivers/interconnect/qcom/sdm660.c +++ b/drivers/interconnect/qcom/sdm660.c @@ -174,6 +174,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 @@ -811,6 +821,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;