lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 432/633] PCI: iproc: Set affinity mask on MSI interrupts
    Date
    From: Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>

    [ Upstream commit eb7eacaa5b9e4f665bd08d416c8f88e63d2f123c ]

    The core interrupt code expects the irq_set_affinity call to update the
    effective affinity for the interrupt. This was not being done, so update
    iproc_msi_irq_set_affinity() to do so.

    Link: https://lore.kernel.org/r/20200803035241.7737-1-mark.tomlinson@alliedtelesis.co.nz
    Fixes: 3bc2b2348835 ("PCI: iproc: Add iProc PCIe MSI support")
    Signed-off-by: Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
    Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Reviewed-by: Ray Jui <ray.jui@broadcom.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/controller/pcie-iproc-msi.c | 13 +++++++++----
    1 file changed, 9 insertions(+), 4 deletions(-)

    diff --git a/drivers/pci/controller/pcie-iproc-msi.c b/drivers/pci/controller/pcie-iproc-msi.c
    index 3176ad3ab0e52..908475d27e0e7 100644
    --- a/drivers/pci/controller/pcie-iproc-msi.c
    +++ b/drivers/pci/controller/pcie-iproc-msi.c
    @@ -209,15 +209,20 @@ static int iproc_msi_irq_set_affinity(struct irq_data *data,
    struct iproc_msi *msi = irq_data_get_irq_chip_data(data);
    int target_cpu = cpumask_first(mask);
    int curr_cpu;
    + int ret;

    curr_cpu = hwirq_to_cpu(msi, data->hwirq);
    if (curr_cpu == target_cpu)
    - return IRQ_SET_MASK_OK_DONE;
    + ret = IRQ_SET_MASK_OK_DONE;
    + else {
    + /* steer MSI to the target CPU */
    + data->hwirq = hwirq_to_canonical_hwirq(msi, data->hwirq) + target_cpu;
    + ret = IRQ_SET_MASK_OK;
    + }

    - /* steer MSI to the target CPU */
    - data->hwirq = hwirq_to_canonical_hwirq(msi, data->hwirq) + target_cpu;
    + irq_data_update_effective_affinity(data, cpumask_of(target_cpu));

    - return IRQ_SET_MASK_OK;
    + return ret;
    }

    static void iproc_msi_irq_compose_msi_msg(struct irq_data *data,
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 16:14    [W:4.019 / U:0.480 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site