[kernel] r16972 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Thu Mar  3 00:35:35 2011
New Revision: 16972

Log:
virtio: set pci bus master enable bit.

Reported-by: Wessel Dankers <wsl-debbug at fruit.je>
Signed-off-by: maximilian attems <max at stro.at>

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/virtio-set-pci-bus-master-enable-bit.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/31

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Wed Mar  2 23:58:45 2011	(r16971)
+++ dists/squeeze/linux-2.6/debian/changelog	Thu Mar  3 00:35:35 2011	(r16972)
@@ -76,6 +76,7 @@
     - x25: Do not reference freed memory
   * netxen: fix set mac addr. (closes: #616058)
   * [xen] do not release any memory under 1M in domain 0. (closes: #613823)
+  * virtio: set pci bus master enable bit. (closes: #610360)
 
   [ Aurelien Jarno ]
   * init: fix race between init and kthreadd, fixes a kernel panic on 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/virtio-set-pci-bus-master-enable-bit.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/virtio-set-pci-bus-master-enable-bit.patch	Thu Mar  3 00:35:35 2011	(r16972)
@@ -0,0 +1,34 @@
+From: Michael S. Tsirkin <mst at redhat.com>
+Date: Sun, 29 Nov 2009 17:52:00 +0200
+Subject: [PATCH] virtio: set pci bus master enable bit
+
+commit bc505f373979692d51a86d40925f77a8b09d17b9 upstream.
+
+As all virtio devices perform DMA, we
+must enable bus mastering for them to be
+spec compliant.
+
+This patch fixes hotplug of virtio devices
+with Linux guests and qemu 0.11-0.12.
+
+Tested-by: Alexander Graf <agraf at suse.de>
+Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
+---
+ drivers/virtio/virtio_pci.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
+index 1b65732..625447f 100644
+--- a/drivers/virtio/virtio_pci.c
++++ b/drivers/virtio/virtio_pci.c
+@@ -649,6 +649,7 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,
+ 		goto out_req_regions;
+ 
+ 	pci_set_drvdata(pci_dev, vp_dev);
++	pci_set_master(pci_dev);
+ 
+ 	/* we use the subsystem vendor/device id as the virtio vendor/device
+ 	 * id.  this allows us to use the same PCI vendor/device id for all
+-- 
+1.7.2.3
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/31
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/31	Wed Mar  2 23:58:45 2011	(r16971)
+++ dists/squeeze/linux-2.6/debian/patches/series/31	Thu Mar  3 00:35:35 2011	(r16972)
@@ -44,3 +44,4 @@
 + bugfix/all/stable/2.6.32.30.patch
 + bugfix/all/stable/2.6.32.30-fix.patch
 + bugfix/all/netxen-fix-set-mac-addr.patch
++ bugfix/all/virtio-set-pci-bus-master-enable-bit.patch