Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50230713 authored by Suthikulpanit, Suravee's avatar Suthikulpanit, Suravee Committed by Rafael J. Wysocki
Browse files

PCI: OF: Move of_pci_dma_configure() to pci_dma_configure() 



This patch move of_pci_dma_configure() to a more generic
pci_dma_configure(), which can be extended by non-OF code (e.g. ACPI).

This has no functional change.

Signed-off-by: default avatarSuravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Acked-by: default avatarRob Herring <robh+dt@kernel.org>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 37efbe20

drivers/of/of_pci.c

+0 −19
Original line number Diff line number Diff line
@@ -117,25 +117,6 @@ int of_get_pci_domain_nr(struct device_node *node) 
}

EXPORT_SYMBOL_GPL(of_get_pci_domain_nr);



/**

 * of_pci_dma_configure - Setup DMA configuration

 * @dev: ptr to pci_dev struct of the PCI device

 *

 * Function to update PCI devices's DMA configuration using the same

 * info from the OF node of host bridge's parent (if any).

 */

void of_pci_dma_configure(struct pci_dev *pci_dev)

{

	struct device *dev = &pci_dev->dev;

	struct device *bridge = pci_get_host_bridge_device(pci_dev);



	if (bridge->parent)

		of_dma_configure(dev, bridge->parent->of_node);



	pci_put_host_bridge_device(bridge);

}

EXPORT_SYMBOL_GPL(of_pci_dma_configure);



#if defined(CONFIG_OF_ADDRESS)

/**

 * of_pci_get_host_bridge_resources - Parse PCI host bridge resources from DT

drivers/pci/probe.c

+21 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/delay.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/of_device.h>

#include <linux/of_pci.h>

#include <linux/pci_hotplug.h>

#include <linux/slab.h>
@@ -1633,6 +1634,25 @@ static void pci_set_msi_domain(struct pci_dev *dev) 
				   dev_get_msi_domain(&dev->bus->dev));

}



/**

 * pci_dma_configure - Setup DMA configuration

 * @dev: ptr to pci_dev struct of the PCI device

 *

 * Function to update PCI devices's DMA configuration using the same

 * info from the OF node of host bridge's parent (if any).

 */

static void pci_dma_configure(struct pci_dev *dev)

{

	struct device *bridge = pci_get_host_bridge_device(dev);



	if (IS_ENABLED(CONFIG_OF) && dev->dev.of_node) {

		if (bridge->parent)

			of_dma_configure(&dev->dev, bridge->parent->of_node);

	}



	pci_put_host_bridge_device(bridge);

}



void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)

{

	int ret;
@@ -1646,7 +1666,7 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) 
	dev->dev.dma_mask = &dev->dma_mask;

	dev->dev.dma_parms = &dev->dma_parms;

	dev->dev.coherent_dma_mask = 0xffffffffull;

	of_pci_dma_configure(dev);

	pci_dma_configure(dev);



	pci_set_dma_max_seg_size(dev, 65536);

	pci_set_dma_seg_boundary(dev, 0xffffffff);

include/linux/of_pci.h

+0 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ int of_pci_get_devfn(struct device_node *np); 
int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);

int of_pci_parse_bus_range(struct device_node *node, struct resource *res);

int of_get_pci_domain_nr(struct device_node *node);

void of_pci_dma_configure(struct pci_dev *pci_dev);

#else

static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq)

{
@@ -51,8 +50,6 @@ of_get_pci_domain_nr(struct device_node *node) 
{

	return -1;

}



static inline void of_pci_dma_configure(struct pci_dev *pci_dev) { }

#endif



#if defined(CONFIG_OF_ADDRESS)