From patchwork Sun Jul 25 04:00:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 485652 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2693890jao; Sat, 24 Jul 2021 21:02:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5GDNHqznzQLF6VuV7UlJNHe9WzmmopdyExJjYVRuf56xI9U0d1GYFK8k0XIt+/Pettrmi X-Received: by 2002:a05:6e02:1d0f:: with SMTP id i15mr7888115ila.199.1627185769711; Sat, 24 Jul 2021 21:02:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627185769; cv=none; d=google.com; s=arc-20160816; b=IJY8oF3P/jAk8zrqxe06Pa+HOpKlv1mjITcY6Bjm9givZOozDbKlNkm59cfTaAsMk6 jC8tUKx2kMRhaqc62Aof4tatzjf4Vut76MOReFw5ln1a63h2TuvheDRvIUVrazZc2Mnl tbdVn56RzhzigEE25LvjWYke8efpi3rOWVQXMRly5k0cyQ0lZrJ1jfbb8jkEXt/W7hHy 11fJKpeErPaDCMNamqRcZO0hJt5pFI6H/6p9LtjU/8gHP9WJTXJXI1BEzp7H6WNOleq3 O/hGCBa4xovQITkHXIVFQlZa4Q80RdXSVRW6VpJRZ/Cv+TxmMX4ITKIBnOPoo0Cl8vrm fI6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fJd/jugeN2YjgUvOBixRk7jqpX0of5iUQEXFzXCzPhs=; b=IUsmMG4qYjxPCuTExaYakR4C3IDTgP96v16DnJE6EqNaEj9Sl/QGxceVptkipC4iFm IEHseji6fqwY8H20tt2mxEkvNQrAMW3D52jrsCzhvpnlvwSh5ts9KPnKP9qtUHNQChTD cxpOJiXd9AgN3f+GZt51eXX9qhGSGNFN7Zn4Ip+Dq4Lj4Az6ZGHY44xIoUFGEEn2P6oQ aYQyPOnJzjT7o5tpul8HEvCgNX75l/7NonIOOtMlQ23RmsxoZt71m/Vt6A/2mM5xQkYp F2gHspUf72o9tOW9/0iKnae/JBQ1DNVNEnYPO13qLf6yhgvrTkWvpFtM+GzkbC1hG15B C1dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="B4QCSkS/"; 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 z24si38699427jap.49.2021.07.24.21.02.49; Sat, 24 Jul 2021 21:02:49 -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="B4QCSkS/"; 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 S230075AbhGYDWC (ORCPT + 17 others); Sat, 24 Jul 2021 23:22:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230120AbhGYDV7 (ORCPT ); Sat, 24 Jul 2021 23:21:59 -0400 Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14643C0613D3 for ; Sat, 24 Jul 2021 21:02:28 -0700 (PDT) Received: by mail-oi1-x232.google.com with SMTP id y18so6880477oiv.3 for ; Sat, 24 Jul 2021 21:02:28 -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 :mime-version:content-transfer-encoding; bh=fJd/jugeN2YjgUvOBixRk7jqpX0of5iUQEXFzXCzPhs=; b=B4QCSkS/3XujHlHjUdtVPxFCSmVQO8G5YjMdMPuRNTnWiMywbaU3uKskrYy2ZZrFsR 4VLbUak5CnlEiexnGvgxfBvfM/aZ4fFAFaIGIHRfWtvLkG8iaigdThd+pl8TJY9EWsdI IaUt8tn6TapTa/CIs1Z/nJqdCl6HT0TKe5rfQBM1Fj4wF/CeDLeZIaIr+eYU/tJ2/PLV BkaBPO5w5AbtZrjw/1xF62BCoc2oVwJsvAMXA259XrPkQssO9f5x3kztQ9xgI/F4/yRq 7Ugu9Vj7LBujNombnQN710uRx7It5DQcXy14705lK2gpLzn7gLyGvi8aWcF1KiozGhPI HqpA== 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:mime-version:content-transfer-encoding; bh=fJd/jugeN2YjgUvOBixRk7jqpX0of5iUQEXFzXCzPhs=; b=qIGDh014dYcM+Roz2XHVZEg3NUs7m7cLkqeE3sa0x9jx+MPBMYIrAi5lFdsgrvNdE2 l7r/BpV8KtxJWVBHe+cONviU5teiR6Dc1s9qAKnamUY1UNS3Zai733L25RRDzdHK8I9M KHUTSzLJVA7zrnl/u7SJ3Ja4NjyYDmLm5KmC6Xs+G2O42KDub8v+YVnvUrdW3ZRP/wI5 L68oV5qzLC7VjFU+mjPiNl++nIHfuVpCFtFL+994Bi7Cz9R0KnSVW5LWFfmX+CEtt9uU iSce8y0OXLQ0PC6s3chFgd4WbClc6PNk8ZghxMBZGFe5bo013uEMeR60xIlgm9b3BjEz Y0jQ== X-Gm-Message-State: AOAM532QoMBPm8M1EwbxL0Hr4F4ZIjUrB6VE7n98/B2yWJmhdRib+4Z5 VyfJpKQy0f77gJqFBqxD1Gg1lg== X-Received: by 2002:aca:5a04:: with SMTP id o4mr7357553oib.33.1627185747406; Sat, 24 Jul 2021 21:02:27 -0700 (PDT) Received: from localhost.localdomain (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id q20sm872910otv.50.2021.07.24.21.02.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Jul 2021 21:02:26 -0700 (PDT) From: Bjorn Andersson To: Bjorn Helgaas , Rob Herring , Stanimir Varbanov , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wil?= =?utf-8?q?czy=C5=84ski?= Cc: linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] PCI: qcom: Split init and enable for 1.9.0 and 2.7.0 Date: Sat, 24 Jul 2021 21:00:37 -0700 Message-Id: <20210725040038.3966348-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210725040038.3966348-1-bjorn.andersson@linaro.org> References: <20210725040038.3966348-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On the sc8180x platform the "msi" interrupt often fires before init has a chance to enable the clocks that are necessary for the interrupt handler to access the hardware. Split out the resource enablement and disablement into the newly introduce enable/disable resource operations, to ensure that the necessary resources are enabled when needed. Signed-off-by: Bjorn Andersson --- drivers/pci/controller/dwc/pcie-qcom.c | 31 +++++++++++++++++--------- 1 file changed, 20 insertions(+), 11 deletions(-) -- 2.29.2 diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 8a64a126de2b..8adcbb718832 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -1173,12 +1173,11 @@ static int qcom_pcie_get_resources_2_7_0(struct qcom_pcie *pcie) return PTR_ERR_OR_ZERO(res->pipe_clk); } -static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie) +static int qcom_pcie_enable_2_7_0(struct qcom_pcie *pcie) { struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0; struct dw_pcie *pci = pcie->pci; struct device *dev = pci->dev; - u32 val; int ret; ret = regulator_bulk_enable(ARRAY_SIZE(res->supplies), res->supplies); @@ -1211,6 +1210,20 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie) goto err_disable_clocks; } + return 0; + +err_disable_clocks: + clk_bulk_disable_unprepare(res->num_clks, res->clks); +err_disable_regulators: + regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies); + + return ret; +} + +static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie) +{ + u32 val; + /* configure PCIe to RC mode */ writel(DEVICE_TYPE_RC, pcie->parf + PCIE20_PARF_DEVICE_TYPE); @@ -1238,15 +1251,9 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie) } return 0; -err_disable_clocks: - clk_bulk_disable_unprepare(res->num_clks, res->clks); -err_disable_regulators: - regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies); - - return ret; } -static void qcom_pcie_deinit_2_7_0(struct qcom_pcie *pcie) +static void qcom_pcie_disable_2_7_0(struct qcom_pcie *pcie) { struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0; @@ -1465,8 +1472,9 @@ static const struct qcom_pcie_ops ops_2_3_3 = { /* Qcom IP rev.: 2.7.0 Synopsys IP rev.: 4.30a */ static const struct qcom_pcie_ops ops_2_7_0 = { .get_resources = qcom_pcie_get_resources_2_7_0, + .enable_resources = qcom_pcie_enable_2_7_0, .init = qcom_pcie_init_2_7_0, - .deinit = qcom_pcie_deinit_2_7_0, + .disable_resources = qcom_pcie_disable_2_7_0, .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable, .post_init = qcom_pcie_post_init_2_7_0, .post_deinit = qcom_pcie_post_deinit_2_7_0, @@ -1475,8 +1483,9 @@ static const struct qcom_pcie_ops ops_2_7_0 = { /* Qcom IP rev.: 1.9.0 */ static const struct qcom_pcie_ops ops_1_9_0 = { .get_resources = qcom_pcie_get_resources_2_7_0, + .enable_resources = qcom_pcie_enable_2_7_0, .init = qcom_pcie_init_2_7_0, - .deinit = qcom_pcie_deinit_2_7_0, + .disable_resources = qcom_pcie_disable_2_7_0, .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable, .post_init = qcom_pcie_post_init_2_7_0, .post_deinit = qcom_pcie_post_deinit_2_7_0,