Merge branch 'sdk-kernel-3.8' into master

3 files changed, 68 insertions, 28 deletions

diff --git a/include/linux/fsl_dpa_classifier.h b/include/linux/fsl_dpa_classifier.h
index f81ea90..6199aa0 100644
--- a/include/linux/fsl_dpa_classifier.h
+++ b/include/linux/fsl_dpa_classifier.h
@@ -1505,12 +1505,6 @@ struct dpa_cls_mcast_group_params {
 	unsigned int prefilled_members;
 
 	/*
-	 * External group handle given as input parameter for an import
-	 * operation
-	 */
-	void		*group;
-
-	/*
 	 * External distribution handle. When provided, replicated frames
 	 * are not enqueued to members' frame queues. They are sent to this
 	 * distribution.
@@ -1523,12 +1517,21 @@ struct dpa_cls_mcast_group_params {
 	void		*classification;
 };
 
+/* Multicast group external resource */
+struct dpa_cls_mcast_group_resources {
+	/*
+	 * Multicast group handle used when importing an external group node
+	 */
+	void	*group_node;
+};
+
 /*
  * Creates a multicast group with one member
  */
 int dpa_classif_mcast_create_group(
 		const struct dpa_cls_mcast_group_params *group_params,
-		int *grpd);
+		int *grpd,
+		const struct dpa_cls_mcast_group_resources *res);
 
 /*
  * Adds a new member to a multicast group
diff --git a/include/linux/fsl_dpa_stats.h b/include/linux/fsl_dpa_stats.h
index ba11791..b8fe850 100644
--- a/include/linux/fsl_dpa_stats.h
+++ b/include/linux/fsl_dpa_stats.h
@@ -396,8 +396,11 @@ struct dpa_stats_cnt_classif_tbl {
 	/* Table descriptor */
 	int td;
 
-	/* Key to identify a specific entry */
-	struct dpa_offload_lookup_key key;
+	/*
+	 * Pointer to a key that identifies a specific entry or NULL in order
+	 * to obtain statistics for miss entry
+	 */
+	struct dpa_offload_lookup_key *key;
 
 	/*
 	 * Single or multiple selection of Classifier Table counters
@@ -429,8 +432,11 @@ struct dpa_stats_cnt_classif_node {
 	/* The type of FMAN Classification Node */
 	enum dpa_stats_classif_node_type ccnode_type;
 
-	/* Key to identify a specific entry */
-	struct dpa_offload_lookup_key key;
+	/*
+	 * Pointer to a key that identifies a specific entry or NULL in order
+	 * to obtain statistics for miss entry
+	 */
+	struct dpa_offload_lookup_key *key;
 
 	/*
 	 * Single or multiple selection of Classifier
@@ -576,11 +582,17 @@ enum dpa_stats_classif_key_type {
 /* DPA Stats Classification counter - pair of keys */
 struct dpa_offload_lookup_key_pair {
 
-	/* Key to identify the first entry */
-	struct dpa_offload_lookup_key first_key;
+	/*
+	 * Pointer to a key that identifies the first entry or NULL in order
+	 * to identify the miss entry of the first table
+	 */
+	struct dpa_offload_lookup_key *first_key;
 
-	/* Key to identify the entry connected to the first entry */
-	struct dpa_offload_lookup_key second_key;
+	/*
+	 * Pointer to a key that identifies the entry connected to the first
+	 * entry first entry or NULL in order to identify the miss entry
+	 */
+	struct dpa_offload_lookup_key *second_key;
 };
 
 /* DPA Stats Classifier Table class counter parameters */
