Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9481f8f8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa3: changes to status packet"

parents 761d7046 4ff682e5

drivers/platform/msm/ipa/ipa_v3/ipa_dp.c

+12 −16
Original line number Diff line number Diff line
@@ -1905,14 +1905,11 @@ begin: 
				status->status_opcode, status->endp_src_idx,

				status->endp_dest_idx, status->pkt_len);



		if (status->status_opcode !=

			IPA_HW_STATUS_OPCODE_DROPPED_PACKET &&

			status->status_opcode !=

			IPA_HW_STATUS_OPCODE_PACKET &&

			status->status_opcode !=

			IPA_HW_STATUS_OPCODE_SUSPENDED_PACKET &&

			status->status_opcode !=

			IPA_HW_STATUS_OPCODE_XLAT_PACKET) {

		if ((status->status_opcode &

		    (IPA_HW_STATUS_OPCODE_DROPPED_PACKET |

		    IPA_HW_STATUS_OPCODE_PACKET |

		    IPA_HW_STATUS_OPCODE_SUSPENDED_PACKET |

		    IPA_HW_STATUS_OPCODE_PACKET_2ND_PASS)) == 0) {

			IPAERR("unsupported opcode(%d)\n",

				status->status_opcode);

			skb_pull(skb, IPA_PKT_STATUS_SIZE);
@@ -1931,7 +1928,7 @@ begin: 
			struct ipa_tag_completion *comp;



			IPADBG("TAG packet arrived\n");

			if (status->tag_f_2 == IPA_COOKIE) {

			if (status->tag == IPA_COOKIE) {

				skb_pull(skb, IPA_PKT_STATUS_SIZE);

				if (skb->len < sizeof(comp)) {

					IPAERR("TAG arrived without packet\n");
@@ -1964,7 +1961,8 @@ begin: 
			 * A packet which is received back to the AP after

			 * there was no route match.

			 */

			if (!status->exception && !status->route_match)

			if (!status->exception &&

			    status->route_rule_id == IPA_RULE_ID_INVALID)

				drop_packet = true;



			if (skb->len == IPA_PKT_STATUS_SIZE &&
@@ -2145,12 +2143,10 @@ static int ipa_wan_rx_pyld_hdlr(struct sk_buff *skb, 
		IPADBG("STATUS opcode=%d src=%d dst=%d len=%d\n",

				status->status_opcode, status->endp_src_idx,

				status->endp_dest_idx, status->pkt_len);

		if (status->status_opcode !=

			IPA_HW_STATUS_OPCODE_DROPPED_PACKET &&

			status->status_opcode !=

			IPA_HW_STATUS_OPCODE_PACKET &&

			status->status_opcode !=

			IPA_HW_STATUS_OPCODE_XLAT_PACKET) {

		if ((status->status_opcode &

		    (IPA_HW_STATUS_OPCODE_DROPPED_PACKET |

		    IPA_HW_STATUS_OPCODE_PACKET |

		    IPA_HW_STATUS_OPCODE_PACKET_2ND_PASS)) == 0) {

			IPAERR("unsupported opcode\n");

			skb_pull(skb, IPA_PKT_STATUS_SIZE);

			continue;

drivers/platform/msm/ipa/ipa_v3/ipa_hw_defs.h

+49 −47
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define IPA_PROC_CTX_TLV_TYPE_HDR_ADD 1

#define IPA_PROC_CTX_TLV_TYPE_PROC_CMD 3



#define IPA_RULE_ID_INVALID 0x3FF



/**

 * struct ipa_flt_rule_hw_hdr - HW header of IPA filter rule
@@ -346,51 +347,52 @@ struct ipa_ip_packet_tag_status { 
	u64 tag:48;

};



/*! @brief Struct for the IPAv2.0 and IPAv2.5 UL packet status header */

/*! @brief Struct for the IPAv3.0 UL packet status header */

struct ipa_hw_pkt_status {

	u32 status_opcode:8;

	u32 exception:8;

	u32 status_mask:16;

	u32 pkt_len:16;

	u32 endp_src_idx:5;

	u32 reserved_1:3;

	u32 endp_dest_idx:5;

	u32 reserved_2:3;

	u32 metadata:32;

	u32 filt_local:1;

	u32 filt_global:1;

	u32 filt_pipe_idx:5;

	u32 ret_hdr:1;

	u32 filt_rule_idx:8;

	u32 tag_f_1:16;

	u32 tag_f_2:32;

	u32 time_day_ctr:32;

	u32 nat_hit:1;

	u32 nat_tbl_idx:13;

	u32 nat_type:2;

	u32 route_local:1;

	u32 route_tbl_idx:5;

	u32 route_match:1;

	u32 ucp:1;

	u32 route_rule_idx:8;

	u32 hdr_local:1;

	u32 hdr_offset:10;

	u32 frag_hit:1;

	u32 frag_rule:4;

	u32 reserved_4:16;

	u64 status_opcode:8;

	u64 exception:8;

	u64 status_mask:16;

	u64 pkt_len:16;

	u64 endp_src_idx:5;

	u64 reserved_1:3;

	u64 endp_dest_idx:5;

	u64 reserved_2:3;

	u64 metadata:32;

	u64 filt_local:1;

	u64 filt_hash:1;

	u64 filt_global:1;

	u64 ret_hdr:1;

	u64 filt_rule_id:10;

	u64 route_local:1;

	u64 route_hash:1;

	u64 ucp:1;

	u64 route_tbl_idx:5;

	u64 route_rule_id:10;

	u64 nat_hit:1;

	u64 nat_tbl_idx:13;

	u64 nat_type:2;

	u64 tag:48;

	u64 seq_num:8;

	u64 time_day_ctr:24;

	u64 hdr_local:1;

	u64 hdr_offset:10;

	u64 frag_hit:1;

	u64 frag_rule:4;

	u64 reserved_4:16;

};



#define IPA_PKT_STATUS_SIZE 32



/*! @brief Status header opcodes */

enum ipa_hw_status_opcode {

	IPA_HW_STATUS_OPCODE_MIN,

	IPA_HW_STATUS_OPCODE_PACKET = IPA_HW_STATUS_OPCODE_MIN,

	IPA_HW_STATUS_OPCODE_NEW_FRAG_RULE,

	IPA_HW_STATUS_OPCODE_DROPPED_PACKET,

	IPA_HW_STATUS_OPCODE_SUSPENDED_PACKET,

	IPA_HW_STATUS_OPCODE_XLAT_PACKET = 6,

	IPA_HW_STATUS_OPCODE_MAX

	IPA_HW_STATUS_OPCODE_PACKET             = 0x1,

	IPA_HW_STATUS_OPCODE_NEW_FRAG_RULE      = 0x2,

	IPA_HW_STATUS_OPCODE_DROPPED_PACKET     = 0x4,

	IPA_HW_STATUS_OPCODE_SUSPENDED_PACKET   = 0x8,

	IPA_HW_STATUS_OPCODE_LOG                = 0x10,

	IPA_HW_STATUS_OPCODE_DCMP               = 0x20,

	IPA_HW_STATUS_OPCODE_PACKET_2ND_PASS    = 0x40,



};



/*! @brief Possible Masks received in status */
@@ -415,9 +417,9 @@ enum ipa_hw_pkt_status_mask { 
enum ipa_hw_pkt_status_exception {

	IPA_HW_PKT_STATUS_EXCEPTION_NONE             = 0x0,

	IPA_HW_PKT_STATUS_EXCEPTION_DEAGGR           = 0x1,

	IPA_HW_PKT_STATUS_EXCEPTION_REPL           = 0x2,

	IPA_HW_PKT_STATUS_EXCEPTION_IPTYPE           = 0x4,

	IPA_HW_PKT_STATUS_EXCEPTION_IHL            = 0x8,

	IPA_HW_PKT_STATUS_EXCEPTION_PACKET_LENGTH    = 0x8,

	IPA_HW_PKT_STATUS_EXCEPTION_PACKET_THRESHOLD = 0x9,

	IPA_HW_PKT_STATUS_EXCEPTION_FRAG_RULE_MISS   = 0x10,

	IPA_HW_PKT_STATUS_EXCEPTION_SW_FILT          = 0x20,

	IPA_HW_PKT_STATUS_EXCEPTION_NAT              = 0x40,