Received: by 2002:a05:6358:7058:b0:131:369:b2a3 with SMTP id 24csp802704rwp; Thu, 13 Jul 2023 00:55:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlH9xupZxOtOpNoiLtM7EpsbNyxhwdYFLOBgHNLQps0jt0ePjALX4JkxRqSZdoiPHtXA/vev X-Received: by 2002:a17:90a:4f81:b0:263:25f9:6603 with SMTP id q1-20020a17090a4f8100b0026325f96603mr640965pjh.13.1689234934171; Thu, 13 Jul 2023 00:55:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689234934; cv=none; d=google.com; s=arc-20160816; b=iaQN+IeyR2ntFXOUxxQYOOVomIYSypZ1B9ZXf9/XeOGlcnUdpOix1bW0hzBdaGfxgM qTejOQ8VqtMoPkZU7Nkusu9EwCZaASoVjD9o5DFgKWS7PeaxYFEg2eDTLGJ0elpSC2M9 MmQKm03y8VR0c+Bvuabva46udH7lK1GDt5Lb0lNq1Ip9Cq6OnA3d7QoE60PkrCcMHVnZ Ogqm3SD4YtI9eY3snAQGCwRT5DhmB0caPGRK3y3RxEDjth5u91ic+Lh2Lw54szZUuTd0 1m8H9gAjjhRHNuZlzhF9W4ku/bbeOQznOyDu4K2QXTXKFPnXXm7xgucaYvDq5do5SEgD 4AjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=lKGtutkplbBk67yEGBRsPATEyRnzJ5+/W5Fq7v45xjM=; fh=Pa6/6vt4n479bPo22oNBkdeHL3DgVOnTDA2Sv6Ik7SM=; b=p3D0nG0KgN1VQCSf3zgD+xBieKT345eUaA+hf8bi4IfuuO3TCi647YwIvG6veg6Svx 5siGpeXgbBiqgp0dj6/mfS2RrEd32/GjCloDtFgDTxC8QqSG9o2cs2JFNIjve+nNnyPX GRvlmCGA9C7QlAHHklkuanV8A9WIhqQmyiQWweSi35RsKGXDHrLt1WMDlSAtsnsBX/NR zNcKeXQgPc44oBQXNJcnmviU2ZycnlrpKJJ3p9Rj7fslf9V1TK8Hg0vyZ/3BVhYo4VXY D6t3Os6vhb5GzQikXhbmWrQKfIqfFvy+0AiSvZGor7XcR3CBMkBSgeNWPBpcLMu2Abp0 Qx8A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fa2-20020a17090af0c200b0026360db339fsi4736790pjb.12.2023.07.13.00.55.21; Thu, 13 Jul 2023 00:55:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229695AbjGMHeM (ORCPT + 99 others); Thu, 13 Jul 2023 03:34:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229455AbjGMHeL (ORCPT ); Thu, 13 Jul 2023 03:34:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73A7010E2; Thu, 13 Jul 2023 00:34:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 08F2A61A39; Thu, 13 Jul 2023 07:34:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0096C433C7; Thu, 13 Jul 2023 07:34:04 +0000 (UTC) Date: Thu, 13 Jul 2023 13:03:54 +0530 From: Manivannan Sadhasivam To: Krishna chaitanya chundru Cc: helgaas@kernel.org, linux-pci@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, quic_vbadigan@quicinc.com, quic_nitegupt@quicinc.com, quic_skananth@quicinc.com, quic_ramkri@quicinc.com, krzysztof.kozlowski@linaro.org, Manivannan Sadhasivam , Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Rob Herring , Bjorn Helgaas Subject: Re: [PATCH v7 3/3] PCI: qcom-ep: Add ICC bandwidth voting support Message-ID: <20230713073354.GH3047@thinkpad> References: <1688099123-28036-1-git-send-email-quic_krichai@quicinc.com> <1688099123-28036-4-git-send-email-quic_krichai@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1688099123-28036-4-git-send-email-quic_krichai@quicinc.com> X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 30, 2023 at 09:55:23AM +0530, Krishna chaitanya chundru wrote: > Add support for voting interconnect (ICC) bandwidth based > on the link speed and width. > > This commit is inspired from the basic interconnect support added > to pcie-qcom driver in commit c4860af88d0c ("PCI: qcom: Add basic > interconnect support"). > > The interconnect support is kept optional to be backward compatible > with legacy devicetrees. > > Signed-off-by: Krishna chaitanya chundru > --- > drivers/pci/controller/dwc/pcie-qcom-ep.c | 71 +++++++++++++++++++++++++++++++ > 1 file changed, 71 insertions(+) > > diff --git a/drivers/pci/controller/dwc/pcie-qcom-ep.c b/drivers/pci/controller/dwc/pcie-qcom-ep.c > index 1435f51..cfe3061 100644 > --- a/drivers/pci/controller/dwc/pcie-qcom-ep.c > +++ b/drivers/pci/controller/dwc/pcie-qcom-ep.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -28,6 +29,7 @@ > #define PARF_SYS_CTRL 0x00 > #define PARF_DB_CTRL 0x10 > #define PARF_PM_CTRL 0x20 > +#define PARF_PM_STTS 0x24 > #define PARF_MHI_CLOCK_RESET_CTRL 0x174 > #define PARF_MHI_BASE_ADDR_LOWER 0x178 > #define PARF_MHI_BASE_ADDR_UPPER 0x17c > @@ -133,6 +135,11 @@ > #define CORE_RESET_TIME_US_MAX 1005 > #define WAKE_DELAY_US 2000 /* 2 ms */ > > +#define PCIE_GEN1_BW_MBPS 250 > +#define PCIE_GEN2_BW_MBPS 500 > +#define PCIE_GEN3_BW_MBPS 985 > +#define PCIE_GEN4_BW_MBPS 1969 > + > #define to_pcie_ep(x) dev_get_drvdata((x)->dev) > > enum qcom_pcie_ep_link_status { > @@ -178,6 +185,8 @@ struct qcom_pcie_ep { > struct phy *phy; > struct dentry *debugfs; > > + struct icc_path *icc_mem; > + > struct clk_bulk_data *clks; > int num_clks; > > @@ -253,8 +262,49 @@ static void qcom_pcie_dw_stop_link(struct dw_pcie *pci) > disable_irq(pcie_ep->perst_irq); > } > > +static void qcom_pcie_ep_icc_update(struct qcom_pcie_ep *pcie_ep) > +{ > + struct dw_pcie *pci = &pcie_ep->pci; > + u32 offset, status, bw; > + int speed, width; > + int ret; > + > + if (!pcie_ep->icc_mem) > + return; > + > + offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); > + status = readw(pci->dbi_base + offset + PCI_EXP_LNKSTA); > + > + speed = FIELD_GET(PCI_EXP_LNKSTA_CLS, status); > + width = FIELD_GET(PCI_EXP_LNKSTA_NLW, status); > + > + switch (speed) { > + case 1: > + bw = MBps_to_icc(PCIE_GEN1_BW_MBPS); > + break; > + case 2: > + bw = MBps_to_icc(PCIE_GEN2_BW_MBPS); > + break; > + case 3: > + bw = MBps_to_icc(PCIE_GEN3_BW_MBPS); > + break; > + default: > + dev_warn(pci->dev, "using default GEN4 bandwidth\n"); > + fallthrough; > + case 4: > + bw = MBps_to_icc(PCIE_GEN4_BW_MBPS); > + break; > + } > + > + ret = icc_set_bw(pcie_ep->icc_mem, 0, width * bw); > + if (ret) > + dev_err(pci->dev, "failed to set interconnect bandwidth: %d\n", > + ret); > +} > + > static int qcom_pcie_enable_resources(struct qcom_pcie_ep *pcie_ep) > { > + struct dw_pcie *pci = &pcie_ep->pci; > int ret; > > ret = clk_bulk_prepare_enable(pcie_ep->num_clks, pcie_ep->clks); > @@ -277,8 +327,24 @@ static int qcom_pcie_enable_resources(struct qcom_pcie_ep *pcie_ep) > if (ret) > goto err_phy_exit; > > + /* > + * Some Qualcomm platforms require interconnect bandwidth constraints > + * to be set before enabling interconnect clocks. > + * > + * Set an initial peak bandwidth corresponding to single-lane Gen 1 > + * for the pcie-mem path. > + */ > + ret = icc_set_bw(pcie_ep->icc_mem, 0, MBps_to_icc(PCIE_GEN1_BW_MBPS)); > + if (ret) { > + dev_err(pci->dev, "failed to set interconnect bandwidth: %d\n", > + ret); > + goto err_phy_off; > + } > + You need to set bw to 0 during disable_resources() as well. Otherwise, it will result in resource leakage when the driver is not in use. - Mani > return 0; > > +err_phy_off: > + phy_power_off(pcie_ep->phy); > err_phy_exit: > phy_exit(pcie_ep->phy); > err_disable_clk: > @@ -550,6 +616,10 @@ static int qcom_pcie_ep_get_resources(struct platform_device *pdev, > if (IS_ERR(pcie_ep->phy)) > ret = PTR_ERR(pcie_ep->phy); > > + pcie_ep->icc_mem = devm_of_icc_get(dev, "pcie-mem"); > + if (IS_ERR(pcie_ep->icc_mem)) > + ret = PTR_ERR(pcie_ep->icc_mem); > + > return ret; > } > > @@ -573,6 +643,7 @@ static irqreturn_t qcom_pcie_ep_global_irq_thread(int irq, void *data) > } else if (FIELD_GET(PARF_INT_ALL_BME, status)) { > dev_dbg(dev, "Received BME event. Link is enabled!\n"); > pcie_ep->link_status = QCOM_PCIE_EP_LINK_ENABLED; > + qcom_pcie_ep_icc_update(pcie_ep); > pci_epc_bme_notify(pci->ep.epc); > } else if (FIELD_GET(PARF_INT_ALL_PM_TURNOFF, status)) { > dev_dbg(dev, "Received PM Turn-off event! Entering L23\n"); > -- > 2.7.4 > -- மணிவண்ணன் சதாசிவம்