@@ -601,18 +613,28 @@ struct dpa_stats_cls_cnt_classif_tbl {
 		 */
 
 		/*
-		 * Array of keys to identify specific entries. A key can be
-		 * 'invalidated' by providing the 'byte' and 'mask' pointers
-		 * set to NULL.
+		 * Pointer to an array of keys, where each element of the array
+		 * can either be a key that identifies a specific entry or NULL
+		 * in order to obtain the statistics for the miss entry. A key
+		 * can be'invalidated' by providing the 'byte' pointer set
+		 * to NULL.
 		 */
-		struct dpa_offload_lookup_key *keys;
+		struct dpa_offload_lookup_key **keys;
 
 		/*
 		 * Array of 'pair-keys' to identify specific entries. A key pair
 		 * can be 'invalidated' by providing the 'byte' and 'mask'
 		 * pointers of the first key set to NULL
 		 */
-		struct dpa_offload_lookup_key_pair *pairs;
+
+		/*
+		 * Pointer to an array of ‘pair-keys’, where each element of the
+		 * array can either be a ‘pair-key’ that identifies a specific
+		 * entry or NULL in in order to obtain the statistics for the
+		 * miss entry. A key pair can be 'invalidated' by providing the
+		 * 'byte' pointer of the first key set to NULL.
+		 */
+		struct dpa_offload_lookup_key_pair **pairs;
 	};
 
 	/*
@@ -636,7 +658,7 @@ struct dpa_stats_cls_cnt_classif_node {
 	enum dpa_stats_classif_node_type ccnode_type;
 
 	/* Array of keys to identify specific entries */
-	struct dpa_offload_lookup_key *keys;
+	struct dpa_offload_lookup_key **keys;
 
 	/*
 	 * Single or multiple selection of Classifier counters
@@ -739,17 +761,20 @@ struct dpa_stats_cls_member_params {
 
 	union {
 		/*
-		 * Key to set or update in case the byte and mask pointers are
-		 * not NULL, or class member to invalidate otherwise
+		 * Pointer to a key to set or update in case the byte pointer is
+		 * not NULL, or class member to invalidate otherwise. The
+		 * pointer can be NULL, in which case it represents the miss
+		 * entry.
 		 */
-		struct dpa_offload_lookup_key key;
+		struct dpa_offload_lookup_key *key;
 
 		/*
-		 * Key to set or update in case the byte and mask pointers of
-		 * the first key are not NULL, or class member to invalidate
-		 * otherwise
+		 * Pointer to a 'pair-key' to set or update in case the byte
+		 * pointer of the first key is not NULL, or class member to
+		 * invalidate otherwise. The pointer can be NULL, in which case
+		 * it represents the miss entry.
 		 */
-		struct dpa_offload_lookup_key_pair pair;
+		struct dpa_offload_lookup_key_pair *pair;
 
 		/*
 		 * Security association identifier to set or update or class
diff --git a/include/linux/fsl_usdpaa.h b/include/linux/fsl_usdpaa.h
index de017a6..fbf9480 100644
--- a/include/linux/fsl_usdpaa.h
+++ b/include/linux/fsl_usdpaa.h
@@ -165,9 +165,17 @@ enum usdpaa_portal_type {
 	 usdpaa_portal_bman,
 };
 
+#define QBMAN_ANY_PORTAL_IDX 0xffffffff
+
 struct usdpaa_ioctl_portal_map {
 	/* Input parameter, is a qman or bman portal required. */
+
 	enum usdpaa_portal_type type;
+	/* Specifes a specific portal index to map or QBMAN_ANY_PORTAL_IDX
+	   for don't care.  The portal index will be populated by the
+	   driver when the ioctl() successfully completes */
+	uint32_t index;
+
 	/* Return value if the map succeeds, this gives the mapped
 	 * cache-inhibited (cinh) and cache-enabled (cena) addresses. */
 	struct usdpaa_portal_map {
@@ -183,6 +191,10 @@ struct usdpaa_ioctl_portal_map {
 struct compat_usdpaa_ioctl_portal_map {
 	/* Input parameter, is a qman or bman portal required. */
 	enum usdpaa_portal_type type;
+	/* Specifes a specific portal index to map or QBMAN_ANY_PORTAL_IDX
+	   for don't care.  The portal index will be populated by the
+	   driver when the ioctl() successfully completes */
+	uint32_t index;
 	/* Return value if the map succeeds, this gives the mapped
 	 * cache-inhibited (cinh) and cache-enabled (cena) addresses. */
 	struct usdpaa_portal_map_compat {