Commit ecf294a6 authored by Lizhi Hou's avatar Lizhi Hou Committed by Vinod Koul
Browse files

dmaengine: xilinx: xdma: Add user logic interrupt support 



The Xilinx DMA/Bridge Subsystem for PCIe (XDMA) provides up to 16 user
interrupt wires to user logic that generate interrupts to the host.
This patch adds APIs to enable/disable user logic interrupt for a given
interrupt wire index.

Signed-off-by: default avatarLizhi Hou <lizhi.hou@amd.com>
Signed-off-by: default avatarSonal Santan <sonal.santan@amd.com>
Signed-off-by: default avatarMax Zhen <max.zhen@amd.com>
Signed-off-by: default avatarBrian Xu <brian.xu@amd.com>
Tested-by: default avatarMartin Tuma <tumic@gpxsee.org>
Link: https://lore.kernel.org/r/1674145926-29449-3-git-send-email-lizhi.hou@amd.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 17ce2522

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -22897,6 +22897,7 @@ L: dmaengine@vger.kernel.org 
S:	Supported

F:	drivers/dma/xilinx/xdma-regs.h

F:	drivers/dma/xilinx/xdma.c

F:	include/linux/dma/amd_xdma.h

F:	include/linux/platform_data/amd_xdma.h









XILINX ZYNQMP DPDMA DRIVER

























drivers/dma/xilinx/xdma.c



+81
−0






























Original line number
Diff line number
Diff line







@@ -25,6 +25,7 @@







#include <linux/dmapool.h>









#include <linux/regmap.h>









#include <linux/dmaengine.h>









#include <linux/dma/amd_xdma.h>









#include <linux/platform_device.h>









#include <linux/platform_data/amd_xdma.h>









#include <linux/dma-mapping.h>










@@ -687,6 +688,7 @@ static int xdma_set_vector_reg(struct xdma_device *xdev, u32 vec_tbl_start,







static int xdma_irq_init(struct xdma_device *xdev)









{









	u32 irq = xdev->irq_start;









	u32 user_irq_start;









	int i, j, ret;



















	/* return failure if there are not enough IRQs */










@@ -729,6 +731,18 @@ static int xdma_irq_init(struct xdma_device *xdev)







		goto failed_init_c2h;









	}



















	/* config user IRQ registers if needed */









	user_irq_start = XDMA_CHAN_NUM(xdev);









	if (xdev->irq_num > user_irq_start) {









		ret = xdma_set_vector_reg(xdev, XDMA_IRQ_USER_VEC_NUM,









					  user_irq_start,









					  xdev->irq_num - user_irq_start);









		if (ret) {









			xdma_err(xdev, "failed to set user vectors: %d", ret);









			goto failed_init_c2h;









		}









	}



















	/* enable interrupt */









	ret = regmap_write(xdev->rmap, XDMA_IRQ_CHAN_INT_EN_W1S, ~0);









	if (ret)










@@ -754,6 +768,73 @@ static bool xdma_filter_fn(struct dma_chan *chan, void *param)







	return chan_info->dir == xdma_chan->dir;









}



















/**









 * xdma_disable_user_irq - Disable user interrupt









 * @pdev: Pointer to the platform_device structure









 * @irq_num: System IRQ number









 */









void xdma_disable_user_irq(struct platform_device *pdev, u32 irq_num)









{









	struct xdma_device *xdev = platform_get_drvdata(pdev);









	u32 index;



















	index = irq_num - xdev->irq_start;









	if (index < XDMA_CHAN_NUM(xdev) || index >= xdev->irq_num) {









		xdma_err(xdev, "invalid user irq number");









		return;









	}









	index -= XDMA_CHAN_NUM(xdev);



















	regmap_write(xdev->rmap, XDMA_IRQ_USER_INT_EN_W1C, 1 << index);









}









EXPORT_SYMBOL(xdma_disable_user_irq);



















/**









 * xdma_enable_user_irq - Enable user logic interrupt









 * @pdev: Pointer to the platform_device structure









 * @irq_num: System IRQ number









 */









int xdma_enable_user_irq(struct platform_device *pdev, u32 irq_num)









{









	struct xdma_device *xdev = platform_get_drvdata(pdev);









	u32 index;









	int ret;



















	index = irq_num - xdev->irq_start;









	if (index < XDMA_CHAN_NUM(xdev) || index >= xdev->irq_num) {









		xdma_err(xdev, "invalid user irq number");









		return -EINVAL;









	}









	index -= XDMA_CHAN_NUM(xdev);



















	ret = regmap_write(xdev->rmap, XDMA_IRQ_USER_INT_EN_W1S, 1 << index);









	if (ret)









		return ret;



















	return 0;









}









EXPORT_SYMBOL(xdma_enable_user_irq);



















/**









 * xdma_get_user_irq - Get system IRQ number









 * @pdev: Pointer to the platform_device structure









 * @user_irq_index: User logic IRQ wire index









 *









 * Return: The system IRQ number allocated for the given wire index.









 */









int xdma_get_user_irq(struct platform_device *pdev, u32 user_irq_index)









{









	struct xdma_device *xdev = platform_get_drvdata(pdev);



















	if (XDMA_CHAN_NUM(xdev) + user_irq_index >= xdev->irq_num) {









		xdma_err(xdev, "invalid user irq index");









		return -EINVAL;









	}



















	return xdev->irq_start + XDMA_CHAN_NUM(xdev) + user_irq_index;









}









EXPORT_SYMBOL(xdma_get_user_irq);



















/**









 * xdma_remove - Driver remove function









 * @pdev: Pointer to the platform_device structure


































include/linux/dma/amd_xdma.h
0 → 100644



+16
−0






























Original line number
Diff line number
Diff line









/* SPDX-License-Identifier: GPL-2.0-or-later */









/*









 * Copyright (C) 2022, Advanced Micro Devices, Inc.









 */



















#ifndef _DMAENGINE_AMD_XDMA_H









#define _DMAENGINE_AMD_XDMA_H



















#include <linux/interrupt.h>









#include <linux/platform_device.h>



















int xdma_enable_user_irq(struct platform_device *pdev, u32 irq_num);









void xdma_disable_user_irq(struct platform_device *pdev, u32 irq_num);









int xdma_get_user_irq(struct platform_device *pdev, u32 user_irq_index);



















#endif /* _DMAENGINE_AMD_XDMA_H */