diff options
| -rw-r--r-- | drivers/arm/cci/cci.c | 7 | ||||
| -rw-r--r-- | plat/nvidia/tegra/common/drivers/smmu/smmu.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/arm/cci/cci.c b/drivers/arm/cci/cci.c index dd39051f..0fcec850 100644 --- a/drivers/arm/cci/cci.c +++ b/drivers/arm/cci/cci.c @@ -54,20 +54,19 @@ static int validate_cci_map(const int *map) continue; if (slave_if_id >= CCI_SLAVE_INTERFACE_COUNT) { - tf_printf("Slave interface ID is invalid\n"); + ERROR("Slave interface ID is invalid\n"); return 0; } if (valid_cci_map & (1 << slave_if_id)) { - tf_printf("Multiple masters are assigned same" - " slave interface ID\n"); + ERROR("Multiple masters are assigned same slave interface ID\n"); return 0; } valid_cci_map |= 1 << slave_if_id; } if (!valid_cci_map) { - tf_printf("No master is assigned a valid slave interface\n"); + ERROR("No master is assigned a valid slave interface\n"); return 0; } diff --git a/plat/nvidia/tegra/common/drivers/smmu/smmu.c b/plat/nvidia/tegra/common/drivers/smmu/smmu.c index a57db8b1..e8b0d0b4 100644 --- a/plat/nvidia/tegra/common/drivers/smmu/smmu.c +++ b/plat/nvidia/tegra/common/drivers/smmu/smmu.c @@ -116,7 +116,7 @@ void tegra_smmu_save_context(uint64_t smmu_ctx_addr) /* Save SMMU config settings */ memcpy16((void *)(uintptr_t)smmu_ctx_addr, (void *)smmu_ctx_regs, - sizeof(smmu_ctx_regs)); + sizeof(smmu_regs_t)); /* save the SMMU table address */ mmio_write_32(TEGRA_SCRATCH_BASE + SECURE_SCRATCH_RSV11_LO, |