]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Revert "UBUNTU: SAUCE: net: hns3: Optimize PF CMDQ interrupt switching process"
authordann frazier <dann.frazier@canonical.com>
Thu, 16 Aug 2018 19:19:04 +0000 (13:19 -0600)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 5 Sep 2018 12:18:30 +0000 (14:18 +0200)
BugLink: https://bugs.launchpad.net/bugs/1787477
This reverts commit e9ebd8a5e53a12e579ae1d7c4816c23123123899.
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

index 0e67e441c485572c7ed136246af27abe3f27cd5a..3db190764bf20ee4e4d3e471a9fb90eaed83c6c8 100644 (file)
@@ -2522,15 +2522,6 @@ static void hclge_clear_event_cause(struct hclge_dev *hdev, u32 event_type,
        }
 }
 
-static void hclge_clear_all_event_cause(struct hclge_dev *hdev)
-{
-       hclge_clear_event_cause(hdev, HCLGE_VECTOR0_EVENT_RST,
-                               BIT(HCLGE_VECTOR0_GLOBALRESET_INT_B) |
-                               BIT(HCLGE_VECTOR0_CORERESET_INT_B) |
-                               BIT(HCLGE_VECTOR0_IMPRESET_INT_B));
-       hclge_clear_event_cause(hdev, HCLGE_VECTOR0_EVENT_MBX, 0);
-}
-
 static void hclge_enable_vector(struct hclge_misc_vector *vector, bool enable)
 {
        writel(enable ? 1 : 0, vector->addr);
@@ -5762,8 +5753,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
        INIT_WORK(&hdev->rst_service_task, hclge_reset_service_task);
        INIT_WORK(&hdev->mbx_service_task, hclge_mailbox_service_task);
 
-       hclge_clear_all_event_cause(hdev);
-
        /* Enable MISC vector(vector0) */
        hclge_enable_vector(&hdev->misc_vector, true);
 
@@ -5879,8 +5868,6 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)
 
        /* Disable MISC vector(vector0) */
        hclge_enable_vector(&hdev->misc_vector, false);
-       synchronize_irq(hdev->misc_vector.vector_irq);
-
        hclge_destroy_cmd_queue(&hdev->hw);
        hclge_misc_irq_uninit(hdev);
        hclge_pci_uninit(hdev);