From patchwork Thu Jun 10 15:22:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 105409 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5AFTF0P012821 for ; Thu, 10 Jun 2010 15:29:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759180Ab0FJP3P (ORCPT ); Thu, 10 Jun 2010 11:29:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19471 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751893Ab0FJP3O (ORCPT ); Thu, 10 Jun 2010 11:29:14 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5AFRbaS020185 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 10 Jun 2010 11:27:37 -0400 Received: from redhat.com (vpn1-5-214.ams2.redhat.com [10.36.5.214]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o5AFRTaN002162; Thu, 10 Jun 2010 11:27:32 -0400 Date: Thu, 10 Jun 2010 18:22:52 +0300 From: "Michael S. Tsirkin" To: virtualization@lists.linux-foundation.org Cc: Jesse Barnes , "Rafael J. Wysocki" , Kenji Kaneshige , Bjorn Helgaas , Tejun Heo , Rusty Russell , "Michael S. Tsirkin" , Anthony Liguori , Randy Dunlap , "David S. Miller" , Matt Carlson , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH for-2.6.35] virtio-pci: disable msi at startup Message-ID: <20100610152252.GA3510@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 10 Jun 2010 15:29:15 +0000 (UTC) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 60f30e7..740fb4e 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -2292,6 +2292,7 @@ void pci_msi_off(struct pci_dev *dev) pci_write_config_word(dev, pos + PCI_MSIX_FLAGS, control); } } +EXPORT_SYMBOL_GPL(pci_msi_off); #ifndef HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_SIZE int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size) diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 95896f3..ef8d9d5 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c @@ -636,6 +636,9 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev, INIT_LIST_HEAD(&vp_dev->virtqueues); spin_lock_init(&vp_dev->lock); + /* Disable MSI/MSIX to bring device to a known good state. */ + pci_msi_off(pci_dev); + /* enable the device */ err = pci_enable_device(pci_dev); if (err) diff --git a/include/linux/pci.h b/include/linux/pci.h index 7cb0084..31d8a12 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -780,7 +780,11 @@ int __must_check pci_set_mwi(struct pci_dev *dev); int pci_try_set_mwi(struct pci_dev *dev); void pci_clear_mwi(struct pci_dev *dev); void pci_intx(struct pci_dev *dev, int enable); +#ifdef CONFIG_PCI_MSI void pci_msi_off(struct pci_dev *dev); +#else +static inline void pci_msi_off(struct pci_dev *dev) {} +#endif int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size); int pci_set_dma_seg_boundary(struct pci_dev *dev, unsigned long mask); int pcix_get_max_mmrbc(struct pci_dev *dev);