From b2ff1b70cca55a94b9fe5e669fd257649ead98e8 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Oct 07 2012 18:54:52 +0000 Subject: Linux v3.5.6 --- diff --git a/kernel.spec b/kernel.spec index 02030eb..46def3c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -66,7 +66,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 5 +%define stable_update 6 # Is it a -stable RC? %define stable_rc 0 # Set rpm version accordingly @@ -754,9 +754,6 @@ Patch22060: CPU-hotplug-cpusets-suspend-Dont-modify-cpusets-during.patch #rhbz 857324 Patch22070: net-tcp-bz857324.patch -#rhbz 850350 -Patch24050: xen-pciback-restore-pci-config-space-after-FLR.patch - # END OF PATCH DEFINITIONS %endif @@ -1462,9 +1459,6 @@ ApplyPatch CPU-hotplug-cpusets-suspend-Dont-modify-cpusets-during.patch #rhbz 857324 ApplyPatch net-tcp-bz857324.patch -#rhbz 850350 -ApplyPatch xen-pciback-restore-pci-config-space-after-FLR.patch - # END OF PATCH APPLICATIONS %endif @@ -2328,6 +2322,9 @@ fi # '-' | | # '-' %changelog +* Sun Oct 07 2012 Josh Boyer - 3.5.6-1 +- Linux v3.5.6 + * Wed Oct 03 2012 Josh Boyer - Make sure kernel-tools-libs-devel provides kernel-tools-devel diff --git a/sources b/sources index 245490f..5f11dc7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 24153eaaa81dedc9481ada8cd9c3b83d linux-3.5.tar.xz -0d658ffcd548ab029c9a8d6c4d07e8e2 patch-3.5.5.xz +e9502f047c251db3b0c911e53344bad5 patch-3.5.6.xz diff --git a/xen-pciback-restore-pci-config-space-after-FLR.patch b/xen-pciback-restore-pci-config-space-after-FLR.patch deleted file mode 100644 index dece616..0000000 --- a/xen-pciback-restore-pci-config-space-after-FLR.patch +++ /dev/null @@ -1,54 +0,0 @@ -When we do an FLR, or D0->D3_hot we may lose the BARs as the -device has turned itself off (and on). This means the device cannot -function unless the pci_restore_state is called - which it is -when the PCI device is unbound from the Xen PCI backend driver. -For PV guests it ends up calling pci_enable_device / pci_enable_msi[x] -which does the proper steps - -That however is not happening if a HVM guest is run as QEMU -deals with PCI configuration space. QEMU also requires that the -device be "parked" under the ownership of a pci-stub driver to -guarantee that the PCI device is not being used. Hence we -follow the same incantation as pci_reset_function does - by -doing an FLR, then restoring the PCI configuration space. - -The result of this patch is that when you run lspci, you get -now this: - -- Region 0: [virtual] Memory at fe8c0000 (32-bit, non-prefetchable) [size=128K] -- Region 1: [virtual] Memory at fe800000 (32-bit, non-prefetchable) [size=512K] -+ Region 0: Memory at fe8c0000 (32-bit, non-prefetchable) [size=128K] -+ Region 1: Memory at fe800000 (32-bit, non-prefetchable) [size=512K] - Region 2: I/O ports at c000 [size=32] -- Region 3: [virtual] Memory at fe8e0000 (32-bit, non-prefetchable) [size=16K] -+ Region 3: Memory at fe8e0000 (32-bit, non-prefetchable) [size=16K] - -The [virtual] means that lspci read those entries from SysFS but when -it read them from the device it got a different value (0xfffffff). - -CC: stable@vger.kernel.org # only for v3.4 and v3.5 -Signed-off-by: Konrad Rzeszutek Wilk ---- - drivers/xen/xen-pciback/pci_stub.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c -index acec6fa..e5a0c13 100644 ---- a/drivers/xen/xen-pciback/pci_stub.c -+++ b/drivers/xen/xen-pciback/pci_stub.c -@@ -362,6 +362,7 @@ static int __devinit pcistub_init_device(struct pci_dev *dev) - else { - dev_dbg(&dev->dev, "reseting (FLR, D3, etc) the device\n"); - __pci_reset_function_locked(dev); -+ pci_restore_state(dev); - } - /* Now disable the device (this also ensures some private device - * data is setup before we export) --- -1.7.7.6 - --- -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html -Please read the FAQ at http://www.tux.org/lkml/