lkml.org 
[lkml]   [2024]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v15,RESEND 13/23] PCI: microchip: Add INTx and MSI event num to struct plda_event
    Date
    The INTx and MSI interrupt event num is different across platforms, so
    add two event num fields in struct plda_event.

    Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
    Acked-by: Conor Dooley <conor.dooley@microchip.com>
    ---
    drivers/pci/controller/plda/pcie-microchip-host.c | 6 ++++--
    drivers/pci/controller/plda/pcie-plda.h | 2 ++
    2 files changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c
    index bf5ce33ee275..8a51d3aa7e88 100644
    --- a/drivers/pci/controller/plda/pcie-microchip-host.c
    +++ b/drivers/pci/controller/plda/pcie-microchip-host.c
    @@ -817,6 +817,8 @@ static int mc_request_event_irq(struct plda_pcie_rp *plda, int event_irq,

    static const struct plda_event mc_event = {
    .request_event_irq = mc_request_event_irq,
    + .intx_event = EVENT_LOCAL_PM_MSI_INT_INTX,
    + .msi_event = EVENT_LOCAL_PM_MSI_INT_MSI,
    };

    static int plda_pcie_init_irq_domains(struct plda_pcie_rp *port)
    @@ -960,7 +962,7 @@ static int plda_init_interrupts(struct platform_device *pdev,
    }

    intx_irq = irq_create_mapping(port->event_domain,
    - EVENT_LOCAL_PM_MSI_INT_INTX);
    + event->intx_event);
    if (!intx_irq) {
    dev_err(dev, "failed to map INTx interrupt\n");
    return -ENXIO;
    @@ -970,7 +972,7 @@ static int plda_init_interrupts(struct platform_device *pdev,
    irq_set_chained_handler_and_data(intx_irq, plda_handle_intx, port);

    msi_irq = irq_create_mapping(port->event_domain,
    - EVENT_LOCAL_PM_MSI_INT_MSI);
    + event->msi_event);
    if (!msi_irq)
    return -ENXIO;

    diff --git a/drivers/pci/controller/plda/pcie-plda.h b/drivers/pci/controller/plda/pcie-plda.h
    index 935686bba837..89172ce18237 100644
    --- a/drivers/pci/controller/plda/pcie-plda.h
    +++ b/drivers/pci/controller/plda/pcie-plda.h
    @@ -130,6 +130,8 @@ struct plda_pcie_rp {
    struct plda_event {
    int (*request_event_irq)(struct plda_pcie_rp *pcie,
    int event_irq, int event);
    + int intx_event;
    + int msi_event;
    };

    void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index,
    --
    2.17.1

    \
     
     \ /
      Last update: 2024-05-27 15:24    [W:6.301 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site