PCI: endpoint: Use EPC's device in dma_alloc_coherent/dma_free_coherent

PATCH Superseded Kishon Vijay Abraham I 4 participants 5 messages Dec 19, 2017 – Jan 11, 2018

Subsystems (2)

PCI PCI endpoint

lore

Share & tools

lore

Kishon Vijay Abraham I

author

2017-12-19 08:36 UTC #0 lore raw

PATCH v2 1/1 PCI: endpoint: Use EPC's device in dma_alloc_coherent/dma_free_coherent

After commit 723288836628bc1c08 ("of: restrict DMA configuration"), of_dma_configure doesn't configure the coherent_dma_mask/dma_mask of endpoint function device (since it doesn't have a dt node associated with and hence no dma-ranges property), resulting in dma_alloc_coherent (used in pci_epf_alloc_space) to fail.

Fix it by making dma_alloc_coherent use EPC's device for allocating memory address as per discussion in [1]

[1] https://lkml.org/lkml/2017/10/24/26

Signed-off-by Kishon Vijay Abraham I <[email protected]>

Cc Robin Murphy <[email protected]>

Cc Rob Herring <[email protected]>

Cc Christoph Hellwig <[email protected]>

Tested-by Cyrille Pitchen <[email protected]>

---
No change in patch. Only added "Tested-by" of Cyrille Pitchen.

 drivers/pci/endpoint/pci-epc-core.c | 10 ----------
 drivers/pci/endpoint/pci-epf-core.c |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)

drivers/pci/endpoint/pci-epc-core.c +0 ~~-10~~

index 42c2a1156325..cd7d4788b94d 100644
@@ -18,7 +18,6 @@
  */
 
 #include <linux/device.h>
-#include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/of_device.h>

@@ -371,7 +370,6 @@ EXPORT_SYMBOL_GPL(pci_epc_write_header);
 int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf)
 {
 	unsigned long flags;
-	struct device *dev = epc->dev.parent;
 
 	if (epf->epc)
 		return -EBUSY;

@@ -383,12 +381,6 @@ int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf)
 		return -EINVAL;
 
 	epf->epc = epc;
-	if (dev->of_node) {
-		of_dma_configure(&epf->dev, dev->of_node);
-	} else {
-		dma_set_coherent_mask(&epf->dev, epc->dev.coherent_dma_mask);
-		epf->dev.dma_mask = epc->dev.dma_mask;
-	}
 
 	spin_lock_irqsave(&epc->lock, flags);
 	list_add_tail(&epf->list, &epc->pci_epf);

