Commit 62747512 authored by Alex Elder's avatar Alex Elder Committed by Paolo Abeni
Browse files

net: ipa: avoid setting an undefined field 



The GSI channel protocol field in the CH_C_CNTXT_0 GSI register is
widened starting IPA v5.0, making the CHTYPE_PROTOCOL_MSB field
added in IPA v4.5 unnecessary.  Update the code to reflect this.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent f75f44dd

drivers/net/ipa/gsi.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static u32 ch_c_cntxt_0_type_encode(enum ipa_version version, 
	u32 val;



	val = reg_encode(reg, CHTYPE_PROTOCOL, type);

	if (version < IPA_VERSION_4_5)

	if (version < IPA_VERSION_4_5 || version >= IPA_VERSION_5_0)

		return val;



	type >>= hweight32(reg_fmask(reg, CHTYPE_PROTOCOL));

drivers/net/ipa/gsi_reg.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ enum gsi_reg_ch_c_cntxt_0_field_id { 
	CHTYPE_DIR,

	CH_EE,

	CHID,

	CHTYPE_PROTOCOL_MSB,				/* IPA v4.9+ */

	CHTYPE_PROTOCOL_MSB,				/* IPA v4.5-4.11 */

	ERINDEX,

	CHSTATE,

	ELEMENT_SIZE,