Skip to content

Commit

Permalink
iommu/shmobile: Remove unused Renesas IPMMU/IPMMUI driver
Browse files Browse the repository at this point in the history
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 <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
Geert Uytterhoeven authored and Joerg Roedel committed Dec 14, 2015
1 parent 9f9499a commit ae50dc4
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 642 deletions.
75 changes: 0 additions & 75 deletions drivers/iommu/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -263,81 +263,6 @@ config EXYNOS_IOMMU_DEBUG

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

config SHMOBILE_IPMMU
bool

config SHMOBILE_IPMMU_TLB
bool

config SHMOBILE_IOMMU
bool "IOMMU for Renesas IPMMU/IPMMUI"
default n
depends on ARM && MMU
depends on ARCH_SHMOBILE || COMPILE_TEST
select IOMMU_API
select ARM_DMA_USE_IOMMU
select SHMOBILE_IPMMU
select SHMOBILE_IPMMU_TLB
help
Support for Renesas IPMMU/IPMMUI. This option enables
remapping of DMA memory accesses from all of the IP blocks
on the ICB.

Warning: Drivers (including userspace drivers of UIO
devices) of the IP blocks on the ICB *must* use addresses
allocated from the IPMMU (iova) for DMA with this option
enabled.

If unsure, say N.

choice
prompt "IPMMU/IPMMUI address space size"
default SHMOBILE_IOMMU_ADDRSIZE_2048MB
depends on SHMOBILE_IOMMU
help
This option sets IPMMU/IPMMUI address space size by
adjusting the 1st level page table size. The page table size
is calculated as follows:

page table size = number of page table entries * 4 bytes
number of page table entries = address space size / 1 MiB

For example, when the address space size is 2048 MiB, the
1st level page table size is 8192 bytes.

config SHMOBILE_IOMMU_ADDRSIZE_2048MB
bool "2 GiB"

config SHMOBILE_IOMMU_ADDRSIZE_1024MB
bool "1 GiB"

config SHMOBILE_IOMMU_ADDRSIZE_512MB
bool "512 MiB"

config SHMOBILE_IOMMU_ADDRSIZE_256MB
bool "256 MiB"

config SHMOBILE_IOMMU_ADDRSIZE_128MB
bool "128 MiB"

config SHMOBILE_IOMMU_ADDRSIZE_64MB
bool "64 MiB"

config SHMOBILE_IOMMU_ADDRSIZE_32MB
bool "32 MiB"

endchoice

config SHMOBILE_IOMMU_L1SIZE
int
default 8192 if SHMOBILE_IOMMU_ADDRSIZE_2048MB
default 4096 if SHMOBILE_IOMMU_ADDRSIZE_1024MB
default 2048 if SHMOBILE_IOMMU_ADDRSIZE_512MB
default 1024 if SHMOBILE_IOMMU_ADDRSIZE_256MB
default 512 if SHMOBILE_IOMMU_ADDRSIZE_128MB
default 256 if SHMOBILE_IOMMU_ADDRSIZE_64MB
default 128 if SHMOBILE_IOMMU_ADDRSIZE_32MB

config IPMMU_VMSA
bool "Renesas VMSA-compatible IPMMU"
depends on ARM_LPAE
Expand Down
2 changes: 0 additions & 2 deletions drivers/iommu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,5 @@ obj-$(CONFIG_ROCKCHIP_IOMMU) += rockchip-iommu.o
obj-$(CONFIG_TEGRA_IOMMU_GART) += tegra-gart.o
obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o
obj-$(CONFIG_EXYNOS_IOMMU) += exynos-iommu.o
obj-$(CONFIG_SHMOBILE_IOMMU) += shmobile-iommu.o
obj-$(CONFIG_SHMOBILE_IPMMU) += shmobile-ipmmu.o
obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o
obj-$(CONFIG_S390_IOMMU) += s390-iommu.o
Loading

0 comments on commit ae50dc4

Please sign in to comment.