Merge remote-tracking branch 'arm64/for-next/iommu/io-pgtable-domain-attr' into msm-next-staging (9e0673c0) · Commits · 戴 / test

drivers/iommu/io-pgtable-arm.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -761,7 +761,8 @@ arm_64_lpae_alloc_pgtable_s1(struct io_pgtable_cfg cfg, void cookie)

		if (cfg->quirks & ~(IO_PGTABLE_QUIRK_ARM_NS \|
		IO_PGTABLE_QUIRK_NON_STRICT \|
		IO_PGTABLE_QUIRK_ARM_TTBR1))
		IO_PGTABLE_QUIRK_ARM_TTBR1 \|
		IO_PGTABLE_QUIRK_ARM_OUTER_WBWA))
		return NULL;

		data = arm_lpae_alloc_pgtable(cfg);
		@@ -773,10 +774,15 @@ arm_64_lpae_alloc_pgtable_s1(struct io_pgtable_cfg cfg, void cookie)
		tcr->sh = ARM_LPAE_TCR_SH_IS;
		tcr->irgn = ARM_LPAE_TCR_RGN_WBWA;
		tcr->orgn = ARM_LPAE_TCR_RGN_WBWA;
		if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_OUTER_WBWA)
		goto out_free_data;
		} else {
		tcr->sh = ARM_LPAE_TCR_SH_OS;
		tcr->irgn = ARM_LPAE_TCR_RGN_NC;
		if (!(cfg->quirks & IO_PGTABLE_QUIRK_ARM_OUTER_WBWA))
		tcr->orgn = ARM_LPAE_TCR_RGN_NC;
		else
		tcr->orgn = ARM_LPAE_TCR_RGN_WBWA;
		}

		tg1 = cfg->quirks & IO_PGTABLE_QUIRK_ARM_TTBR1;

+8 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,9 @@ struct io_pgtable_cfg {
		*
		* IO_PGTABLE_QUIRK_ARM_TTBR1: (ARM LPAE format) Configure the table
		* for use in the upper half of a split address space.
		*
		* IO_PGTABLE_QUIRK_ARM_OUTER_WBWA: Override the outer-cacheability
		* attributes set in the TCR for a non-coherent page-table walker.
		*/
		#define IO_PGTABLE_QUIRK_ARM_NS BIT(0)
		#define IO_PGTABLE_QUIRK_NO_PERMS BIT(1)
		@@ -93,6 +96,7 @@ struct io_pgtable_cfg {
		#define IO_PGTABLE_QUIRK_ARM_MTK_EXT BIT(3)
		#define IO_PGTABLE_QUIRK_NON_STRICT BIT(4)
		#define IO_PGTABLE_QUIRK_ARM_TTBR1 BIT(5)
		#define IO_PGTABLE_QUIRK_ARM_OUTER_WBWA BIT(6)
		unsigned long quirks;
		unsigned long pgsize_bitmap;
		unsigned int ias;
		@@ -208,6 +212,10 @@ struct io_pgtable {

		#define io_pgtable_ops_to_pgtable(x) container_of((x), struct io_pgtable, ops)

		struct io_pgtable_domain_attr {
		unsigned long quirks;
		};

		static inline void io_pgtable_tlb_flush_all(struct io_pgtable *iop)
		{
		iop->cfg.tlb->tlb_flush_all(iop->cookie);

+1 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,7 @@ enum iommu_attr {
		DOMAIN_ATTR_FSL_PAMUV1,
		DOMAIN_ATTR_NESTING, /* two stages of translation */
		DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE,
		DOMAIN_ATTR_IO_PGTABLE_CFG,
		DOMAIN_ATTR_MAX,
		};