Skip to content

Commit ae50dc4

Browse files
geertujoergroedel
authored andcommitted
iommu/shmobile: Remove unused Renesas IPMMU/IPMMUI driver
As of commit 44d88c7 ("ARM: shmobile: Remove legacy SoC code for R-Mobile A1"), the Renesas IPMMU/IPMMUI driver is no longer used. In theory it could still be used on SH-Mobile AG5 and R-Mobile A1 SoCs, but that requires adding DT support to the driver, which is not planned. Remove the driver, it can be resurrected from git history when needed. Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Simon Horman <[email protected]> Signed-off-by: Joerg Roedel <[email protected]>
1 parent 9f9499a commit ae50dc4

File tree

5 files changed

+0
-642
lines changed

5 files changed

+0
-642
lines changed

drivers/iommu/Kconfig

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -263,81 +263,6 @@ config EXYNOS_IOMMU_DEBUG
263263

264264
Say N unless you need kernel log message for IOMMU debugging.
265265

266-
config SHMOBILE_IPMMU
267-
bool
268-
269-
config SHMOBILE_IPMMU_TLB
270-
bool
271-
272-
config SHMOBILE_IOMMU
273-
bool "IOMMU for Renesas IPMMU/IPMMUI"
274-
default n
275-
depends on ARM && MMU
276-
depends on ARCH_SHMOBILE || COMPILE_TEST
277-
select IOMMU_API
278-
select ARM_DMA_USE_IOMMU
279-
select SHMOBILE_IPMMU
280-
select SHMOBILE_IPMMU_TLB
281-
help
282-
Support for Renesas IPMMU/IPMMUI. This option enables
283-
remapping of DMA memory accesses from all of the IP blocks
284-
on the ICB.
285-
286-
Warning: Drivers (including userspace drivers of UIO
287-
devices) of the IP blocks on the ICB *must* use addresses
288-
allocated from the IPMMU (iova) for DMA with this option
289-
enabled.
290-
291-
If unsure, say N.
292-
293-
choice
294-
prompt "IPMMU/IPMMUI address space size"
295-
default SHMOBILE_IOMMU_ADDRSIZE_2048MB
296-
depends on SHMOBILE_IOMMU
297-
help
298-
This option sets IPMMU/IPMMUI address space size by
299-
adjusting the 1st level page table size. The page table size
300-
is calculated as follows:
301-
302-
page table size = number of page table entries * 4 bytes
303-
number of page table entries = address space size / 1 MiB
304-
305-
For example, when the address space size is 2048 MiB, the
306-
1st level page table size is 8192 bytes.
307-
308-
config SHMOBILE_IOMMU_ADDRSIZE_2048MB
309-
bool "2 GiB"
310-
311-
config SHMOBILE_IOMMU_ADDRSIZE_1024MB
312-
bool "1 GiB"
313-
314-
config SHMOBILE_IOMMU_ADDRSIZE_512MB
315-
bool "512 MiB"
316-
317-
config SHMOBILE_IOMMU_ADDRSIZE_256MB
318-
bool "256 MiB"
319-
320-
config SHMOBILE_IOMMU_ADDRSIZE_128MB
321-
bool "128 MiB"
322-
323-
config SHMOBILE_IOMMU_ADDRSIZE_64MB
324-
bool "64 MiB"
325-
326-
config SHMOBILE_IOMMU_ADDRSIZE_32MB
327-
bool "32 MiB"
328-
329-
endchoice
330-
331-
config SHMOBILE_IOMMU_L1SIZE
332-
int
333-
default 8192 if SHMOBILE_IOMMU_ADDRSIZE_2048MB
334-
default 4096 if SHMOBILE_IOMMU_ADDRSIZE_1024MB
335-
default 2048 if SHMOBILE_IOMMU_ADDRSIZE_512MB
336-
default 1024 if SHMOBILE_IOMMU_ADDRSIZE_256MB
337-
default 512 if SHMOBILE_IOMMU_ADDRSIZE_128MB
338-
default 256 if SHMOBILE_IOMMU_ADDRSIZE_64MB
339-
default 128 if SHMOBILE_IOMMU_ADDRSIZE_32MB
340-
341266
config IPMMU_VMSA
342267
bool "Renesas VMSA-compatible IPMMU"
343268
depends on ARM_LPAE

drivers/iommu/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,5 @@ obj-$(CONFIG_ROCKCHIP_IOMMU) += rockchip-iommu.o
2222
obj-$(CONFIG_TEGRA_IOMMU_GART) += tegra-gart.o
2323
obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o
2424
obj-$(CONFIG_EXYNOS_IOMMU) += exynos-iommu.o
25-
obj-$(CONFIG_SHMOBILE_IOMMU) += shmobile-iommu.o
26-
obj-$(CONFIG_SHMOBILE_IPMMU) += shmobile-ipmmu.o
2725
obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o
2826
obj-$(CONFIG_S390_IOMMU) += s390-iommu.o

0 commit comments

Comments
 (0)