| From f8c3ba9b91afcdea25e1171e31034313638b1a34 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 7 Nov 2023 16:57:13 +0530 |
| Subject: memory: tegra: Skip SID programming if SID registers aren't set |
| |
| From: Ashish Mhetre <amhetre@nvidia.com> |
| |
| [ Upstream commit 0d6c918011ce4764ed277de4726a468b7ffe5fed ] |
| |
| There are few MC clients where SID security and override register |
| offsets are not specified like "sw_cluster0" in tegra234. Don't program |
| SID override for such clients because it leads to access to invalid |
| addresses. |
| |
| Signed-off-by: Ashish Mhetre <amhetre@nvidia.com> |
| Link: https://lore.kernel.org/r/20231107112713.21399-2-amhetre@nvidia.com |
| Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/memory/tegra/tegra186.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c |
| index 533f85a4b2bdb..7633481e547d2 100644 |
| --- a/drivers/memory/tegra/tegra186.c |
| +++ b/drivers/memory/tegra/tegra186.c |
| @@ -75,6 +75,9 @@ static void tegra186_mc_client_sid_override(struct tegra_mc *mc, |
| { |
| u32 value, old; |
| |
| + if (client->regs.sid.security == 0 && client->regs.sid.override == 0) |
| + return; |
| + |
| value = readl(mc->regs + client->regs.sid.security); |
| if ((value & MC_SID_STREAMID_SECURITY_OVERRIDE) == 0) { |
| /* |
| -- |
| 2.43.0 |
| |
