@@ -133,8 +133,8 @@ static void __iommu_group_set_domain_nofail(struct iommu_group *group,
133133
134134static 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 );
138138static ssize_t iommu_group_store_type (struct iommu_group * group ,
139139 const char * buf , size_t count );
140140static struct group_device * iommu_group_alloc_device (struct iommu_group * group ,
@@ -597,7 +597,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
597597 list_add_tail (& gdev -> list , & group -> devices );
598598 WARN_ON (group -> default_domain && !group -> domain );
599599 if (group -> default_domain )
600- iommu_create_device_direct_mappings (group -> default_domain , dev );
600+ iommu_create_device_fw_mappings (group -> default_domain , dev );
601601 if (group -> domain ) {
602602 ret = __iommu_device_set_domain (group , dev , group -> domain , 0 );
603603 if (ret )
@@ -1125,8 +1125,8 @@ int iommu_group_set_name(struct iommu_group *group, const char *name)
11251125}
11261126EXPORT_SYMBOL_GPL (iommu_group_set_name );
11271127
1128- static int iommu_create_device_direct_mappings (struct iommu_domain * domain ,
1129- struct device * dev )
1128+ static int iommu_create_device_fw_mappings (struct iommu_domain * domain ,
1129+ struct device * dev )
11301130{
11311131 struct iommu_resv_region * entry ;
11321132 struct list_head mappings ;
@@ -2972,7 +2972,7 @@ static int iommu_setup_default_domain(struct iommu_group *group,
29722972 struct iommu_domain * old_dom = group -> default_domain ;
29732973 struct group_device * gdev ;
29742974 struct iommu_domain * dom ;
2975- bool direct_failed ;
2975+ bool fw_failed ;
29762976 int req_type ;
29772977 int ret ;
29782978
@@ -3002,10 +3002,10 @@ static int iommu_setup_default_domain(struct iommu_group *group,
30023002 * mapped before their device is attached, in order to guarantee
30033003 * continuity with any FW activity
30043004 */
3005- direct_failed = false;
3005+ fw_failed = false;
30063006 for_each_group_device (group , gdev ) {
3007- if (iommu_create_device_direct_mappings (dom , gdev -> dev )) {
3008- direct_failed = true;
3007+ if (iommu_create_device_fw_mappings (dom , gdev -> dev )) {
3008+ fw_failed = true;
30093009 dev_warn_once (
30103010 gdev -> dev -> iommu -> iommu_dev -> dev ,
30113011 "IOMMU driver was not able to establish FW requested direct mapping." );
@@ -3037,9 +3037,9 @@ static int iommu_setup_default_domain(struct iommu_group *group,
30373037 * trying again after attaching. If this happens it means the device
30383038 * will not continuously have the IOMMU_RESV_DIRECT map.
30393039 */
3040- if (direct_failed ) {
3040+ if (fw_failed ) {
30413041 for_each_group_device (group , gdev ) {
3042- ret = iommu_create_device_direct_mappings (dom , gdev -> dev );
3042+ ret = iommu_create_device_fw_mappings (dom , gdev -> dev );
30433043 if (ret )
30443044 goto err_restore_domain ;
30453045 }
0 commit comments