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

Commit b0a35f46 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: Fix inadvertent stomp on BKE_EN register"

parents 59f92047 b73c2137

drivers/platform/msm/msm_bus/msm_bus_bimc.c

+3 −3
Original line number Diff line number Diff line
@@ -1122,7 +1122,7 @@ static void msm_bus_bimc_set_qos_mode(void __iomem *base, 
	switch (qmode_sel) {

	case BIMC_QOS_MODE_FIXED:

		reg_val = readl_relaxed(M_BKE_EN_ADDR(base,

			mas_index)) & M_BKE_EN_RMSK;

			mas_index));

		writel_relaxed((reg_val & (~M_BKE_EN_EN_BMSK)),

			M_BKE_EN_ADDR(base, mas_index));

		/* Ensure that the book-keeping register writes
@@ -1136,7 +1136,7 @@ static void msm_bus_bimc_set_qos_mode(void __iomem *base, 


	case BIMC_QOS_MODE_BYPASS:

		reg_val = readl_relaxed(M_BKE_EN_ADDR(base,

			mas_index)) & M_BKE_EN_RMSK;

			mas_index));

		writel_relaxed((reg_val & (~M_BKE_EN_EN_BMSK)),

			M_BKE_EN_ADDR(base, mas_index));

		/* Ensure that the book-keeping register writes
@@ -1152,7 +1152,7 @@ static void msm_bus_bimc_set_qos_mode(void __iomem *base, 
	case BIMC_QOS_MODE_LIMITER:

		set_qos_mode(base, mas_index, 0, 0, 0);

		reg_val = readl_relaxed(M_BKE_EN_ADDR(base,

			mas_index)) & M_BKE_EN_RMSK;

			mas_index));

		val = 1 << M_BKE_EN_EN_SHFT;

		/* Ensure that the book-keeping register writes

		 * go through before setting QoS mode.