iommu: Remove OMAP IOVMM driver

Hello,

The OMAP3 ISP driver was the only user of the OMAP IOVMM API. Now that is has been ported to the DMA API, remove the unused virtual memory manager.

The removal is split in three patches to ease upstream merge. The first patch removes the omap-iovmm driver, the second patch removes setting of now unused platform data fields from arch code, and the last patch cleans up the platform data structure.

I'd like to get at least the first patch merged in v3.17. To avoid splitting the series across three kernel versions, it would be nice to also merge at least the second patch for v3.17. If there's no risk of conflict everything could be merged in one go through the ARM SoC tree. Otherwise a stable branch with patch 1/3 will be needed to base the arch change on.

Joerg, Tony, how would you like to proceed ?

Changes compared to v1:

- Fix OMAP_IOMMU_DEBUG dependency on OMAP_IOMMU
- Remove omap_iommu da_start and da_end fields
- Added patches 2/3 and 3/3

Laurent Pinchart (3):
iommu/omap: Remove virtual memory manager
ARM: omap: Don't set iommu pdata da_start and da_end fields iommu/omap: Remove platform data da_start and da_end fields

 arch/arm/mach-omap2/omap-iommu.c           |   2 -
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |   4 -
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c |   4 -
 drivers/iommu/Kconfig                      |  10 +-
 drivers/iommu/Makefile                     |   1 -
 drivers/iommu/omap-iommu-debug.c           | 114 -----
 drivers/iommu/omap-iommu.c                 |  13 -
 drivers/iommu/omap-iommu.h                 |   8 +-
 drivers/iommu/omap-iovmm.c                 | 791 -----------------------------
 include/linux/omap-iommu.h                 |  37 +-
 include/linux/platform_data/iommu-omap.h   |   6 -
 11 files changed, 8 insertions(+), 982 deletions(-)
 delete mode 100644 drivers/iommu/omap-iovmm.c

Quoted 9 lines · Laurent Pinchart

Hello,

The OMAP3 ISP driver was the only user of the OMAP IOVMM API. Now that is has been ported to the DMA API, remove the unused virtual memory manager.

The removal is split in three patches to ease upstream merge. The first patch removes the omap-iovmm driver, the second patch removes setting of now unused platform data fields from arch code, and the last patch cleans up the platform data structure.

Thanks for the revised series, it looks good. I have also tested the series on OMAP3, OMAP4 and OMAP5.

For the changes in the entire series,

Acked-by Suman Anna <[email protected]>

Quoted 8 lines

I'd like to get at least the first patch merged in v3.17. To avoid splitting the series across three kernel versions, it would be nice to also merge at least the second patch for v3.17. If there's no risk of conflict everything could be merged in one go through the ARM SoC tree. Otherwise a stable branch with patch 1/3 will be needed to base the arch change on.

Joerg, Tony, how would you like to proceed ?

Quoted 24 lines

Changes compared to v1:

- Fix OMAP_IOMMU_DEBUG dependency on OMAP_IOMMU
- Remove omap_iommu da_start and da_end fields
- Added patches 2/3 and 3/3

Laurent Pinchart (3):
iommu/omap: Remove virtual memory manager
ARM: omap: Don't set iommu pdata da_start and da_end fields iommu/omap: Remove platform data da_start and da_end fields

 arch/arm/mach-omap2/omap-iommu.c           |   2 -
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |   4 -
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c |   4 -
 drivers/iommu/Kconfig                      |  10 +-
 drivers/iommu/Makefile                     |   1 -
 drivers/iommu/omap-iommu-debug.c           | 114 -----
 drivers/iommu/omap-iommu.c                 |  13 -
 drivers/iommu/omap-iommu.h                 |   8 +-
 drivers/iommu/omap-iovmm.c                 | 791 ------------------------
 include/linux/omap-iommu.h                 |  37 +-
 include/linux/platform_data/iommu-omap.h   |   6 -
 11 files changed, 8 insertions(+), 982 deletions(-)
 delete mode 100644 drivers/iommu/omap-iovmm.c

Hi Suman, Joerg and Tony,

Quoted 11 lines · On Friday 18 July 2014 11:53:56 Suman Anna wrote:

Quoted 9 lines · Laurent Pinchart

Hello,

The OMAP3 ISP driver was the only user of the OMAP IOVMM API. Now that is has been ported to the DMA API, remove the unused virtual memory manager.

The removal is split in three patches to ease upstream merge. The first patch removes the omap-iovmm driver, the second patch removes setting of now unused platform data fields from arch code, and the last patch cleans up the platform data structure.

