From: Lorenzo Pieralisi <lpieralisi@kernel.org>
To: Johan Hovold <johan@kernel.org>
Cc: "Bjorn Helgaas" <bhelgaas@google.com>,
"Stanimir Varbanov" <svarbanov@mm-sol.com>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Andy Gross" <agross@kernel.org>,
"Bjorn Andersson" <bjorn.andersson@linaro.org>,
"Konrad Dybcio" <konrad.dybcio@somainline.org>,
"Manivannan Sadhasivam" <mani@kernel.org>,
"Dmitry Baryshkov" <dmitry.baryshkov@linaro.org>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org
Subject: Re: [PATCH v2] PCI: qcom: Add support for modular builds
Date: Tue, 27 Sep 2022 15:28:09 +0200 [thread overview]
Message-ID: <YzL6aS6mktksLnqn@lpieralisi> (raw)
In-Reply-To: <Yyl+PNcbtSwzlgvh@hovoldconsulting.com>
On Tue, Sep 20, 2022 at 10:47:56AM +0200, Johan Hovold wrote:
> Hi Lorenzo,
>
> On Thu, Jul 21, 2022 at 08:47:20AM +0200, Johan Hovold wrote:
> > Allow the Qualcomm PCIe controller driver to be built as a module, which
> > is useful for multi-platform kernels as well as during development.
> >
> > Reviewed-by: Rob Herring <robh@kernel.org>
> > Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> > ---
> >
> > Changes in v2
> > - rebase on next-20220720 (adjust context)
> > - add Rob and Mani's reviewed-by tags
>
> Have you had a change to look at this one since you got back from
> vacation?
>
> I believe this should be uncontroversial as we already have other
> modular dwc drivers and there's no mapping of legacy INTx interrupts
> involved.
Sincere apologies for the delay.
I am afraid it does look controversial - I need some time to go through
the full discussion and make up my mind, unfortunately we are late in
the cycle and I am dealing with the patch backlog, I believe this may
end up being a discussion targeting the v6.2 merge window I am afraid.
Lorenzo
> > drivers/pci/controller/dwc/Kconfig | 2 +-
> > drivers/pci/controller/dwc/pcie-qcom.c | 36 +++++++++++++++++++++++---
> > 2 files changed, 34 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig
> > index 62ce3abf0f19..230f56d1a268 100644
> > --- a/drivers/pci/controller/dwc/Kconfig
> > +++ b/drivers/pci/controller/dwc/Kconfig
> > @@ -168,7 +168,7 @@ config PCI_HISI
> > Hip05 and Hip06 SoCs
> >
> > config PCIE_QCOM
> > - bool "Qualcomm PCIe controller"
> > + tristate "Qualcomm PCIe controller"
> > depends on OF && (ARCH_QCOM || COMPILE_TEST)
> > depends on PCI_MSI_IRQ_DOMAIN
> > select PCIE_DW_HOST
> > diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
> > index 5ed164c2afa3..d176c635016b 100644
> > --- a/drivers/pci/controller/dwc/pcie-qcom.c
> > +++ b/drivers/pci/controller/dwc/pcie-qcom.c
> > @@ -16,7 +16,7 @@
> > #include <linux/io.h>
> > #include <linux/iopoll.h>
> > #include <linux/kernel.h>
> > -#include <linux/init.h>
> > +#include <linux/module.h>
> > #include <linux/of_device.h>
> > #include <linux/of_gpio.h>
> > #include <linux/pci.h>
> > @@ -1518,6 +1518,15 @@ static int qcom_pcie_host_init(struct dw_pcie_rp *pp)
> > return ret;
> > }
> >
> > +static void qcom_pcie_host_deinit(struct qcom_pcie *pcie)
> > +{
> > + qcom_ep_reset_assert(pcie);
> > + if (pcie->cfg->ops->post_deinit)
> > + pcie->cfg->ops->post_deinit(pcie);
> > + phy_power_off(pcie->phy);
> > + pcie->cfg->ops->deinit(pcie);
> > +}
> > +
> > static const struct dw_pcie_host_ops qcom_pcie_dw_ops = {
> > .host_init = qcom_pcie_host_init,
> > };
> > @@ -1752,6 +1761,22 @@ static int qcom_pcie_probe(struct platform_device *pdev)
> > return ret;
> > }
> >
> > +static int qcom_pcie_remove(struct platform_device *pdev)
> > +{
> > + struct qcom_pcie *pcie = platform_get_drvdata(pdev);
> > + struct device *dev = &pdev->dev;
> > +
> > + dw_pcie_host_deinit(&pcie->pci->pp);
> > + qcom_pcie_host_deinit(pcie);
> > +
> > + phy_exit(pcie->phy);
> > +
> > + pm_runtime_put_sync(dev);
> > + pm_runtime_disable(dev);
> > +
> > + return 0;
> > +}
> > +
> > static const struct of_device_id qcom_pcie_match[] = {
> > { .compatible = "qcom,pcie-apq8084", .data = &apq8084_cfg },
> > { .compatible = "qcom,pcie-ipq8064", .data = &ipq8064_cfg },
> > @@ -1771,6 +1796,7 @@ static const struct of_device_id qcom_pcie_match[] = {
> > { .compatible = "qcom,pcie-ipq6018", .data = &ipq6018_cfg },
> > { }
> > };
> > +MODULE_DEVICE_TABLE(of, qcom_pcie_match);
> >
> > static void qcom_fixup_class(struct pci_dev *dev)
> > {
> > @@ -1786,10 +1812,14 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, 0x1001, qcom_fixup_class);
> >
> > static struct platform_driver qcom_pcie_driver = {
> > .probe = qcom_pcie_probe,
> > + .remove = qcom_pcie_remove,
> > .driver = {
> > .name = "qcom-pcie",
> > - .suppress_bind_attrs = true,
> > .of_match_table = qcom_pcie_match,
> > },
> > };
> > -builtin_platform_driver(qcom_pcie_driver);
> > +module_platform_driver(qcom_pcie_driver);
> > +
> > +MODULE_AUTHOR("Stanimir Varbanov <svarbanov@mm-sol.com>");
> > +MODULE_DESCRIPTION("Qualcomm PCIe root complex driver");
> > +MODULE_LICENSE("GPL");
>
> Johan
next prev parent reply other threads:[~2022-09-27 13:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-21 6:47 [PATCH v2] PCI: qcom: Add support for modular builds Johan Hovold
2022-07-21 19:35 ` Bjorn Helgaas
2022-07-27 20:02 ` Bjorn Helgaas
2022-07-28 12:19 ` Johan Hovold
2022-09-20 8:47 ` Johan Hovold
2022-09-20 13:37 ` Bjorn Helgaas
2022-09-20 14:05 ` Johan Hovold
2022-09-20 14:27 ` Manivannan Sadhasivam
2022-09-27 13:28 ` Lorenzo Pieralisi [this message]
2022-09-28 6:16 ` Johan Hovold
2022-09-20 10:26 ` Stanimir Varbanov
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=YzL6aS6mktksLnqn@lpieralisi \
--to=lpieralisi@kernel.org \
--cc=agross@kernel.org \
--cc=bhelgaas@google.com \
--cc=bjorn.andersson@linaro.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=johan@kernel.org \
--cc=konrad.dybcio@somainline.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=mani@kernel.org \
--cc=robh@kernel.org \
--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).