net: ipa: three bug fixes
Subsystems (3)
cover net: ipa: three bug fixes
This series fixes three bugs in the Qualcomm IPA code. The third adds a missing error code initialization step.
-Alex
Alex Elder (3):
net: ipa: fix a bug in ipa_endpoint_stop()
net: ipa: fix an error message in gsi_channel_init_one()
net: ipa: zero return code before issuing generic EE command
drivers/net/ipa/gsi.c | 11 +++++++++-- drivers/net/ipa/gsi_reg.h | 2 ++ drivers/net/ipa/ipa_endpoint.c | 7 ++----- 3 files changed, 13 insertions(+), 7 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/3 net: ipa: fix a bug in ipa_endpoint_stop()
In ipa_endpoint_stop(), for TX endpoints we set the number of retries to 0. When we break out of the loop, retries being 0 means we return EIO rather than the value of ret (which should be 0).
Fix this by using a non-zero retry count for both RX and TX channels, and just break out of the loop after calling gsi_channel_stop() for TX channels. This way only RX channels will retry, and the retry count will be non-zero at the end for TX channels (so the proper value gets returned).
--- drivers/net/ipa/ipa_endpoint.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/net/ipa/ipa_endpoint.c +2 -5
@@ -1283,7 +1283,7 @@ static int ipa_endpoint_stop_rx_dma(struct ipa *ipa)*/ int ipa_endpoint_stop (struct ipa_endpoint *endpoint) { -u32 retries = endpoint->toward_ipa ?0 :IPA_ENDPOINT_STOP_RX_RETRIES ; +u32 retries =IPA_ENDPOINT_STOP_RX_RETRIES ;int ret; do {
@@ -1291,12 +1291,9 @@ int ipa_endpoint_stop(struct ipa_endpoint *endpoint)struct gsi *gsi = &ipa->gsi; ret =gsi_channel_stop (gsi, endpoint->channel_id); -if (ret != -EAGAIN ) +if (ret != -EAGAIN || endpoint->toward_ipa)break ; -if (endpoint->toward_ipa) -continue ; -/* For IPA v3.5.1, send a DMA read task and check again */ if (ipa->version ==IPA_VERSION_3_5_1 ) { ret =ipa_endpoint_stop_rx_dma (ipa);
Signature · 1 line
2.20.1
PATCH 2/3 net: ipa: fix an error message in gsi_channel_init_one()
In reply to Alex ElderAn error message about limiting the number of TREs used prints the wrong value. Fix this bug.
--- drivers/net/ipa/gsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ipa/gsi.c +2 -2
@@ -1798,9 +1798,9 @@ static int gsi_channel_init_one(struct gsi *gsi,/* Worst case we need an event for every outstanding TRE */ if (data->channel.tre_count > data->channel.event_count) { -dev_warn (gsi->dev,"channel %u limited to %u TREs\n" , - data->channel_id, data->channel.tre_count); tre_count = data->channel.event_count; +dev_warn (gsi->dev,"channel %u limited to %u TREs\n" , + data->channel_id, tre_count); }else { tre_count = data->channel.tre_count; }
Signature · 1 line
2.20.1
PATCH 3/3 net: ipa: zero return code before issuing generic EE command
In reply to Alex ElderZero 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
--- drivers/net/ipa/gsi.c | 7 +++++++ drivers/net/ipa/gsi_reg.h | 2 ++ 2 files changed, 9 insertions(+)
drivers/net/ipa/gsi.c +7 -0
@@ -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
@@ -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)
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Alex Elder <[email protected]>
Date: Thu, 30 Apr 2020 16:35:09 -0500
Quoted 2 lines
This series fixes three bugs in the Qualcomm IPA code. The third adds a missing error code initialization step.
Series applied, thanks.