Quoted 5 lines

Thanks for the revised series, it looks good. I have also tested the series on OMAP3, OMAP4 and OMAP5.

For the changes in the entire series,

Acked-by Suman Anna <[email protected]>

Thank you.

Quoted 7 lines

Quoted 7 lines

I'd like to get at least the first patch merged in v3.17. To avoid splitting the series across three kernel versions, it would be nice to also merge at least the second patch for v3.17. If there's no risk of conflict everything could be merged in one go through the ARM SoC tree. Otherwise a stable branch with patch 1/3 will be needed to base the arch change on.

Quoted 1 line

Quoted 1 line

Joerg, Tony, how would you like to proceed ?

The v3.17 merge window is getting close, it's probably too late to merge patch 2/3. Joerg, could you please take 1/3 in your tree for v3.17 ? 2/3 and 3/3 would then get in v3.18. Tony, how would you like to proceed for those ?

Quoted 30 lines · Laurent Pinchart

Hi Suman, Joerg and Tony,

Quoted 12 lines · On Friday 18 July 2014 11:53:56 Suman Anna wrote:

Quoted 10 lines · Laurent Pinchart

Hello,

The OMAP3 ISP driver was the only user of the OMAP IOVMM API. Now that is has been ported to the DMA API, remove the unused virtual memory manager.

The removal is split in three patches to ease upstream merge. The first patch removes the omap-iovmm driver, the second patch removes setting of now unused platform data fields from arch code, and the last patch cleans up the platform data structure.

Quoted 5 lines

Thanks for the revised series, it looks good. I have also tested the series on OMAP3, OMAP4 and OMAP5.

For the changes in the entire series,

Acked-by Suman Anna <[email protected]>

Thank you.

Quoted 7 lines

Quoted 7 lines

I'd like to get at least the first patch merged in v3.17. To avoid splitting the series across three kernel versions, it would be nice to also merge at least the second patch for v3.17. If there's no risk of conflict everything could be merged in one go through the ARM SoC tree. Otherwise a stable branch with patch 1/3 will be needed to base the arch change on.

Quoted 6 lines

Quoted 1 line

Quoted 1 line

Joerg, Tony, how would you like to proceed ?

The v3.17 merge window is getting close, it's probably too late to merge patch 2/3. Joerg, could you please take 1/3 in your tree for v3.17 ? 2/3 and 3/3 would then get in v3.18. Tony, how would you like to proceed for those ?

How about Joerg maybe do an immutable branch against v3.16-rc1 with just these three patches and merge it into your tree?

