Commit 35805a48 authored by Barry Song's avatar Barry Song Committed by Cheng Jian
Browse files

net: hns: use IRQ_NOAUTOEN to avoid irq is enabled due to request_irq 



mainline inclusion
from mainline-5.10-rc1
commit 5a6bd84f
category: bugfix
bugzilla: NA
CVE: NA

---------------------------

Rather than doing request_irq and then disabling the irq immediately, it
should be safer to use IRQ_NOAUTOEN flag for the irq. It removes any gap
between request_irq() and disable_irq().

Cc: Salil Mehta <salil.mehta@huawei.com>
Reviewed-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarBarry Song <song.bao.hua@hisilicon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Reviewed-by: default avatarli yongxin <liyongxin1@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarCheng Jian <cj.chengjian@huawei.com>
parent d91158fd

drivers/net/ethernet/hisilicon/hns/hns_enet.c

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/io.h>

#include <linux/ip.h>

#include <linux/ipv6.h>

#include <linux/irq.h>

#include <linux/marvell_phy.h>

#include <linux/module.h>

#include <linux/phy.h>
@@ -1311,6 +1312,7 @@ static int hns_nic_init_irq(struct hns_nic_priv *priv) 


		rd->ring->ring_name[RCB_RING_NAME_LEN - 1] = '\0';



		irq_set_status_flags(rd->ring->irq, IRQ_NOAUTOEN);

		ret = request_irq(rd->ring->irq,

				  hns_irq_handle, 0, rd->ring->ring_name, rd);

		if (ret) {
@@ -1318,7 +1320,6 @@ static int hns_nic_init_irq(struct hns_nic_priv *priv) 
				   rd->ring->irq);

			goto out_free_irq;

		}

		disable_irq(rd->ring->irq);



		cpu = hns_nic_init_affinity_mask(h->q_num, i,

						 rd->ring, &rd->mask);