Unverified Commit 1d81a268 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12259 octeontx2-af: Use separate handlers for interrupts 

Merge Pull Request from: @ci-robot 
 
PR sync from: Guo Mengqi <guomengqi3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZM37GRDABNS2VY4CQVNFSLMJV7AINXJP/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9L9N9 
 
Link:https://gitee.com/openeuler/kernel/pulls/12259

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents ba7bfd2c 816d521b

drivers/net/ethernet/marvell/octeontx2/af/rvu.c

+14 −3
Original line number Diff line number Diff line
@@ -1885,10 +1885,9 @@ static void rvu_queue_work(struct mbox_wq_info *mw, int first, 
	}

}



static irqreturn_t rvu_mbox_intr_handler(int irq, void *rvu_irq)

static irqreturn_t rvu_mbox_pf_intr_handler(int irq, void *rvu_irq)

{

	struct rvu *rvu = (struct rvu *)rvu_irq;

	int vfs = rvu->vfs;

	u64 intr;



	intr = rvu_read64(rvu, BLKADDR_RVUM, RVU_AF_PFAF_MBOX_INT);
@@ -1902,6 +1901,18 @@ static irqreturn_t rvu_mbox_intr_handler(int irq, void *rvu_irq) 


	rvu_queue_work(&rvu->afpf_wq_info, 0, rvu->hw->total_pfs, intr);



	return IRQ_HANDLED;

}



static irqreturn_t rvu_mbox_intr_handler(int irq, void *rvu_irq)

{

	struct rvu *rvu = (struct rvu *)rvu_irq;

	int vfs = rvu->vfs;

	u64 intr;



	/* Sync with mbox memory region */

	rmb();



	/* Handle VF interrupts */

	if (vfs > 64) {

		intr = rvupf_read64(rvu, RVU_PF_VFPF_MBOX_INTX(1));
@@ -2216,7 +2227,7 @@ static int rvu_register_interrupts(struct rvu *rvu) 
	/* Register mailbox interrupt handler */

	sprintf(&rvu->irq_name[RVU_AF_INT_VEC_MBOX * NAME_SIZE], "RVUAF Mbox");

	ret = request_irq(pci_irq_vector(rvu->pdev, RVU_AF_INT_VEC_MBOX),

			  rvu_mbox_intr_handler, 0,

			  rvu_mbox_pf_intr_handler, 0,

			  &rvu->irq_name[RVU_AF_INT_VEC_MBOX * NAME_SIZE], rvu);

	if (ret) {

		dev_err(rvu->dev,