Commit 5229bd5f authored by Hector Martin's avatar Hector Martin Committed by Joerg Roedel
Browse files

iommu/apple-dart: Add 4-level page table support 



The T8110 variant DART implementation on T602x SoCs indicates an IAS of
42, which requires an extra page table level. The extra level is
optional, but let's implement it.

Later it might be useful to restrict this based on the actual attached
devices, since most won't need that much address space anyway.

Signed-off-by: default avatarHector Martin <marcan@marcan.st>
Signed-off-by: default avatarJanne Grunau <j@jannau.net>
Reviewed-by: default avatarSven Peter <sven@kernel.org>
Reviewed-by: default avatarNeal Gompa <neal@gompa.dev>
Link: https://lore.kernel.org/r/20250821-apple-dart-4levels-v2-3-e39af79daa37@jannau.net


Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 74a0e72f

drivers/iommu/apple-dart.c

+20 −6
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ 
#define DART_T8110_TCR                  0x1000

#define DART_T8110_TCR_REMAP            GENMASK(11, 8)

#define DART_T8110_TCR_REMAP_EN         BIT(7)

#define DART_T8110_TCR_FOUR_LEVEL       BIT(3)

#define DART_T8110_TCR_BYPASS_DAPF      BIT(2)

#define DART_T8110_TCR_BYPASS_DART      BIT(1)

#define DART_T8110_TCR_TRANSLATE_ENABLE BIT(0)
@@ -177,6 +178,7 @@ struct apple_dart_hw { 
	u32 tcr_enabled;

	u32 tcr_disabled;

	u32 tcr_bypass;

	u32 tcr_4level;



	u32 ttbr;

	u32 ttbr_valid;
@@ -217,6 +219,7 @@ struct apple_dart { 
	u32 pgsize;

	u32 num_streams;

	u32 supports_bypass : 1;

	u32 four_level : 1;



	struct iommu_group *sid2group[DART_MAX_STREAMS];

	struct iommu_device iommu;
@@ -305,13 +308,19 @@ static struct apple_dart_domain *to_dart_domain(struct iommu_domain *dom) 
}



static void

apple_dart_hw_enable_translation(struct apple_dart_stream_map *stream_map)

apple_dart_hw_enable_translation(struct apple_dart_stream_map *stream_map, int levels)

{

	struct apple_dart *dart = stream_map->dart;

	u32 tcr = dart->hw->tcr_enabled;

	int sid;



	if (levels == 4)

		tcr |= dart->hw->tcr_4level;



	WARN_ON(levels != 3 && levels != 4);

	WARN_ON(levels == 4 && !dart->four_level);

	for_each_set_bit(sid, stream_map->sidmap, dart->num_streams)

		writel(dart->hw->tcr_enabled, dart->regs + DART_TCR(dart, sid));

		writel(tcr, dart->regs + DART_TCR(dart, sid));

}



static void apple_dart_hw_disable_dma(struct apple_dart_stream_map *stream_map)
@@ -569,7 +578,8 @@ apple_dart_setup_translation(struct apple_dart_domain *domain, 
	for (; i < stream_map->dart->hw->ttbr_count; ++i)

		apple_dart_hw_clear_ttbr(stream_map, i);



	apple_dart_hw_enable_translation(stream_map);

	apple_dart_hw_enable_translation(stream_map,

					 pgtbl_cfg->apple_dart_cfg.n_levels);

	stream_map->dart->hw->invalidate_tlb(stream_map);

}
@@ -614,7 +624,7 @@ static int apple_dart_finalize_domain(struct apple_dart_domain *dart_domain, 
	dart_domain->domain.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;

	dart_domain->domain.geometry.aperture_start = 0;

	dart_domain->domain.geometry.aperture_end =

		(dma_addr_t)DMA_BIT_MASK(dart->ias);

		(dma_addr_t)DMA_BIT_MASK(pgtbl_cfg.ias);

	dart_domain->domain.geometry.force_aperture = true;



	dart_domain->finalized = true;
@@ -807,6 +817,8 @@ static int apple_dart_of_xlate(struct device *dev, 
	if (cfg_dart) {

		if (cfg_dart->pgsize != dart->pgsize)

			return -EINVAL;

		if (cfg_dart->ias != dart->ias)

			return -EINVAL;

	}



	cfg->supports_bypass &= dart->supports_bypass;
@@ -1137,6 +1149,7 @@ static int apple_dart_probe(struct platform_device *pdev) 
		dart->ias = FIELD_GET(DART_T8110_PARAMS3_VA_WIDTH, dart_params[2]);

		dart->oas = FIELD_GET(DART_T8110_PARAMS3_PA_WIDTH, dart_params[2]);

		dart->num_streams = FIELD_GET(DART_T8110_PARAMS4_NUM_SIDS, dart_params[3]);

		dart->four_level = dart->ias > 36;

		break;

	}
@@ -1169,9 +1182,9 @@ static int apple_dart_probe(struct platform_device *pdev) 


	dev_info(

		&pdev->dev,

		"DART [pagesize %x, %d streams, bypass support: %d, bypass forced: %d] initialized\n",

		"DART [pagesize %x, %d streams, bypass support: %d, bypass forced: %d, AS %d -> %d] initialized\n",

		dart->pgsize, dart->num_streams, dart->supports_bypass,

		dart->pgsize > PAGE_SIZE);

		dart->pgsize > PAGE_SIZE, dart->ias, dart->oas);

	return 0;



err_sysfs_remove:
@@ -1292,6 +1305,7 @@ static const struct apple_dart_hw apple_dart_hw_t8110 = { 
	.tcr_enabled = DART_T8110_TCR_TRANSLATE_ENABLE,

	.tcr_disabled = 0,

	.tcr_bypass = DART_T8110_TCR_BYPASS_DAPF | DART_T8110_TCR_BYPASS_DART,

	.tcr_4level = DART_T8110_TCR_FOUR_LEVEL,



	.ttbr = DART_T8110_TTBR,

	.ttbr_valid = DART_T8110_TTBR_VALID,