From patchwork Tue Mar 24 15:42:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 6082231 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AD0AE9F318 for ; Tue, 24 Mar 2015 16:29:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B16B02025B for ; Tue, 24 Mar 2015 16:29:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A1792024F for ; Tue, 24 Mar 2015 16:29:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754366AbbCXQ2p (ORCPT ); Tue, 24 Mar 2015 12:28:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46373 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752302AbbCXPmj (ORCPT ); Tue, 24 Mar 2015 11:42:39 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id A0A5CC2E32; Tue, 24 Mar 2015 15:42:38 +0000 (UTC) Received: from redhat.com (ovpn-116-61.ams2.redhat.com [10.36.116.61]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id t2OFgZL9003512; Tue, 24 Mar 2015 11:42:36 -0400 Date: Tue, 24 Mar 2015 16:42:35 +0100 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Bjorn Helgaas , linux-pci@vger.kernel.org, Fam Zheng , Yinghai Lu Subject: [PATCH v3 03/10] pci: drop some duplicate code Message-ID: <1427211032-2270-4-git-send-email-mst@redhat.com> References: <1427211032-2270-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1427211032-2270-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 pci_msi_init_pci_dev and pci_msi_off share a lot of code. This used to be justified since pci_msi_init_pci_dev wasn't compiled in when CONFIG_PCI_MSI is off. Now that it is, let's reuse code. Signed-off-by: Michael S. Tsirkin --- drivers/pci/pci.c | 24 +++++------------------- drivers/pci/probe.c | 11 ++++------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 81f06e8..d5f297a 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3106,26 +3106,12 @@ EXPORT_SYMBOL_GPL(pci_check_and_unmask_intx); */ void pci_msi_off(struct pci_dev *dev) { - int pos; - u16 control; + if (dev->msi_cap) + pci_msi_set_enable(dev, 0); - /* - * This looks like it could go in msi.c, but we need it even when - * CONFIG_PCI_MSI=n. For the same reason, we can't use - * dev->msi_cap or dev->msix_cap here. - */ - pos = pci_find_capability(dev, PCI_CAP_ID_MSI); - if (pos) { - pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &control); - control &= ~PCI_MSI_FLAGS_ENABLE; - pci_write_config_word(dev, pos + PCI_MSI_FLAGS, control); - } - pos = pci_find_capability(dev, PCI_CAP_ID_MSIX); - if (pos) { - pci_read_config_word(dev, pos + PCI_MSIX_FLAGS, &control); - control &= ~PCI_MSIX_FLAGS_ENABLE; - pci_write_config_word(dev, pos + PCI_MSIX_FLAGS, control); - } + dev->msix_cap = pci_find_capability(dev, PCI_CAP_ID_MSIX); + if (dev->msix_cap) + pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0); } EXPORT_SYMBOL_GPL(pci_msi_off); diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 45d6d5c..baf8ddd 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1489,17 +1489,14 @@ static void pci_msi_init_pci_dev(struct pci_dev *dev) INIT_LIST_HEAD(&dev->msi_list); #endif + dev->msi_cap = pci_find_capability(dev, PCI_CAP_ID_MSI); + dev->msix_cap = pci_find_capability(dev, PCI_CAP_ID_MSIX); + /* Disable the msi hardware to avoid screaming interrupts * during boot. This is the power on reset default so * usually this should be a noop. */ - dev->msi_cap = pci_find_capability(dev, PCI_CAP_ID_MSI); - if (dev->msi_cap) - pci_msi_set_enable(dev, 0); - - dev->msix_cap = pci_find_capability(dev, PCI_CAP_ID_MSIX); - if (dev->msix_cap) - pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0); + pci_msi_off(dev); } static void pci_init_capabilities(struct pci_dev *dev)