From: Bjorn Helgaas <bhelgaas@google.com>
To: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Jesse Barnes <jbarnes@virtuousgeek.org>,
Yinghai Lu <yinghai@kernel.org>,
"Ronciak, John" <john.ronciak@intel.com>,
"Penner, Miles J" <miles.j.penner@intel.com>,
Bruce Allan <bruce.w.allan@intel.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-acpi@vger.kernel.org" <linux-acpi@vger.kernel.org>,
"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
"x86@kernel.org" <x86@kernel.org>
Subject: Re: [PATCH v2 1/8] x86/PCI: prevent re-allocation of already existing bridge and ROM resources
Date: Mon, 22 Jul 2013 18:08:28 -0600 [thread overview]
Message-ID: <CAErSpo7=ed3=P7ab9zYB23qnwe8Z-ghRfCEurskpcNW5m86j8g@mail.gmail.com> (raw)
In-Reply-To: <1372860295-8306-2-git-send-email-mika.westerberg@linux.intel.com>
On Wed, Jul 3, 2013 at 8:04 AM, Mika Westerberg
<mika.westerberg@linux.intel.com> wrote:
> In hotplug case (especially with Thunderbolt enabled systems) we might need
> to call pcibios_resource_survey_bus() several times for a bus. The function
> ends up calling pci_claim_resource() for each bridge resource that then
> fails claiming that the resource exists already (which it does). Once this
> happens the resource is invalidated thus preventing devices behind the
> bridge to allocate their resources.
>
> To fix this we do what has been done in pcibios_allocate_dev_resources()
> and check 'parent' of the given resource. If it is non-NULL it means that
> the resource has been allocated already and we can skip it. We do the same
> for ROM resources as well.
>
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This looks reasonable to me.
However, the use of "r->parent" to determine whether the resource is
already allocated is nothing specific to x86. So I think we might be
missing an opportunity to make this more consistent across
architectures. I looked at other callers of pci_claim_resource() for
bridge and ROM resources, and it looks like we might be able to make
similar changes in:
frv pcibios_allocate_bus_resources()
ia64 pcibios_fixup_resources() (via pcibios_fixup_bridge_resources())
mn10300 pcibios_allocate_bus_resources()
mn10300 pcibios_assign_resources() (ROM)
mn10300 pcibios_fixup_device_resources()
parisc lba_fixup_bus()
I really hate the idea of fixing something for x86 but not for other
arches, so maybe somebody could take a deeper look at this and see if
it would make sense to change the other arches, too.
Bjorn
> ---
> arch/x86/pci/i386.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
> index 94919e3..db6b1ab 100644
> --- a/arch/x86/pci/i386.c
> +++ b/arch/x86/pci/i386.c
> @@ -210,6 +210,8 @@ static void pcibios_allocate_bridge_resources(struct pci_dev *dev)
> r = &dev->resource[idx];
> if (!r->flags)
> continue;
> + if (r->parent) /* Already allocated */
> + continue;
> if (!r->start || pci_claim_resource(dev, idx) < 0) {
> /*
> * Something is wrong with the region.
> @@ -318,6 +320,8 @@ static void pcibios_allocate_dev_rom_resource(struct pci_dev *dev)
> r = &dev->resource[PCI_ROM_RESOURCE];
> if (!r->flags || !r->start)
> return;
> + if (r->parent) /* Already allocated */
> + return;
>
> if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) {
> r->end -= r->start;
> --
> 1.8.3.2
>
next prev parent reply other threads:[~2013-07-23 0:08 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-03 14:04 [PATCH v2 0/8] Thunderbolt workarounds Mika Westerberg
2013-07-03 14:04 ` [PATCH v2 1/8] x86/PCI: prevent re-allocation of already existing bridge and ROM resources Mika Westerberg
2013-07-23 0:08 ` Bjorn Helgaas [this message]
2013-07-23 1:18 ` Bjorn Helgaas
2013-07-23 1:33 ` Bjorn Helgaas
2013-07-23 2:01 ` Rafael J. Wysocki
2013-07-23 1:50 ` Rafael J. Wysocki
2013-07-03 14:04 ` [PATCH v2 2/8] PCI: acpiphp: do not check for SLOT_ENABLED in enable_device() Mika Westerberg
2013-07-03 14:04 ` [PATCH v2 3/8] PCI: acpiphp: enable_device(): rescan even if no new devices on slot Mika Westerberg
2013-07-03 14:04 ` [PATCH v2 4/8] PCI: acpiphp: check for new devices on enabled host Mika Westerberg
2013-07-03 14:04 ` [PATCH v2 5/8] PCI: acpiphp: kill SLOT_ENABLED in favor of always re-enumerating the devices Mika Westerberg
2013-07-03 14:04 ` [PATCH v2 6/8] PCI: acpiphp: workaround for Thunderbolt on Acer Aspire S5 Mika Westerberg
2013-07-03 21:40 ` Rafael J. Wysocki
2013-07-04 8:58 ` Mika Westerberg
2013-07-04 12:36 ` Rafael J. Wysocki
2013-07-04 12:53 ` Mika Westerberg
2013-07-04 13:14 ` Rafael J. Wysocki
2013-07-04 13:33 ` Mika Westerberg
2013-07-04 13:53 ` Rafael J. Wysocki
2013-07-04 14:29 ` [PATCH v2.1 " Mika Westerberg
2013-07-04 23:48 ` Rafael J. Wysocki
2013-07-05 5:47 ` Mika Westerberg
2013-07-19 3:57 ` [PATCH v2 " Robert Hancock
2013-07-19 12:18 ` Rafael J. Wysocki
2013-07-03 21:45 ` Bjorn Helgaas
2013-07-03 21:58 ` Rafael J. Wysocki
2013-07-03 14:04 ` [PATCH v2 7/8] PCI: acpiphp: get rid of unused constants in acpiphp.h Mika Westerberg
2013-07-03 14:04 ` [PATCH v2 8/8] PCI: acpiphp: sanitize acpiphp_get_[latch|adapter]_status() Mika Westerberg
2013-07-03 18:29 ` [PATCH v2 0/8] Thunderbolt workarounds Matthew Garrett
2013-07-03 18:33 ` Greg Kroah-Hartman
2013-07-03 18:44 ` Matthew Garrett
2013-07-03 19:57 ` Ronciak, John
2013-07-03 20:35 ` Matthew Garrett
2013-07-03 20:46 ` Ronciak, John
2013-07-03 21:21 ` Matthew Garrett
2013-07-03 18:41 ` Mika Westerberg
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='CAErSpo7=ed3=P7ab9zYB23qnwe8Z-ghRfCEurskpcNW5m86j8g@mail.gmail.com' \
--to=bhelgaas@google.com \
--cc=bruce.w.allan@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=jbarnes@virtuousgeek.org \
--cc=john.ronciak@intel.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=miles.j.penner@intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=x86@kernel.org \
--cc=yinghai@kernel.org \
/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).