From: "Guilherme G. Piccoli" <gpiccoli@linux.vnet.ibm.com>
To: mpe@ellerman.id.au
Cc: gpiccoli@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org,
linux-pci@vger.kernel.org, gwshan@linux.vnet.ibm.com,
benh@kernel.crashing.org, paulus@samba.org, bhelgaas@google.com,
mst@redhat.com
Subject: [PATCH v2 1/2] PCI: Make pci_msi_setup_pci_dev() non-static for use by arch code
Date: Wed, 19 Aug 2015 15:45:22 -0300 [thread overview]
Message-ID: <1440009922-30248-1-git-send-email-gpiccoli@linux.vnet.ibm.com> (raw)
In-Reply-To: <1439945086.23217.5.camel@ellerman.id.au>, <1439932077-11427-2-git-send-email-gpiccoli@linux.vnet.ibm.com>
Thanks very much for your suggestions Michael. I agree with them all,
so I'm sending the patch v2 (see below).
About the relevant mailing lists, I already sent to the linux-pci and
already cc'ed Bjorn Helgaas - the problem is that I made a mistake and
sent 2 different emails using git send-email. I'm really sorry about
this.
Now I'm trying to correct my mistake sending this message
simultaneously to both lists (and to a bunch of cc's) using two
Message-IDs in my reply. Hope it works...
Cheers
Changes since v2:
* Made commit message more clear
* Added "Fixes" line
* Improved commit reference by using 12 first chars of SHA
>8----------8<
Commit 1851617cd2da ("PCI/MSI: Disable MSI at enumeration even if kernel
doesn't support MSI") changed the location of the code that disables
MSI/MSI-X interrupts at PCI probe time in devices that have this flag
set. It moved the code from pci_msi_init_pci_dev() to a new function
named pci_msi_setup_pci_dev(), called by pci_setup_device().
The pseries PCI probing code does not call pci_setup_device(), so since
the aforementioned commit the function pci_msi_setup_pci_dev() is not
called and MSI/MSI-X interrupts are left enabled, which is a bug. To fix
this, the pseries PCI probe should manually call pci_msi_setup_pci_dev(),
so this patch makes it non-static.
Fixes: 1851617cd2da ("PCI/MSI: Disable MSI at enumeration even if kernel
doesn't support MSI")
Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
---
drivers/pci/probe.c | 2 +-
include/linux/pci.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index cefd636..520c5b6 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1103,7 +1103,7 @@ 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)
+void pci_msi_setup_pci_dev(struct pci_dev *dev)
{
/*
* Disable the MSI hardware to avoid screaming interrupts
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 8a0321a..860c751 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1202,6 +1202,7 @@ struct msix_entry {
u16 entry; /* driver uses to specify entry, OS writes */
};
+void pci_msi_setup_pci_dev(struct pci_dev *dev);
#ifdef CONFIG_PCI_MSI
int pci_msi_vec_count(struct pci_dev *dev);
--
2.1.0
next prev parent reply other threads:[~2015-08-19 18:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-18 21:13 [PATCH 0/2] Disable MSI/MSI-X interrupts manually at PCI probe time in PowerPC architecture Guilherme G. Piccoli
2015-08-18 21:13 ` [PATCH 1/2] PCI: Make pci_msi_setup_pci_dev() non-static for use by arch code Guilherme G. Piccoli
2015-08-19 0:44 ` Michael Ellerman
[not found] ` <1439932077-11427-2-git-send-email-gpiccoli@linux.vnet.ibm.com>
2015-08-19 18:45 ` Guilherme G. Piccoli [this message]
2015-08-20 1:02 ` [PATCH v2 " Michael Ellerman
2015-08-20 19:10 ` Guilherme G. Piccoli
2015-08-24 7:37 ` Michael Ellerman
2015-08-24 12:18 ` Guilherme G. Piccoli
2015-08-18 21:13 ` [PATCH 2/2] powerpc/PCI: Disable MSI/MSI-X interrupts at PCI probe time in OF case Guilherme G. Piccoli
[not found] ` <1439932077-11427-3-git-send-email-gpiccoli@linux.vnet.ibm.com>
2015-08-19 18:54 ` [PATCH v2 " Guilherme G. Piccoli
2015-09-03 17:56 ` Bjorn Helgaas
2015-09-04 23:17 ` Guilherme G. Piccoli
2015-09-04 22:59 ` jeclark2006
2015-09-06 14:44 ` Michael S. Tsirkin
2015-09-07 3:17 ` Michael Ellerman
2015-09-07 23:04 ` Guilherme G. Piccoli
2015-09-15 16:18 ` Bjorn Helgaas
2015-10-08 16:05 ` Guilherme G. Piccoli
2015-09-07 3:10 ` Michael Ellerman
2015-09-07 23:07 ` Guilherme G. Piccoli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440009922-30248-1-git-send-email-gpiccoli@linux.vnet.ibm.com \
--to=gpiccoli@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=gwshan@linux.vnet.ibm.com \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=mst@redhat.com \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).