Skip to content

Commit 39d8cd1

Browse files
committed
iommu: Rename iommu_create_device_direct_mappings()
It will be used to create firmware mappings which require a paging domain and mappings installed at specific IOVA. Signed-off-by: Janne Grunau <j@jannau.net>
1 parent 2e1906c commit 39d8cd1

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

drivers/iommu/iommu.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ static void __iommu_group_set_domain_nofail(struct iommu_group *group,
133133

134134
static int iommu_setup_default_domain(struct iommu_group *group,
135135
int target_type);
136-
static int iommu_create_device_direct_mappings(struct iommu_domain *domain,
137-
struct device *dev);
136+
static int iommu_create_device_fw_mappings(struct iommu_domain *domain,
137+
struct device *dev);
138138
static ssize_t iommu_group_store_type(struct iommu_group *group,
139139
const char *buf, size_t count);
140140
static struct group_device *iommu_group_alloc_device(struct iommu_group *group,
@@ -601,7 +601,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
601601
list_add_tail(&gdev->list, &group->devices);
602602
WARN_ON(group->default_domain && !group->domain);
603603
if (group->default_domain)
604-
iommu_create_device_direct_mappings(group->default_domain, dev);
604+
iommu_create_device_fw_mappings(group->default_domain, dev);
605605
if (group->domain) {
606606
ret = __iommu_device_set_domain(group, dev, group->domain, 0);
607607
if (ret)
@@ -1129,8 +1129,8 @@ int iommu_group_set_name(struct iommu_group *group, const char *name)
11291129
}
11301130
EXPORT_SYMBOL_GPL(iommu_group_set_name);
11311131

1132-
static int iommu_create_device_direct_mappings(struct iommu_domain *domain,
1133-
struct device *dev)
1132+
static int iommu_create_device_fw_mappings(struct iommu_domain *domain,
1133+
struct device *dev)
11341134
{
11351135
struct iommu_resv_region *entry;
11361136
struct list_head mappings;
@@ -2980,7 +2980,7 @@ static int iommu_setup_default_domain(struct iommu_group *group,
29802980
struct iommu_domain *old_dom = group->default_domain;
29812981
struct group_device *gdev;
29822982
struct iommu_domain *dom;
2983-
bool direct_failed;
2983+
bool fw_failed;
29842984
int req_type;
29852985
int ret;
29862986

@@ -3010,10 +3010,10 @@ static int iommu_setup_default_domain(struct iommu_group *group,
30103010
* mapped before their device is attached, in order to guarantee
30113011
* continuity with any FW activity
30123012
*/
3013-
direct_failed = false;
3013+
fw_failed = false;
30143014
for_each_group_device(group, gdev) {
3015-
if (iommu_create_device_direct_mappings(dom, gdev->dev)) {
3016-
direct_failed = true;
3015+
if (iommu_create_device_fw_mappings(dom, gdev->dev)) {
3016+
fw_failed = true;
30173017
dev_warn_once(
30183018
gdev->dev->iommu->iommu_dev->dev,
30193019
"IOMMU driver was not able to establish FW requested direct mapping.");
@@ -3045,9 +3045,9 @@ static int iommu_setup_default_domain(struct iommu_group *group,
30453045
* trying again after attaching. If this happens it means the device
30463046
* will not continuously have the IOMMU_RESV_DIRECT map.
30473047
*/
3048-
if (direct_failed) {
3048+
if (fw_failed) {
30493049
for_each_group_device(group, gdev) {
3050-
ret = iommu_create_device_direct_mappings(dom, gdev->dev);
3050+
ret = iommu_create_device_fw_mappings(dom, gdev->dev);
30513051
if (ret)
30523052
goto err_restore_domain;
30533053
}

0 commit comments

Comments
 (0)