From: Lukas Wunner <lukas@wunner.de>
To: Rajat Jain <rajatja@google.com>
Cc: Ravi Chandra Sadineni <ravisadineni@chromium.org>,
linux-pci@vger.kernel.org, Todd Broch <tbroch@google.com>,
Gwendal Grignou <gwendal@google.com>,
Bjorn Helgaas <bhelgaas@google.com>,
"Busch, Keith" <keith.busch@intel.com>,
paul.gortmaker@windriver.com
Subject: Re: [PATCH] pciehp_resume: don't add existing device
Date: Fri, 11 Nov 2016 08:23:31 +0100 [thread overview]
Message-ID: <20161111072331.GA8246@wunner.de> (raw)
In-Reply-To: <CACK8Z6EJ45m+_fSNPQGpoTq52vWHwRyDguO6Syau3XFUt-HdkA@mail.gmail.com>
On Wed, Nov 09, 2016 at 12:59:01PM -0800, Rajat Jain wrote:
> On Wed, Nov 9, 2016 at 11:58 AM, Lukas Wunner <lukas@wunner.de> wrote:
> > On Wed, Nov 09, 2016 at 10:05:35AM -0800, Ravi Chandra Sadineni wrote:
> >> If a slot was occupied before supend, and nothing has changed after
> >> resume, we call pciehp_enable_slot() although it fails a little
> >> later with the message:
> >> Device XXXX:XX:XX.X already exists at XXXX:XX:XX, cannot hot-add
> >> Cannot add device at XXXX:XX:XX
> >>
> >> This was partly discussed here: https://lkml.org/lkml/2013/7/9/452
> >> and I'm pulling only the part4 of that patch, since it does not change
> >> anything functionally (or atleast does not seem to make it worse), but
> >> prevents uncomfortable messages pointed above.
>
> Missing "Signed-off-by" :-)
>
> >> ---
> >> drivers/pci/hotplug/pciehp_core.c | 10 +++++++---
> >> 1 file changed, 7 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
> >> index 612b21a..873cff8 100644
> >> --- a/drivers/pci/hotplug/pciehp_core.c
> >> +++ b/drivers/pci/hotplug/pciehp_core.c
> >> @@ -290,6 +290,7 @@ static int pciehp_resume(struct pcie_device *dev)
> >> {
> >> struct controller *ctrl;
> >> struct slot *slot;
> >> + struct pci_bus *pbus = dev->port->subordinate;
> >> u8 status;
> >>
> >> ctrl = get_service_data(dev);
> >> @@ -302,10 +303,13 @@ static int pciehp_resume(struct pcie_device *dev)
> >> /* Check if slot is occupied */
> >> pciehp_get_adapter_status(slot, &status);
> >> mutex_lock(&slot->hotplug_lock);
> >> - if (status)
> >> - pciehp_enable_slot(slot);
> >> - else
> >> + if (status) {
>
> should be "} else {" (on the same line)
>
>
> >> + if (list_empty(&pbus->devices))
> >> + pciehp_enable_slot(slot);
> >> + }
> >> + else {
> >> pciehp_disable_slot(slot);
> >> + }
> >
> > What if the device plugged in after suspend is a different one
> > and requires e.g. an entirely different driver or different resource
> > allocations?
>
> I may be missing it completely, but this situation does not seem be
> handled well today (even without this patch).
Yes, what we currently have is not correct.
First of all we should call pci_rescan_bus() in pciehp_configure_device().
Second, pci_rescan_bus() is broken in that it only adds new devices,
it doesn't remove devices.
It should perform a first pass where it walks the bus, checks for each
device whether the immediate parent is a hotplug bridge, and if so,
compares the vendor and device ID to what we have cached. If it's
the same, chances are it's the same device (could have been replaced
by an identical device, but that shouldn't be a problem at least after
waking from system sleep).
If it's not the same, pci_stop_and_remove_bus_device() needs to be called
on it. That way we remove all replaced or no longer present devices. In a
subsequent pass, pci_rescan_bus() would discover any newly added devices,
as it does now.
Third, we're not allowed to remove devices during the ->resume phase,
actually we're not even allowed to add devices until after the
->complete phase. Perhaps this can be accomplished with a PM notifier.
Fourth, we're also not allowed to add new devices after the ->prepare
phase, so we should disable the interrupt there.
> I wasn't able to figure out that if the device was replaced, how the
> old driver would be notified or the new driver's probe routine get
> called.
pci_stop_and_remove_bus_device() will unbind the old driver.
pci_bus_add_devices() causes the new driver to probe. This is called
both from pci_rescan_bus() as well as pciehp_configure_device().
Thanks,
Lukas
next prev parent reply other threads:[~2016-11-11 7:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-09 18:05 [PATCH] pciehp_resume: don't add existing device Ravi Chandra Sadineni
2016-11-09 19:58 ` Lukas Wunner
2016-11-09 20:59 ` Rajat Jain
2016-11-11 7:23 ` Lukas Wunner [this message]
2016-11-09 21:15 ` Rajat Jain
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=20161111072331.GA8246@wunner.de \
--to=lukas@wunner.de \
--cc=bhelgaas@google.com \
--cc=gwendal@google.com \
--cc=keith.busch@intel.com \
--cc=linux-pci@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=rajatja@google.com \
--cc=ravisadineni@chromium.org \
--cc=tbroch@google.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).