Hey,
On Wed, Sep 27, 2023 at 06:07:55PM +0800, Minda Chen wrote:
> The INTx and MSI interrupt event num is different
> in Microchip and StarFive platform.
BTW, please use the full 72 columns, not just 50, for your commit
messages.
Acked-by: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>
Thanks,
Conor.
>
> Signed-off-by: Minda Chen <minda.chen@xxxxxxxxxxxxxxxx>
> ---
> 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 e3c7d5e66150..fb09b6c34e01 100644
> --- a/drivers/pci/controller/plda/pcie-microchip-host.c
> +++ b/drivers/pci/controller/plda/pcie-microchip-host.c
> @@ -807,6 +807,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)
> @@ -947,7 +949,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;
> @@ -957,7 +959,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 4e0712c9365e..af5e69718342 100644
> --- a/drivers/pci/controller/plda/pcie-plda.h
> +++ b/drivers/pci/controller/plda/pcie-plda.h
> @@ -156,6 +156,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;
> };
>
> irqreturn_t plda_event_handler(int irq, void *dev_id);
> --
> 2.17.1
>
Attachment:
signature.asc
Description: PGP signature
