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

Commit 52fabc34 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/io-pgtable: Deprecate IO_PGTABLE_QUIRK_NO_DMA"

parents 5de94c18 c0907ad0
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -108,9 +108,8 @@ config QCOM_IOMMU_IO_PGTABLE_QUIRKS
	help
	  Enables some quirks that are used when creating the IOMMU's
	  page tables for a particular domain for faster translations.
	  The quirks that are supported deal with allowing for page
	  tables to be IO-coherent, allowing for page tables to be
	  saved in the system cache, and disabling the write-allocate
	  The quirks that are supported deal with allowing for page tables
	  to be saved in the system cache, and disabling the write-allocate
	  hint when saving page tables in the system cache.

	  If unsure, say N here.
+2 −8
Original line number Diff line number Diff line
@@ -109,11 +109,6 @@ struct io_pgtable_cfg {
	 *	on unmap, for DMA domains using the flush queue mechanism for
	 *	delayed invalidation.
	 *
	 * IO_PGTABLE_QUIRK_NO_DMA: Guarantees that the tables will only ever
	 *	be accessed by a fully cache-coherent IOMMU or CPU (e.g. for a
	 *	software-emulated IOMMU), such that pagetable updates need not
	 *	be treated as explicit DMA data.
	 *
	 * IO_PGTABLE_QUIRK_QCOM_USE_UPSTREAM_HINT: Override the attributes
	 *	set in TCR for the page table walker. Use attributes specified
	 *	by the upstream hw instead.
@@ -128,9 +123,8 @@ struct io_pgtable_cfg {
	#define IO_PGTABLE_QUIRK_TLBI_ON_MAP	BIT(2)
	#define IO_PGTABLE_QUIRK_ARM_MTK_EXT	BIT(3)
	#define IO_PGTABLE_QUIRK_NON_STRICT	BIT(4)
	#define IO_PGTABLE_QUIRK_NO_DMA		BIT(5)
	#define IO_PGTABLE_QUIRK_QCOM_USE_UPSTREAM_HINT	BIT(6)
	#define IO_PGTABLE_QUIRK_QCOM_USE_LLC_NWA	BIT(7)
	#define IO_PGTABLE_QUIRK_QCOM_USE_UPSTREAM_HINT	BIT(5)
	#define IO_PGTABLE_QUIRK_QCOM_USE_LLC_NWA	BIT(6)
	unsigned long			quirks;
	unsigned long			pgsize_bitmap;
	unsigned int			ias;