public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

iommu: apple-dart: Allow mismatched bypass support

Browse source 
This is needed by ISP, which has DART0 with bypass and DART1/2 without.

Signed-off-by: Hector Martin <marcan@marcan.st>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>
Reviewed-by: Sven Peter <sven@svenpeter.dev>
Link: https://lore.kernel.org/r/20250307-isp-dart-v3-2-684fe4489591@gmail.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Hector Martin 2025-03-07 21:07:46 +01:00 • committed by Joerg Roedel
parent 9d7b779e30
commit 3bc0102835
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/iommu/apple-dart.c
View file

@ -277,6 +277,9 @@ struct apple_dart_domain {
* @streams: streams for this device * @streams: streams for this device
*/ */
struct apple_dart_master_cfg { struct apple_dart_master_cfg {
/* Intersection of DART capabilitles */
u32 supports_bypass : 1;
struct apple_dart_stream_map stream_maps[MAX_DARTS_PER_DEVICE]; struct apple_dart_stream_map stream_maps[MAX_DARTS_PER_DEVICE];
}; };
@ -684,7 +687,7 @@ static int apple_dart_attach_dev_identity(struct iommu_domain *domain,
struct apple_dart_stream_map *stream_map; struct apple_dart_stream_map *stream_map;
int i; int i;
if (!cfg->stream_maps[0].dart->supports_bypass) if (!cfg->supports_bypass)
return -EINVAL; return -EINVAL;
for_each_stream_map(i, cfg, stream_map) for_each_stream_map(i, cfg, stream_map)
@ -792,20 +795,24 @@ static int apple_dart_of_xlate(struct device *dev,
return -EINVAL; return -EINVAL;
sid = args->args[0]; sid = args->args[0];
if (!cfg) if (!cfg) {
cfg = kzalloc(sizeof(*cfg), GFP_KERNEL); cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);
/* Will be ANDed with DART capabilities */
cfg->supports_bypass = true;
}
if (!cfg) if (!cfg)
return -ENOMEM; return -ENOMEM;
dev_iommu_priv_set(dev, cfg); dev_iommu_priv_set(dev, cfg);
cfg_dart = cfg->stream_maps[0].dart; cfg_dart = cfg->stream_maps[0].dart;
if (cfg_dart) { if (cfg_dart) {
if (cfg_dart->supports_bypass != dart->supports_bypass)
return -EINVAL;
if (cfg_dart->pgsize != dart->pgsize) if (cfg_dart->pgsize != dart->pgsize)
return -EINVAL; return -EINVAL;
} }
cfg->supports_bypass &= dart->supports_bypass;
for (i = 0; i < MAX_DARTS_PER_DEVICE; ++i) { for (i = 0; i < MAX_DARTS_PER_DEVICE; ++i) {
if (cfg->stream_maps[i].dart == dart) { if (cfg->stream_maps[i].dart == dart) {
set_bit(sid, cfg->stream_maps[i].sidmap); set_bit(sid, cfg->stream_maps[i].sidmap);
@ -945,7 +952,7 @@ static int apple_dart_def_domain_type(struct device *dev)
if (cfg->stream_maps[0].dart->pgsize > PAGE_SIZE) if (cfg->stream_maps[0].dart->pgsize > PAGE_SIZE)
return IOMMU_DOMAIN_IDENTITY; return IOMMU_DOMAIN_IDENTITY;
if (!cfg->stream_maps[0].dart->supports_bypass) if (!cfg->supports_bypass)
return IOMMU_DOMAIN_DMA; return IOMMU_DOMAIN_DMA;
return 0; return 0;