From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
David Miller <davem@davemloft.net>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Wei Yang <weiyang@linux.vnet.ibm.com>, TJ <linux@iam.tj>,
Yijing Wang <wangyijing@huawei.com>,
Khalid Aziz <khalid.aziz@oracle.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH v7 17/60] PCI: Claim fixed resource during remove/rescan path
Date: Thu, 8 Oct 2015 14:38:36 -0700 [thread overview]
Message-ID: <1444340359-8011-18-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1444340359-8011-1-git-send-email-yinghai@kernel.org>
During driver loading kernel will check if resources get reserved.
so we need to make sure resources get reserved before pci_bus_add().
On remove/rescan path, we will leave those fixed resource
not reserved. In that path, We don't call pcibios_resource_survery()
before pci_assign_unassigned_bus_resources(), and that is intentional
for us to get new resources for rescan. We do need to use rescan to make
device get resource allocated while ignoring BIOS allocate resource.
But fixed resources are not allocated via
pci_assign_unassigned_bus_resources(), so we need to reserve them
explicitly.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/quirks.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 55bb661..e7e86d3 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -323,6 +323,23 @@ static void quirk_s3_64M(struct pci_dev *dev)
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_868, quirk_s3_64M);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_968, quirk_s3_64M);
+/* for pci remove and rescan */
+static void quirk_allocate_fixed(struct pci_dev *dev)
+{
+ int i;
+ for (i = 0; i < PCI_NUM_RESOURCES; i++) {
+ struct resource *r = &dev->resource[i];
+
+ if (r->parent ||
+ !(r->flags & IORESOURCE_PCI_FIXED) ||
+ !(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
+ continue;
+
+ pci_claim_resource(dev, i);
+ }
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_allocate_fixed);
+
static void quirk_io(struct pci_dev *dev, int pos, unsigned size,
const char *name)
{
--
1.8.4.5
next prev parent reply other threads:[~2015-10-08 21:40 UTC|newest]
Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-08 21:38 [PATCH v7 00/60] PCI: Resource allocation cleanup for v4.4 Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 01/60] sparc/PCI: Add mem64 resource parsing for root bus Yinghai Lu
2015-10-09 16:15 ` Khalid Aziz
2015-10-20 16:42 ` Bjorn Helgaas
2015-10-08 21:38 ` [PATCH v7 02/60] sparc/PCI: Use correct bus address to resource offset Yinghai Lu
2015-10-09 16:16 ` Khalid Aziz
2015-10-20 16:45 ` Bjorn Helgaas
2015-10-20 19:54 ` Bjorn Helgaas
2015-10-20 20:07 ` Khalid Aziz
2015-10-20 20:34 ` Yinghai Lu
2015-10-20 20:49 ` Khalid Aziz
2015-10-20 23:51 ` Khalid Aziz
2015-10-21 0:03 ` Yinghai Lu
2015-10-21 0:25 ` Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 03/60] sparc/PCI: Unify pci_register_region() Yinghai Lu
2015-10-09 16:16 ` Khalid Aziz
2015-10-20 21:57 ` Bjorn Helgaas
2015-10-20 22:16 ` Yinghai Lu
2015-10-20 22:30 ` Yinghai Lu
2015-10-21 2:35 ` Bjorn Helgaas
2015-10-21 18:16 ` Yinghai Lu
2015-10-21 18:50 ` Bjorn Helgaas
2015-10-21 22:32 ` Yinghai Lu
2015-10-21 22:59 ` Yinghai Lu
2015-10-22 1:15 ` Yinghai Lu
2015-10-22 19:56 ` Yinghai Lu
2015-10-22 21:43 ` Yinghai Lu
2015-10-22 1:27 ` David Miller
2015-10-22 3:47 ` Benjamin Herrenschmidt
2015-10-23 5:38 ` Bjorn Helgaas
2015-10-08 21:38 ` [PATCH v7 04/60] sparc/PCI: Reserve legacy mmio after PCI mmio Yinghai Lu
2015-10-09 16:19 ` Khalid Aziz
2015-10-08 21:38 ` [PATCH v7 05/60] sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing Yinghai Lu
2015-10-09 16:19 ` Khalid Aziz
2015-10-08 21:38 ` [PATCH v7 06/60] sparc/PCI: Keep resource idx order with bridge register number Yinghai Lu
2015-10-09 16:19 ` Khalid Aziz
2015-10-08 21:38 ` [PATCH v7 07/60] PCI: kill wrong quirk about M7101 Yinghai Lu
2015-10-09 16:20 ` Khalid Aziz
2015-10-12 19:46 ` Meelis Roos
2015-10-12 22:41 ` Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 08/60] powerpc/PCI: Keep resource idx order with bridge register number Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 09/60] powerpc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 10/60] OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource Yinghai Lu
2015-10-09 16:20 ` Khalid Aziz
2015-10-08 21:38 ` [PATCH v7 11/60] PCI: Check pref compatible bit for mem64 resource of PCIe device Yinghai Lu
2015-10-09 16:20 ` Khalid Aziz
2015-10-08 21:38 ` [PATCH v7 12/60] PCI: Only treat non-pref mmio64 as pref if all bridges have MEM_64 Yinghai Lu
2015-10-09 16:21 ` Khalid Aziz
2015-10-08 21:38 ` [PATCH v7 13/60] PCI: Add has_mem64 for struct host_bridge Yinghai Lu
2015-10-09 16:21 ` Khalid Aziz
2015-10-08 21:38 ` [PATCH v7 14/60] PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64 Yinghai Lu
2015-10-09 16:21 ` Khalid Aziz
2015-10-08 21:38 ` [PATCH v7 15/60] PCI: Restore pref MMIO allocation logic for host bridge without mmio64 Yinghai Lu
2015-10-09 16:22 ` Khalid Aziz
2015-10-08 21:38 ` [PATCH v7 16/60] PCI: Don't release fixed resource for realloc Yinghai Lu
2015-10-08 21:38 ` Yinghai Lu [this message]
2015-10-08 21:38 ` [PATCH v7 18/60] PCI: Set resource to FIXED for LSI devices Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 19/60] PCI: Separate realloc list checking after allocation Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 20/60] PCI: Treat optional as required in first try for bridge rescan Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 21/60] PCI: Get new realloc size for bridge for last try Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 22/60] PCI: Don't release sibling bridge resources during hotplug Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 23/60] PCI: Cleanup res_to_dev_res() printout Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 24/60] PCI: Reuse res_to_dev_res() in reassign_resources_sorted() Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 25/60] PCI: Use correct align for optional only resources during sorting Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 26/60] PCI: Optimize bus min_align/size calculation during sizing Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 27/60] PCI: Optimize bus align/size calculation for optional " Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 28/60] PCI: Don't add too much optional size for hotplug bridge MMIO Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 29/60] PCI: Reorder resources list for required/optional resources Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 30/60] PCI: Remove duplicated code for resource sorting Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 31/60] PCI: Rename pdev_sort_resources() to pdev_assign_resources_prepare() Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 32/60] PCI: Treat ROM resource as optional during realloc Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 33/60] PCI: Add debug printout during releasing partial assigned resources Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 34/60] PCI: Simplify res reference using in __assign_resources_sorted() Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 35/60] PCI: Add __add_to_list() Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 36/60] PCI: Cache window alignment value during bus sizing Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 37/60] PCI: Check if resource is allocated before trying to assign one Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 38/60] PCI: Separate out save_resources()/restore_resources() Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 39/60] PCI: Move comment to pci_need_to_release() Yinghai Lu
2015-10-08 21:38 ` [PATCH v7 40/60] PCI: Separate required+optional assigning to another function Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 41/60] PCI: Skip required+optional if there is no optional Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 42/60] PCI: Move saved required resource list out of required+optional assigning Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 43/60] PCI: Add alt_size ressource allocation support Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 44/60] PCI: Add support for more than two alt_size entries under same bridge Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 45/60] PCI: Fix size calculation with old_size on rescan path Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 46/60] PCI: Don't add too much optional size for hotplug bridge io Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 47/60] PCI: Move ISA io port align out of calculate_iosize() Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 48/60] PCI: Don't add too much io port for hotplug bridge with old size Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 49/60] PCI: Unify calculate_size() for io port and MMIO Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 50/60] PCI: Allow bridge optional only io port resource required size to be 0 Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 51/60] PCI: Unify skip_ioresource_align() Yinghai Lu
2015-10-13 9:45 ` [v7,51/60] " Michael Ellerman
2015-10-08 21:39 ` [PATCH v7 52/60] PCI: Kill macro checking for bus io port sizing Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 53/60] resources: Split out __allocate_resource() Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 54/60] resources: Make allocate_resource() return best fit resource Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 55/60] PCI, x86: Allocate from high in available window for MMIO Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 56/60] PCI: Add debug print out for min_align and alt_size Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 57/60] PCI, x86: Add pci=assign_pref_bars to reallocate pref BARs Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 58/60] PCI: Introduce resource_disabled() Yinghai Lu
2015-10-13 9:48 ` [v7,58/60] " Michael Ellerman
2015-10-08 21:39 ` [PATCH v7 59/60] PCI: Don't set flags to 0 when assign resource fail Yinghai Lu
2015-10-08 21:39 ` [PATCH v7 60/60] PCI: Only try to assign io port only for root bus that support it Yinghai Lu
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=1444340359-8011-18-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=khalid.aziz@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux@iam.tj \
--cc=wangyijing@huawei.com \
--cc=weiyang@linux.vnet.ibm.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).