This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, api-next has been updated via 7bb364313bfeed59556e167bfa848e9ea6f52669 (commit) via 0bc12ffcf7898515c74a5567b832dcfc913d831a (commit) via 22ec8f3aefe9b2c92020cd9aa36e9f8e5a380799 (commit) via 2119e4548281ed50fecc5fe9f5bddcaa2adee2de (commit) from 3547226b19e6982bf74fc8c258b89db2c5f6a39c (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 7bb364313bfeed59556e167bfa848e9ea6f52669 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:43:39 2017 +0300
linux-gen: scalable queue: mark queue_shm_pool as static
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Brian Brooks brian.brooks@arm.com Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 503b40f5..79148060 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -49,7 +49,7 @@ typedef struct queue_table_t { } queue_table_t;
static queue_table_t *queue_tbl; -_odp_ishm_pool_t *queue_shm_pool; +static _odp_ishm_pool_t *queue_shm_pool;
static inline odp_queue_t queue_from_id(uint32_t queue_id) {
commit 0bc12ffcf7898515c74a5567b832dcfc913d831a Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:43:27 2017 +0300
linux-gen: scalable sched: mark sched_grp_lock as static
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Brian Brooks brian.brooks@arm.com Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 78159b53..a289a7d7 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -87,7 +87,7 @@ ODP_STATIC_ASSERT(CHECK_IS_POWER2(ODP_CONFIG_QUEUES), static sched_group_mask_t sg_free; static sched_group_t *sg_vec[MAX_SCHED_GROUP]; /* Group lock for MT-safe APIs */ -odp_spinlock_t sched_grp_lock; +static odp_spinlock_t sched_grp_lock;
#define SCHED_GROUP_JOIN 0 #define SCHED_GROUP_LEAVE 1
commit 22ec8f3aefe9b2c92020cd9aa36e9f8e5a380799 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:37:51 2017 +0300
linux-gen: scalable sched: mark several function as static
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Brian Brooks brian.brooks@arm.com Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/include/odp_schedule_scalable_ordered.h b/platform/linux-generic/include/odp_schedule_scalable_ordered.h index 941304b7..1c365a2b 100644 --- a/platform/linux-generic/include/odp_schedule_scalable_ordered.h +++ b/platform/linux-generic/include/odp_schedule_scalable_ordered.h @@ -115,17 +115,8 @@ reorder_window_t *rwin_alloc(_odp_ishm_pool_t *pool, unsigned lock_count); int rwin_free(_odp_ishm_pool_t *pool, reorder_window_t *rwin); bool rwin_reserve(reorder_window_t *rwin, uint32_t *sn); -void rwin_insert(reorder_window_t *rwin, - reorder_context_t *rctx, - uint32_t sn, - void (*callback)(reorder_context_t *)); void rctx_init(reorder_context_t *rctx, uint16_t idx, reorder_window_t *rwin, uint32_t sn); -void rctx_free(const reorder_context_t *rctx); -void olock_unlock(const reorder_context_t *rctx, reorder_window_t *rwin, - uint32_t lock_index); -void olock_release(const reorder_context_t *rctx); -void rctx_retire(reorder_context_t *first); void rctx_release(reorder_context_t *rctx); int rctx_save(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr[], int num);
diff --git a/platform/linux-generic/odp_schedule_scalable_ordered.c b/platform/linux-generic/odp_schedule_scalable_ordered.c index 90ddb61c..e4468a90 100644 --- a/platform/linux-generic/odp_schedule_scalable_ordered.c +++ b/platform/linux-generic/odp_schedule_scalable_ordered.c @@ -71,10 +71,10 @@ bool rwin_reserve(reorder_window_t *rwin, uint32_t *sn) return true; }
-void rwin_insert(reorder_window_t *rwin, - reorder_context_t *rctx, - uint32_t sn, - void (*callback)(reorder_context_t *)) +static void rwin_insert(reorder_window_t *rwin, + reorder_context_t *rctx, + uint32_t sn, + void (*callback)(reorder_context_t *)) { /* Initialise to silence scan-build */ hc_t old = {0, 0}; @@ -172,7 +172,7 @@ void rctx_init(reorder_context_t *rctx, uint16_t idx, rctx->numevts = 0; }
-inline void rctx_free(const reorder_context_t *rctx) +static inline void rctx_free(const reorder_context_t *rctx) { const reorder_context_t *const base = &rctx[-(int)rctx->idx]; const uint32_t first = rctx->idx; @@ -206,8 +206,9 @@ inline void rctx_free(const reorder_context_t *rctx) } }
-inline void olock_unlock(const reorder_context_t *rctx, reorder_window_t *rwin, - uint32_t lock_index) +static inline void olock_unlock(const reorder_context_t *rctx, + reorder_window_t *rwin, + uint32_t lock_index) { if ((rctx->olock_flags & (1U << lock_index)) == 0) { /* Use relaxed ordering, we are not releasing any updates */ @@ -215,7 +216,7 @@ inline void olock_unlock(const reorder_context_t *rctx, reorder_window_t *rwin, } }
-void olock_release(const reorder_context_t *rctx) +static void olock_release(const reorder_context_t *rctx) { reorder_window_t *rwin; int i; @@ -246,7 +247,7 @@ static void blocking_enqueue(queue_entry_t *q, odp_buffer_hdr_t **evts, int num) } }
-void rctx_retire(reorder_context_t *first) +static void rctx_retire(reorder_context_t *first) { reorder_context_t *rctx; queue_entry_t *q;
commit 2119e4548281ed50fecc5fe9f5bddcaa2adee2de Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Aug 4 11:23:39 2017 +0300
linux-gen: classification: mark several functions as static
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Brian Brooks brian.brooks@arm.com Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/include/odp_classification_internal.h b/platform/linux-generic/include/odp_classification_internal.h index 208b0f5b..8882a717 100644 --- a/platform/linux-generic/include/odp_classification_internal.h +++ b/platform/linux-generic/include/odp_classification_internal.h @@ -49,13 +49,6 @@ This function should be called during pktio initialization. **/ int pktio_classifier_init(pktio_entry_t *pktio);
-void _odp_cls_update_hash_proto(cos_t *cos, - odp_pktin_hash_proto_t hash_proto); - -uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, - odp_cls_hash_proto_t hash_proto, - const uint8_t *base); - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index f9a82a2e..a785c604 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -33,7 +33,7 @@ static cos_tbl_t *cos_tbl; static pmr_tbl_t *pmr_tbl; static _cls_queue_grp_tbl_t *queue_grp_tbl;
-const rss_key default_rss = { +static const rss_key default_rss = { .u8 = { 0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2, 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0, @@ -191,7 +191,8 @@ int odp_cls_capability(odp_cls_capability_t *capability) return 0; }
-void _odp_cls_update_hash_proto(cos_t *cos, odp_pktin_hash_proto_t hash_proto) +static void _odp_cls_update_hash_proto(cos_t *cos, + odp_pktin_hash_proto_t hash_proto) { if (hash_proto.proto.ipv4 || hash_proto.proto.ipv4_tcp || hash_proto.proto.ipv4_udp) @@ -934,6 +935,10 @@ static inline cos_t *cls_select_cos(pktio_entry_t *entry, return cls->default_cos; }
+static uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, + odp_cls_hash_proto_t hash_proto, + const uint8_t *base); + /** * Classify packet * @@ -989,9 +994,9 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, return 0; }
-uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, - odp_cls_hash_proto_t hash_proto, - const uint8_t *base) +static uint32_t packet_rss_hash(odp_packet_hdr_t *pkt_hdr, + odp_cls_hash_proto_t hash_proto, + const uint8_t *base) { thash_tuple_t tuple; const _odp_ipv4hdr_t *ipv4;
-----------------------------------------------------------------------
Summary of changes: .../include/odp_classification_internal.h | 7 ------- .../include/odp_schedule_scalable_ordered.h | 9 --------- platform/linux-generic/odp_classification.c | 15 ++++++++++----- platform/linux-generic/odp_queue_scalable.c | 2 +- platform/linux-generic/odp_schedule_scalable.c | 2 +- .../linux-generic/odp_schedule_scalable_ordered.c | 19 ++++++++++--------- 6 files changed, 22 insertions(+), 32 deletions(-)
hooks/post-receive