]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
RDMA/hns: Fix VF triggering PF reset in abnormal interrupt handler
authorJunxian Huang <huangjunxian6@hisilicon.com>
Fri, 6 Sep 2024 09:34:41 +0000 (17:34 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Oct 2024 14:29:33 +0000 (16:29 +0200)
[ Upstream commit 4321feefa5501a746ebf6a7d8b59e6b955ae1860 ]

In abnormal interrupt handler, a PF reset will be triggered even if
the device is a VF. It should be a VF reset.

Fixes: 2b9acb9a97fe ("RDMA/hns: Add the process of AEQ overflow for hip08")
Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com>
Link: https://patch.msgid.link/20240906093444.3571619-7-huangjunxian6@hisilicon.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/hw/hns/hns_roce_hw_v2.c

index 908b4372bac95bef8d4b4bbda0b3fb64b7250c14..2cdd002b7122899eb7a602d33b81d11aa312e45b 100644 (file)
@@ -6070,6 +6070,7 @@ static irqreturn_t abnormal_interrupt_basic(struct hns_roce_dev *hr_dev,
        struct pci_dev *pdev = hr_dev->pci_dev;
        struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev);
        const struct hnae3_ae_ops *ops = ae_dev->ops;
+       enum hnae3_reset_type reset_type;
        irqreturn_t int_work = IRQ_NONE;
        u32 int_en;
 
@@ -6081,10 +6082,12 @@ static irqreturn_t abnormal_interrupt_basic(struct hns_roce_dev *hr_dev,
                roce_write(hr_dev, ROCEE_VF_ABN_INT_ST_REG,
                           1 << HNS_ROCE_V2_VF_INT_ST_AEQ_OVERFLOW_S);
 
+               reset_type = hr_dev->is_vf ?
+                            HNAE3_VF_FUNC_RESET : HNAE3_FUNC_RESET;
+
                /* Set reset level for reset_event() */
                if (ops->set_default_reset_request)
-                       ops->set_default_reset_request(ae_dev,
-                                                      HNAE3_FUNC_RESET);
+                       ops->set_default_reset_request(ae_dev, reset_type);
                if (ops->reset_event)
                        ops->reset_event(pdev, NULL);