Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dmaengine: Move AMD PTDMA driver to amd directory

PTDMA driver is the AMD DMA driver, and newer AMD platforms support newer
DMA engines. Hence, move the current drivers to the AMD directory. This
would also mean that future driver submissions to the AMD DMA driver will
also land in the AMD-specific directory.

Reviewed-by: Raju Rangoju <Raju.Rangoju@amd.com>
Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Link: https://lore.kernel.org/r/20241025095931.726018-2-Basavaraj.Natikar@amd.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Basavaraj Natikar and committed by
Vinod Koul
e01ee7c6 8d0191a6

+18 -21
+2 -2
MAINTAINERS
··· 1164 1164 AMD PTDMA DRIVER 1165 1165 M: Basavaraj Natikar <Basavaraj.Natikar@amd.com> 1166 1166 L: dmaengine@vger.kernel.org 1167 - S: Maintained 1168 - F: drivers/dma/ptdma/ 1167 + S: Supported 1168 + F: drivers/dma/amd/ptdma/ 1169 1169 1170 1170 AMD QDMA DRIVER 1171 1171 M: Nishad Saraf <nishads@amd.com>
-2
drivers/dma/Kconfig
··· 740 740 741 741 source "drivers/dma/mediatek/Kconfig" 742 742 743 - source "drivers/dma/ptdma/Kconfig" 744 - 745 743 source "drivers/dma/qcom/Kconfig" 746 744 747 745 source "drivers/dma/dw/Kconfig"
-1
drivers/dma/Makefile
··· 16 16 obj-$(CONFIG_ALTERA_MSGDMA) += altera-msgdma.o 17 17 obj-$(CONFIG_AMBA_PL08X) += amba-pl08x.o 18 18 obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/ 19 - obj-$(CONFIG_AMD_PTDMA) += ptdma/ 20 19 obj-$(CONFIG_APPLE_ADMAC) += apple-admac.o 21 20 obj-$(CONFIG_AT_HDMAC) += at_hdmac.o 22 21 obj-$(CONFIG_AT_XDMAC) += at_xdmac.o
+13
drivers/dma/amd/Kconfig
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 + # 3 + config AMD_PTDMA 4 + tristate "AMD PassThru DMA Engine" 5 + depends on X86_64 && PCI 6 + select DMA_ENGINE 7 + select DMA_VIRTUAL_CHANNELS 8 + help 9 + Enable support for the AMD PTDMA controller. This controller 10 + provides DMA capabilities to perform high bandwidth memory to 11 + memory and IO copy operations. It performs DMA transfer through 12 + queue-based descriptor management. This DMA controller is intended 13 + to be used with AMD Non-Transparent Bridge devices and not for 14 + general purpose peripheral DMA. 2 15 3 16 config AMD_QDMA 4 17 tristate "AMD Queue-based DMA"
+1
drivers/dma/amd/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 3 + obj-$(CONFIG_AMD_PTDMA) += ptdma/ 3 4 obj-$(CONFIG_AMD_QDMA) += qdma/
-13
drivers/dma/ptdma/Kconfig
··· 1 - # SPDX-License-Identifier: GPL-2.0-only 2 - config AMD_PTDMA 3 - tristate "AMD PassThru DMA Engine" 4 - depends on X86_64 && PCI 5 - select DMA_ENGINE 6 - select DMA_VIRTUAL_CHANNELS 7 - help 8 - Enable support for the AMD PTDMA controller. This controller 9 - provides DMA capabilities to perform high bandwidth memory to 10 - memory and IO copy operations. It performs DMA transfer through 11 - queue-based descriptor management. This DMA controller is intended 12 - to be used with AMD Non-Transparent Bridge devices and not for 13 - general purpose peripheral DMA.
drivers/dma/ptdma/Makefile drivers/dma/amd/ptdma/Makefile
drivers/dma/ptdma/ptdma-debugfs.c drivers/dma/amd/ptdma/ptdma-debugfs.c
drivers/dma/ptdma/ptdma-dev.c drivers/dma/amd/ptdma/ptdma-dev.c
+1 -2
drivers/dma/ptdma/ptdma-dmaengine.c drivers/dma/amd/ptdma/ptdma-dmaengine.c
··· 10 10 */ 11 11 12 12 #include "ptdma.h" 13 - #include "../dmaengine.h" 14 - #include "../virt-dma.h" 13 + #include "../../dmaengine.h" 15 14 16 15 static inline struct pt_dma_chan *to_pt_chan(struct dma_chan *dma_chan) 17 16 {
drivers/dma/ptdma/ptdma-pci.c drivers/dma/amd/ptdma/ptdma-pci.c
+1 -1
drivers/dma/ptdma/ptdma.h drivers/dma/amd/ptdma/ptdma.h
··· 22 22 #include <linux/wait.h> 23 23 #include <linux/dmapool.h> 24 24 25 - #include "../virt-dma.h" 25 + #include "../../virt-dma.h" 26 26 27 27 #define MAX_PT_NAME_LEN 16 28 28 #define MAX_DMAPOOL_NAME_LEN 32