Skip to contentSkip to conversation

iommu/vt-d: Fix pointer cast warnings on 32 bit

PATCH Applied Lu Baolu 2 participants 3 messages May 19, 2020 IOMMU

lore
Share & tools
lore

Lu Baolu

author
#0 lore raw

PATCH 1/1 iommu/vt-d: Fix pointer cast warnings on 32 bit

Pointers should be casted to unsigned long to avoid "cast from pointer to integer of different size" warnings.

drivers/iommu/intel-pasid.c:818:6: warning:
cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/iommu/intel-pasid.c:821:9: warning:
cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/iommu/intel-pasid.c:824:23: warning:
cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/iommu/intel-svm.c:343:45: warning:
cast to pointer from integer of different size [-Wint-to-pointer-cast]

Fixes d64d47f4f5678 ("iommu/vt-d: Add nested translation helper function")
Fixes a3bea1a35c083 ("iommu/vt-d: Add bind guest PASID support")
---
 drivers/iommu/intel-pasid.c | 8 ++++----
 drivers/iommu/intel-svm.c   | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/iommu/intel-pasid.c +4 -4
index 25d749830500..c81f0f17c6ba 100644
@@ -815,13 +815,13 @@ int intel_pasid_setup_nested(struct intel_iommu *iommu, struct device *dev,
 	}
 
 	/* First level PGD is in GPA, must be supported by the second level */
-	if ((unsigned long long)gpgd > domain->max_addr) {
+	if ((uintptr_t)gpgd > domain->max_addr) {
 		dev_err_ratelimited(dev,
-				    "Guest PGD %llx not supported, max %llx\n",
-				    (unsigned long long)gpgd, domain->max_addr);
+				    "Guest PGD %lx not supported, max %llx\n",
+				    (uintptr_t)gpgd, domain->max_addr);
 		return -EINVAL;
 	}
-	pasid_set_flptr(pte, (u64)gpgd);
+	pasid_set_flptr(pte, (uintptr_t)gpgd);
 
 	ret = intel_pasid_setup_bind_data(iommu, pte, pasid_data);
 	if (ret)
drivers/iommu/intel-svm.c +2 -1
index 11366dc91971..acc7555b002d 100644
@@ -340,7 +340,8 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev,
 	 * call the nested mode setup function here.
 	 */
 	spin_lock(&iommu->lock);
-	ret = intel_pasid_setup_nested(iommu, dev, (pgd_t *)data->gpgd,
+	ret = intel_pasid_setup_nested(iommu, dev,
+				       (pgd_t *)(uintptr_t)data->gpgd,
 				       data->hpasid, &data->vtd, dmar_domain,
 				       data->addr_width);
 	spin_unlock(&iommu->lock);
Signature · 6 lines
2.17.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
maintainer Applied
#1 lore raw
Quoted 12 lines · Lu Baolu

Pointers should be casted to unsigned long to avoid "cast from pointer to integer of different size" warnings.

drivers/iommu/intel-pasid.c:818:6: warning:
cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/iommu/intel-pasid.c:821:9: warning:
cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/iommu/intel-pasid.c:824:23: warning:
cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/iommu/intel-svm.c:343:45: warning:
cast to pointer from integer of different size [-Wint-to-pointer-cast]

Quoted 7 lines
Fixes d64d47f4f5678 ("iommu/vt-d: Add nested translation helper function")
Fixes a3bea1a35c083 ("iommu/vt-d: Add bind guest PASID support")
---
 drivers/iommu/intel-pasid.c | 8 ++++----
 drivers/iommu/intel-svm.c   | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

Applied, thanks.

Btw, I think the PASID and Intel SVM code is pretty useless on 32 bit anyway, no? It only supports 4 and 5 level page-tables, not the 2 and 3-level variants on 32-bit. Can you make it 64-bit only?

Regards,

Joerg

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

author
#2 lore raw
Quoted 21 lines · Joerg Roedel
Quoted 12 lines · Lu Baolu

Pointers should be casted to unsigned long to avoid "cast from pointer to integer of different size" warnings.

drivers/iommu/intel-pasid.c:818:6: warning:
cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/iommu/intel-pasid.c:821:9: warning:
cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/iommu/intel-pasid.c:824:23: warning:
cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/iommu/intel-svm.c:343:45: warning:
cast to pointer from integer of different size [-Wint-to-pointer-cast]

Quoted 7 lines
Fixes d64d47f4f5678 ("iommu/vt-d: Add nested translation helper function")
Fixes a3bea1a35c083 ("iommu/vt-d: Add bind guest PASID support")
---
  drivers/iommu/intel-pasid.c | 8 ++++----
  drivers/iommu/intel-svm.c   | 3 ++-
  2 files changed, 6 insertions(+), 5 deletions(-)
Quoted 5 lines

Applied, thanks.

Btw, I think the PASID and Intel SVM code is pretty useless on 32 bit anyway, no? It only supports 4 and 5 level page-tables, not the 2 and 3-level variants on 32-bit. Can you make it 64-bit only?

Sure. I will make it.

Best regards,
baolu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu