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

Commit 1d04cee1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: msm_bus: Prevent BKE swtich from overwriting other fields"

parents 58f69ac3 363b1c66

drivers/platform/msm/msm_bus/msm_bus_bimc.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1470,12 +1470,12 @@ static void free_commit_data(void *cdata) 
static void bke_switch(

static void bke_switch(

	void __iomem *baddr, uint32_t mas_index, bool req, int mode)

	void __iomem *baddr, uint32_t mas_index, bool req, int mode)

{

{

	uint32_t reg_val, val;

	uint32_t reg_val, val, cur_val;





	val = req << M_BKE_EN_EN_SHFT;

	val = req << M_BKE_EN_EN_SHFT;

	reg_val = readl_relaxed(M_BKE_EN_ADDR(baddr, mas_index)) &

	reg_val = readl_relaxed(M_BKE_EN_ADDR(baddr, mas_index));

		M_BKE_EN_RMSK;

	cur_val = reg_val & M_BKE_EN_RMSK;

	if (val == reg_val)

	if (val == cur_val)

		return;

		return;





	if (!req && mode == BIMC_QOS_MODE_FIXED)

	if (!req && mode == BIMC_QOS_MODE_FIXED)