That way I too can merge the minimal branch in if there are conflics. If that works for Joerg, then for arch/arm/*omap* changes:

Acked-by Tony Lindgren <[email protected]>

If the above is too complicated, then how about Laurent resend patches 2 - 3 once the dependencies have cleared so I can pick them up. This is assuming nothing breaks with patchs 2 - 3 missing naturally :)

Hi Tony and Joerg,

Quoted 38 lines · On Monday 21 July 2014 02:33:36 Tony Lindgren wrote:

Quoted 30 lines · Laurent Pinchart

Hi Suman, Joerg and Tony,

Quoted 12 lines · On Friday 18 July 2014 11:53:56 Suman Anna wrote:

Quoted 10 lines · Laurent Pinchart

Hello,

The OMAP3 ISP driver was the only user of the OMAP IOVMM API. Now that is has been ported to the DMA API, remove the unused virtual memory manager.

The removal is split in three patches to ease upstream merge. The first patch removes the omap-iovmm driver, the second patch removes setting of now unused platform data fields from arch code, and the last patch cleans up the platform data structure.

Quoted 5 lines

Thanks for the revised series, it looks good. I have also tested the series on OMAP3, OMAP4 and OMAP5.

For the changes in the entire series,

Acked-by Suman Anna <[email protected]>

Thank you.

Quoted 7 lines

Quoted 7 lines

I'd like to get at least the first patch merged in v3.17. To avoid splitting the series across three kernel versions, it would be nice to also merge at least the second patch for v3.17. If there's no risk of conflict everything could be merged in one go through the ARM SoC tree. Otherwise a stable branch with patch 1/3 will be needed to base the arch change on.

Quoted 6 lines

Quoted 1 line

Quoted 1 line

Joerg, Tony, how would you like to proceed ?

The v3.17 merge window is getting close, it's probably too late to merge patch 2/3. Joerg, could you please take 1/3 in your tree for v3.17 ? 2/3 and 3/3 would then get in v3.18. Tony, how would you like to proceed for those ?

Quoted 7 lines

How about Joerg maybe do an immutable branch against v3.16-rc1 with just these three patches and merge it into your tree?

That way I too can merge the minimal branch in if there are conflics. If that works for Joerg, then for arch/arm/*omap* changes:

Acked-by Tony Lindgren <[email protected]>

I've created an immutable branch (or, rather, immutable until the changes reach mainline, at which point I will remove the branch) on top of v3.16-rc1 with just the three patches from this series. You can find it at.

git://linuxtv.org/pinchartl/media.git omap/iommu

Tony, is there still time to get this (and especially patch 2/3, which touches arch/ code) in v3.17 ?

Quoted 50 lines · Laurent Pinchart

Quoted 36 lines · On Monday 21 July 2014 02:33:36 Tony Lindgren wrote:

Quoted 28 lines · Laurent Pinchart

Quoted 12 lines · On Friday 18 July 2014 11:53:56 Suman Anna wrote:

Quoted 10 lines · Laurent Pinchart

Hello,

The OMAP3 ISP driver was the only user of the OMAP IOVMM API. Now that is has been ported to the DMA API, remove the unused virtual memory manager.

The removal is split in three patches to ease upstream merge. The first patch removes the omap-iovmm driver, the second patch removes setting of now unused platform data fields from arch code, and the last patch cleans up the platform data structure.

Quoted 5 lines

Thanks for the revised series, it looks good. I have also tested the series on OMAP3, OMAP4 and OMAP5.

For the changes in the entire series,

Acked-by Suman Anna <[email protected]>

Thank you.

Quoted 7 lines

Quoted 7 lines

I'd like to get at least the first patch merged in v3.17. To avoid splitting the series across three kernel versions, it would be nice to also merge at least the second patch for v3.17. If there's no risk of conflict everything could be merged in one go through the ARM SoC tree. Otherwise a stable branch with patch 1/3 will be needed to base the arch change on.

Quoted 6 lines

Quoted 1 line

Quoted 1 line

Joerg, Tony, how would you like to proceed ?

The v3.17 merge window is getting close, it's probably too late to merge patch 2/3. Joerg, could you please take 1/3 in your tree for v3.17 ? 2/3 and 3/3 would then get in v3.18. Tony, how would you like to proceed for those ?

Quoted 7 lines

How about Joerg maybe do an immutable branch against v3.16-rc1 with just these three patches and merge it into your tree?

That way I too can merge the minimal branch in if there are conflics. If that works for Joerg, then for arch/arm/*omap* changes:

Acked-by Tony Lindgren <[email protected]>

I've created an immutable branch (or, rather, immutable until the changes reach mainline, at which point I will remove the branch) on top of v3.16-rc1 with just the three patches from this series. You can find it at.

Quoted 4 lines

git://linuxtv.org/pinchartl/media.git omap/iommu

Tony, is there still time to get this (and especially patch 2/3, which touches arch/ code) in v3.17 ?

Yes as long as Joerg is OK to merge that branch in :)

Quoted 2 lines

Tony, is there still time to get this (and especially patch 2/3, which touches arch/ code) in v3.17 ?

Yes as long as Joerg is OK to merge that branch in :)

Quoted 4 lines · Tony Lindgren

Quoted 2 lines

Tony, is there still time to get this (and especially patch 2/3, which touches arch/ code) in v3.17 ?

Yes as long as Joerg is OK to merge that branch in :)

Fine with me, I can take only patch 1 or all 3 into my arm/omap branch, given Tony's Acked-by.

Then you guys can merge in this branch wherever you want :)

Hi Joerg,

Quoted 6 lines · On Wednesday 23 July 2014 15:52:17 Joerg Roedel wrote:

Quoted 4 lines · Tony Lindgren

Quoted 2 lines

Tony, is there still time to get this (and especially patch 2/3, which touches arch/ code) in v3.17 ?

Yes as long as Joerg is OK to merge that branch in :)

Quoted 4 lines

Fine with me, I can take only patch 1 or all 3 into my arm/omap branch, given Tony's Acked-by.

Then you guys can merge in this branch wherever you want :)

Thank you. Assuming there's currently no conflict to be resolved, I believe the easiest would be for both you and Tony to merge my branch in your trees.

Thank you. Assuming there's currently no conflict to be resolved, I believe the easiest would be for both you and Tony to merge my branch in your trees.