This is a note to let you know that I've just added the patch titled

    x86/PCI: Clip bridge windows to fit in upstream windows

to the 3.18-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     x86-pci-clip-bridge-windows-to-fit-in-upstream-windows.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From 851b09369255a91e77f56d83e3643439ac5b209a Mon Sep 17 00:00:00 2001
From: Yinghai Lu <[email protected]>
Date: Thu, 15 Jan 2015 16:21:49 -0600
Subject: x86/PCI: Clip bridge windows to fit in upstream windows

From: Yinghai Lu <[email protected]>

commit 851b09369255a91e77f56d83e3643439ac5b209a upstream.

Every PCI-PCI bridge window should fit inside an upstream bridge window
because orphaned address space is unreachable from the primary side of the
upstream bridge.  If we inherit invalid bridge windows that overlap an
upstream window from firmware, clip them to fit and update the bridge
accordingly.

[bhelgaas: changelog]
Link: https://bugzilla.kernel.org/show_bug.cgi?id=85491
Reported-by: Marek Kordik <[email protected]>
Tested-by: Marek Kordik <[email protected]>
Fixes: 5b28541552ef ("PCI: Restrict 64-bit prefetchable bridge windows to 
64-bit resources")
Signed-off-by: Yinghai Lu <[email protected]>
Signed-off-by: Bjorn Helgaas <[email protected]>
CC: Thomas Gleixner <[email protected]>
CC: Ingo Molnar <[email protected]>
CC: "H. Peter Anvin" <[email protected]>
CC: [email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 arch/x86/pci/i386.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -216,7 +216,7 @@ static void pcibios_allocate_bridge_reso
                        continue;
                if (r->parent)  /* Already allocated */
                        continue;
-               if (!r->start || pci_claim_resource(dev, idx) < 0) {
+               if (!r->start || pci_claim_bridge_resource(dev, idx) < 0) {
                        /*
                         * Something is wrong with the region.
                         * Invalidate the resource to prevent


Patches currently in stable-queue which might be from [email protected] are

queue-3.18/pci-add-pci_bus_clip_resource-to-clip-to-fit-upstream-window.patch
queue-3.18/x86-pci-clip-bridge-windows-to-fit-in-upstream-windows.patch
queue-3.18/pci-add-pci_claim_bridge_resource-to-clip-window-if-necessary.patch
queue-3.18/pci-pass-bridge-device-not-bus-when-updating-bridge-windows.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to