Skip to content

Commit e01ee7c

Browse files
basuamdvinodkoul
authored andcommitted
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 <[email protected]> Signed-off-by: Basavaraj Natikar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent 8d0191a commit e01ee7c

File tree

12 files changed

+18
-21
lines changed

12 files changed

+18
-21
lines changed

MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,8 +1164,8 @@ F: tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
11641164
AMD PTDMA DRIVER
11651165
M: Basavaraj Natikar <[email protected]>
11661166
1167-
S: Maintained
1168-
F: drivers/dma/ptdma/
1167+
S: Supported
1168+
F: drivers/dma/amd/ptdma/
11691169

11701170
AMD QDMA DRIVER
11711171
M: Nishad Saraf <[email protected]>

drivers/dma/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,8 +740,6 @@ source "drivers/dma/bestcomm/Kconfig"
740740

741741
source "drivers/dma/mediatek/Kconfig"
742742

743-
source "drivers/dma/ptdma/Kconfig"
744-
745743
source "drivers/dma/qcom/Kconfig"
746744

747745
source "drivers/dma/dw/Kconfig"

drivers/dma/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ obj-$(CONFIG_DMATEST) += dmatest.o
1616
obj-$(CONFIG_ALTERA_MSGDMA) += altera-msgdma.o
1717
obj-$(CONFIG_AMBA_PL08X) += amba-pl08x.o
1818
obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/
19-
obj-$(CONFIG_AMD_PTDMA) += ptdma/
2019
obj-$(CONFIG_APPLE_ADMAC) += apple-admac.o
2120
obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
2221
obj-$(CONFIG_AT_XDMAC) += at_xdmac.o

drivers/dma/amd/Kconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
11
# 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.
215

316
config AMD_QDMA
417
tristate "AMD Queue-based DMA"

drivers/dma/amd/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3+
obj-$(CONFIG_AMD_PTDMA) += ptdma/
34
obj-$(CONFIG_AMD_QDMA) += qdma/
File renamed without changes.
File renamed without changes.

drivers/dma/ptdma/ptdma-dmaengine.c renamed to drivers/dma/amd/ptdma/ptdma-dmaengine.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
*/
1111

1212
#include "ptdma.h"
13-
#include "../dmaengine.h"
14-
#include "../virt-dma.h"
13+
#include "../../dmaengine.h"
1514

1615
static inline struct pt_dma_chan *to_pt_chan(struct dma_chan *dma_chan)
1716
{
File renamed without changes.

drivers/dma/ptdma/ptdma.h renamed to drivers/dma/amd/ptdma/ptdma.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <linux/wait.h>
2323
#include <linux/dmapool.h>
2424

25-
#include "../virt-dma.h"
25+
#include "../../virt-dma.h"
2626

2727
#define MAX_PT_NAME_LEN 16
2828
#define MAX_DMAPOOL_NAME_LEN 32

drivers/dma/ptdma/Kconfig

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)