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>
@@ -3780,7 +3781,7 @@ static int hclge_misc_irq_init(struct hclge_dev *hdev)
3780
3781
snprintf (hdev -> misc_vector .name , HNAE3_INT_NAME_LEN , "%s-misc-%s" ,
3781
3782
HCLGE_NAME , pci_name (hdev -> pdev ));
3782
3783
ret = request_irq (hdev -> misc_vector .vector_irq , hclge_misc_irq_handle ,
3783
- 0 , hdev -> misc_vector .name , hdev );
3784
+ IRQF_NO_AUTOEN , hdev -> misc_vector .name , hdev );
3784
3785
if (ret ) {
3785
3786
hclge_free_vector (hdev , 0 );
3786
3787
dev_err (& hdev -> pdev -> dev , "request misc irq(%d) fail\n" ,
@@ -11916,9 +11917,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
11916
11917
11917
11918
hclge_init_rxd_adv_layout (hdev );
11918
11919
11919
- /* Enable MISC vector(vector0) */
11920
- hclge_enable_vector (& hdev -> misc_vector , true);
11921
-
11922
11920
ret = hclge_init_wol (hdev );
11923
11921
if (ret )
11924
11922
dev_warn (& pdev -> dev ,
@@ -11931,6 +11929,10 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
11931
11929
hclge_state_init (hdev );
11932
11930
hdev -> last_reset_time = jiffies ;
11933
11931
11932
+ /* Enable MISC vector(vector0) */
11933
+ enable_irq (hdev -> misc_vector .vector_irq );
11934
+ hclge_enable_vector (& hdev -> misc_vector , true);
11935
+
11934
11936
dev_info (& hdev -> pdev -> dev , "%s driver initialization finished.\n" ,
11935
11937
HCLGE_DRIVER_NAME );
11936
11938
@@ -12336,7 +12338,7 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)
12336
12338
12337
12339
/* Disable MISC vector(vector0) */
12338
12340
hclge_enable_vector (& hdev -> misc_vector , false);
12339
- synchronize_irq (hdev -> misc_vector .vector_irq );
12341
+ disable_irq (hdev -> misc_vector .vector_irq );
12340
12342
12341
12343
/* Disable all hw interrupts */
12342
12344
hclge_config_mac_tnl_int (hdev , false);
0 commit comments