From: Matthew Minter <matt@masarand.com>
To: linux-pci@vger.kernel.org, bhelgaas@google.com,
Liviu.Dudau@arm.com, ddaney@caviumnetworks.com,
lorenzo.pieralisi@arm.com
Cc: Matthew Minter <matt@masarand.com>
Subject: [PATCH V4 15/29] cris/PCI: Defer IRQ assignment to device enable time
Date: Fri, 23 Oct 2015 06:03:48 +0100 [thread overview]
Message-ID: <1445576642-29624-16-git-send-email-matt@masarand.com> (raw)
In-Reply-To: <1445576642-29624-1-git-send-email-matt@masarand.com>
PCI IRQs are currently configured to be enabled once at boot in a
dedicated pass. This means that PCI devices which are hot-plugged after
boot time will not be given an IRQ, this patch-set fixes this by
registering the assignment function to be called later in the device
enable path.
Signed-off-by: Matthew Minter <matt@masarand.com>
---
arch/cris/arch-v32/drivers/pci/bios.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c
index 64a5fb9..2b7b79f 100644
--- a/arch/cris/arch-v32/drivers/pci/bios.c
+++ b/arch/cris/arch-v32/drivers/pci/bios.c
@@ -80,9 +80,10 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask)
return 0;
}
-int pcibios_enable_irq(struct pci_dev *dev)
+int pcibios_enable_irq(struct pci_dev *dev, u8 slot, u8 pin)
{
- dev->irq = EXT_INTR_VECT;
+ if (!dev->msi_enabled)
+ dev->irq = EXT_INTR_VECT;
return 0;
}
@@ -92,8 +93,11 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
if ((err = pcibios_enable_resources(dev, mask)) < 0)
return err;
+ return 0;
+}
- if (!dev->msi_enabled)
- pcibios_enable_irq(dev);
+int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
+{
+ bridge->map_irq = pcibios_enable_irq;
return 0;
}
--
2.6.2
next prev parent reply other threads:[~2015-10-23 5:05 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-23 5:03 [PATCH V4] Delay allocation of PCI device IRQs from boot time until bus scan time to fix PCI hotplugging Matthew Minter
2015-10-23 5:03 ` [PATCH V4 01/29] PCI: Build setup-irq.o on all arches Matthew Minter
2015-10-23 5:03 ` [PATCH V4 02/29] PCI: Add a prototype for pci_find_host_bridge to pci.h Matthew Minter
2015-10-23 5:03 ` [PATCH V4 03/29] PCI: Add IRQ mapping function pointers to pci_host_bridge struct Matthew Minter
2015-10-23 5:03 ` [PATCH V4 04/29] PCI: Remove const from the pci_dev struct passed to pci_fixup_irqs Matthew Minter
2015-10-23 5:03 ` [PATCH V4 05/29] PCI: Add pci_assign_irq function and have pci_fixup_irqs use it Matthew Minter
2015-10-23 5:03 ` [PATCH V4 06/29] PCI: Add a call to pci_assign_irq in do_pci_enable_device Matthew Minter
2015-10-23 5:03 ` [PATCH V4 07/29] x86/pci: Move pcibios_root_bridge_prepare from acpi.c to irq.c Matthew Minter
2015-10-23 5:03 ` [PATCH V4 08/29] x86/pci: Defer IRQ assignment to device enable time Matthew Minter
2015-12-23 23:04 ` Bjorn Helgaas
2016-01-12 11:25 ` Lorenzo Pieralisi
2015-10-23 5:03 ` [PATCH V4 09/29] x86/pci: Pass pin into pcibios_lookup_irq rather than look it up Matthew Minter
2015-10-23 5:03 ` [PATCH V4 10/29] ARM/PCI: Defer IRQ assignment to device enable time Matthew Minter
2015-10-23 5:03 ` [PATCH V4 11/29] powerpc/pci: " Matthew Minter
2015-10-23 5:03 ` [PATCH V4 12/29] sh/PCI: Remove __init optimisations from IRQ mapping functions/data Matthew Minter
2015-10-23 5:03 ` [PATCH V4 13/29] sh/PCI: Defer IRQ assignment to device enable time Matthew Minter
2015-10-23 5:03 ` [PATCH V4 14/29] alpha/PCI: " Matthew Minter
2015-10-23 5:03 ` Matthew Minter [this message]
2015-10-23 5:03 ` [PATCH V4 16/29] frv/PCI: " Matthew Minter
2015-10-23 5:03 ` [PATCH V4 17/29] m68k/pci: " Matthew Minter
2015-10-23 5:44 ` kbuild test robot
2015-10-23 5:03 ` [PATCH V4 18/29] microblaze/PCI: " Matthew Minter
2015-10-23 5:40 ` kbuild test robot
2015-10-23 5:03 ` [PATCH V4 19/29] MIPS/PCI: " Matthew Minter
2015-10-23 6:02 ` kbuild test robot
2015-10-23 5:03 ` [PATCH V4 20/29] mn10300: Defer PCI " Matthew Minter
2015-10-23 5:03 ` [PATCH V4 21/29] mn10300: Remove pcibios_enable_device function Matthew Minter
2015-10-23 5:03 ` [PATCH V4 22/29] sparc/PCI: Defer IRQ assignment to device enable time Matthew Minter
2015-10-23 5:03 ` [PATCH V4 23/29] tile: pci: " Matthew Minter
2015-10-23 5:34 ` kbuild test robot
2015-10-23 5:03 ` [PATCH V4 24/29] unicore32/PCI: " Matthew Minter
2015-10-23 5:03 ` [PATCH V4 25/29] PCI: Update pci-versatile to use IRQ deferred assignment Matthew Minter
2015-10-23 5:03 ` [PATCH V4 26/29] PCI: Update pcie-iproc to use IRQ deffered assignment Matthew Minter
2015-10-23 5:04 ` [PATCH V4 27/29] PCI: Update pci-host-generic " Matthew Minter
2015-10-23 9:40 ` kbuild test robot
2015-10-23 5:04 ` [PATCH V4 28/29] of/pci: Fix comment for pci_fixup_irqs changing to pci_assign_irq Matthew Minter
2016-01-13 11:25 ` Lorenzo Pieralisi
2015-10-23 5:04 ` [PATCH V4 29/29] PCI: Remove pci_fixup_irqs function Matthew Minter
2015-12-07 17:32 ` [PATCH V4] Delay allocation of PCI device IRQs from boot time until bus scan time to fix PCI hotplugging Bjorn Helgaas
2015-12-18 21:54 ` Christopher Covington
2015-12-19 11:50 ` Matthew Minter
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=1445576642-29624-16-git-send-email-matt@masarand.com \
--to=matt@masarand.com \
--cc=Liviu.Dudau@arm.com \
--cc=bhelgaas@google.com \
--cc=ddaney@caviumnetworks.com \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.