From patchwork Fri Apr 10 22:55:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6200281 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 03C9DBF4A6 for ; Fri, 10 Apr 2015 22:55:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34B8320270 for ; Fri, 10 Apr 2015 22:55:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E90920272 for ; Fri, 10 Apr 2015 22:55:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932695AbbDJWzO (ORCPT ); Fri, 10 Apr 2015 18:55:14 -0400 Received: from mail-ig0-f182.google.com ([209.85.213.182]:34193 "EHLO mail-ig0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932681AbbDJWzK (ORCPT ); Fri, 10 Apr 2015 18:55:10 -0400 Received: by iget9 with SMTP id t9so22720683ige.1 for ; Fri, 10 Apr 2015 15:55:09 -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=aE8S6RDz9zuw2av9lkFMO3BcZybBDr1MkjrjG916yzQ=; b=g5sOUZgB/BEZfJapAFYzpEyt/ZGJIaO1MoRv4FBzHrAAa2/XQYlUBLSh1rn4rFYGva +YL6grCVWWbZRPx9pPcuvLg50DXDBtYi9iGQsJWjpxyMsAIC55cXzOpu6+4M/+kuoRNP dnAOxTbBnfPC+Yjge7sGEIiB4Lzl+XjA6w6d5rh9RLo2OkQhvjn44DoQiY80xRZGOJwm e3k/rOCG/4VMzhEB8RND+2I42BMwBsuC0rxZthjUK6fs+DBt18lu1/gLuZzCnMgjzF08 gc7jJ9dYh2Q7RCntJnSjUYwLeaUIDg+fP0X8S5x8b953BqxxPwaAeMV3c/yaAmUdXfow fRVg== 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=aE8S6RDz9zuw2av9lkFMO3BcZybBDr1MkjrjG916yzQ=; b=C8/Do+JN9pNYcFNTRBtAfDsGkgd8yamWr13l2X4So61lxUVqpJYwilYkEBU6oRPCer mJVkOqC74kPmN+SANEiPillZ8aorIenTISLr5bLwX3IGNtaBn+JeClyY0TJdc7uW07Mv WheKPbKRFsxpEAXH+4TkSpQXrSFhzU+hBu7LaBO4VPqGfFK8uzrtM16OKng4KOLog17A 02ey9Ux8k2ORfoTdTmzwulSUUI342Qfprc9aAYS7r2mejUmYW/9epveicZy/7kb8Zjag fQb7xs5Fv4JXHsFfBRd0oJohOhbT6hw4vsTokuTX8A+SfmWnh0Eb+oAzaZ8e6qQ4quGT Hx4w== X-Gm-Message-State: ALoCoQlIlMRYyRcsKKeTSwWbymtoG73GMHTCCXFzJ+0lmw+TgZB6PUekzqyYWSmuyNrDK5tLw30W X-Received: by 10.107.35.70 with SMTP id j67mr6194132ioj.51.1428706509166; Fri, 10 Apr 2015 15:55:09 -0700 (PDT) Received: from localhost ([69.71.1.1]) by mx.google.com with ESMTPSA id qs3sm183443igb.8.2015.04.10.15.55.08 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 10 Apr 2015 15:55:08 -0700 (PDT) Subject: [PATCH v6 07/10] ntb: 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:07 -0500 Message-ID: <20150410225507.20848.32713.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=ham 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/ntb/ntb_hw.c | 2 -- 1 file changed, 2 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/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c index cd29b1038c5e..8225cbcd6eb8 100644 --- a/drivers/ntb/ntb_hw.c +++ b/drivers/ntb/ntb_hw.c @@ -1313,8 +1313,6 @@ static int ntb_setup_intx(struct ntb_device *ndev) struct pci_dev *pdev = ndev->pdev; int rc; - pci_msi_off(pdev); - /* Verify intx is enabled */ pci_intx(pdev, 1);