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

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

Merge branch 'acpi-cca' 

* acpi-cca:
  ufs: fix TRUE and FALSE re-define build error
  megaraid_sas: fix TRUE and FALSE re-define build error
  amd-xgbe: Unify coherency checking logic with device_dma_is_coherent()
  crypto: ccp - Unify coherency checking logic with device_dma_is_coherent()
  device property: Introduces device_dma_is_coherent()
  arm64 : Introduce support for ACPI _CCA object
  ACPI / scan: Parse _CCA and setup device coherency
parents 4def8a36 e144cd04

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line 
config ARM64

	def_bool y

	select ACPI_CCA_REQUIRED if ACPI

	select ACPI_GENERIC_GSI if ACPI

	select ACPI_REDUCED_HARDWARE_ONLY if ACPI

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

arch/arm64/include/asm/dma-mapping.h

+16 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#ifdef __KERNEL__



#include <linux/acpi.h>

#include <linux/types.h>

#include <linux/vmalloc.h>
@@ -28,13 +29,23 @@ 


#define DMA_ERROR_CODE	(~(dma_addr_t)0)

extern struct dma_map_ops *dma_ops;

extern struct dma_map_ops dummy_dma_ops;



static inline struct dma_map_ops *__generic_dma_ops(struct device *dev)

{

	if (unlikely(!dev) || !dev->archdata.dma_ops)

	if (unlikely(!dev))

		return dma_ops;

	else

	else if (dev->archdata.dma_ops)

		return dev->archdata.dma_ops;

	else if (acpi_disabled)

		return dma_ops;



	/*

	 * When ACPI is enabled, if arch_set_dma_ops is not called,

	 * we will disable device DMA capability by setting it

	 * to dummy_dma_ops.

	 */

	return &dummy_dma_ops;

}



static inline struct dma_map_ops *get_dma_ops(struct device *dev)
@@ -48,6 +59,9 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) 
static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

				      struct iommu_ops *iommu, bool coherent)

{

	if (!acpi_disabled && !dev->archdata.dma_ops)

		dev->archdata.dma_ops = dma_ops;



	dev->archdata.dma_coherent = coherent;

}

#define arch_setup_dma_ops	arch_setup_dma_ops

arch/arm64/mm/dma-mapping.c

+92 −0
Original line number Diff line number Diff line
@@ -414,6 +414,98 @@ static int __init atomic_pool_init(void) 
	return -ENOMEM;

}



/********************************************

 * The following APIs are for dummy DMA ops *

 ********************************************/



static void *__dummy_alloc(struct device *dev, size_t size,

			   dma_addr_t *dma_handle, gfp_t flags,

			   struct dma_attrs *attrs)

{

	return NULL;

}



static void __dummy_free(struct device *dev, size_t size,

			 void *vaddr, dma_addr_t dma_handle,

			 struct dma_attrs *attrs)

{

}



static int __dummy_mmap(struct device *dev,

			struct vm_area_struct *vma,

			void *cpu_addr, dma_addr_t dma_addr, size_t size,

			struct dma_attrs *attrs)

{

	return -ENXIO;

}



static dma_addr_t __dummy_map_page(struct device *dev, struct page *page,

				   unsigned long offset, size_t size,

				   enum dma_data_direction dir,

				   struct dma_attrs *attrs)

{

	return DMA_ERROR_CODE;

}



static void __dummy_unmap_page(struct device *dev, dma_addr_t dev_addr,

			       size_t size, enum dma_data_direction dir,

			       struct dma_attrs *attrs)

{

}



static int __dummy_map_sg(struct device *dev, struct scatterlist *sgl,

			  int nelems, enum dma_data_direction dir,

			  struct dma_attrs *attrs)

{

	return 0;

}



static void __dummy_unmap_sg(struct device *dev,

			     struct scatterlist *sgl, int nelems,

			     enum dma_data_direction dir,

			     struct dma_attrs *attrs)

{

}



static void __dummy_sync_single(struct device *dev,

				dma_addr_t dev_addr, size_t size,

				enum dma_data_direction dir)

{

}



static void __dummy_sync_sg(struct device *dev,

			    struct scatterlist *sgl, int nelems,

			    enum dma_data_direction dir)

{

}



static int __dummy_mapping_error(struct device *hwdev, dma_addr_t dma_addr)

{

	return 1;

}



static int __dummy_dma_supported(struct device *hwdev, u64 mask)

{

	return 0;

}



struct dma_map_ops dummy_dma_ops = {

	.alloc                  = __dummy_alloc,

	.free                   = __dummy_free,

	.mmap                   = __dummy_mmap,

	.map_page               = __dummy_map_page,

	.unmap_page             = __dummy_unmap_page,

	.map_sg                 = __dummy_map_sg,

	.unmap_sg               = __dummy_unmap_sg,

	.sync_single_for_cpu    = __dummy_sync_single,

	.sync_single_for_device = __dummy_sync_single,

	.sync_sg_for_cpu        = __dummy_sync_sg,

	.sync_sg_for_device     = __dummy_sync_sg,

	.mapping_error          = __dummy_mapping_error,

	.dma_supported          = __dummy_dma_supported,

};

EXPORT_SYMBOL(dummy_dma_ops);



static int __init arm64_dma_init(void)

{

	int ret;

drivers/acpi/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ config ACPI_GENERIC_GSI 
config ACPI_SYSTEM_POWER_STATES_SUPPORT

	bool



config ACPI_CCA_REQUIRED

	bool



config ACPI_SLEEP

	bool

	depends on SUSPEND || HIBERNATION

drivers/acpi/acpi_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 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 = DMA_BIT_MASK(32);

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

	pdev = platform_device_register_full(&pdevinfo);

	if (IS_ERR(pdev))

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