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: 501860 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=ham 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 CD649C4320E 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 B296A61356 for ; Tue, 24 Aug 2021 04:34:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229831AbhHXEfe (ORCPT ); Tue, 24 Aug 2021 00:35:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229615AbhHXEfd (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 137CCC061757 for ; Mon, 23 Aug 2021 21:34:50 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id n13-20020a17090a4e0d00b0017946980d8dso912923pjh.5 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=Zt/sfmQcQ5eJ1oiUFf+xHux0b2e9iYGMz+12fr2x76wyvAAk2JSlhPavcmQU+Rz+sC w00ecj9pdocgCJ7WV03MhnMyfdveEF01iRnWKMVUSELnrT/jNaZhuemIe6tMswyFNN6c DpFgYjnC+WAecmJD8D1g9K24SySUDKaCIIHnwOtiK5sDakw/vsLk8GlzBXey0U6qmtns z5yPZbsXSsslTJizjuYoNxrkuwwiy4G1cRzNIOUK/S1kW2s9ngxLo2IIUkxiAJt9ksf7 cWq+2WNX5CqGuHx3cTwXS7gjpzGHrERg00+rf212hEgDYCP4/qfnOgSEX/rIREDLgwfA nTHw== X-Gm-Message-State: AOAM532h+ObD0sJR5ltEESj0lXMeZaXeTAgdPiabuB+4Pdaf8qWXm8z/ dT7JXc6h64jLV49Se2waKxD/HQ== 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-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 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; From patchwork Tue Aug 24 04:34:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 501788 Delivered-To: patch@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp2799028jab; Mon, 23 Aug 2021 21:34:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxx9A6SQKb+gFAS/mW4CFn0Z5mIfzEgcSiw8gzhby9KwjjBIUdJMWrxUS+5xE9nS0z349hE X-Received: by 2002:a17:906:a08a:: with SMTP id q10mr37944489ejy.100.1629779694534; Mon, 23 Aug 2021 21:34:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629779694; cv=none; d=google.com; s=arc-20160816; b=l0tUwPOjaeC3Y0IPzFkTMnJI7s1yZcHqDbKQTebiv3rWyjy7b3tzFD+LTy3MRvWVAI FtwhSLvByzf9iAlaCrZ4h0bmNCXUh3Sn1vuel6XwoNjscQqkT/KLTfZdRR4QaBvfJBCf qhIz1rugW1gJ20U7gJipMp+ZcOWi6g+BbNLyIsqCFGIKY6vmkye85pgaFgqe9s8C4vP9 DAOCCbJj2GijzDTUEcLJMVseDnCPtnfzo20xLZ/lw0gIgtI/HUtdT+aMPJSIoOsDej7i tQogU4aVQ9ah4x9UMCUIwZuo5FEnQ/P0FSXHw7ThMrSjLFts0GXGDVj+YNm8ZtRwm/Td wawA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=Nff3Tp8Tu+bjLX3ssyXcSoAVuinaN02903EEynfcyEI=; b=vsnobof22YzF1RMFHl7nkGALrQd+Es63EjUAyM6BZC+R/ZBCkFUj4iN6hXU4LsXp4H Mi6Fv9AemuZTXzniLQG5Q4114kGZOSYQK5hxNWfHoVTijnrcf5bH90vL9F4USXC4i5xq lj5cnUcJOoiYIbXuAPuJo7QmACoUmC5tN8vxwMJozfMPUDk2zzb04Xq8v7BgsFqJD+9C 53Jmr/nijffeasQi2plCVk+MzOycsJMccEXW0/npH2E2RIeLXCAuktMEn7AV1AksSltQ Gm1zU3RCRO3QglN+TWSMrpFoRE1LJltXXNjjIFHjx5YzqOFbfVs3S3sQIPqFricNeOM6 g1Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=akyrO8UW; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gt9si2183422ejc.542.2021.08.23.21.34.54; Mon, 23 Aug 2021 21:34:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=akyrO8UW; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229568AbhHXEfg (ORCPT + 16 others); Tue, 24 Aug 2021 00:35:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229615AbhHXEfg (ORCPT ); Tue, 24 Aug 2021 00:35:36 -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 A49ACC061757 for ; Mon, 23 Aug 2021 21:34:52 -0700 (PDT) Received: by mail-pl1-x636.google.com with SMTP id m4so435407pll.0 for ; Mon, 23 Aug 2021 21:34:52 -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=Nff3Tp8Tu+bjLX3ssyXcSoAVuinaN02903EEynfcyEI=; b=akyrO8UW4SNYZEpYM1TGkjrb18VxaZv24fdamHymXvkgr6Kfc1IY6qzydAlK3ADJO2 oDBT9JuHVRdKmasKr+SNTcGjFx/nAZnTW0sr0g3FAr6kKjJWeL69G02RtwQO3xY4yqHB GEf5Py2ddON8e4RMW4nWJv8lDICXf2aGT4YVv1EnMMG4PPm3pd0ct28OyCJzMfDBKtTc IhulrZ1eq3H3fOWByt4dSA0ajFxQaoYKzXGU64DXg7DSuLTFJqcTao6Kznpqmz1xFTD9 LZZx+2Ka56HW4GabUlUBQlFtfQl1mE82CwwUgwc6p1TTOIpASFAbLppRdP4hLn998i3A 1N4A== 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=Nff3Tp8Tu+bjLX3ssyXcSoAVuinaN02903EEynfcyEI=; b=RszxOXrxjh7XdbsKNYf3hswpekIEq5ag1wV0S6XtNzMS5ZRKJxKSU/hjodewJNKf/q u4+4ksRRnEeGvl37DUK4Yst7nUJr9yt7ghVzCxkmkFjUukyCwlYJfupQs/skl9HMr8B1 GiseMq6i/5TJwM0VuNdKvSPNzFrDLibuceTa6sGXZxcCr7WiJqOwBwWnJp2l6DxItU+E R3KS1h1Rh31YEnOPyRbE3hfvWnYWnDq3jvOUDWB8+NKTk8IOSWsryL7HDUp7896abvIw 0tuGq3xYXkXdsunzxwxl06gkST3g/CU5Sz770BKnliRgBh6mj4KX97pOkMoEX8LkV11t hRxw== X-Gm-Message-State: AOAM532YLZWlo6mzlhU6MkiVeGZhdlaqjPr7w/JlVIUUty/zVwCFOmh5 IBS4vgIRaz1k/mClh2hN3Gb1rQ== X-Received: by 2002:a17:902:c94b:b0:130:ad84:990a with SMTP id i11-20020a170902c94b00b00130ad84990amr18696165pla.1.1629779692226; Mon, 23 Aug 2021 21:34:52 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 21:34:51 -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 3/3] arm64: dts: qcom: sdm630: Add missing a2noc qos clocks Date: Tue, 24 Aug 2021 12:34:35 +0800 Message-Id: <20210824043435.23190-4-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-arm-msm@vger.kernel.org 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 --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) -- 2.17.1 Reviewed-by: AngeloGioacchino Del Regno Acked-by: Georgi Djakov diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 9153e6616ba4..9c7f87e42fcc 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -654,9 +654,20 @@ compatible = "qcom,sdm660-a2noc"; reg = <0x01704000 0xc100>; #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 {