clk: qcom: reset: Ensure write completion on reset de/assertion

BugLink: https://bugs.launchpad.net/bugs/2060097

[ Upstream commit 2f8cf2c3f3e3f7ef61bd19abb4b0bb797ad50aaf ]

Trying to toggle the resets in a rapid fashion can lead to the changes
not actually arriving at the clock controller block when we expect them
to. This was observed at least on SM8250.

Read back the value after regmap_update_bits to ensure write completion.

Fixes: b36ba30c8a ("clk: qcom: Add reset controller support")
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20240105-topic-venus_reset-v2-3-c37eba13b5ce@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 29635d12291023b249834bce0a4756f329ee15a5)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
This commit is contained in:
Konrad Dybcio
2024-02-06 19:43:36 +01:00
committed by Roxana Nicolescu
parent dbabc8207e
commit 6c01a2edcf
+6 -1
View File
@@ -33,7 +33,12 @@ static int qcom_reset_set_assert(struct reset_controller_dev *rcdev,
map = &rst->reset_map[id];
mask = map->bitmask ? map->bitmask : BIT(map->bit);
return regmap_update_bits(rst->regmap, map->reg, mask, assert ? mask : 0);
regmap_update_bits(rst->regmap, map->reg, mask, assert ? mask : 0);
/* Read back the register to ensure write completion, ignore the value */
regmap_read(rst->regmap, map->reg, &mask);
return 0;
}
static int qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)