From patchwork Fri Apr 10 22:54:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6200241 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 B88519F2EC for ; Fri, 10 Apr 2015 22:54:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D02E320272 for ; Fri, 10 Apr 2015 22:54:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D95EB2027D for ; Fri, 10 Apr 2015 22:54:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932164AbbDJWyn (ORCPT ); Fri, 10 Apr 2015 18:54:43 -0400 Received: from mail-ig0-f169.google.com ([209.85.213.169]:36173 "EHLO mail-ig0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756434AbbDJWym (ORCPT ); Fri, 10 Apr 2015 18:54:42 -0400 Received: by igblo3 with SMTP id lo3so9663512igb.1 for ; Fri, 10 Apr 2015 15:54:41 -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=7p1iaKN/cX+DMdT79gZC2WMLhAyGHX1fftUEZjFR0zc=; b=Nay/bKwCUt4YCjChrjsyUshkxcVBqPw4nmYTO8gn+nXvpOXgFC+qbinax7ARiItZ0R NB9S5cq3ZAsv6UZMaDe2vPL3d9E2SxAUUs7A+aCV3Y5DHoykPcOCr3B+U2YcydcKySYb Eyj6PBiznuejnvWS4yrpU4jtxrNpYNOOqQP094hPuJszXx96fpddnAq/NszF6qAVTJp9 uB1EHh3Ks3Ia1yl+eYClF8CIug6f+iwZtLPElABwbQgbVpizvoAJ/bSf8Foa018jQuzv BQFN0NJjp1Spb/cVRM+qLxxLj9uGzZDSrKfAK78AY3KOAXHMzSvD1GYF7MhjeLoBWOGH wcRg== 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=7p1iaKN/cX+DMdT79gZC2WMLhAyGHX1fftUEZjFR0zc=; b=h6CiLkl7DcZg3FwwnFBbeOMoJd04YN19Zt90piZJDU3koJ909GnAqY1Mg0Gj8j9Fo9 Jq+ph1emzY1S1hzREsASvAEswE0Iz8KdllFuR7d+tMsulkn3pOegBWTse/Q3PxWkVs3F im2/Cm3OeAA9DKYjqCKaqf3F+cxYre8dMtzPHDw2QzfDib5GWg+c7yaxze1xPiMRnGuP Ld7rbAcSRzga83Dc3jFmWSr0F7UK6bX1IrVLn3HT/XvaWX4O8uWFs3SuxJflIwhSt1Zs /4+wjbyjbqwMo8mJAxEnmxUzD/lGe8/6EkGsENGGuvm/PE3+NZEZpPN3CacWhi48EvON B3LQ== X-Gm-Message-State: ALoCoQmDS1IB+cSi0lMT4jQshMvPda2ZMDGAa+cqc5d9YCg1U6EAVICmqZpeC3zawQBkSvDvCnQK X-Received: by 10.50.36.103 with SMTP id p7mr1684968igj.20.1428706481856; Fri, 10 Apr 2015 15:54:41 -0700 (PDT) Received: from localhost ([69.71.1.1]) by mx.google.com with ESMTPSA id j2sm143416ioi.8.2015.04.10.15.54.40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 10 Apr 2015 15:54:41 -0700 (PDT) Subject: [PATCH v6 03/10] PCI/MSI: Disable MSI at enumeration even if kernel doesn't support MSI To: "Michael S. Tsirkin" From: Bjorn Helgaas Cc: Fam Zheng , linux-pci@vger.kernel.org, "Eric W. Biederman" , Yijing Wang , Yinghai Lu , stable@kernel.org Date: Fri, 10 Apr 2015 17:54:40 -0500 Message-ID: <20150410225440.20848.16347.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 If we enable MSI, then kexec a new kernel, the new kernel may receive MSIs it is not prepared for. Commit d5dea7d95c48 ("PCI: msi: Disable msi interrupts when we initialize a pci device") prevents this, but only if the new kernel is built with CONFIG_PCI_MSI=y. Move the "disable MSI" functionality from drivers/pci/msi.c to a new pci_msi_setup_pci_dev() in drivers/pci/probe.c so we can disable MSIs when we enumerate devices even if the kernel doesn't include full MSI support. [bhelgaas: changelog, disable MSIs in pci_setup_device(), put pci_msi_setup_pci_dev() at its final destination] Signed-off-by: Michael S. Tsirkin Signed-off-by: Bjorn Helgaas CC: stable@kernel.org --- drivers/pci/msi.c | 12 ------------ drivers/pci/probe.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 12 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/pci/msi.c b/drivers/pci/msi.c index 9942f6827a4a..f66be868ad21 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -1041,18 +1041,6 @@ EXPORT_SYMBOL(pci_msi_enabled); void pci_msi_init_pci_dev(struct pci_dev *dev) { INIT_LIST_HEAD(&dev->msi_list); - - /* 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); } /** diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 8d2f400e96cb..740113b70ade 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1084,6 +1084,22 @@ int pci_cfg_space_size(struct pci_dev *dev) #define LEGACY_IO_RESOURCE (IORESOURCE_IO | IORESOURCE_PCI_FIXED) +static void pci_msi_setup_pci_dev(struct pci_dev *dev) +{ + /* + * 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_setup_device - fill in class and map information of a device * @dev: the device structure to fill @@ -1139,6 +1155,8 @@ int pci_setup_device(struct pci_dev *dev) /* "Unknown power state" */ dev->current_state = PCI_UNKNOWN; + pci_msi_setup_pci_dev(dev); + /* Early fixups, before probing the BARs */ pci_fixup_device(pci_fixup_early, dev); /* device class may be changed after fixup */