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

Commit 40da19e5 authored by Skylar Chang's avatar Skylar Chang
Browse files

msm: gsi: use LSB to ring doorbells 



MSB is always fixed once the channel is setup. Ring
doorbell on for new descriptors by writing to LSB register only.

CRs-Fixed: 2202013
Change-Id: If4e72c5e6c4c9cc58dafae8a44e5f389be593333
Acked-by: default avatarAdy Abraham <adya@qti.qualcomm.com>
Signed-off-by: default avatarSkylar Chang <chiaweic@codeaurora.org>
parent 8e869444

drivers/platform/msm/gsi/gsi.c

+18 −16
Original line number Diff line number Diff line
@@ -434,14 +434,6 @@ static void gsi_ring_evt_doorbell(struct gsi_evt_ctx *ctx) 
{

	uint32_t val;



	/* write order MUST be MSB followed by LSB */

	val = ((ctx->ring.wp_local >> 32) &

			GSI_EE_n_EV_CH_k_DOORBELL_1_WRITE_PTR_MSB_BMSK) <<

			GSI_EE_n_EV_CH_k_DOORBELL_1_WRITE_PTR_MSB_SHFT;

	gsi_writel(val, gsi_ctx->base +

			GSI_EE_n_EV_CH_k_DOORBELL_1_OFFS(ctx->id,

				gsi_ctx->per.ee));



	val = (ctx->ring.wp_local &

			GSI_EE_n_EV_CH_k_DOORBELL_0_WRITE_PTR_LSB_BMSK) <<

			GSI_EE_n_EV_CH_k_DOORBELL_0_WRITE_PTR_LSB_SHFT;
@@ -464,14 +456,6 @@ static void gsi_ring_chan_doorbell(struct gsi_chan_ctx *ctx) 
		gsi_ring_evt_doorbell(ctx->evtr);

	ctx->ring.wp = ctx->ring.wp_local;



	/* write order MUST be MSB followed by LSB */

	val = ((ctx->ring.wp_local >> 32) &

			GSI_EE_n_GSI_CH_k_DOORBELL_1_WRITE_PTR_MSB_BMSK) <<

			GSI_EE_n_GSI_CH_k_DOORBELL_1_WRITE_PTR_MSB_SHFT;

	gsi_writel(val, gsi_ctx->base +

			GSI_EE_n_GSI_CH_k_DOORBELL_1_OFFS(ctx->props.ch_id,

				gsi_ctx->per.ee));



	val = (ctx->ring.wp_local &

			GSI_EE_n_GSI_CH_k_DOORBELL_0_WRITE_PTR_LSB_BMSK) <<

			GSI_EE_n_GSI_CH_k_DOORBELL_0_WRITE_PTR_LSB_SHFT;
@@ -1100,11 +1084,21 @@ static void gsi_init_evt_ring(struct gsi_evt_ring_props *props, 
static void gsi_prime_evt_ring(struct gsi_evt_ctx *ctx)

{

	unsigned long flags;

	uint32_t val;



	spin_lock_irqsave(&ctx->ring.slock, flags);

	memset((void *)ctx->ring.base_va, 0, ctx->ring.len);

	ctx->ring.wp_local = ctx->ring.base +

		ctx->ring.max_num_elem * ctx->ring.elem_sz;



	/* write order MUST be MSB followed by LSB */

	val = ((ctx->ring.wp_local >> 32) &

		GSI_EE_n_EV_CH_k_DOORBELL_1_WRITE_PTR_MSB_BMSK) <<

		GSI_EE_n_EV_CH_k_DOORBELL_1_WRITE_PTR_MSB_SHFT;

	gsi_writel(val, gsi_ctx->base +

		GSI_EE_n_EV_CH_k_DOORBELL_1_OFFS(ctx->id,

		gsi_ctx->per.ee));



	gsi_ring_evt_doorbell(ctx);

	spin_unlock_irqrestore(&ctx->ring.slock, flags);

}
@@ -1966,6 +1960,14 @@ int gsi_start_channel(unsigned long chan_hdl) 
		BUG();

	}



	/* write order MUST be MSB followed by LSB */

	val = ((ctx->ring.wp_local >> 32) &

		GSI_EE_n_GSI_CH_k_DOORBELL_1_WRITE_PTR_MSB_BMSK) <<

		GSI_EE_n_GSI_CH_k_DOORBELL_1_WRITE_PTR_MSB_SHFT;

	gsi_writel(val, gsi_ctx->base +

		GSI_EE_n_GSI_CH_k_DOORBELL_1_OFFS(ctx->props.ch_id,

		gsi_ctx->per.ee));



	mutex_unlock(&gsi_ctx->mlock);



	return GSI_STATUS_SUCCESS;