Skip to contentSkip to conversation

dmaengine: dw: Register ACPI DMA controller for PCI that has companion

PATCH Applied Andy Shevchenko 2 participants 3 messages May 26, 2020 – Jun 16, 2020

Subsystems (2)
lore
Share & tools
lore

Andy Shevchenko

author reviewer
#0 lore raw

PATCH 1/2 dmaengine: dw: Register ACPI DMA controller for PCI that has companion

If PCI enumerated controller has a companion device, register it in the ACPI DMA controllers as well.

Fixes f7c799e950f9 ("dmaengine: dw: we do support Merrifield SoC in PCI mode")

Depends-on: b685fe26e9af ("dmaengine: dw: platform: Split ACPI helpers to separate module")

---
 drivers/dma/dw/Makefile | 2 +-
 drivers/dma/dw/acpi.c   | 2 ++
 drivers/dma/dw/pci.c    | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/dma/dw/Makefile +1 -1
index b6f06699e91a..9e949f13e1b5 100644
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_DW_DMAC_CORE)	+= dw_dmac_core.o
 dw_dmac_core-objs	:= core.o dw.o idma32.o
+dw_dmac_core-$(CONFIG_ACPI)	+= acpi.o
 
 obj-$(CONFIG_DW_DMAC)		+= dw_dmac.o
 dw_dmac-y			:= platform.o
-dw_dmac-$(CONFIG_ACPI)		+= acpi.o
 dw_dmac-$(CONFIG_OF)		+= of.o
 
 obj-$(CONFIG_DW_DMAC_PCI)	+= dw_dmac_pci.o
drivers/dma/dw/acpi.c +2 -0
index f6e8d55b4f6e..c510c109d2c3 100644
@@ -41,6 +41,7 @@ void dw_dma_acpi_controller_register(struct dw_dma *dw)
 	if (ret)
 		dev_err(dev, "could not register acpi_dma_controller\n");
 }
+EXPORT_SYMBOL_GPL(dw_dma_acpi_controller_register);
 
 void dw_dma_acpi_controller_free(struct dw_dma *dw)
 {
@@ -51,3 +52,4 @@ void dw_dma_acpi_controller_free(struct dw_dma *dw)
 
 	acpi_dma_controller_free(dev);
 }
+EXPORT_SYMBOL_GPL(dw_dma_acpi_controller_free);
drivers/dma/dw/pci.c +4 -0
index cf6e8ec4c0ff..1142aa6f8c4a 100644
@@ -60,6 +60,8 @@ static int dw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pid)
 	if (ret)
 		return ret;
 
+	dw_dma_acpi_controller_register(chip->dw);
+
 	pci_set_drvdata(pdev, data);
 
 	return 0;
@@ -71,6 +73,8 @@ static void dw_pci_remove(struct pci_dev *pdev)
 	struct dw_dma_chip *chip = data->chip;
 	int ret;
 
+	dw_dma_acpi_controller_free(chip->dw);
+
 	ret = data->remove(chip);
 	if (ret)
 		dev_warn(&pdev->dev, "can't remove device properly: %d\n", ret);
Signature · 1 line
2.26.2
author reviewer
#1 lore raw

PATCH 2/2 dmaengine: dw: Replace 'objs' by 'y'

-objs is fitted for building host programs, change to -y, more straightforward for device drivers.

---
 drivers/dma/dw/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/dw/Makefile +2 -2
index 9e949f13e1b5..a6f358ad8591 100644
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_DW_DMAC_CORE)	+= dw_dmac_core.o
-dw_dmac_core-objs	:= core.o dw.o idma32.o
+dw_dmac_core-y			:= core.o dw.o idma32.o
 dw_dmac_core-$(CONFIG_ACPI)	+= acpi.o
 
 obj-$(CONFIG_DW_DMAC)		+= dw_dmac.o
@@ -8,4 +8,4 @@ dw_dmac-y			:= platform.o
 dw_dmac-$(CONFIG_OF)		+= of.o
 
 obj-$(CONFIG_DW_DMAC_PCI)	+= dw_dmac_pci.o
-dw_dmac_pci-objs	:= pci.o
+dw_dmac_pci-y			:= pci.o
Signature · 1 line
2.26.2
maintainer Applied
#2 lore raw
In reply to Andy Shevchenko
Quoted 2 lines · Andy Shevchenko

If PCI enumerated controller has a companion device, register it in the ACPI DMA controllers as well.

Applied both, thanks

Signature · 1 line
~Vinod