From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Robert Marko <robimarko@gmail.com>
Cc: svarbanov@mm-sol.com, agross@kernel.org,
bjorn.andersson@linaro.org, lpieralisi@kernel.org,
robh@kernel.org, kw@linux.com, bhelgaas@google.com,
p.zabel@pengutronix.de, jingoohan1@gmail.com,
linux-pci@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org, johan+linaro@kernel.org
Subject: Re: [PATCH v2] PCI: qcom: fix IPQ8074 Gen2 support
Date: Tue, 21 Jun 2022 20:29:08 +0300 [thread overview]
Message-ID: <CAA8EJpoPJKVteUdsxOVH5THH_vqwBrdSn=hkbW4oWmpw+Mjdmg@mail.gmail.com> (raw)
In-Reply-To: <20220621112330.448754-1-robimarko@gmail.com>
On Tue, 21 Jun 2022 at 14:23, Robert Marko <robimarko@gmail.com> wrote:
>
> IPQ8074 has one Gen2 and one Gen3 port, currently the Gen2 port will
> cause the system to hang as its using DBI registers in the .init
> and those are only accesible after phy_power_on().
>
> So solve this by splitting the DBI read/writes to .post_init.
>
> Fixes: a0fd361db8e5 ("PCI: dwc: Move "dbi", "dbi2", and "addr_space" resource setup into common code")
Any elaboration for the Fixes tag? I think the follow one is more
logical, isn't it?
Fixes: 5d76117f070d ("PCI: qcom: Add support for IPQ8074 PCIe controller")
> Signed-off-by: Robert Marko <robimarko@gmail.com>
> ---
> Changes in v2:
> * Rebase onto next-20220621
> ---
> drivers/pci/controller/dwc/pcie-qcom.c | 48 +++++++++++++++-----------
> 1 file changed, 28 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
> index 51fed83484af..da6d79d61397 100644
> --- a/drivers/pci/controller/dwc/pcie-qcom.c
> +++ b/drivers/pci/controller/dwc/pcie-qcom.c
> @@ -1061,9 +1061,7 @@ static int qcom_pcie_init_2_3_3(struct qcom_pcie *pcie)
> struct qcom_pcie_resources_2_3_3 *res = &pcie->res.v2_3_3;
> struct dw_pcie *pci = pcie->pci;
> struct device *dev = pci->dev;
> - u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP);
> int i, ret;
> - u32 val;
>
> for (i = 0; i < ARRAY_SIZE(res->rst); i++) {
> ret = reset_control_assert(res->rst[i]);
> @@ -1120,6 +1118,33 @@ static int qcom_pcie_init_2_3_3(struct qcom_pcie *pcie)
> goto err_clk_aux;
> }
>
> + return 0;
> +
> +err_clk_aux:
> + clk_disable_unprepare(res->ahb_clk);
> +err_clk_ahb:
> + clk_disable_unprepare(res->axi_s_clk);
> +err_clk_axi_s:
> + clk_disable_unprepare(res->axi_m_clk);
> +err_clk_axi_m:
> + clk_disable_unprepare(res->iface);
> +err_clk_iface:
> + /*
> + * Not checking for failure, will anyway return
> + * the original failure in 'ret'.
> + */
> + for (i = 0; i < ARRAY_SIZE(res->rst); i++)
> + reset_control_assert(res->rst[i]);
> +
> + return ret;
> +}
> +
> +static int qcom_pcie_post_init_2_3_3(struct qcom_pcie *pcie)
> +{
> + struct dw_pcie *pci = pcie->pci;
> + u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP);
> + u32 val;
> +
> writel(SLV_ADDR_SPACE_SZ,
> pcie->parf + PCIE20_v3_PARF_SLV_ADDR_SPACE_SIZE);
>
> @@ -1147,24 +1172,6 @@ static int qcom_pcie_init_2_3_3(struct qcom_pcie *pcie)
> PCI_EXP_DEVCTL2);
>
> return 0;
> -
> -err_clk_aux:
> - clk_disable_unprepare(res->ahb_clk);
> -err_clk_ahb:
> - clk_disable_unprepare(res->axi_s_clk);
> -err_clk_axi_s:
> - clk_disable_unprepare(res->axi_m_clk);
> -err_clk_axi_m:
> - clk_disable_unprepare(res->iface);
> -err_clk_iface:
> - /*
> - * Not checking for failure, will anyway return
> - * the original failure in 'ret'.
> - */
> - for (i = 0; i < ARRAY_SIZE(res->rst); i++)
> - reset_control_assert(res->rst[i]);
> -
> - return ret;
> }
>
> static int qcom_pcie_get_resources_2_7_0(struct qcom_pcie *pcie)
> @@ -1598,6 +1605,7 @@ static const struct qcom_pcie_ops ops_2_4_0 = {
> static const struct qcom_pcie_ops ops_2_3_3 = {
> .get_resources = qcom_pcie_get_resources_2_3_3,
> .init = qcom_pcie_init_2_3_3,
> + .post_init = qcom_pcie_post_init_2_3_3,
> .deinit = qcom_pcie_deinit_2_3_3,
> .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable,
> };
> --
> 2.36.1
>
--
With best wishes
Dmitry
next prev parent reply other threads:[~2022-06-21 17:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 11:23 [PATCH v2] PCI: qcom: fix IPQ8074 Gen2 support Robert Marko
2022-06-21 17:29 ` Dmitry Baryshkov [this message]
2022-06-21 18:53 ` Robert Marko
2022-06-21 19:10 ` Dmitry Baryshkov
2022-06-21 20:32 ` Bjorn Helgaas
2022-06-21 20:45 ` Dmitry Baryshkov
2022-06-21 21:16 ` Bjorn Helgaas
2022-06-22 7:03 ` Dmitry Baryshkov
2022-06-21 21:05 ` Robert Marko
2022-06-21 21:43 ` Bjorn Helgaas
2022-06-22 14:23 ` Robert Marko
2022-06-22 20:26 ` Bjorn Helgaas
2022-06-22 6:49 ` Johan Hovold
2022-06-22 7:33 ` Johan Hovold
2022-06-22 14:52 ` Johan Hovold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAA8EJpoPJKVteUdsxOVH5THH_vqwBrdSn=hkbW4oWmpw+Mjdmg@mail.gmail.com' \
--to=dmitry.baryshkov@linaro.org \
--cc=agross@kernel.org \
--cc=bhelgaas@google.com \
--cc=bjorn.andersson@linaro.org \
--cc=jingoohan1@gmail.com \
--cc=johan+linaro@kernel.org \
--cc=kw@linux.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=robh@kernel.org \
--cc=robimarko@gmail.com \
--cc=svarbanov@mm-sol.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).