summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2022-08-14 23:12:40 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-10-05 10:36:45 +0200
commitd25e4b036fc357c249726b4e34e2652ee09ddafc (patch)
treeb9d3501bcc2ed5431b7efaa76779b8a35a4d5295
parentf039564c36ee609bc5327a52895dfee05c8f0f7c (diff)
downloadlinux-stable-d25e4b036fc357c249726b4e34e2652ee09ddafc.tar.gz
linux-stable-d25e4b036fc357c249726b4e34e2652ee09ddafc.tar.bz2
linux-stable-d25e4b036fc357c249726b4e34e2652ee09ddafc.zip
soc: sunxi: sram: Actually claim SRAM regions
[ Upstream commit fd362baad2e659ef0fb5652f023a606b248f1781 ] sunxi_sram_claim() checks the sram_desc->claimed flag before updating the register, with the intent that only one device can claim a region. However, this was ineffective because the flag was never set. Fixes: 4af34b572a85 ("drivers: soc: sunxi: Introduce SoC driver to map SRAMs") Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com> Signed-off-by: Samuel Holland <samuel@sholland.org> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com> Link: https://lore.kernel.org/r/20220815041248.53268-4-samuel@sholland.org Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/soc/sunxi/sunxi_sram.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c
index b4b0f3480bd3..51148704af49 100644
--- a/drivers/soc/sunxi/sunxi_sram.c
+++ b/drivers/soc/sunxi/sunxi_sram.c
@@ -264,6 +264,7 @@ int sunxi_sram_claim(struct device *dev)
writel(val | ((device << sram_data->offset) & mask),
base + sram_data->reg);
+ sram_desc->claimed = true;
spin_unlock(&sram_lock);
return 0;