@@ -503,9 +495,7 @@ __pci_epc_create(struct device *dev, const struct pci_epc_ops *ops,
 	INIT_LIST_HEAD(&epc->pci_epf);
 
 	device_initialize(&epc->dev);
-	dma_set_coherent_mask(&epc->dev, dev->coherent_dma_mask);
 	epc->dev.class = pci_epc_class;
-	epc->dev.dma_mask = dev->dma_mask;
 	epc->dev.parent = dev;
 	epc->ops = ops;

drivers/pci/endpoint/pci-epf-core.c +2 -2

index ae1611a62808..95ccc4b8a0a2 100644
@@ -99,7 +99,7 @@ EXPORT_SYMBOL_GPL(pci_epf_bind);
  */
 void pci_epf_free_space(struct pci_epf *epf, void *addr, enum pci_barno bar)
 {
-	struct device *dev = &epf->dev;
+	struct device *dev = epf->epc->dev.parent;
 
 	if (!addr)
 		return;

@@ -122,7 +122,7 @@ EXPORT_SYMBOL_GPL(pci_epf_free_space);
 void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar)
 {
 	void *space;
-	struct device *dev = &epf->dev;
+	struct device *dev = epf->epc->dev.parent;
 	dma_addr_t phys_addr;
 
 	if (size < 128)

Signature · 1 line

2.11.0

Niklas Cassel

Tested-by on v2 1/1

2018-01-09 12:40 UTC #1 lore raw

This is needed to get PCIe endpoint support working on ARTPEC-6 again.

Tested-by Niklas Cassel <[email protected]>

Quoted 89 lines · Kishon Vijay Abraham I

Fix it by making dma_alloc_coherent use EPC's device for allocating memory address as per discussion in [1]

[1] https://lkml.org/lkml/2017/10/24/26

Signed-off-by Kishon Vijay Abraham I <[email protected]>

Cc Robin Murphy <[email protected]>

Cc Rob Herring <[email protected]>

Cc Christoph Hellwig <[email protected]>

Tested-by Cyrille Pitchen <[email protected]>

---
No change in patch. Only added "Tested-by" of Cyrille Pitchen.

 drivers/pci/endpoint/pci-epc-core.c | 10 ----------
 drivers/pci/endpoint/pci-epf-core.c |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)

drivers/pci/endpoint/pci-epc-core.c +0 ~~-10~~

index 42c2a1156325..cd7d4788b94d 100644
@@ -18,7 +18,6 @@
  */
 
 #include <linux/device.h>
-#include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/of_device.h>

@@ -371,7 +370,6 @@ EXPORT_SYMBOL_GPL(pci_epc_write_header);
 int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf)
 {
 	unsigned long flags;
-	struct device *dev = epc->dev.parent;
 
 	if (epf->epc)
 		return -EBUSY;

@@ -383,12 +381,6 @@ int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf)
 		return -EINVAL;
 
 	epf->epc = epc;
-	if (dev->of_node) {
-		of_dma_configure(&epf->dev, dev->of_node);
-	} else {
-		dma_set_coherent_mask(&epf->dev, epc->dev.coherent_dma_mask);
-		epf->dev.dma_mask = epc->dev.dma_mask;
-	}
 
 	spin_lock_irqsave(&epc->lock, flags);
 	list_add_tail(&epf->list, &epc->pci_epf);

@@ -503,9 +495,7 @@ __pci_epc_create(struct device *dev, const struct pci_epc_ops *ops,
 	INIT_LIST_HEAD(&epc->pci_epf);
 
 	device_initialize(&epc->dev);
-	dma_set_coherent_mask(&epc->dev, dev->coherent_dma_mask);
 	epc->dev.class = pci_epc_class;
-	epc->dev.dma_mask = dev->dma_mask;
 	epc->dev.parent = dev;
 	epc->ops = ops;

drivers/pci/endpoint/pci-epf-core.c +2 -2

index ae1611a62808..95ccc4b8a0a2 100644
@@ -99,7 +99,7 @@ EXPORT_SYMBOL_GPL(pci_epf_bind);
  */
 void pci_epf_free_space(struct pci_epf *epf, void *addr, enum pci_barno bar)
 {
-	struct device *dev = &epf->dev;
+	struct device *dev = epf->epc->dev.parent;
 
 	if (!addr)
 		return;

@@ -122,7 +122,7 @@ EXPORT_SYMBOL_GPL(pci_epf_free_space);
 void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar)
 {
 	void *space;
-	struct device *dev = &epf->dev;
+	struct device *dev = epf->epc->dev.parent;
 	dma_addr_t phys_addr;
 
 	if (size < 128)

Robin Murphy

Reviewed-by on v2 1/1

2018-01-09 12:46 UTC #2 lore raw

In reply to Kishon Vijay Abraham I

Quoted 8 lines · Kishon Vijay Abraham I

After commit 723288836628bc1c08 ("of: restrict DMA configuration"), of_dma_configure doesn't configure the coherent_dma_mask/dma_mask of endpoint function device (since it doesn't have a dt node associated with and hence no dma-ranges property), resulting in dma_alloc_coherent (used in pci_epf_alloc_space) to fail.
Fix it by making dma_alloc_coherent use EPC's device for allocating memory address as per discussion in [1]

Looks like cleaning up the API usage also cleans up the code nicely too, yay :)

Reviewed-by Robin Murphy <[email protected]>

Quoted 80 lines

