From: Bjorn Helgaas <bhelgaas@google.com>
To: linux-pci@vger.kernel.org
Cc: ОлегМороз <oleg.moroz@mcc.vniiem.ru>,
"Joerg Roedel" <jroedel@suse.de>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
linux-kernel@vger.kernel.org, "Sunjin Yang" <fan4326@gmail.com>,
linux-acpi@vger.kernel.org,
"Thomas Gleixner" <tglx@linutronix.de>,
"Yinghai Lu" <yinghai@kernel.org>,
"Jiang Liu" <jiang.liu@linux.intel.com>
Subject: [PATCH v2 1/3] Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"
Date: Wed, 17 Feb 2016 12:37:06 -0600 [thread overview]
Message-ID: <20160217183706.302.17831.stgit@bhelgaas-glaptop2.roam.corp.google.com> (raw)
In-Reply-To: <20160217182718.302.10272.stgit@bhelgaas-glaptop2.roam.corp.google.com>
Revert 8affb487d4a4 ("x86/PCI: Don't alloc pcibios-irq when MSI is
enabled").
This is part of reverting 991de2e59090 ("PCI, x86: Implement
pcibios_alloc_irq() and pcibios_free_irq()") to fix regressions it
introduced.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=111211
Fixes: 991de2e59090 ("PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()")
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Jiang Liu <jiang.liu@linux.intel.com>
CC: Joerg Roedel <jroedel@suse.de>
---
arch/x86/pci/common.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 2879efc..cb499c5 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -713,14 +713,6 @@ int pcibios_add_device(struct pci_dev *dev)
int pcibios_alloc_irq(struct pci_dev *dev)
{
- /*
- * If the PCI device was already claimed by core code and has
- * MSI enabled, probing of the pcibios IRQ will overwrite
- * dev->irq. So bail out if MSI is already enabled.
- */
- if (pci_dev_msi_enabled(dev))
- return -EBUSY;
-
return pcibios_enable_irq(dev);
}
next prev parent reply other threads:[~2016-02-17 18:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-17 18:36 [PATCH v2 0/3] PCI: Revert "Implement pcibios_alloc_irq() and pcibios_free_irq()" Bjorn Helgaas
2016-02-17 18:37 ` Bjorn Helgaas [this message]
2016-02-17 18:37 ` [PATCH v2 2/3] Revert "PCI: Add helpers to manage pci_dev->irq and pci_dev->irq_managed" Bjorn Helgaas
2016-02-17 18:37 ` [PATCH v2 3/3] Revert "PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()" Bjorn Helgaas
2016-02-17 19:47 ` [PATCH v2 0/3] PCI: Revert "Implement " Rafael J. Wysocki
2016-02-18 5:13 ` Мороз Олег
2016-02-18 16:03 ` Bjorn Helgaas
2016-02-24 18:30 ` Олег Мороз
2016-02-25 14:53 ` Bjorn Helgaas
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=20160217183706.302.17831.stgit@bhelgaas-glaptop2.roam.corp.google.com \
--to=bhelgaas@google.com \
--cc=fan4326@gmail.com \
--cc=jiang.liu@linux.intel.com \
--cc=jroedel@suse.de \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=oleg.moroz@mcc.vniiem.ru \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=yinghai@kernel.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
all inboxes | Powered by JetHome®