From patchwork Thu Nov 7 00:16:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 11231385 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3573F15AB for ; Thu, 7 Nov 2019 00:17:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F6D4217F5 for ; Thu, 7 Nov 2019 00:17:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="KlLlhnQz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727927AbfKGAQt (ORCPT ); Wed, 6 Nov 2019 19:16:49 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:47078 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727328AbfKGAQs (ORCPT ); Wed, 6 Nov 2019 19:16:48 -0500 Received: by mail-pg1-f195.google.com with SMTP id r18so358564pgu.13 for ; Wed, 06 Nov 2019 16:16:48 -0800 (PST) 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=0nBZv8FFoKEgL4fsBvxQaUdCsRxc1XVotv1J9YRLLnw=; b=KlLlhnQzrZLYcZikdtxcTrY7sQne6JCPy0QN8bUz5EuBMZh8wwD/0fld2egCgIDonA nEFruNRrcA4//QYZF5HEFn9d3KTeaRgZfVoBvdDX610t95RTvAYuq5bc/3OrgJS3cvYY QV+6Yx2iagsg0yaRhWwaAh+p1AAVTlVfa1BcHioGT+oMCsp67w2724+YyAZ5xVBw29/e IIwjBgZl7xk1sDCqRN1J9ImRuwhrZpDfSZELDsI4RkzjRqGn25M/xwKG9LksalvkjlFW 4+P/1jCX6LgKnuKeILkhZdoCNMANVdOGfrFQwwmr3neU3l6SZQQem0MbywkBO8YnIzc6 4PKg== 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=0nBZv8FFoKEgL4fsBvxQaUdCsRxc1XVotv1J9YRLLnw=; b=Vflv16n7p9fddyYpiuX5AOsihllSkGf7K/nVzKGwVIiQL60UNH6DY6BWQv0yHoR76m NSjXVbMvWbLTfile2XLcFa6n0A8R4ea4jbmfHGMBmbskDoz9U7kL0I0ecHe1F8XSclT4 sV3tmr1VeEdGA3AX7/iYUmQtej1qmcxROcG9kn/Tsd6lF/B8jFLQ2mQOZjUgi6P6nyG3 gJRskK07xm+djRI92khqY3IcgtzjtMMEegI7VGnYb5d7Zo3Z/gW3fsGx6y/v7eYWwMfU MN6XMkKHOeM7wcIce+aOI7dasNzfZHcVoiWPM+g5/vj4/Ds0elbpNDSUFBUmfRSiV7Eo F/gA== X-Gm-Message-State: APjAAAVxnem/RiUd11rhGqqDwto5DD23ihWI+8nMZgTWpUdP795m2nkT Yy/D7Zsj24hKfTbuuAJ45gdPOA== X-Google-Smtp-Source: APXvYqylCS28PWGfQarKLeATMQnlbU/SSpHJ55W+DXbTPWJdbgLGRSTTN/p4Gq9A3Hy0tqLWzVu3KQ== X-Received: by 2002:a63:65c6:: with SMTP id z189mr714193pgb.433.1573085807945; Wed, 06 Nov 2019 16:16:47 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id 90sm81044pjz.29.2019.11.06.16.16.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2019 16:16:47 -0800 (PST) From: Bjorn Andersson To: Bjorn Helgaas , Stanimir Varbanov , Lorenzo Pieralisi , Andrew Murray , Philipp Zabel Cc: linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Vinod Koul Subject: [PATCH v3 1/2] dt-bindings: PCI: qcom: Add support for SDM845 PCIe Date: Wed, 6 Nov 2019 16:16:41 -0800 Message-Id: <20191107001642.1127561-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191107001642.1127561-1-bjorn.andersson@linaro.org> References: <20191107001642.1127561-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add compatible and necessary clocks and resets definitions for the SDM845 PCIe controller. Reviewed-by: Rob Herring Reviewed-by: Vinod Koul Signed-off-by: Bjorn Andersson Reviewed-by: Andrew Murray --- Changes since v1: - Picked up Rob and Vinod's R-b .../devicetree/bindings/pci/qcom,pcie.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.txt b/Documentation/devicetree/bindings/pci/qcom,pcie.txt index ada80b01bf0c..981b4de12807 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie.txt +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.txt @@ -11,6 +11,7 @@ - "qcom,pcie-ipq4019" for ipq4019 - "qcom,pcie-ipq8074" for ipq8074 - "qcom,pcie-qcs404" for qcs404 + - "qcom,pcie-sdm845" for sdm845 - reg: Usage: required @@ -126,6 +127,18 @@ - "master_bus" AXI Master clock - "slave_bus" AXI Slave clock +-clock-names: + Usage: required for sdm845 + Value type: + Definition: Should contain the following entries + - "aux" Auxiliary clock + - "cfg" Configuration clock + - "bus_master" Master AXI clock + - "bus_slave" Slave AXI clock + - "slave_q2a" Slave Q2A clock + - "tbu" PCIe TBU clock + - "pipe" PIPE clock + - resets: Usage: required Value type: @@ -188,6 +201,12 @@ - "pwr" PWR reset - "ahb" AHB reset +- reset-names: + Usage: required for sdm845 + Value type: + Definition: Should contain the following entries + - "pci" PCIe core reset + - power-domains: Usage: required for apq8084 and msm8996/apq8096 Value type: From patchwork Thu Nov 7 00:16:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 11231381 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 471A1139A for ; Thu, 7 Nov 2019 00:16:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17530214D8 for ; Thu, 7 Nov 2019 00:16:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="HKtGSHQL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732364AbfKGAQy (ORCPT ); Wed, 6 Nov 2019 19:16:54 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:43890 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731985AbfKGAQu (ORCPT ); Wed, 6 Nov 2019 19:16:50 -0500 Received: by mail-pl1-f194.google.com with SMTP id a18so73018plm.10 for ; Wed, 06 Nov 2019 16:16:50 -0800 (PST) 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=ku11UK5M4kBjClOZ9jsUdie4RqmP8PdwQKvUzAijcRU=; b=HKtGSHQLHLryzCDWQ1fAxmEr+YAD4wkG/cyr5Zl8adkZqu/3MSYAAFkC0/NGufbzCC 4dmPWLKiOU6bVjYsN4bOzWUvFmkd0SCX8Ho5sM3wwW1qwaBDX4dVWRaXFC2f2vxVLyTa je/gs7AOiKO9EO3NZfb4JUiMfojJaC0KtsJf5ct5g9vRuF+DFauYReSqQl7fZITbEyMc B6EZsjFdD7V0V9q7SGZx4z1OSrA40GlSGy9Y6aOocvpiK8EP3fSpD/Mc8T8uOH57g+GA W+5iYPSy5cSVyqkC1wEKR0b/zZY1usm+cPTv6ZcGau/M1S+p+X7Uxg0JPGKMAH9SylNH LWSw== 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=ku11UK5M4kBjClOZ9jsUdie4RqmP8PdwQKvUzAijcRU=; b=GTWF8KnjNPsxVvslHvEuT4Gv+HkTe7S65ri5h2XSqr7kPUj07oZcEnviRQLfxELLnV G7hddC8DL22JASmAS5GXxOrZu0q2HFIln0wQjsANN3YUDt6CJymErii0LeWsYknLil76 wgkRDK6DIoGwxjBNQGgNMPth+JgiCVIwf4ZYSCQuxpa9VJZs8pJFOqNqC66be91TvV0P qSeDXWvysM06aDnyJNOfJBd8cK9CIBPwewzx+5MieVpBDSoRxlpPqnOMpQEQtFYdwR0H hFxqgn4puidRe3XS1LTyUPkn4Rr2bY/t/WsFuFtI24NiXi759+mHmlT9svqnuJMz8I1o Vy6w== X-Gm-Message-State: APjAAAUNBjfcEoHdVUqE89HLNx8Atq9DI81XLZWv056bsv5Fk9/2K5/c eLqoXC7dUqroEK6pdfxE2FhMCA== X-Google-Smtp-Source: APXvYqyKBySTal5ICDyjqZZChJzUzwSF7LcKZLZMAAisuuTe3GRjRz8u4XnrK/XyZlExPVGGcTprHg== X-Received: by 2002:a17:902:14e:: with SMTP id 72mr412670plb.271.1573085809358; Wed, 06 Nov 2019 16:16:49 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id 90sm81044pjz.29.2019.11.06.16.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2019 16:16:48 -0800 (PST) From: Bjorn Andersson To: Bjorn Helgaas , Stanimir Varbanov , Lorenzo Pieralisi , Andrew Murray , Philipp Zabel Cc: linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Vinod Koul Subject: [PATCH v3 2/2] PCI: qcom: Add support for SDM845 PCIe controller Date: Wed, 6 Nov 2019 16:16:42 -0800 Message-Id: <20191107001642.1127561-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191107001642.1127561-1-bjorn.andersson@linaro.org> References: <20191107001642.1127561-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The SDM845 has one Gen2 and one Gen3 controller, add support for these. Reviewed-by: Vinod Koul Signed-off-by: Bjorn Andersson Reviewed-by: Philipp Zabel Acked-by: Stanimir Varbanov Reviewed-by: Andrew Murray Acked-by: Stanimir Varbanov Reviewed-by: Philipp Zabel --- Changes since v1: - Don't assert the reset in the failure path drivers/pci/controller/dwc/pcie-qcom.c | 150 +++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 7e581748ee9f..5ea527a6bd9f 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -54,6 +54,7 @@ #define PCIE20_PARF_LTSSM 0x1B0 #define PCIE20_PARF_SID_OFFSET 0x234 #define PCIE20_PARF_BDF_TRANSLATE_CFG 0x24C +#define PCIE20_PARF_DEVICE_TYPE 0x1000 #define PCIE20_ELBI_SYS_CTRL 0x04 #define PCIE20_ELBI_SYS_CTRL_LT_ENABLE BIT(0) @@ -80,6 +81,8 @@ #define PCIE20_v3_PARF_SLV_ADDR_SPACE_SIZE 0x358 #define SLV_ADDR_SPACE_SZ 0x10000000 +#define DEVICE_TYPE_RC 0x4 + #define QCOM_PCIE_2_1_0_MAX_SUPPLY 3 struct qcom_pcie_resources_2_1_0 { struct clk *iface_clk; @@ -139,12 +142,20 @@ struct qcom_pcie_resources_2_3_3 { struct reset_control *rst[7]; }; +struct qcom_pcie_resources_2_7_0 { + struct clk_bulk_data clks[6]; + struct regulator_bulk_data supplies[2]; + struct reset_control *pci_reset; + struct clk *pipe_clk; +}; + union qcom_pcie_resources { struct qcom_pcie_resources_1_0_0 v1_0_0; struct qcom_pcie_resources_2_1_0 v2_1_0; struct qcom_pcie_resources_2_3_2 v2_3_2; struct qcom_pcie_resources_2_3_3 v2_3_3; struct qcom_pcie_resources_2_4_0 v2_4_0; + struct qcom_pcie_resources_2_7_0 v2_7_0; }; struct qcom_pcie; @@ -1068,6 +1079,134 @@ static int qcom_pcie_init_2_3_3(struct qcom_pcie *pcie) return ret; } +static int qcom_pcie_get_resources_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; + int ret; + + res->pci_reset = devm_reset_control_get_exclusive(dev, "pci"); + if (IS_ERR(res->pci_reset)) + return PTR_ERR(res->pci_reset); + + res->supplies[0].supply = "vdda"; + res->supplies[1].supply = "vddpe-3v3"; + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(res->supplies), + res->supplies); + if (ret) + return ret; + + res->clks[0].id = "aux"; + res->clks[1].id = "cfg"; + res->clks[2].id = "bus_master"; + res->clks[3].id = "bus_slave"; + res->clks[4].id = "slave_q2a"; + res->clks[5].id = "tbu"; + + ret = devm_clk_bulk_get(dev, ARRAY_SIZE(res->clks), res->clks); + if (ret < 0) + return ret; + + res->pipe_clk = devm_clk_get(dev, "pipe"); + return PTR_ERR_OR_ZERO(res->pipe_clk); +} + +static int qcom_pcie_init_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); + if (ret < 0) { + dev_err(dev, "cannot enable regulators\n"); + return ret; + } + + ret = clk_bulk_prepare_enable(ARRAY_SIZE(res->clks), res->clks); + if (ret < 0) + goto err_disable_regulators; + + ret = reset_control_assert(res->pci_reset); + if (ret < 0) { + dev_err(dev, "cannot deassert pci reset\n"); + goto err_disable_clocks; + } + + usleep_range(1000, 1500); + + ret = reset_control_deassert(res->pci_reset); + if (ret < 0) { + dev_err(dev, "cannot deassert pci reset\n"); + goto err_disable_clocks; + } + + ret = clk_prepare_enable(res->pipe_clk); + if (ret) { + dev_err(dev, "cannot prepare/enable pipe clock\n"); + goto err_disable_clocks; + } + + /* configure PCIe to RC mode */ + writel(DEVICE_TYPE_RC, pcie->parf + PCIE20_PARF_DEVICE_TYPE); + + /* enable PCIe clocks and resets */ + val = readl(pcie->parf + PCIE20_PARF_PHY_CTRL); + val &= ~BIT(0); + writel(val, pcie->parf + PCIE20_PARF_PHY_CTRL); + + /* change DBI base address */ + writel(0, pcie->parf + PCIE20_PARF_DBI_BASE_ADDR); + + /* MAC PHY_POWERDOWN MUX DISABLE */ + val = readl(pcie->parf + PCIE20_PARF_SYS_CTRL); + val &= ~BIT(29); + writel(val, pcie->parf + PCIE20_PARF_SYS_CTRL); + + val = readl(pcie->parf + PCIE20_PARF_MHI_CLOCK_RESET_CTRL); + val |= BIT(4); + writel(val, pcie->parf + PCIE20_PARF_MHI_CLOCK_RESET_CTRL); + + if (IS_ENABLED(CONFIG_PCI_MSI)) { + val = readl(pcie->parf + PCIE20_PARF_AXI_MSTR_WR_ADDR_HALT); + val |= BIT(31); + writel(val, pcie->parf + PCIE20_PARF_AXI_MSTR_WR_ADDR_HALT); + } + + return 0; +err_disable_clocks: + clk_bulk_disable_unprepare(ARRAY_SIZE(res->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) +{ + struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0; + + clk_bulk_disable_unprepare(ARRAY_SIZE(res->clks), res->clks); + regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies); +} + +static int qcom_pcie_post_init_2_7_0(struct qcom_pcie *pcie) +{ + struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0; + + return clk_prepare_enable(res->pipe_clk); +} + +static void qcom_pcie_post_deinit_2_7_0(struct qcom_pcie *pcie) +{ + struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0; + + clk_disable_unprepare(res->pipe_clk); +} + static int qcom_pcie_link_up(struct dw_pcie *pci) { u16 val = readw(pci->dbi_base + PCIE20_CAP + PCI_EXP_LNKSTA); @@ -1167,6 +1306,16 @@ static const struct qcom_pcie_ops ops_2_3_3 = { .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable, }; +/* 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, + .init = qcom_pcie_init_2_7_0, + .deinit = qcom_pcie_deinit_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, +}; + static const struct dw_pcie_ops dw_pcie_ops = { .link_up = qcom_pcie_link_up, }; @@ -1282,6 +1431,7 @@ static const struct of_device_id qcom_pcie_match[] = { { .compatible = "qcom,pcie-ipq8074", .data = &ops_2_3_3 }, { .compatible = "qcom,pcie-ipq4019", .data = &ops_2_4_0 }, { .compatible = "qcom,pcie-qcs404", .data = &ops_2_4_0 }, + { .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 }, { } };