[1] https://lkml.org/lkml/2017/10/24/26

Signed-off-by Kishon Vijay Abraham I <[email protected]>

Cc Robin Murphy <[email protected]>

Cc Rob Herring <[email protected]>

Cc Christoph Hellwig <[email protected]>

Tested-by Cyrille Pitchen <[email protected]>

---
No change in patch. Only added "Tested-by" of Cyrille Pitchen.

  drivers/pci/endpoint/pci-epc-core.c | 10 ----------
  drivers/pci/endpoint/pci-epf-core.c |  4 ++--
  2 files changed, 2 insertions(+), 12 deletions(-)

drivers/pci/endpoint/pci-epc-core.c +0 ~~-10~~

index 42c2a1156325..cd7d4788b94d 100644
@@ -18,7 +18,6 @@
   */
 
  #include <linux/device.h>
-#include <linux/dma-mapping.h>
  #include <linux/slab.h>
  #include <linux/module.h>
  #include <linux/of_device.h>

@@ -371,7 +370,6 @@ EXPORT_SYMBOL_GPL(pci_epc_write_header);
  int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf)
  {
  	unsigned long flags;
-	struct device *dev = epc->dev.parent;
 
  	if (epf->epc)
  		return -EBUSY;

@@ -383,12 +381,6 @@ int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf)
  		return -EINVAL;
 
  	epf->epc = epc;
-	if (dev->of_node) {
-		of_dma_configure(&epf->dev, dev->of_node);
-	} else {
-		dma_set_coherent_mask(&epf->dev, epc->dev.coherent_dma_mask);
-		epf->dev.dma_mask = epc->dev.dma_mask;
-	}
 
  	spin_lock_irqsave(&epc->lock, flags);
  	list_add_tail(&epf->list, &epc->pci_epf);

@@ -503,9 +495,7 @@ __pci_epc_create(struct device *dev, const struct pci_epc_ops *ops,
  	INIT_LIST_HEAD(&epc->pci_epf);
 
  	device_initialize(&epc->dev);
-	dma_set_coherent_mask(&epc->dev, dev->coherent_dma_mask);
  	epc->dev.class = pci_epc_class;
-	epc->dev.dma_mask = dev->dma_mask;
  	epc->dev.parent = dev;
  	epc->ops = ops;

drivers/pci/endpoint/pci-epf-core.c +2 -2

index ae1611a62808..95ccc4b8a0a2 100644
@@ -99,7 +99,7 @@ EXPORT_SYMBOL_GPL(pci_epf_bind);
   */
  void pci_epf_free_space(struct pci_epf *epf, void *addr, enum pci_barno bar)
  {
-	struct device *dev = &epf->dev;
+	struct device *dev = epf->epc->dev.parent;
 
  	if (!addr)
  		return;

@@ -122,7 +122,7 @@ EXPORT_SYMBOL_GPL(pci_epf_free_space);
  void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar)
  {
  	void *space;
-	struct device *dev = &epf->dev;
+	struct device *dev = epf->epc->dev.parent;
  	dma_addr_t phys_addr;
 
  	if (size < 128)

Lorenzo Pieralisi

2018-01-10 11:10 UTC #3 lore raw

In reply to Kishon Vijay Abraham I

Quoted 10 lines · Kishon Vijay Abraham I

After commit 723288836628bc1c08 ("of: restrict DMA configuration"), of_dma_configure doesn't configure the coherent_dma_mask/dma_mask of endpoint function device (since it doesn't have a dt node associated with and hence no dma-ranges property), resulting in dma_alloc_coherent (used in pci_epf_alloc_space) to fail.
Fix it by making dma_alloc_coherent use EPC's device for allocating memory address as per discussion in [1]
[1] https://lkml.org/lkml/2017/10/24/26

Hi Kishon,

small nit, mind embedding the link [1] above in a lkml redirector format - as described in:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v4.15-rc7

put it in a Link: tag to be added below - I think that's important for the commit log to have.

Either send me the formatted link or send a v3 with it, I will merge then.

Thanks,
Lorenzo

Quoted 80 lines

Signed-off-by Kishon Vijay Abraham I <[email protected]>

Cc Robin Murphy <[email protected]>

Cc Rob Herring <[email protected]>

Cc Christoph Hellwig <[email protected]>

Tested-by Cyrille Pitchen <[email protected]>

---
No change in patch. Only added "Tested-by" of Cyrille Pitchen.

 drivers/pci/endpoint/pci-epc-core.c | 10 ----------
 drivers/pci/endpoint/pci-epf-core.c |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)

