On Thu, Oct 02, 2014 at 05:07:35AM +0100, matt@xxxxxxxxxxxx wrote:
> From: Matthew Minter <matt@xxxxxxxxxxxx>
>
> 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@xxxxxxxxxxxx>
>
> ---
> arch/cris/arch-v32/drivers/pci/bios.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c
> index 64a5fb9..d04ecc8 100644
> --- a/arch/cris/arch-v32/drivers/pci/bios.c
> +++ b/arch/cris/arch-v32/drivers/pci/bios.c
> @@ -80,20 +80,16 @@ 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;
> return 0;
> }
>
> -int pcibios_enable_device(struct pci_dev *dev, int mask)
> +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
> {
> - int err;
> -
> - if ((err = pcibios_enable_resources(dev, mask)) < 0)
> - return err;
If I understand correctly, this means we'd now use the default
pcibios_enable_device() from drivers/pci/pci.c, which uses
pci_enable_resources(), instead of cris's pcibios_enable_resources().
That's a good thing that we should do someday, but it's out of scope for
this series because they *are* different, and we need to evaluate whether
it's safe to use the default version instead of the cris version. Also, I
think this patch leaves the cris pcibios_enable_resources() unused.
> -
> - if (!dev->msi_enabled)
> - pcibios_enable_irq(dev);
> + bridge->swizzle_irq = NULL;
> + bridge->map_irq = pcibios_enable_irq;
> return 0;
> }
> +
> --
> 2.1.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
