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 32f5f3ff343b516cb0dbe98e81479e6c748f0ebf (commit) via 3c9248f5c98b194d91712fafed4bf3b21327f2a8 (commit) via 91ef9f7e224056af351cbaf99ccfa98ee815460d (commit) via ba97c3174d0de3e08cffaad414bf2a55de8853df (commit) via 69a1179a05344b59961aaf997a1b406698b6840b (commit) via 6efe7d971a3a4b8f7eaa42660b48eee31493924c (commit) via ef4e4d4c4ef1f9f569c236494cb178feb7c90343 (commit) via e4289ab4f73221a9d20ecfb8eac6b79a26df06a3 (commit) via a787abf96b17d9714a6b892091d19c1be2bc5e6c (commit) via 20c75b764af6fd15e5e1d4df969ac33d62525405 (commit) via 04029613fbdc85221d1a20354a49ada912302fc0 (commit) via 88d36e6811de494708c520cb12e9e5f97628e9e4 (commit) via a820d8a84e132652b4cef295756ccf135e3bd54b (commit) via f7c5f3e973814e0fc9211e008a37080b1c7d4a76 (commit) via d445395c66edb38abedb918afdba37ec9f7f95af (commit) via b38117eeed5d7bd5a334ef2387bf83d5cb8b9188 (commit) via d0821c9c43fb89e4c0021b174bbc12bef543ffa0 (commit) via 17e829a3b78d6513d22496734c6edbec955cbfd4 (commit) via eccc78540c05dc71095179b613f014648385f3df (commit) via f8c6360667380f6b3fb917ecbe5b941b23dbadf1 (commit) from 6b6253c30f88c80bf632436ff06c1b000860a2f1 (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 32f5f3ff343b516cb0dbe98e81479e6c748f0ebf Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Thu Sep 14 22:29:44 2017 +0300
linux-gen: move packet_to_buffer to packet_inlines.h
odp_crypto.c is also uses packet_to_buffer() so move this function to common place.
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 6874d149..be7e18ec 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -157,6 +157,11 @@ static inline void _odp_packet_prefetch(odp_packet_t pkt, uint32_t offset, (void)pkt; (void)offset; (void)len; }
+static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt) +{ + return (odp_buffer_t)pkt; +} + /* Include inlined versions of API functions */ #include <odp/api/plat/static_inline.h> #if ODP_ABI_COMPAT == 0 diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 081fe178..3174feee 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -19,6 +19,7 @@ #include <odp_debug_internal.h> #include <odp/api/hints.h> #include <odp/api/random.h> +#include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h>
#include <string.h> diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 5dbe65d3..ff0cb8fe 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -69,11 +69,6 @@ odp_packet_t _odp_packet_from_buf_hdr(odp_buffer_hdr_t *buf_hdr) return (odp_packet_t)buf_hdr; }
-static inline odp_buffer_t packet_to_buffer(odp_packet_t pkt) -{ - return (odp_buffer_t)pkt; -} - static inline seg_entry_t *seg_entry(odp_packet_hdr_t *hdr, uint32_t seg_idx) {
commit 3c9248f5c98b194d91712fafed4bf3b21327f2a8 Merge: 6b6253c3 91ef9f7e Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Thu Sep 14 17:56:51 2017 +0300
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --cc .travis.yml index 0b5fb87d,43141f9f..8cf6ed22 --- a/.travis.yml +++ b/.travis.yml @@@ -67,8 -66,11 +67,12 @@@ env - CONF="--disable-abi-compat" - CONF="--enable-schedule-sp" - CONF="--enable-schedule-iquery" + - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" + - CROSS_ARCH="arm64" + - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" + - CROSS_ARCH="powerpc" + - CROSS_ARCH="i386"
before_install:
diff --cc platform/linux-generic/include/odp_buffer_internal.h index fe0c26b9,5d40303b..358c0e44 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@@ -80,15 -107,9 +107,12 @@@ struct odp_buffer_hdr_t /* User area size */ uint32_t uarea_size;
- /* Event type. Maybe different than pool type (crypto compl event) */ - int8_t event_type; + /* Max data size */ + uint32_t size;
+ /* Event subtype. Should be ODP_EVENT_NO_SUBTYPE except packets. */ + int8_t event_subtype; + - /* Burst table */ - struct odp_buffer_hdr_t *burst[BUFFER_BURST_SIZE]; - /* ipc mapped process can not walk over pointers, * offset has to be used */ uint64_t ipc_data_offset; diff --cc platform/linux-generic/include/odp_packet_internal.h index 91fba1ea,d76d7bf0..09726423 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@@ -272,11 -230,6 +230,8 @@@ static inline void packet_init(odp_pack CONFIG_PACKET_TAILROOM;
pkt_hdr->input = ODP_PKTIO_INVALID; + pkt_hdr->buf_hdr.event_subtype = ODP_EVENT_PACKET_BASIC; + - /* By default packet has no references */ - pkt_hdr->unshared_len = len; - pkt_hdr->ref_hdr = NULL; }
static inline void copy_packet_parser_metadata(odp_packet_hdr_t *src_hdr,
-----------------------------------------------------------------------
Summary of changes: .travis.yml | 134 +- include/odp/arch/default/api/abi/packet.h | 2 +- .../include/odp/api/plat/packet_inlines.h | 49 +- .../include/odp/api/plat/packet_inlines_api.h | 16 + .../include/odp/api/plat/packet_types.h | 38 +- .../linux-generic/include/odp_buffer_internal.h | 71 +- .../linux-generic/include/odp_packet_internal.h | 133 +- platform/linux-generic/odp_crypto.c | 1 + platform/linux-generic/odp_packet.c | 1514 +++++++++----------- platform/linux-generic/odp_pool.c | 8 + test/common_plat/validation/api/packet/packet.c | 109 +- 11 files changed, 979 insertions(+), 1096 deletions(-)
hooks/post-receive