lkml.org 
[lkml]   [2014]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 18/22] arm/iop13xx/MSI: Use MSI chip framework to configure MSI/MSI-X irq
    Date
    Use MSI chip framework instead of arch MSI functions to configure
    MSI/MSI-X irq. So we can manage MSI/MSI-X irq in a unified framework.

    Signed-off-by: Yijing Wang <wangyijing@huawei.com>
    ---
    arch/arm/mach-iop13xx/include/mach/pci.h | 2 ++
    arch/arm/mach-iop13xx/iq81340mc.c | 1 +
    arch/arm/mach-iop13xx/iq81340sc.c | 1 +
    arch/arm/mach-iop13xx/msi.c | 9 +++++++--
    arch/arm/mach-iop13xx/pci.c | 6 ++++++
    5 files changed, 17 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/mach-iop13xx/include/mach/pci.h b/arch/arm/mach-iop13xx/include/mach/pci.h
    index 59f42b5..7a073cb 100644
    --- a/arch/arm/mach-iop13xx/include/mach/pci.h
    +++ b/arch/arm/mach-iop13xx/include/mach/pci.h
    @@ -10,6 +10,8 @@ struct pci_bus *iop13xx_scan_bus(int nr, struct pci_sys_data *);
    void iop13xx_atu_select(struct hw_pci *plat_pci);
    void iop13xx_pci_init(void);
    void iop13xx_map_pci_memory(void);
    +void iop13xx_add_bus(struct pci_bus *bus);
    +extern struct msi_chip iop13xx_msi_chip;

    #define IOP_PCI_STATUS_ERROR (PCI_STATUS_PARITY | \
    PCI_STATUS_SIG_TARGET_ABORT | \
    diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c
    index 9cd07d3..19d47cb 100644
    --- a/arch/arm/mach-iop13xx/iq81340mc.c
    +++ b/arch/arm/mach-iop13xx/iq81340mc.c
    @@ -59,6 +59,7 @@ static struct hw_pci iq81340mc_pci __initdata = {
    .map_irq = iq81340mc_pcix_map_irq,
    .scan = iop13xx_scan_bus,
    .preinit = iop13xx_pci_init,
    + .add_bus = iop13xx_add_bus;
    };

    static int __init iq81340mc_pci_init(void)
    diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c
    index b3ec11c..4d56993 100644
    --- a/arch/arm/mach-iop13xx/iq81340sc.c
    +++ b/arch/arm/mach-iop13xx/iq81340sc.c
    @@ -61,6 +61,7 @@ static struct hw_pci iq81340sc_pci __initdata = {
    .scan = iop13xx_scan_bus,
    .map_irq = iq81340sc_atux_map_irq,
    .preinit = iop13xx_pci_init
    + .add_bus = iop13xx_add_bus;
    };

    static int __init iq81340sc_pci_init(void)
    diff --git a/arch/arm/mach-iop13xx/msi.c b/arch/arm/mach-iop13xx/msi.c
    index e7730cf..1a8cb2f 100644
    --- a/arch/arm/mach-iop13xx/msi.c
    +++ b/arch/arm/mach-iop13xx/msi.c
    @@ -132,7 +132,7 @@ static struct irq_chip iop13xx_msi_chip = {
    .irq_unmask = unmask_msi_irq,
    };

    -int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
    +static int iop13xx_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
    {
    int id, irq = irq_alloc_desc_from(IRQ_IOP13XX_MSI_0, -1);
    struct msi_msg msg;
    @@ -159,7 +159,12 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
    return 0;
    }

    -void arch_teardown_msi_irq(unsigned int irq)
    +static void iop13xx_teardown_msi_irq(unsigned int irq)
    {
    irq_free_desc(irq);
    }
    +
    +struct msi_chip iop13xx_chip = {
    + .setup_irq = iop13xx_setup_msi_irq,
    + .teardown_irq = iop13xx_teardown_msi_irq,
    +};
    diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c
    index 9082b84..f498800 100644
    --- a/arch/arm/mach-iop13xx/pci.c
    +++ b/arch/arm/mach-iop13xx/pci.c
    @@ -962,6 +962,12 @@ void __init iop13xx_atu_select(struct hw_pci *plat_pci)
    }
    }

    +void iop13xx_add_bus(struct pci_bus *bus)
    +{
    + if (IS_ENABLED(CONFIG_PCI_MSI))
    + bus->msi = &iop13xx_msi_chip;
    +}
    +
    void __init iop13xx_pci_init(void)
    {
    /* clear pre-existing south bridge errors */
    --
    1.7.1


    \
     
     \ /
      Last update: 2014-09-25 05:21    [W:4.172 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site