6
6
#include <linux/etherdevice.h>
7
7
#include <linux/init.h>
8
8
#include <linux/interrupt.h>
9
+ #include <linux/irq.h>
9
10
#include <linux/kernel.h>
10
11
#include <linux/module.h>
11
12
#include <linux/netdevice.h>
@@ -3770,7 +3771,7 @@ static int hclge_misc_irq_init(struct hclge_dev *hdev)
3770
3771
snprintf (hdev -> misc_vector .name , HNAE3_INT_NAME_LEN , "%s-misc-%s" ,
3771
3772
HCLGE_NAME , pci_name (hdev -> pdev ));
3772
3773
ret = request_irq (hdev -> misc_vector .vector_irq , hclge_misc_irq_handle ,
3773
- 0 , hdev -> misc_vector .name , hdev );
3774
+ IRQF_NO_AUTOEN , hdev -> misc_vector .name , hdev );
3774
3775
if (ret ) {
3775
3776
hclge_free_vector (hdev , 0 );
3776
3777
dev_err (& hdev -> pdev -> dev , "request misc irq(%d) fail\n" ,
@@ -11906,9 +11907,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
11906
11907
11907
11908
hclge_init_rxd_adv_layout (hdev );
11908
11909
11909
- /* Enable MISC vector(vector0) */
11910
- hclge_enable_vector (& hdev -> misc_vector , true);
11911
-
11912
11910
ret = hclge_init_wol (hdev );
11913
11911
if (ret )
11914
11912
dev_warn (& pdev -> dev ,
@@ -11921,6 +11919,10 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
11921
11919
hclge_state_init (hdev );
11922
11920
hdev -> last_reset_time = jiffies ;
11923
11921
11922
+ /* Enable MISC vector(vector0) */
11923
+ enable_irq (hdev -> misc_vector .vector_irq );
11924
+ hclge_enable_vector (& hdev -> misc_vector , true);
11925
+
11924
11926
dev_info (& hdev -> pdev -> dev , "%s driver initialization finished.\n" ,
11925
11927
HCLGE_DRIVER_NAME );
11926
11928
@@ -12326,7 +12328,7 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)
12326
12328
12327
12329
/* Disable MISC vector(vector0) */
12328
12330
hclge_enable_vector (& hdev -> misc_vector , false);
12329
- synchronize_irq (hdev -> misc_vector .vector_irq );
12331
+ disable_irq (hdev -> misc_vector .vector_irq );
12330
12332
12331
12333
/* Disable all hw interrupts */
12332
12334
hclge_config_mac_tnl_int (hdev , false);
0 commit comments