UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iommu/ipmmu-vmsa: Add support for r8a779a0 

Add support for r8a779a0 (R-Car V3U). The IPMMU hardware design
of this SoC differs than others. So, add a new ipmmu_features for it.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20210907083020.907648-3-yoshihiro.shimoda.uh@renesas.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Yoshihiro Shimoda 2021-09-07 17:30:20 +09:00 committed by Joerg Roedel
parent 5c8e9a47b5
commit 7a62ced8eb
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/iommu/ipmmu-vmsa.c
View File

@ -33,10 +33,10 @@
#define arm_iommu_detach_device(...) do {} while (0) #define arm_iommu_detach_device(...) do {} while (0)
#endif #endif
#define IPMMU_CTX_MAX 8U #define IPMMU_CTX_MAX 16U
#define IPMMU_CTX_INVALID -1 #define IPMMU_CTX_INVALID -1
#define IPMMU_UTLB_MAX 48U #define IPMMU_UTLB_MAX 64U
struct ipmmu_features { struct ipmmu_features {
bool use_ns_alias_offset; bool use_ns_alias_offset;
@ -189,8 +189,12 @@ static void ipmmu_write(struct ipmmu_vmsa_device *mmu, unsigned int offset,
static unsigned int ipmmu_ctx_reg(struct ipmmu_vmsa_device *mmu, static unsigned int ipmmu_ctx_reg(struct ipmmu_vmsa_device *mmu,
unsigned int context_id, unsigned int reg) unsigned int context_id, unsigned int reg)
{ {
return mmu->features->ctx_offset_base + unsigned int base = mmu->features->ctx_offset_base;
context_id * mmu->features->ctx_offset_stride + reg;
if (context_id > 7)
base += 0x800 - 8 * 0x40;
return base + context_id * mmu->features->ctx_offset_stride + reg;
} }
static u32 ipmmu_ctx_read(struct ipmmu_vmsa_device *mmu, static u32 ipmmu_ctx_read(struct ipmmu_vmsa_device *mmu,
@ -922,6 +926,20 @@ static const struct ipmmu_features ipmmu_features_rcar_gen3 = {
.utlb_offset_base = 0, .utlb_offset_base = 0,
}; };
static const struct ipmmu_features ipmmu_features_r8a779a0 = {
.use_ns_alias_offset = false,
.has_cache_leaf_nodes = true,
.number_of_contexts = 16,
.num_utlbs = 64,
.setup_imbuscr = false,
.twobit_imttbcr_sl0 = true,
.reserved_context = true,
.cache_snoop = false,
.ctx_offset_base = 0x10000,
.ctx_offset_stride = 0x1040,
.utlb_offset_base = 0x3000,
};
static const struct of_device_id ipmmu_of_ids[] = { static const struct of_device_id ipmmu_of_ids[] = {
{ {
.compatible = "renesas,ipmmu-vmsa", .compatible = "renesas,ipmmu-vmsa",
@ -959,6 +977,9 @@ static const struct of_device_id ipmmu_of_ids[] = {
}, { }, {
.compatible = "renesas,ipmmu-r8a77995", .compatible = "renesas,ipmmu-r8a77995",
.data = &ipmmu_features_rcar_gen3, .data = &ipmmu_features_rcar_gen3,
}, {
.compatible = "renesas,ipmmu-r8a779a0",
.data = &ipmmu_features_r8a779a0,
}, { }, {
/* Terminator */ /* Terminator */
}, },