Skip to contentSkip to conversation

iommu/arm-smmu: wire up map_sg for arm-smmu-v3

PATCH New Will Deacon 2 participants 3 messages Jun 3, 2016 – Jun 13, 2016

Subsystems (2)
Stable branch IOMMU
lore
Share & tools
lore

Will Deacon

author
#0 lore raw

PATCH 1/1 iommu/arm-smmu: wire up map_sg for arm-smmu-v3

From: Jean-Philippe Brucker <[email protected]>

The map_sg callback is missing from arm_smmu_ops, but is required by iommu.h. Similarly to most other IOMMU drivers, connect it to default_iommu_map_sg.

Cc <[email protected]>
Signed-off-by Jean-Philippe Brucker <[email protected]>
Signed-off-by Will Deacon <[email protected]>

---

Joerg -- this is the only fix I have queued, so could you pick it up directly, please?

 drivers/iommu/arm-smmu-v3.c | 1 +
 1 file changed, 1 insertion(+)
drivers/iommu/arm-smmu-v3.c +1 -0
index 94b68213c50d..5f6b3bcab078 100644
@@ -1941,6 +1941,7 @@ static struct iommu_ops arm_smmu_ops = {
 	.attach_dev		= arm_smmu_attach_dev,
 	.map			= arm_smmu_map,
 	.unmap			= arm_smmu_unmap,
+	.map_sg			= default_iommu_map_sg,
 	.iova_to_phys		= arm_smmu_iova_to_phys,
 	.add_device		= arm_smmu_add_device,
 	.remove_device		= arm_smmu_remove_device,
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH 1/1 iommu/arm-smmu: wire up map_sg for arm-smmu-v3

Hi Joerg,

Quoted 6 lines · Will Deacon

From: Jean-Philippe Brucker <[email protected]>

The map_sg callback is missing from arm_smmu_ops, but is required by iommu.h. Similarly to most other IOMMU drivers, connect it to default_iommu_map_sg.

Quoted 7 lines
Cc <[email protected]>
Signed-off-by Jean-Philippe Brucker <[email protected]>
Signed-off-by Will Deacon <[email protected]>

---

Joerg -- this is the only fix I have queued, so could you pick it up directly, please?

Could you queue this as a fix for 4.7, please?

Will

Quoted 18 lines
 drivers/iommu/arm-smmu-v3.c | 1 +
 1 file changed, 1 insertion(+)
drivers/iommu/arm-smmu-v3.c +1 -0
index 94b68213c50d..5f6b3bcab078 100644
@@ -1941,6 +1941,7 @@ static struct iommu_ops arm_smmu_ops = {
 	.attach_dev		= arm_smmu_attach_dev,
 	.map			= arm_smmu_map,
 	.unmap			= arm_smmu_unmap,
+	.map_sg			= default_iommu_map_sg,
 	.iova_to_phys		= arm_smmu_iova_to_phys,
 	.add_device		= arm_smmu_add_device,
 	.remove_device		= arm_smmu_remove_device,
Signature · 1 line
2.1.4
Applied
#2 lore raw

PATCH 1/1 iommu/arm-smmu: wire up map_sg for arm-smmu-v3

In reply to Will Deacon
Quoted 6 lines · Will Deacon

From: Jean-Philippe Brucker <[email protected]>

The map_sg callback is missing from arm_smmu_ops, but is required by iommu.h. Similarly to most other IOMMU drivers, connect it to default_iommu_map_sg.

Quoted 7 lines
Cc <[email protected]>
Signed-off-by Jean-Philippe Brucker <[email protected]>
Signed-off-by Will Deacon <[email protected]>

---

Joerg -- this is the only fix I have queued, so could you pick it up directly, please?

Queued, thanks Will.