Changes in v4: - Add device_remove hook, so hisi-smmu and smmu-v3 can reclaim other resources. like dynamic allocted memory. And s1cbt and s2cbt memory are now allocated in driver(Previously, I hope BIOS to do this). - Fix bugs according to review comments. CB_FAR_LOW, CB_FAR_HIGH are (n) << 3. - Change context_map in struct arm_smmu_device to dynamic memory allocation. - Merge original patch 3 and 4 into one patch.
Changes in v3:
- Split arm-smmu.c into three files: arm-smmu.h arm-smmu-base.c arm-smmu.c. To build stardard arm-smmu driver, use these three files. To build hisilicon smmu driver, replace arm-smmu.c with hisi-smmu.c. Now, hisi smmu driver is not dependent on arm smmu driver. They can seperate exist, or coexist, when both building and running time. - Give up Hisilicon private properties. - Place hooks from global variable into struct arm_smmu_device. And deleted three hooks: tlb_sync, flush_pgtable and dt_cfg_probe. - Share the codes which are used to limit the size of smmu ias,oas,ubs. - Add two little patchs about code style, variable types, etc.
Changes in v2:
- Split Hisilicon smmu implementation in a separate file, hisi-smmu.c - Refactor arm-smmu.c. Some direct call hardware dependent functions replaced with hooks. And move common struct and marco definition into arm-smmu.h - Merge the description of Hisilicon private properties into arm,smmu.txt
I tried to merge hisi-smmu driver into arm-smmu.c, but it looks impossible. The biggest problem is that too many registers are diffrent: the base address, the field definition, or present only on one side. And if I use #if, hisi-smmu and arm-smmu can not coexist in one binary file. Almost need 20 #if.
In addition, SMMUv3 is also not compatible with v2. And something is similar with hisi-smmu: registers definition and fault handler is different with v2, but can reuse fdt configuration and memory map. Hence, arm-smmu-base.c and arm-smmu.h should be shared by all SMMUs(v2, v3 and hisi), and each smmu will own a private file, like: arm-smmu.c(for v1 and v2), arm-smmu-v3.c, hisi-smmu.c
In this patch, arm-smmu.h is not suitable for v3. Because it contains macros about v2 registers. SMMUv3 draft have not given detailed registers definition. So I don't know how many macros can be reused. In fact, I think all marcos which are not used in arm-smmu-base.c and arm-smmu.h, should place into each private file, and abide duplication(After all, it is hardware dependent. It will not bring any maintenance headaches, except when need rename the marcos).
Zhen Lei (5): iommu/arm: change some structure member types in arm_smmu_device iommu/arm: eliminate errors reported by checkpatch iommu/arm: split arm-smmu.c into three files iommu/hisilicon: Add support for Hisilicon Ltd. System MMU architecture documentation/iommu: Add description of Hisilicon SMMU private binding
.../devicetree/bindings/iommu/arm,smmu.txt | 2 + drivers/iommu/Kconfig | 14 + drivers/iommu/Makefile | 2 + drivers/iommu/arm-smmu-base.c | 1067 +++++++++++++++ drivers/iommu/arm-smmu.c | 1406 +------------------- drivers/iommu/arm-smmu.h | 438 ++++++ drivers/iommu/hisi-smmu.c | 541 ++++++++ 7 files changed, 2103 insertions(+), 1367 deletions(-) create mode 100644 drivers/iommu/arm-smmu-base.c create mode 100644 drivers/iommu/arm-smmu.h create mode 100644 drivers/iommu/hisi-smmu.c
-- 1.8.0