From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753153Ab0FWNUg (ORCPT ); Wed, 23 Jun 2010 09:20:36 -0400 Received: from ozlabs.org ([203.10.76.45]:43473 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752410Ab0FWNUf (ORCPT ); Wed, 23 Jun 2010 09:20:35 -0400 From: Rusty Russell To: Linus Torvalds Subject: [PULL] virtio fixes Date: Wed, 23 Jun 2010 22:50:24 +0930 User-Agent: KMail/1.13.2 (Linux/2.6.32-22-generic; KDE/4.4.2; i686; ; ) Cc: "Michael S. Tsirkin" , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, David Miller MIME-Version: 1.0 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-Id: <201006232250.25564.rusty@rustcorp.com.au> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org (There are two net fixes which depend on this which will go via DaveM, so please pull soon). The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: Linus Torvalds (1): Linux 2.6.35-rc3 are available in the git repository at: ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6.git virtio Michael S. Tsirkin (2): virtio: return ENOMEM on out of memory virtio-pci: disable msi at startup drivers/pci/pci.c | 1 + drivers/virtio/virtio_pci.c | 3 +++ drivers/virtio/virtio_ring.c | 2 +- 3 files changed, 5 insertions(+), 1 deletions(-) commit 686d363786a53ed28ee875b84ef24e6d5126ef6f Author: Michael S. Tsirkin Date: Thu Jun 10 18:16:11 2010 +0300 virtio: return ENOMEM on out of memory add_buf returns ring size on out of memory, this is not what devices expect. Signed-off-by: Michael S. Tsirkin Acked-by: Amit Shah Signed-off-by: Rusty Russell Cc: stable@kernel.org # .34.x drivers/virtio/virtio_ring.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b03214d559471359e2a85ae256686381d0672f29 Author: Michael S. Tsirkin Date: Wed Jun 23 22:49:06 2010 -0600 virtio-pci: disable msi at startup virtio-pci resets the device at startup by writing to the status register, but this does not clear the pci config space, specifically msi enable status which affects register layout. This breaks things like kdump when they try to use e.g. virtio-blk. Fix by forcing msi off at startup. Since pci.c already has a routine to do this, we export and use it instead of duplicating code. Signed-off-by: Michael S. Tsirkin Tested-by: Vivek Goyal Acked-by: Jesse Barnes Cc: linux-pci@vger.kernel.org Signed-off-by: Rusty Russell Cc: stable@kernel.org drivers/pci/pci.c | 1 + drivers/virtio/virtio_pci.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-)