Commit 0b1ba18a authored by Alex Elder's avatar Alex Elder Committed by David S. Miller
Browse files

net: ipa: zero return code before issuing generic EE command 



Zero the result code stored in a field of the scratch 0 register
before issuing a generic EE command.  This just guarantees that
the value we read later was actually written as a result of the
command.

Also add the definitions of two more possible result codes that can
be returned when issuing flow control enable or disable commands:
  INCORRECT_CHANNEL_STATE: - channel must be in started state
  INCORRECT_DIRECTION - flow control is only valid for TX channels

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

drivers/net/ipa/gsi.c

+7 −0
Original line number Diff line number Diff line
@@ -1041,6 +1041,7 @@ static void gsi_isr_gp_int1(struct gsi *gsi) 


	complete(&gsi->completion);

}



/* Inter-EE interrupt handler */

static void gsi_isr_glob_ee(struct gsi *gsi)

{
@@ -1493,6 +1494,12 @@ static int gsi_generic_command(struct gsi *gsi, u32 channel_id, 
	struct completion *completion = &gsi->completion;

	u32 val;



	/* First zero the result code field */

	val = ioread32(gsi->virt + GSI_CNTXT_SCRATCH_0_OFFSET);

	val &= ~GENERIC_EE_RESULT_FMASK;

	iowrite32(val, gsi->virt + GSI_CNTXT_SCRATCH_0_OFFSET);



	/* Now issue the command */

	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);

drivers/net/ipa/gsi_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -410,6 +410,8 @@ 
#define INTER_EE_RESULT_FMASK		GENMASK(2, 0)

#define GENERIC_EE_RESULT_FMASK		GENMASK(7, 5)

#define GENERIC_EE_SUCCESS_FVAL			1

#define GENERIC_EE_INCORRECT_DIRECTION_FVAL	3

#define GENERIC_EE_INCORRECT_CHANNEL_FVAL	5

#define GENERIC_EE_NO_RESOURCES_FVAL		7

#define USB_MAX_PACKET_FMASK		GENMASK(15, 15)	/* 0: HS; 1: SS */

#define MHI_BASE_CHANNEL_FMASK		GENMASK(31, 24)

CRA Git | Maintained and supported by SUSTech CRA and CCSE