Commit 42839f95 authored by Alex Elder's avatar Alex Elder Committed by David S. Miller
Browse files

net: ipa: update GSI ring size registers 



Each GSI channel has a CNTXT_1 register that encodes the size of its
ring buffer.  The size of the field that records that is increased
starting at IPA v4.9.  Replace the use of a fixed-size field mask
with a new inline function that encodes that size value.

Similarly, the size of GSI event rings can be larger starting with
IPA v4.9, so create a function to encode that as well.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f57b2fa

drivers/net/ipa/gsi.c

+5 −2
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ static void gsi_evt_ring_program(struct gsi *gsi, u32 evt_ring_id) 
	val |= u32_encode_bits(GSI_RING_ELEMENT_SIZE, EV_ELEMENT_SIZE_FMASK);

	iowrite32(val, gsi->virt + GSI_EV_CH_E_CNTXT_0_OFFSET(evt_ring_id));



	val = u32_encode_bits(size, EV_R_LENGTH_FMASK);

	val = ev_r_length_encoded(gsi->version, size);

	iowrite32(val, gsi->virt + GSI_EV_CH_E_CNTXT_1_OFFSET(evt_ring_id));



	/* The context 2 and 3 registers store the low-order and
@@ -808,7 +808,7 @@ static void gsi_channel_program(struct gsi_channel *channel, bool doorbell) 
	val |= u32_encode_bits(GSI_RING_ELEMENT_SIZE, ELEMENT_SIZE_FMASK);

	iowrite32(val, gsi->virt + GSI_CH_C_CNTXT_0_OFFSET(channel_id));



	val = u32_encode_bits(size, R_LENGTH_FMASK);

	val = r_length_encoded(gsi->version, size);

	iowrite32(val, gsi->virt + GSI_CH_C_CNTXT_1_OFFSET(channel_id));



	/* The context 2 and 3 registers store the low-order and
@@ -842,6 +842,9 @@ static void gsi_channel_program(struct gsi_channel *channel, bool doorbell) 
			val |= u32_encode_bits(GSI_ESCAPE_BUF_ONLY,

					       PREFETCH_MODE_FMASK);

	}

	/* All channels set DB_IN_BYTES */

	if (gsi->version >= IPA_VERSION_4_9)

		val |= DB_IN_BYTES;



	iowrite32(val, gsi->virt + GSI_CH_C_QOS_OFFSET(channel_id));

drivers/net/ipa/gsi_reg.h

+15 −2
Original line number Diff line number Diff line
@@ -90,7 +90,14 @@ enum gsi_channel_type { 
		GSI_EE_N_CH_C_CNTXT_1_OFFSET((ch), GSI_EE_AP)

#define GSI_EE_N_CH_C_CNTXT_1_OFFSET(ch, ee) \

		(0x0001c004 + 0x4000 * (ee) + 0x80 * (ch))

#define R_LENGTH_FMASK			GENMASK(15, 0)



/* Encoded value for CH_C_CNTXT_1 register R_LENGTH field */

static inline u32 r_length_encoded(enum ipa_version version, u32 length)

{

	if (version < IPA_VERSION_4_9)

		return u32_encode_bits(length, GENMASK(15, 0));

	return u32_encode_bits(length, GENMASK(19, 0));

}



#define GSI_CH_C_CNTXT_2_OFFSET(ch) \

		GSI_EE_N_CH_C_CNTXT_2_OFFSET((ch), GSI_EE_AP)
@@ -161,7 +168,13 @@ enum gsi_prefetch_mode { 
		GSI_EE_N_EV_CH_E_CNTXT_1_OFFSET((ev), GSI_EE_AP)

#define GSI_EE_N_EV_CH_E_CNTXT_1_OFFSET(ev, ee) \

		(0x0001d004 + 0x4000 * (ee) + 0x80 * (ev))

#define EV_R_LENGTH_FMASK		GENMASK(15, 0)

/* Encoded value for EV_CH_C_CNTXT_1 register EV_R_LENGTH field */

static inline u32 ev_r_length_encoded(enum ipa_version version, u32 length)

{

	if (version < IPA_VERSION_4_9)

		return u32_encode_bits(length, GENMASK(15, 0));

	return u32_encode_bits(length, GENMASK(19, 0));

}



#define GSI_EV_CH_E_CNTXT_2_OFFSET(ev) \

		GSI_EE_N_EV_CH_E_CNTXT_2_OFFSET((ev), GSI_EE_AP)