drivers/pci/endpoint/pci-epc-core.c +0 ~~-10~~

index 42c2a1156325..cd7d4788b94d 100644
@@ -18,7 +18,6 @@
  */
 
 #include <linux/device.h>
-#include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/of_device.h>

@@ -371,7 +370,6 @@ EXPORT_SYMBOL_GPL(pci_epc_write_header);
 int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf)
 {
 	unsigned long flags;
-	struct device *dev = epc->dev.parent;
 
 	if (epf->epc)
 		return -EBUSY;

@@ -383,12 +381,6 @@ int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf)
 		return -EINVAL;
 
 	epf->epc = epc;
-	if (dev->of_node) {
-		of_dma_configure(&epf->dev, dev->of_node);
-	} else {
-		dma_set_coherent_mask(&epf->dev, epc->dev.coherent_dma_mask);
-		epf->dev.dma_mask = epc->dev.dma_mask;
-	}
 
 	spin_lock_irqsave(&epc->lock, flags);
 	list_add_tail(&epf->list, &epc->pci_epf);

@@ -503,9 +495,7 @@ __pci_epc_create(struct device *dev, const struct pci_epc_ops *ops,
 	INIT_LIST_HEAD(&epc->pci_epf);
 
 	device_initialize(&epc->dev);
-	dma_set_coherent_mask(&epc->dev, dev->coherent_dma_mask);
 	epc->dev.class = pci_epc_class;
-	epc->dev.dma_mask = dev->dma_mask;
 	epc->dev.parent = dev;
 	epc->ops = ops;

drivers/pci/endpoint/pci-epf-core.c +2 -2

index ae1611a62808..95ccc4b8a0a2 100644
@@ -99,7 +99,7 @@ EXPORT_SYMBOL_GPL(pci_epf_bind);
  */
 void pci_epf_free_space(struct pci_epf *epf, void *addr, enum pci_barno bar)
 {
-	struct device *dev = &epf->dev;
+	struct device *dev = epf->epc->dev.parent;
 
 	if (!addr)
 		return;

@@ -122,7 +122,7 @@ EXPORT_SYMBOL_GPL(pci_epf_free_space);
 void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar)
 {
 	void *space;
-	struct device *dev = &epf->dev;
+	struct device *dev = epf->epc->dev.parent;
 	dma_addr_t phys_addr;
 
 	if (size < 128)

Signature · 1 line

2.11.0

Kishon Vijay Abraham I

author

2018-01-11 08:32 UTC #4 lore raw

Quoted 17 lines · Lorenzo Pieralisi

Quoted 10 lines · Kishon Vijay Abraham I
After commit 723288836628bc1c08 ("of: restrict DMA configuration"), of_dma_configure doesn't configure the coherent_dma_mask/dma_mask of endpoint function device (since it doesn't have a dt node associated with and hence no dma-ranges property), resulting in dma_alloc_coherent (used in pci_epf_alloc_space) to fail.
Fix it by making dma_alloc_coherent use EPC's device for allocating memory address as per discussion in [1]
[1] https://lkml.org/lkml/2017/10/24/26
Hi Kishon,
small nit, mind embedding the link [1] above in a lkml redirector format - as described in:

Quoted 7 lines

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v4.15-rc7
put it in a Link: tag to be added below - I think that's important for the commit log to have.
Either send me the formatted link or send a v3 with it, I will merge then.

sure, sent you a v3.

Thanks
Kishon