From patchwork Fri Apr 10 22:55:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6200271 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 93E8ABF4A6 for ; Fri, 10 Apr 2015 22:55:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C927C2028D for ; Fri, 10 Apr 2015 22:55:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC15C20270 for ; Fri, 10 Apr 2015 22:55:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932343AbbDJWzJ (ORCPT ); Fri, 10 Apr 2015 18:55:09 -0400 Received: from mail-ig0-f173.google.com ([209.85.213.173]:34143 "EHLO mail-ig0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932681AbbDJWzD (ORCPT ); Fri, 10 Apr 2015 18:55:03 -0400 Received: by iget9 with SMTP id t9so22719430ige.1 for ; Fri, 10 Apr 2015 15:55:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=qXTkn+jxURpRI+yH8z0TccMPgcAggJWlZ3DRYUcevus=; b=NZ+Y2f+enyxXNSgrh/bWnxm2xqiYEZtzthol4pKXyslGDM9ao90koVEX8bVUhWg1f8 B1IlqD5c/n/gj+TRsvUMJWQFkZzxVBO/+wPJwgnXoG9ff2v+VpJe07ywCerH5ylYEf55 9x0oZrZHjKkgL/oXedKFOJxNeLAxgaRRrakOdb++cr/eFgB5DJAnAlO0odB+CoslfEYI YGtAFbFSHd5Sh+hE6alwzkFvTDiC13U/IOrEMySuaAHOJnAr+0oViN3VrfGZSf0uky5a EM/Y4aNam1qsDMQbOi9JXYYX3kI19L/CRntLYM4ilaZL7J7e8y+BIlut0U4z77YTI4nK xXQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=qXTkn+jxURpRI+yH8z0TccMPgcAggJWlZ3DRYUcevus=; b=FPE8eRrLAv4+Vce9jnrzVtQEQFQuaXeEV4uJeWvlkTtDE60Z1y/ofmrK3t5/XImhKY ZPVNssqLgcOqVeG7pdE2VVzTY/XcWnQnf38aaIKOzfrSDj1zGCVM/Wg5Wsypoj2wqczp x5PODvR+o3AxKA3XT+IVKEs3WxfyVm7VF+Ql5cgeTUjqGm0uqoAiIQVV+yB8HkKDce0n 79tg5ro3UQMP5as2yLGzp24XnH7Ry3Sj1HPJImHhJCAgPkZH+dxUL5CrJzsTrXDaC2SW l/FJeTY8Yst1xrp+6uQl2AA8HmIpzRAZUCxrHWSnb54grLHTn865cP6nKKmEJ/szItCu 8uhw== X-Gm-Message-State: ALoCoQniRlSDtOOHTWYNpSGgbK7OtKf+KSbdCKlxBtnFtilVeyAGx+DLp4MDcYYZEVwm6Txh2D8W X-Received: by 10.107.29.21 with SMTP id d21mr6273616iod.11.1428706502558; Fri, 10 Apr 2015 15:55:02 -0700 (PDT) Received: from localhost ([69.71.1.1]) by mx.google.com with ESMTPSA id 16sm136393ion.20.2015.04.10.15.55.01 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 10 Apr 2015 15:55:02 -0700 (PDT) Subject: [PATCH v6 06/10] virtio_pci: drop pci_msi_off() call during probe To: "Michael S. Tsirkin" From: Bjorn Helgaas Cc: Yijing Wang , linux-pci@vger.kernel.org, Fam Zheng , Yinghai Lu , "Eric W. Biederman" Date: Fri, 10 Apr 2015 17:55:00 -0500 Message-ID: <20150410225500.20848.97595.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150410223533.20848.95316.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150410223533.20848.95316.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Michael S. Tsirkin The PCI core now disables MSI and MSI-X for all devices during enumeration regardless of CONFIG_PCI_MSI. Remove device-specific code to disable MSI/MSI-X. Signed-off-by: Michael S. Tsirkin Signed-off-by: Bjorn Helgaas --- drivers/virtio/virtio_pci_common.c | 3 --- 1 file changed, 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c index e894eb278d83..806bb2c2e382 100644 --- a/drivers/virtio/virtio_pci_common.c +++ b/drivers/virtio/virtio_pci_common.c @@ -501,9 +501,6 @@ static int 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 */ rc = pci_enable_device(pci_dev); if (rc)