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

Commit f2115faa authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-pci' 

* acpi-pci:
  PCI: ACPI: Add support for PCI device DMA coherency
  PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()
  of/pci: Fix pci_get_host_bridge_device leak
  device property: ACPI: Remove unused DMA APIs
  device property: ACPI: Make use of the new DMA Attribute APIs
  device property: Adding DMA Attribute APIs for Generic Devices
  ACPI: Adding DMA Attribute APIs for ACPI Device
  device property: Introducing enum dev_dma_attr
  ACPI: Honor ACPI _CCA attribute setting

Conflicts:
	drivers/crypto/ccp/ccp-platform.c
parents 0d51ce9c 29dbe1f0

drivers/acpi/acpi_platform.c

+6 −1
Original line number Diff line number Diff line
@@ -103,7 +103,12 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev) 
	pdevinfo.res = resources;

	pdevinfo.num_res = count;

	pdevinfo.fwnode = acpi_fwnode_handle(adev);

	pdevinfo.dma_mask = acpi_check_dma(adev, NULL) ? DMA_BIT_MASK(32) : 0;



	if (acpi_dma_supported(adev))

		pdevinfo.dma_mask = DMA_BIT_MASK(32);

	else

		pdevinfo.dma_mask = 0;



	pdev = platform_device_register_full(&pdevinfo);

	if (IS_ERR(pdev))

		dev_err(&adev->dev, "platform device creation failed: %ld\n",

drivers/acpi/glue.c

+5 −3
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev) 
	struct list_head *physnode_list;

	unsigned int node_id;

	int retval = -EINVAL;

	bool coherent;

	enum dev_dma_attr attr;



	if (has_acpi_companion(dev)) {

		if (acpi_dev) {
@@ -225,8 +225,10 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev) 
	if (!has_acpi_companion(dev))

		ACPI_COMPANION_SET(dev, acpi_dev);



	if (acpi_check_dma(acpi_dev, &coherent))

		arch_setup_dma_ops(dev, 0, 0, NULL, coherent);

	attr = acpi_get_dma_attr(acpi_dev);

	if (attr != DEV_DMA_NOT_SUPPORTED)

		arch_setup_dma_ops(dev, 0, 0, NULL,

				   attr == DEV_DMA_COHERENT);



	acpi_physnode_link_name(physical_node_name, node_id);

	retval = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,

drivers/acpi/scan.c

+42 −0
Original line number Diff line number Diff line
@@ -1308,6 +1308,48 @@ void acpi_free_pnp_ids(struct acpi_device_pnp *pnp) 
	kfree(pnp->unique_id);

}



/**

 * acpi_dma_supported - Check DMA support for the specified device.

 * @adev: The pointer to acpi device

 *

 * Return false if DMA is not supported. Otherwise, return true

 */

bool acpi_dma_supported(struct acpi_device *adev)

{

	if (!adev)

		return false;



	if (adev->flags.cca_seen)

		return true;



	/*

	* Per ACPI 6.0 sec 6.2.17, assume devices can do cache-coherent

	* DMA on "Intel platforms".  Presumably that includes all x86 and

	* ia64, and other arches will set CONFIG_ACPI_CCA_REQUIRED=y.

	*/

	if (!IS_ENABLED(CONFIG_ACPI_CCA_REQUIRED))

		return true;



	return false;

}



/**

 * acpi_get_dma_attr - Check the supported DMA attr for the specified device.

 * @adev: The pointer to acpi device

 *

 * Return enum dev_dma_attr.

 */

enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev)

{

	if (!acpi_dma_supported(adev))

		return DEV_DMA_NOT_SUPPORTED;



	if (adev->flags.coherent_dma)

		return DEV_DMA_COHERENT;

	else

		return DEV_DMA_NON_COHERENT;

}



static void acpi_init_coherency(struct acpi_device *adev)

{

	unsigned long long cca = 0;

drivers/base/property.c

+24 −8
Original line number Diff line number Diff line
@@ -598,18 +598,34 @@ unsigned int device_get_child_node_count(struct device *dev) 
}

EXPORT_SYMBOL_GPL(device_get_child_node_count);



bool device_dma_is_coherent(struct device *dev)

bool device_dma_supported(struct device *dev)

{

	bool coherent = false;



	/* For DT, this is always supported.

	 * For ACPI, this depends on CCA, which

	 * is determined by the acpi_dma_supported().

	 */

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

		coherent = of_dma_is_coherent(dev->of_node);

		return true;



	return acpi_dma_supported(ACPI_COMPANION(dev));

}

EXPORT_SYMBOL_GPL(device_dma_supported);



enum dev_dma_attr device_get_dma_attr(struct device *dev)

{

	enum dev_dma_attr attr = DEV_DMA_NOT_SUPPORTED;



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

		if (of_dma_is_coherent(dev->of_node))

			attr = DEV_DMA_COHERENT;

		else

		acpi_check_dma(ACPI_COMPANION(dev), &coherent);

			attr = DEV_DMA_NON_COHERENT;

	} else

		attr = acpi_get_dma_attr(ACPI_COMPANION(dev));



	return coherent;

	return attr;

}

EXPORT_SYMBOL_GPL(device_dma_is_coherent);

EXPORT_SYMBOL_GPL(device_get_dma_attr);



/**

 * device_get_phy_mode - Get phy mode for given device

drivers/crypto/ccp/ccp-platform.c

+11 −4
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ static int ccp_platform_probe(struct platform_device *pdev) 
	struct ccp_device *ccp;

	struct ccp_platform *ccp_platform;

	struct device *dev = &pdev->dev;

	enum dev_dma_attr attr;

	struct resource *ior;

	int ret;
@@ -118,18 +119,24 @@ static int ccp_platform_probe(struct platform_device *pdev) 
	}

	ccp->io_regs = ccp->io_map;



	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(48));

	if (ret) {

		dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n", ret);

	attr = device_get_dma_attr(dev);

	if (attr == DEV_DMA_NOT_SUPPORTED) {

		dev_err(dev, "DMA is not supported");

		goto e_err;

	}



	ccp_platform->coherent = device_dma_is_coherent(ccp->dev);

	ccp_platform->coherent = (attr == DEV_DMA_COHERENT);

	if (ccp_platform->coherent)

		ccp->axcache = CACHE_WB_NO_ALLOC;

	else

		ccp->axcache = CACHE_NONE;



	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(48));

	if (ret) {

		dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n", ret);

		goto e_err;

	}



	dev_set_drvdata(dev, ccp);



	ret = ccp_init(ccp);