Commit 2df181f0 authored by Alex Elder's avatar Alex Elder Committed by David S. Miller
Browse files

net: ipa: generic command param fix 



Starting at IPA v4.11, the GSI_GENERIC_COMMAND GSI register got a
new PARAMS field.  The code that encodes a value into that field
sets it unconditionally, which is wrong.

We currently only provide 0 as the field's value, so this error has
no real effect.  Still, it's a bug, so let's fix it.

Fix an (unrelated) incorrect comment as well.  Fields in the
ERROR_LOG GSI register actually *are* defined for IPA versions
prior to v3.5.1.

Fixes: fe68c43c ("net: ipa: support enhanced channel flow control")
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47400aae

drivers/net/ipa/gsi.c

+2 −1
Original line number Diff line number Diff line
@@ -1666,6 +1666,7 @@ static int gsi_generic_command(struct gsi *gsi, u32 channel_id, 
	val = u32_encode_bits(opcode, GENERIC_OPCODE_FMASK);

	val |= u32_encode_bits(channel_id, GENERIC_CHID_FMASK);

	val |= u32_encode_bits(GSI_EE_MODEM, GENERIC_EE_FMASK);

	if (gsi->version >= IPA_VERSION_4_11)

		val |= u32_encode_bits(params, GENERIC_PARAMS_FMASK);



	timeout = !gsi_command(gsi, GSI_GENERIC_CMD_OFFSET, val);

drivers/net/ipa/gsi_reg.h

+0 −1
Original line number Diff line number Diff line
@@ -372,7 +372,6 @@ enum gsi_general_id { 
#define GSI_ERROR_LOG_OFFSET \

			(0x0001f200 + 0x4000 * GSI_EE_AP)



/* Fields below are present for IPA v3.5.1 and above */

#define ERR_ARG3_FMASK			GENMASK(3, 0)

#define ERR_ARG2_FMASK			GENMASK(7, 4)

#define ERR_ARG1_FMASK			GENMASK(11, 8)