Commit a14d5937 authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: update sequencer definition constraints 



Starting with IPA v4.5, replication is done differently from before,
and as a result the "replication" portion of the how the sequencer
is specified must be zero.

Add a check for the configuration data failing that requirement, and
only update the sesquencer type value when it's supported.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9eefd2fb

drivers/net/ipa/ipa_endpoint.c

+13 −3
Original line number Diff line number Diff line
@@ -182,6 +182,15 @@ static bool ipa_endpoint_data_valid_one(struct ipa *ipa, u32 count, 
		return true;	/* Nothing more to check for RX */

	}



	/* Starting with IPA v4.5 sequencer replication is obsolete */

	if (ipa->version >= IPA_VERSION_4_5) {

		if (data->endpoint.config.tx.seq_rep_type) {

			dev_err(dev, "no-zero seq_rep_type TX endpoint %u\n",

				data->endpoint_id);

			return false;

		}

	}



	if (data->endpoint.config.status_enable) {

		other_name = data->endpoint.config.tx.status_endpoint;

		if (other_name >= count) {
@@ -995,7 +1004,8 @@ static void ipa_endpoint_init_seq(struct ipa_endpoint *endpoint) 
	/* Low-order byte configures primary packet processing */

	val |= u32_encode_bits(endpoint->config.tx.seq_type, SEQ_TYPE_FMASK);



	/* Second byte configures replicated packet processing */

	/* Second byte (if supported) configures replicated packet processing */

	if (endpoint->ipa->version < IPA_VERSION_4_5)

		val |= u32_encode_bits(endpoint->config.tx.seq_rep_type,

				       SEQ_REP_TYPE_FMASK);

drivers/net/ipa/ipa_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -585,6 +585,7 @@ static inline u32 rsrc_grp_encoded(enum ipa_version version, u32 rsrc_grp) 
#define IPA_REG_ENDP_INIT_SEQ_N_OFFSET(txep) \

					(0x0000083c + 0x0070 * (txep))

#define SEQ_TYPE_FMASK				GENMASK(7, 0)

/* The next field must be zero for IPA v4.5+ */

#define SEQ_REP_TYPE_FMASK			GENMASK(15, 8)



/**