From: Shawn Lin <shawn.lin@rock-chips.com>
To: Brian Norris <briannorris@chromium.org>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: shawn.lin@rock-chips.com, linux-kernel@vger.kernel.org,
Jeffy Chen <jeffy.chen@rock-chips.com>,
Wenrui Li <wenrui.li@rock-chips.com>,
linux-pci@vger.kernel.org, linux-rockchip@lists.infradead.org
Subject: Re: [PATCH v2 3/5] PCI: rockchip: add remove() support
Date: Fri, 10 Mar 2017 11:22:26 +0800 [thread overview]
Message-ID: <de4d1e8a-c971-1f4d-2996-883341d287b3@rock-chips.com> (raw)
In-Reply-To: <20170310024617.67303-3-briannorris@chromium.org>
On 2017/3/10 10:46, Brian Norris wrote:
> Currently, if we try to unbind the platform device, the remove will
> succeed, but the removal won't undo most of the registration, leaving
> partially-configured PCI devices in the system.
>
> This allows, for example, a simple 'lspci' to crash the system, as it
> will try to touch the freed (via devm_*) driver structures.
>
> So let's implement device remove().
>
As this patchset seems to be merged together so I think the following
warning will be ok? if my git-am robot only pick your patch 1->compile->
patch 2->compile->patch 3 then
drivers/pci/host/pcie-rockchip.c: In function 'rockchip_pcie_remove':
drivers/pci/host/pcie-rockchip.c:1435:2: error: implicit declaration of
function 'pci_unmap_iospace' [-Werror=implicit-function-declaration]
pci_unmap_iospace(rockchip->io);
but I guess you may need to move your patch 4 ahead of patch 3?
> Signed-off-by: Brian Norris <briannorris@chromium.org>
> ---
> v2:
> * unmap IO space with pci_unmap_iospace()
> * remove IRQ domain
> ---
> drivers/pci/host/pcie-rockchip.c | 36 ++++++++++++++++++++++++++++++++++--
> 1 file changed, 34 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-rockchip.c b/drivers/pci/host/pcie-rockchip.c
> index 5d7b27b1e941..d2e5078ae331 100644
> --- a/drivers/pci/host/pcie-rockchip.c
> +++ b/drivers/pci/host/pcie-rockchip.c
> @@ -223,9 +223,11 @@ struct rockchip_pcie {
> int link_gen;
> struct device *dev;
> struct irq_domain *irq_domain;
> - u32 io_size;
> int offset;
> + struct pci_bus *root_bus;
> + struct resource *io;
> phys_addr_t io_bus_addr;
> + u32 io_size;
> void __iomem *msg_region;
> u32 mem_size;
> phys_addr_t msg_bus_addr;
> @@ -1360,6 +1362,7 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
> err, io);
> continue;
> }
> + rockchip->io = io;
> break;
> case IORESOURCE_MEM:
> mem = win->res;
> @@ -1391,6 +1394,7 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
> err = -ENOMEM;
> goto err_free_res;
> }
> + rockchip->root_bus = bus;
>
> pci_bus_size_bridges(bus);
> pci_bus_assign_resources(bus);
> @@ -1421,6 +1425,34 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
> return err;
> }
>
> +static int rockchip_pcie_remove(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct rockchip_pcie *rockchip = dev_get_drvdata(dev);
> +
> + pci_stop_root_bus(rockchip->root_bus);
> + pci_remove_root_bus(rockchip->root_bus);
> + pci_unmap_iospace(rockchip->io);
> + irq_domain_remove(rockchip->irq_domain);
> +
> + phy_power_off(rockchip->phy);
> + phy_exit(rockchip->phy);
> +
> + clk_disable_unprepare(rockchip->clk_pcie_pm);
> + clk_disable_unprepare(rockchip->hclk_pcie);
> + clk_disable_unprepare(rockchip->aclk_perf_pcie);
> + clk_disable_unprepare(rockchip->aclk_pcie);
> +
> + if (!IS_ERR(rockchip->vpcie3v3))
> + regulator_disable(rockchip->vpcie3v3);
> + if (!IS_ERR(rockchip->vpcie1v8))
> + regulator_disable(rockchip->vpcie1v8);
> + if (!IS_ERR(rockchip->vpcie0v9))
> + regulator_disable(rockchip->vpcie0v9);
> +
> + return 0;
> +}
> +
> static const struct dev_pm_ops rockchip_pcie_pm_ops = {
> SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(rockchip_pcie_suspend_noirq,
> rockchip_pcie_resume_noirq)
> @@ -1438,6 +1470,6 @@ static struct platform_driver rockchip_pcie_driver = {
> .pm = &rockchip_pcie_pm_ops,
> },
> .probe = rockchip_pcie_probe,
> -
> + .remove = rockchip_pcie_remove,
> };
> builtin_platform_driver(rockchip_pcie_driver);
>
--
Best Regards
Shawn Lin
next prev parent reply other threads:[~2017-03-10 3:22 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-10 2:46 [PATCH v2 1/5] PCI: rockchip: fix sign issues for current limits Brian Norris
2017-03-10 2:46 ` [PATCH v2 2/5] PCI: rockchip: make 'return 0' more obvious in probe() Brian Norris
2017-03-10 2:46 ` [PATCH v2 3/5] PCI: rockchip: add remove() support Brian Norris
2017-03-10 3:22 ` Shawn Lin [this message]
2017-03-10 4:20 ` Shawn Lin
2017-03-10 19:40 ` Brian Norris
2017-03-13 2:26 ` Shawn Lin
2017-03-20 22:29 ` Brian Norris
2017-03-24 14:25 ` Bjorn Helgaas
2017-03-24 17:22 ` Brian Norris
2017-03-30 23:28 ` Bjorn Helgaas
2017-03-31 0:26 ` Brian Norris
2017-03-31 5:17 ` Bjorn Helgaas
2017-03-31 16:40 ` Brian Norris
2017-04-11 18:18 ` Brian Norris
2017-03-10 2:46 ` [PATCH v2 4/5] PCI: export pci_remap_iospace() and pci_unmap_iospace() Brian Norris
2017-03-10 2:46 ` [PATCH v2 5/5] PCI: rockchip: modularize Brian Norris
2017-03-23 22:27 ` [PATCH v2 1/5] PCI: rockchip: fix sign issues for current limits Bjorn Helgaas
2017-03-23 22:33 ` Brian Norris
2017-03-24 1:24 ` Shawn Lin
2017-04-21 19:03 ` Bjorn Helgaas
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=de4d1e8a-c971-1f4d-2996-883341d287b3@rock-chips.com \
--to=shawn.lin@rock-chips.com \
--cc=bhelgaas@google.com \
--cc=briannorris@chromium.org \
--cc=jeffy.chen@rock-chips.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=wenrui.li@rock-chips.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
all inboxes | Powered by JetHome®