From patchwork Tue Aug 24 04:34:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 12453943 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.7 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,URIBL_BLOCKED, 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 E7358C4320A for ; Tue, 24 Aug 2021 04:34:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C88F8611EF for ; Tue, 24 Aug 2021 04:34:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229815AbhHXEfe (ORCPT ); Tue, 24 Aug 2021 00:35:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229568AbhHXEfd (ORCPT ); Tue, 24 Aug 2021 00:35:33 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12E00C061575 for ; Mon, 23 Aug 2021 21:34:50 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id om1-20020a17090b3a8100b0017941c44ce4so918452pjb.3 for ; Mon, 23 Aug 2021 21:34:50 -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=kM+/qtuecMY4rwyh4CAd/6/l8VczUh+C0H7yTgD5l9I=; b=C1BSeTMSTiuXURuIkor7ch+3EBsKtClK8fJDglOJ9JfIDxlTsSGRUPwg8+yKACGRbh bFXcx9Jegu+fb0aRasHMRS82tb8cN8QSntraHbLfEC7Y/T6kGG6vG3/E9c9sRMjR2yXH yzFk6PkcQ78+hhol0KBFYxQ0cLgvh6Q37BQzgZ90hEavr3R4BB46YEtAHnrwZD/rzAnz hfBo6RfHr1450Ey8/HXEm89Sj3Sg/IMr7JSGokV8h9uIC5mlzo9ZN1umkbz5c3swF+X9 w0gk1AQ82c5vDnEjYuPPxH6rrNUeYkchQa673mYwrX/Tsp5IpiEF7DK/mQ2iuFR5uFur tzzA== 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=kM+/qtuecMY4rwyh4CAd/6/l8VczUh+C0H7yTgD5l9I=; b=kUMvli/fiMLTNiMe6oxvXT/1IknwIe2z/V3tpJqbPnyr+PXouF6JJwBGYMYiT7DnXy OaRfY0vx90zZB362liQmy6kiFMV8T7TeCAP6kHXZjYAzgP9IFtu+jn8N9AtqzxOCN7et I5zbCoeW7UseALFhmOlyO5xfzo8DhytMAFOyV/UYok11BlEXqgvZ4lN9XZ5YYzSU1oJ5 UjACnr0J2TyGscZu2MzqKzZ9Y08Q4rqxo6kEkQk0oLq+l6WOZ1wWCyj8X/2GSwTghnJ/ bgI1RHpusO0zBc8XDAinNA8hXYwiDNUV+BNCevtJoarLJ5LlyEFeAhKxyNlz1vCmE2+C PYzw== X-Gm-Message-State: AOAM531ZSFVIPgbD0USZFtnOD5cT+WvYQ1+vyB0pzOEmnpUCzYDKlXeq gYBqbzddJFlYsk/HOTgbF3hdYA== X-Google-Smtp-Source: ABdhPJxn/MMrSkc28FvXszBm2e2PGYOijM+kBz1jlyTSkChSIOALJvWmZuJPnmkuJ/55PgH9go7TtQ== X-Received: by 2002:a17:90a:9dc6:: with SMTP id x6mr2352694pjv.122.1629779689616; Mon, 23 Aug 2021 21:34:49 -0700 (PDT) Received: from localhost.localdomain (80.251.214.228.16clouds.com. [80.251.214.228]) by smtp.gmail.com with ESMTPSA id p10sm789401pjv.39.2021.08.23.21.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 21:34:49 -0700 (PDT) From: Shawn Guo To: Georgi Djakov Cc: AngeloGioacchino Del Regno , Bjorn Andersson , Dmitry Baryshkov , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, Shawn Guo Subject: [PATCH v2 2/3] interconnect: qcom: sdm660: Add missing a2noc qos clocks Date: Tue, 24 Aug 2021 12:34:34 +0800 Message-Id: <20210824043435.23190-3-shawn.guo@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210824043435.23190-1-shawn.guo@linaro.org> References: <20210824043435.23190-1-shawn.guo@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-pm@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 Reviewed-by: AngeloGioacchino Del Regno --- 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;