Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68435ffc authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Sasha Levin
Browse files

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



[ 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: b36ba30c ("clk: qcom: Add reset controller support")
Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20240105-topic-venus_reset-v2-3-c37eba13b5ce@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 026d3984

drivers/clk/qcom/reset.c

+6 −1
Original line number Diff line number Diff line
@@ -32,7 +32,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)