diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_dp.c b/drivers/platform/msm/ipa/ipa_v3/ipa_dp.c index 515f7ac851c2..5426d9d076d4 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_dp.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_dp.c @@ -2770,25 +2770,26 @@ begin: sys->status_stat->curr = 0; } - if ((status.status_opcode != - IPAHAL_PKT_STATUS_OPCODE_DROPPED_PACKET) && - (status.status_opcode != - IPAHAL_PKT_STATUS_OPCODE_PACKET) && - (status.status_opcode != - IPAHAL_PKT_STATUS_OPCODE_SUSPENDED_PACKET) && - (status.status_opcode != - IPAHAL_PKT_STATUS_OPCODE_PACKET_2ND_PASS)) { - IPAERR("unsupported opcode(%d)\n", + switch (status.status_opcode) { + case IPAHAL_PKT_STATUS_OPCODE_DROPPED_PACKET: + case IPAHAL_PKT_STATUS_OPCODE_PACKET: + case IPAHAL_PKT_STATUS_OPCODE_SUSPENDED_PACKET: + case IPAHAL_PKT_STATUS_OPCODE_PACKET_2ND_PASS: + case IPAHAL_PKT_STATUS_OPCODE_NEW_FRAG_RULE: + break; + default: + IPAERR_RL("unsupported opcode(%d)\n", status.status_opcode); skb_pull(skb, pkt_status_sz); continue; } + IPA_STATS_EXCP_CNT(status.exception, ipa3_ctx->stats.rx_excp_pkts); if (status.endp_dest_idx >= ipa3_ctx->ipa_num_pipes || status.endp_src_idx >= ipa3_ctx->ipa_num_pipes) { - IPAERR("status fields invalid\n"); - IPAERR("STATUS opcode=%d src=%d dst=%d len=%d\n", + IPAERR_RL("status fields invalid\n"); + IPAERR_RL("STATUS opcode=%d src=%d dst=%d len=%d\n", status.status_opcode, status.endp_src_idx, status.endp_dest_idx, status.pkt_len); WARN_ON(1); diff --git a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.c b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.c index eb1e81f9f0b7..27ad3c2a47bf 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.c @@ -933,9 +933,8 @@ static void ipa_pkt_status_parse( opcode = IPAHAL_PKT_STATUS_OPCODE_PACKET_2ND_PASS; break; default: - IPAHAL_ERR("unsupported Status Opcode 0x%x\n", + IPAHAL_ERR_RL("unsupported Status Opcode 0x%x\n", hw_status->status_opcode); - WARN_ON(1); }; status->status_opcode = opcode; @@ -950,9 +949,8 @@ static void ipa_pkt_status_parse( status->nat_type = IPAHAL_PKT_STATUS_NAT_DST; break; default: - IPAHAL_ERR("unsupported Status NAT type 0x%x\n", + IPAHAL_ERR_RL("unsupported Status NAT type 0x%x\n", hw_status->nat_type); - WARN_ON(1); }; switch (hw_status->exception) { @@ -984,9 +982,8 @@ static void ipa_pkt_status_parse( exception_type = IPAHAL_PKT_STATUS_EXCEPTION_CSUM; break; default: - IPAHAL_ERR("unsupported Status Exception type 0x%x\n", + IPAHAL_ERR_RL("unsupported Status Exception type 0x%x\n", hw_status->exception); - WARN_ON(1); }; status->exception = exception_type;