xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/amd: Declare MSI and HT regions as reserved IOVA regions

Browse Source 
This patch registers the MSI and HT regions as non mappable
reserved regions. They will be exposed in the iommu-group sysfs.

For direct-mapped regions let's also use iommu_alloc_resv_region().

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Eric Auger
2017-01-19 20:57:54 +00:00
committed by Will Deacon
parent 0659b8dc45
commit 4397f32c03
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/iommu/amd_iommu.c
View File

@@ -3164,6 +3164,7 @@ static bool amd_iommu_capable(enum iommu_cap cap)
static void amd_iommu_get_resv_regions(struct device *dev, static void amd_iommu_get_resv_regions(struct device *dev,
struct list_head *head) struct list_head *head)
{ {
struct iommu_resv_region *region;
struct unity_map_entry *entry; struct unity_map_entry *entry;
int devid; int devid;
@@ -3172,28 +3173,42 @@ static void amd_iommu_get_resv_regions(struct device *dev,
return; return;
list_for_each_entry(entry, &amd_iommu_unity_map, list) { list_for_each_entry(entry, &amd_iommu_unity_map, list) {
struct iommu_resv_region *region; size_t length;
int prot = 0;
if (devid < entry->devid_start || devid > entry->devid_end) if (devid < entry->devid_start || devid > entry->devid_end)
continue; continue;
region = kzalloc(sizeof(*region), GFP_KERNEL); length = entry->address_end - entry->address_start;
if (entry->prot & IOMMU_PROT_IR)
prot |= IOMMU_READ;
if (entry->prot & IOMMU_PROT_IW)
prot |= IOMMU_WRITE;
region = iommu_alloc_resv_region(entry->address_start,
length, prot,
IOMMU_RESV_DIRECT);
if (!region) { if (!region) {
pr_err("Out of memory allocating dm-regions for %s\n", pr_err("Out of memory allocating dm-regions for %s\n",
dev_name(dev)); dev_name(dev));
return; return;
} }
region->start = entry->address_start;
region->length = entry->address_end - entry->address_start;
region->type = IOMMU_RESV_DIRECT;
if (entry->prot & IOMMU_PROT_IR)
region->prot |= IOMMU_READ;
if (entry->prot & IOMMU_PROT_IW)
region->prot |= IOMMU_WRITE;
list_add_tail(&region->list, head); list_add_tail(&region->list, head);
} }
region = iommu_alloc_resv_region(MSI_RANGE_START,
MSI_RANGE_END - MSI_RANGE_START + 1,
0, IOMMU_RESV_RESERVED);
if (!region)
return;
list_add_tail(&region->list, head);
region = iommu_alloc_resv_region(HT_RANGE_START,
HT_RANGE_END - HT_RANGE_START + 1,
0, IOMMU_RESV_RESERVED);
if (!region)
return;
list_add_tail(&region->list, head);
} }
static void amd_iommu_put_resv_regions(struct device *dev, static void amd_iommu_put_resv_regions(struct device *dev,