@@ -129,8 +129,8 @@ static void __iommu_group_set_domain_nofail(struct iommu_group *group,
129129
130130static int iommu_setup_default_domain (struct iommu_group * group ,
131131 int target_type );
132- static int iommu_create_device_direct_mappings (struct iommu_domain * domain ,
133- struct device * dev );
132+ static int iommu_create_device_fw_mappings (struct iommu_domain * domain ,
133+ struct device * dev );
134134static ssize_t iommu_group_store_type (struct iommu_group * group ,
135135 const char * buf , size_t count );
136136static struct group_device * iommu_group_alloc_device (struct iommu_group * group ,
@@ -563,7 +563,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
563563 list_add_tail (& gdev -> list , & group -> devices );
564564 WARN_ON (group -> default_domain && !group -> domain );
565565 if (group -> default_domain )
566- iommu_create_device_direct_mappings (group -> default_domain , dev );
566+ iommu_create_device_fw_mappings (group -> default_domain , dev );
567567 if (group -> domain ) {
568568 ret = __iommu_device_set_domain (group , dev , group -> domain , 0 );
569569 if (ret )
@@ -1091,8 +1091,8 @@ int iommu_group_set_name(struct iommu_group *group, const char *name)
10911091}
10921092EXPORT_SYMBOL_GPL (iommu_group_set_name );
10931093
1094- static int iommu_create_device_direct_mappings (struct iommu_domain * domain ,
1095- struct device * dev )
1094+ static int iommu_create_device_fw_mappings (struct iommu_domain * domain ,
1095+ struct device * dev )
10961096{
10971097 struct iommu_resv_region * entry ;
10981098 struct list_head mappings ;
@@ -2941,7 +2941,7 @@ static int iommu_setup_default_domain(struct iommu_group *group,
29412941 struct iommu_domain * old_dom = group -> default_domain ;
29422942 struct group_device * gdev ;
29432943 struct iommu_domain * dom ;
2944- bool direct_failed ;
2944+ bool fw_failed ;
29452945 int req_type ;
29462946 int ret ;
29472947
@@ -2971,10 +2971,10 @@ static int iommu_setup_default_domain(struct iommu_group *group,
29712971 * mapped before their device is attached, in order to guarantee
29722972 * continuity with any FW activity
29732973 */
2974- direct_failed = false;
2974+ fw_failed = false;
29752975 for_each_group_device (group , gdev ) {
2976- if (iommu_create_device_direct_mappings (dom , gdev -> dev )) {
2977- direct_failed = true;
2976+ if (iommu_create_device_fw_mappings (dom , gdev -> dev )) {
2977+ fw_failed = true;
29782978 dev_warn_once (
29792979 gdev -> dev -> iommu -> iommu_dev -> dev ,
29802980 "IOMMU driver was not able to establish FW requested direct mapping." );
@@ -3006,9 +3006,9 @@ static int iommu_setup_default_domain(struct iommu_group *group,
30063006 * trying again after attaching. If this happens it means the device
30073007 * will not continuously have the IOMMU_RESV_DIRECT map.
30083008 */
3009- if (direct_failed ) {
3009+ if (fw_failed ) {
30103010 for_each_group_device (group , gdev ) {
3011- ret = iommu_create_device_direct_mappings (dom , gdev -> dev );
3011+ ret = iommu_create_device_fw_mappings (dom , gdev -> dev );
30123012 if (ret )
30133013 goto err_restore_domain ;
30143014 }
0 commit comments