git-lng-odp October 2017

git-lng-odp@lists.linaro.org

1 participants
72 discussions

[COMMIT] branch master updated. v1.15.0.0-227-g3cb45201

by git＠git-us.linaro.org

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, master has been updated via 3cb452014694b6a20ab2896370a90b4fbded7512 (commit) via 73bc46197ec0617878034ac793dcc96ed41eb9a1 (commit) from a63f25ff2994b2df78c24f1f8b63d0e06628eb68 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive --

7 years, 4 months

[COMMIT] branch api-next updated. v1.15.0.0-731-gbf803098

by git＠git-us.linaro.org

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 bf803098eb1518dfb9e719071256fe22700b8c72 (commit) via 3cb452014694b6a20ab2896370a90b4fbded7512 (commit) via 73bc46197ec0617878034ac793dcc96ed41eb9a1 (commit) from a2e288f35da1f3838f0650157932a93091e6c3f4 (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 bf803098eb1518dfb9e719071256fe22700b8c72 Merge: a2e288f3 3cb45201 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Sat Oct 7 00:31:24 2017 +0300 Merge branch 'master' into api-next ----------------------------------------------------------------------- Summary of changes: .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive --

7 years, 4 months

[COMMIT] branch api-next updated. v1.15.0.0-728-ga2e288f3

by git＠git-us.linaro.org

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 a2e288f35da1f3838f0650157932a93091e6c3f4 (commit) via 7ea3096a0b64b605fd14d654a6b1f644ea72ba3d (commit) via 458683cb05ecdf60c38d2827e8f6241ab4afa8e4 (commit) via 9695d43dc1afa2baf968c97f1afff11e381408aa (commit) via a63f25ff2994b2df78c24f1f8b63d0e06628eb68 (commit) via 34884aa91524c4329e4ea1a9b312538d8f7dd187 (commit) from d74515dcb08a8f15ffee5fca621bd8dc1742a9f5 (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 a2e288f35da1f3838f0650157932a93091e6c3f4 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Sep 15 15:15:19 2017 +0300 validation: chksum: add test chksum suite Create chksum test suite and ones complement sum test in there. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4 index 13a13bd5..c06daea2 100644 --- a/test/common_plat/m4/configure.m4 +++ b/test/common_plat/m4/configure.m4 @@ -11,6 +11,7 @@ AC_CONFIG_FILES([test/common_plat/Makefile test/common_plat/validation/api/atomic/Makefile test/common_plat/validation/api/barrier/Makefile test/common_plat/validation/api/buffer/Makefile + test/common_plat/validation/api/chksum/Makefile test/common_plat/validation/api/classification/Makefile test/common_plat/validation/api/cpumask/Makefile test/common_plat/validation/api/crypto/Makefile diff --git a/test/common_plat/validation/api/Makefile.am b/test/common_plat/validation/api/Makefile.am index b00fb2e9..65b2e3b9 100644 --- a/test/common_plat/validation/api/Makefile.am +++ b/test/common_plat/validation/api/Makefile.am @@ -1,6 +1,7 @@ ODP_MODULES = atomic \ barrier \ buffer \ + chksum \ classification \ cpumask \ crypto \ diff --git a/test/common_plat/validation/api/chksum/.gitignore b/test/common_plat/validation/api/chksum/.gitignore new file mode 100644 index 00000000..c69e8c47 --- /dev/null +++ b/test/common_plat/validation/api/chksum/.gitignore @@ -0,0 +1 @@ +chksum_main diff --git a/test/common_plat/validation/api/chksum/Makefile.am b/test/common_plat/validation/api/chksum/Makefile.am new file mode 100644 index 00000000..46f3643e --- /dev/null +++ b/test/common_plat/validation/api/chksum/Makefile.am @@ -0,0 +1,5 @@ +include ../Makefile.inc + +test_PROGRAMS = chksum_main$(EXEEXT) +chksum_main_SOURCES = chksum_main.c chksum.c chksum.h +chksum_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/chksum/chksum.c b/test/common_plat/validation/api/chksum/chksum.c new file mode 100644 index 00000000..b05f3bf0 --- /dev/null +++ b/test/common_plat/validation/api/chksum/chksum.c @@ -0,0 +1,134 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp_api.h> +#include <odp_cunit_common.h> +#include "chksum.h" + +#define NUM_IP_HDR 5 +#define IP_HDR_LEN 20 + +#define NUM_UDP 4 +#define MAX_UDP_LEN 128 + +uint8_t ip_hdr_test_vect[NUM_IP_HDR][IP_HDR_LEN] ODP_ALIGNED(4) = { + { 0x45, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11, + 0xAB, 0x33, 0xC0, 0xA8, 0x2C, 0xA2, 0xC0, 0xA8, 0x21, 0x99 + }, + { 0x45, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11, + 0xAB, 0xCA, 0xC0, 0xA8, 0x2C, 0x5E, 0xC0, 0xA8, 0x21, 0x46 + }, + { 0x45, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11, + 0xAB, 0x64, 0xC0, 0xA8, 0x2C, 0x20, 0xC0, 0xA8, 0x21, 0xEA + }, + { 0x45, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11, + 0xAB, 0x59, 0xC0, 0xA8, 0x2C, 0xD2, 0xC0, 0xA8, 0x21, 0x43 + }, + { 0x45, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11, + 0xAC, 0x06, 0xC0, 0xA8, 0x2C, 0x5C, 0xC0, 0xA8, 0x21, 0x0C + } +}; + +struct udp_test_vect_s { + uint32_t len; + + uint8_t data[MAX_UDP_LEN]; +}; + +struct udp_test_vect_s udp_test_vect[NUM_UDP] ODP_ALIGNED(4) = { + {.len = 38, + .data = { 0x00, 0x11, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x1A, 0xFF, 0x3C, + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, + 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0xC7, 0xBF + } }, + + {.len = 39, + .data = { 0x00, 0x11, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x20, 0x40, 0x09, 0x35, 0x00, 0x1B, 0xD6, 0x43, + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, + 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0xBF, 0xB7 + } }, + + {.len = 59, + .data = { 0x00, 0x11, 0x00, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x32, 0x5F, 0x01, 0x71, 0x00, 0x2F, 0xCB, 0xC0, + 0x09, 0x8B, 0x61, 0x3E, 0x3A, 0x7F, 0x30, 0x0F, 0x4D, 0xEE, + 0x2D, 0x7D, 0x11, 0xBB, 0xBB, 0x34, 0x0E, 0x9E, 0xC5, 0x3D, + 0xBB, 0x81, 0x9A, 0x7F, 0xF2, 0x2A, 0xFC, 0x85, 0xA0, 0x1B, + 0x73, 0x81, 0xC1, 0xB6, 0xE8, 0x91, 0x8C, 0xD8, 0x7F + } }, + + {.len = 109, + .data = { 0x00, 0x11, 0x00, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x32, 0x5F, 0x01, 0x71, 0x00, 0x61, 0xCB, 0x5C, + 0x61, 0xAD, 0xFD, 0xE7, 0x4E, 0x98, 0x69, 0x59, 0x12, 0x3F, + 0xDF, 0xF6, 0x79, 0x8B, 0xB3, 0x94, 0x94, 0x9F, 0x8C, 0x0B, + 0x67, 0xBA, 0xBA, 0x3C, 0xE2, 0x5F, 0xCA, 0x52, 0x13, 0xB4, + 0x57, 0x48, 0x99, 0x29, 0x23, 0xAC, 0x5C, 0x59, 0x66, 0xA2, + 0x7B, 0x35, 0x65, 0x2B, 0x86, 0x5F, 0x47, 0xA7, 0xEE, 0xD4, + 0x24, 0x99, 0xB9, 0xCE, 0x60, 0xAB, 0x7A, 0xE9, 0x37, 0xF2, + 0x81, 0x84, 0x98, 0x72, 0x4F, 0x6A, 0x37, 0xE5, 0x4D, 0xB2, + 0xDE, 0xB8, 0xBD, 0xE3, 0x03, 0x57, 0xF0, 0x5C, 0xA0, 0xAA, + 0xB9, 0xF3, 0x3F, 0xDF, 0x23, 0xDD, 0x54, 0x2F, 0xCE + } } +}; + +/* Test ones complement sum with IPv4 headers */ +void chksum_ones_complement_ip(void) +{ + int i; + uint16_t sum, res; + + for (i = 0; i < NUM_IP_HDR; i++) { + sum = odp_chksum_ones_comp16(ip_hdr_test_vect[i], IP_HDR_LEN); + res = ~sum; + + CU_ASSERT(res == 0); + } +} + +/* Test ones complement sum with various length pseudo UDP packets */ +void chksum_ones_complement_udp(void) +{ + int i; + uint16_t sum, res; + + for (i = 0; i < NUM_UDP; i++) { + sum = odp_chksum_ones_comp16(udp_test_vect[i].data, + udp_test_vect[i].len); + res = ~sum; + + CU_ASSERT(res == 0); + } +} + +odp_testinfo_t chksum_suite[] = { + ODP_TEST_INFO(chksum_ones_complement_ip), + ODP_TEST_INFO(chksum_ones_complement_udp), + ODP_TEST_INFO_NULL, +}; + +odp_suiteinfo_t chksum_suites[] = { + {"Checksum", NULL, NULL, chksum_suite}, + ODP_SUITE_INFO_NULL +}; + +int chksum_main(int argc, char *argv[]) +{ + int ret; + + /* parse common options: */ + if (odp_cunit_parse_options(argc, argv)) + return -1; + + ret = odp_cunit_register(chksum_suites); + + if (ret == 0) + ret = odp_cunit_run(); + + return ret; +} diff --git a/test/common_plat/validation/api/chksum/chksum.h b/test/common_plat/validation/api/chksum/chksum.h new file mode 100644 index 00000000..886f15c2 --- /dev/null +++ b/test/common_plat/validation/api/chksum/chksum.h @@ -0,0 +1,25 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef _ODP_TEST_CHKSUM_H_ +#define _ODP_TEST_CHKSUM_H_ + +#include <odp_cunit_common.h> + +/* test functions: */ +void chksum_ones_complement_ip(void); +void chksum_ones_complement_udp(void); + +/* test arrays: */ +extern odp_testinfo_t chksum_suite[]; + +/* test registry: */ +extern odp_suiteinfo_t chksum_suites[]; + +/* main test program: */ +int chksum_main(int argc, char *argv[]); + +#endif diff --git a/test/common_plat/validation/api/chksum/chksum_main.c b/test/common_plat/validation/api/chksum/chksum_main.c new file mode 100644 index 00000000..bec10ddd --- /dev/null +++ b/test/common_plat/validation/api/chksum/chksum_main.c @@ -0,0 +1,12 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "chksum.h" + +int main(int argc, char *argv[]) +{ + return chksum_main(argc, argv); +} diff --git a/test/linux-generic/Makefile.am b/test/linux-generic/Makefile.am index 4be5d94e..0d363588 100644 --- a/test/linux-generic/Makefile.am +++ b/test/linux-generic/Makefile.am @@ -13,6 +13,7 @@ TESTS = validation/api/pktio/pktio_run.sh \ $(ALL_API_VALIDATION_DIR)/atomic/atomic_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/barrier/barrier_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/buffer/buffer_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/chksum/chksum_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/classification/classification_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/cpumask/cpumask_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/crypto/crypto_main$(EXEEXT) \ commit 7ea3096a0b64b605fd14d654a6b1f644ea72ba3d Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Sep 15 14:33:00 2017 +0300 linux-gen: chksum: implement ones complement sum Add implementation of 16 bit ones complement sum function. This is non-performance optimized but simple and based on RFC 1071 and its errata. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 3e439df6..eb49f455 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -208,6 +208,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_bitmap.c \ odp_buffer.c \ odp_byteorder.c \ + odp_chksum.c \ odp_classification.c \ odp_cpu.c \ odp_cpumask.c \ diff --git a/platform/linux-generic/odp_chksum.c b/platform/linux-generic/odp_chksum.c new file mode 100644 index 00000000..349bdaf4 --- /dev/null +++ b/platform/linux-generic/odp_chksum.c @@ -0,0 +1,36 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/chksum.h> +#include <odp/api/std_types.h> + +/* Simple implementation of ones complement sum. + * Based on RFC1071 and its errata. + */ +uint16_t odp_chksum_ones_comp16(const void *p, uint32_t len) +{ + uint32_t sum = 0; + const uint16_t *data = p; + + while (len > 1) { + sum += *data++; + len -= 2; + } + + /* Add left-over byte, if any */ + if (len > 0) { + uint16_t left_over; + + *(uint8_t *)&left_over = *(const uint8_t *)data; + sum += left_over; + } + + /* Fold 32-bit sum to 16 bits */ + while (sum >> 16) + sum = (sum & 0xffff) + (sum >> 16); + + return sum; +} commit 458683cb05ecdf60c38d2827e8f6241ab4afa8e4 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Sep 15 11:48:42 2017 +0300 api: chksum: add ones complement sum function This is a low level function for IP/UDP/TCP checksum calculations on SW. HW cannot always calculate checksums, for that or other reasons application may need calculate ones compelement sums. This kind of low level function is easy to optimize e.g. with CPU vector instructions. In addition to this, there may be higher (packet) level functions introduced later. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/chksum.h b/include/odp/api/spec/chksum.h new file mode 100644 index 00000000..e523ac28 --- /dev/null +++ b/include/odp/api/spec/chksum.h @@ -0,0 +1,53 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP Hash functions + */ + +#ifndef ODP_API_CHKSUM_H_ +#define ODP_API_CHKSUM_H_ +#include <odp/visibility_begin.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/std_types.h> + +/** @defgroup odp_chksum ODP CHECKSUM + * ODP checksum functions + * @{ + */ + +/** + * Ones' complement sum of 16-bit words + * + * Calculates 16-bit ones' complement sum over the data. In case of odd number + * of bytes, calculation uses a zero byte as padding at the end. This algorithm + * may be used as part of e.g. IPv4/UDP/TCP checksum generation and checking. + * + * @param data Pointer to data. Data address must be 16-bit aligned + * in minimum. + * @param data_len Data length in bytes. In case of an odd number, calculation + * includes one byte of padding. + * + * @return Ones' complement sum + */ +uint16_t odp_chksum_ones_comp16(const void *data, uint32_t data_len); + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#include <odp/visibility_end.h> +#endif diff --git a/include/odp_api.h b/include/odp_api.h index 86232ee1..069ec9d1 100644 --- a/include/odp_api.h +++ b/include/odp_api.h @@ -24,6 +24,7 @@ extern "C" { #include <odp/api/compiler.h> #include <odp/api/align.h> #include <odp/api/hash.h> +#include <odp/api/chksum.h> #include <odp/api/hints.h> #include <odp/api/debug.h> #include <odp/api/byteorder.h> diff --git a/platform/Makefile.inc b/platform/Makefile.inc index efd3a664..e76c6bc6 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -22,6 +22,7 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/barrier.h \ $(top_srcdir)/include/odp/api/spec/buffer.h \ $(top_srcdir)/include/odp/api/spec/byteorder.h \ + $(top_srcdir)/include/odp/api/spec/chksum.h \ $(top_srcdir)/include/odp/api/spec/classification.h \ $(top_srcdir)/include/odp/api/spec/compiler.h \ $(top_srcdir)/include/odp/api/spec/cpu.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 05456681..3e439df6 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -37,6 +37,7 @@ odpapiinclude_HEADERS = \ $(srcdir)/include/odp/api/byteorder.h \ $(srcdir)/include/odp/api/classification.h \ $(srcdir)/include/odp/api/compiler.h \ + $(srcdir)/include/odp/api/chksum.h \ $(srcdir)/include/odp/api/cpu.h \ $(srcdir)/include/odp/api/cpumask.h \ $(srcdir)/include/odp/api/crypto.h \ diff --git a/platform/linux-generic/include/odp/api/chksum.h b/platform/linux-generic/include/odp/api/chksum.h new file mode 100644 index 00000000..18dcb6d1 --- /dev/null +++ b/platform/linux-generic/include/odp/api/chksum.h @@ -0,0 +1,34 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP checksum functions + */ + +#ifndef ODP_PLAT_CHKSUM_H_ +#define ODP_PLAT_CHKSUM_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @ingroup odp_chksum + * @{ + */ + +/** + * @} + */ + +#include <odp/api/spec/chksum.h> + +#ifdef __cplusplus +} +#endif + +#endif commit 9695d43dc1afa2baf968c97f1afff11e381408aa Merge: d74515dc a63f25ff Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Oct 6 11:36:56 2017 +0300 Merge branch 'master' into api-next ----------------------------------------------------------------------- Summary of changes: .travis.yml | 16 +-- include/odp/api/spec/chksum.h | 53 ++++++++ include/odp_api.h | 1 + platform/Makefile.inc | 1 + platform/linux-generic/Makefile.am | 2 + .../include/odp/api/{feature.h => chksum.h} | 10 +- platform/linux-generic/odp_chksum.c | 36 ++++++ test/common_plat/m4/configure.m4 | 1 + test/common_plat/validation/api/Makefile.am | 1 + test/common_plat/validation/api/chksum/.gitignore | 1 + test/common_plat/validation/api/chksum/Makefile.am | 5 + test/common_plat/validation/api/chksum/chksum.c | 134 +++++++++++++++++++++ test/common_plat/validation/api/chksum/chksum.h | 25 ++++ .../{ipsec/ipsec_main.c => chksum/chksum_main.c} | 4 +- test/linux-generic/Makefile.am | 1 + 15 files changed, 277 insertions(+), 14 deletions(-) create mode 100644 include/odp/api/spec/chksum.h copy platform/linux-generic/include/odp/api/{feature.h => chksum.h} (63%) create mode 100644 platform/linux-generic/odp_chksum.c create mode 100644 test/common_plat/validation/api/chksum/.gitignore create mode 100644 test/common_plat/validation/api/chksum/Makefile.am create mode 100644 test/common_plat/validation/api/chksum/chksum.c create mode 100644 test/common_plat/validation/api/chksum/chksum.h copy test/common_plat/validation/api/{ipsec/ipsec_main.c => chksum/chksum_main.c} (74%) hooks/post-receive --

7 years, 4 months

[COMMIT] branch master updated. v1.15.0.0-225-ga63f25ff

by git＠git-us.linaro.org

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, master has been updated via a63f25ff2994b2df78c24f1f8b63d0e06628eb68 (commit) from 34884aa91524c4329e4ea1a9b312538d8f7dd187 (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 a63f25ff2994b2df78c24f1f8b63d0e06628eb68 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Oct 5 20:36:20 2017 +0300 travis: fix netmap module loading Travis script will insmod netmap.ko only it was rebuilt during this session, which is wrong. Split the ifs, so that module loading does not depend on the cache contents. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 5069ddff..88cc3f4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -167,13 +167,15 @@ install: # Netmap pktio - | - if [ -z "$CROSS_ARCH" -a ! -f "netmap/LINUX/netmap.ko" ]; then - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git - pushd netmap/LINUX - ./configure - make - sudo insmod ./netmap.ko - popd + if [ -z "$CROSS_ARCH" ]; then + if [ ! -f "netmap/LINUX/netmap.ko" ]; then + git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git + pushd netmap/LINUX + ./configure + make + popd + fi + sudo insmod ./netmap/LINUX/netmap.ko fi script: ----------------------------------------------------------------------- Summary of changes: .travis.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) hooks/post-receive --

7 years, 4 months

[COMMIT] branch api-next updated. v1.15.0.0-722-gd74515dc

by git＠git-us.linaro.org

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 d74515dcb08a8f15ffee5fca621bd8dc1742a9f5 (commit) via 24bf1003e1fbf6ca4003c31a79dfe5ddc40e38d9 (commit) from 506bf9dcf0e071cd8b168806b1d279124551af86 (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 d74515dcb08a8f15ffee5fca621bd8dc1742a9f5 Author: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Date: Wed Oct 4 12:02:55 2017 +0200 linux-gen: fixing typos Signed-off-by: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/doc/platform_specific.dox b/platform/linux-generic/doc/platform_specific.dox index e116ec61..41ad53f4 100644 --- a/platform/linux-generic/doc/platform_specific.dox +++ b/platform/linux-generic/doc/platform_specific.dox @@ -28,7 +28,7 @@ * to odp_init_local() is actually fully defined by these * requirements: It has to be the value returned by the * unique call to odp_init_global() made by one single - * acsendant of the current process. + * ancestor of the current process. */ /** diff --git a/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h b/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h index f47a13f6..be3926d4 100644 --- a/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h +++ b/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h @@ -56,7 +56,7 @@ extern "C" { #define ODP_TM_MAX_SCHED_WEIGHT 255 /** The ODP_TM_MAX_TM_QUEUES constant is the largest number of tm_queues - * that can handled by any one TM system. + * that can be handled by any one TM system. */ #define ODP_TM_MAX_TM_QUEUES (16 * 1024 * 1024) commit 24bf1003e1fbf6ca4003c31a79dfe5ddc40e38d9 Author: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Date: Wed Oct 4 12:02:55 2017 +0200 api: fixing typos Signed-off-by: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h index c498e2e2..c705c3a6 100644 --- a/include/odp/api/spec/packet.h +++ b/include/odp/api/spec/packet.h @@ -920,7 +920,7 @@ odp_packet_t odp_packet_ref_static(odp_packet_t pkt); * dynamic references must not be mixed. Results are undefined if these * restrictions are not observed. * - * The packet handle 'pkt' may itself by a (dynamic) reference to a packet. + * The packet handle 'pkt' may itself be a (dynamic) reference to a packet. * * If the caller does not intend to modify either the packet or the new * reference to it, odp_packet_ref_static() may be used to create @@ -947,7 +947,7 @@ odp_packet_t odp_packet_ref(odp_packet_t pkt, uint32_t offset); * packet consists metadata and data of the 'hdr' packet, followed by the * shared part of packet 'pkt'. * - * The packet handle ('pkt') may itself by a (dynamic) reference to a packet, + * The packet handle ('pkt') may itself be a (dynamic) reference to a packet, * but the header packet handle ('hdr') must be unique. Both packets must be * have been allocated from the same pool and the handles must not refer to * the same packet. Results are undefined if these restrictions are not diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h index 3a748cef..c9134e8e 100644 --- a/include/odp/api/spec/traffic_mngr.h +++ b/include/odp/api/spec/traffic_mngr.h @@ -75,7 +75,7 @@ extern "C" { /** * @def ODP_TM_MAX_TM_QUEUES - * The largest number of tm_queues that can handled by any one TM system. + * The largest number of tm_queues that can be handled by any one TM system. */ /** @@ -97,7 +97,7 @@ extern "C" { /** * @def ODP_TM_MIN_SHAPER_BW - * The largest amount of bandwidth that any shaper's peak or commit rate can + * The lowest amount of bandwidth that any shaper's peak or commit rate can * be set to. It is in units of 1000 bytes/second. */ @@ -143,7 +143,7 @@ extern "C" { /** * @typedef odp_tm_node_t - * Each odp_tm_queue_t value is an opaque ODP handle representing a specific + * Each odp_tm_node_t value is an opaque ODP handle representing a specific * tm node within a specific TM system. */ ----------------------------------------------------------------------- Summary of changes: include/odp/api/spec/packet.h | 4 ++-- include/odp/api/spec/traffic_mngr.h | 6 +++--- platform/linux-generic/doc/platform_specific.dox | 2 +- platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) hooks/post-receive --

7 years, 4 months

[COMMIT] branch master updated. v1.15.0.0-224-g34884aa9

by git＠git-us.linaro.org

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, master has been updated via 34884aa91524c4329e4ea1a9b312538d8f7dd187 (commit) from 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 (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 34884aa91524c4329e4ea1a9b312538d8f7dd187 Author: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Date: Wed Oct 4 12:02:55 2017 +0200 linux-gen: fixing typos Signed-off-by: Mykyta Iziumtsev <mykyta.iziumtsev(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/doc/platform_specific.dox b/platform/linux-generic/doc/platform_specific.dox index e116ec61..41ad53f4 100644 --- a/platform/linux-generic/doc/platform_specific.dox +++ b/platform/linux-generic/doc/platform_specific.dox @@ -28,7 +28,7 @@ * to odp_init_local() is actually fully defined by these * requirements: It has to be the value returned by the * unique call to odp_init_global() made by one single - * acsendant of the current process. + * ancestor of the current process. */ /** diff --git a/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h b/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h index f47a13f6..be3926d4 100644 --- a/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h +++ b/platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h @@ -56,7 +56,7 @@ extern "C" { #define ODP_TM_MAX_SCHED_WEIGHT 255 /** The ODP_TM_MAX_TM_QUEUES constant is the largest number of tm_queues - * that can handled by any one TM system. + * that can be handled by any one TM system. */ #define ODP_TM_MAX_TM_QUEUES (16 * 1024 * 1024) ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/doc/platform_specific.dox | 2 +- platform/linux-generic/include/odp/api/plat/traffic_mngr_types.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

7 years, 4 months

[COMMIT] branch api-next updated. v1.15.0.0-720-g506bf9dc

by git＠git-us.linaro.org

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 506bf9dcf0e071cd8b168806b1d279124551af86 (commit) via 41472f5887d172234aaa89af0775b9e32f2209e9 (commit) via 8f63377237e1f783f77c2baf94922f07bcb24a55 (commit) via 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 (commit) from 75cfc6f70d5b21d6f04082e1d03a7e677a895280 (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 506bf9dcf0e071cd8b168806b1d279124551af86 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Oct 4 21:15:33 2017 +0300 linux-gen: more unification of arch-specific code Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index f830d69f..05456681 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -278,6 +278,7 @@ arch_odp_headers = $(srcdir)/arch/arm/odp/api/cpu_arch.h noinst_HEADERS += ${srcdir}/arch/arm/odp_atomic.h \ ${srcdir}/arch/arm/odp_cpu.h \ ${srcdir}/arch/arm/odp_cpu_idling.h \ + ${srcdir}/arch/default/odp_cpu_idling.h \ ${srcdir}/arch/arm/odp_llsc.h endif if ARCH_IS_AARCH64 @@ -289,6 +290,7 @@ arch_odp_headers = $(srcdir)/arch/aarch64/odp/api/cpu_arch.h noinst_HEADERS += ${srcdir}/arch/aarch64/odp_atomic.h \ ${srcdir}/arch/aarch64/odp_cpu.h \ ${srcdir}/arch/aarch64/odp_cpu_idling.h \ + ${srcdir}/arch/default/odp_cpu_idling.h \ ${srcdir}/arch/aarch64/odp_llsc.h endif if ARCH_IS_MIPS64 @@ -297,7 +299,8 @@ __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_arch.c \ arch/default/odp_global_time.c \ arch/mips64/odp_sysinfo_parse.c arch_odp_headers = $(srcdir)/arch/mips64/odp/api/cpu_arch.h -noinst_HEADERS += ${srcdir}/arch/default/odp_cpu.h +noinst_HEADERS += ${srcdir}/arch/default/odp_cpu.h \ + ${srcdir}/arch/default/odp_cpu_idling.h endif if ARCH_IS_POWERPC __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ @@ -305,7 +308,8 @@ __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ arch/default/odp_global_time.c \ arch/powerpc/odp_sysinfo_parse.c arch_odp_headers = $(srcdir)/arch/powerpc/odp/api/cpu_arch.h -noinst_HEADERS += ${srcdir}/arch/default/odp_cpu.h +noinst_HEADERS += ${srcdir}/arch/default/odp_cpu.h \ + ${srcdir}/arch/default/odp_cpu_idling.h endif if ARCH_IS_X86 __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ @@ -315,7 +319,8 @@ __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ arch/x86/odp_sysinfo_parse.c arch_odp_headers = $(srcdir)/arch/x86/odp/api/cpu_arch.h noinst_HEADERS += $(srcdir)/arch/x86/cpu_flags.h -noinst_HEADERS += ${srcdir}/arch/default/odp_cpu.h +noinst_HEADERS += ${srcdir}/arch/default/odp_cpu.h \ + ${srcdir}/arch/default/odp_cpu_idling.h endif noinst_HEADERS += $(srcdir)/arch/default/odp/api/cpu_arch.h diff --git a/platform/linux-generic/arch/aarch64/odp_cpu_idling.h b/platform/linux-generic/arch/aarch64/odp_cpu_idling.h index ab29455b..e7dec7d9 100644 --- a/platform/linux-generic/arch/aarch64/odp_cpu_idling.h +++ b/platform/linux-generic/arch/aarch64/odp_cpu_idling.h @@ -13,39 +13,33 @@ #error This file should not be included directly, please include odp_cpu.h #endif +#ifndef CONFIG_WFE + +#include "../default/odp_cpu_idling.h" + +#else /* CONFIG_WFE */ + static inline void sevl(void) { -#ifdef CONFIG_WFE __asm__ volatile("sevl" : : : ); -#endif } static inline int wfe(void) { -#ifdef CONFIG_WFE __asm__ volatile("wfe" : : : "memory"); -#endif return 1; } static inline void doze(void) { -#ifndef CONFIG_WFE /* When using WFE do not stall the pipeline using other means */ odp_cpu_pause(); -#endif } -#ifdef CONFIG_WFE #define monitor128(addr, mo) lld((addr), (mo)) #define monitor64(addr, mo) ll64((addr), (mo)) #define monitor32(addr, mo) ll32((addr), (mo)) #define monitor8(addr, mo) ll8((addr), (mo)) -#else -#define monitor128(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor64(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor32(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor8(addr, mo) __atomic_load_n((addr), (mo)) -#endif +#endif /* CONFIG_WFE */ #endif /* PLATFORM_LINUXGENERIC_ARCH_ARM_CPU_IDLING_H */ diff --git a/platform/linux-generic/arch/arm/odp_cpu_idling.h b/platform/linux-generic/arch/arm/odp_cpu_idling.h index ab29455b..e7dec7d9 100644 --- a/platform/linux-generic/arch/arm/odp_cpu_idling.h +++ b/platform/linux-generic/arch/arm/odp_cpu_idling.h @@ -13,39 +13,33 @@ #error This file should not be included directly, please include odp_cpu.h #endif +#ifndef CONFIG_WFE + +#include "../default/odp_cpu_idling.h" + +#else /* CONFIG_WFE */ + static inline void sevl(void) { -#ifdef CONFIG_WFE __asm__ volatile("sevl" : : : ); -#endif } static inline int wfe(void) { -#ifdef CONFIG_WFE __asm__ volatile("wfe" : : : "memory"); -#endif return 1; } static inline void doze(void) { -#ifndef CONFIG_WFE /* When using WFE do not stall the pipeline using other means */ odp_cpu_pause(); -#endif } -#ifdef CONFIG_WFE #define monitor128(addr, mo) lld((addr), (mo)) #define monitor64(addr, mo) ll64((addr), (mo)) #define monitor32(addr, mo) ll32((addr), (mo)) #define monitor8(addr, mo) ll8((addr), (mo)) -#else -#define monitor128(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor64(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor32(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor8(addr, mo) __atomic_load_n((addr), (mo)) -#endif +#endif /* CONFIG_WFE */ #endif /* PLATFORM_LINUXGENERIC_ARCH_ARM_CPU_IDLING_H */ diff --git a/platform/linux-generic/arch/default/odp_cpu.h b/platform/linux-generic/arch/default/odp_cpu.h index 12a44b93..2df6f65c 100644 --- a/platform/linux-generic/arch/default/odp_cpu.h +++ b/platform/linux-generic/arch/default/odp_cpu.h @@ -16,28 +16,6 @@ #define atomic_store_release(loc, val, ro) \ __atomic_store_n(loc, val, __ATOMIC_RELEASE) -/****************************************************************************** - * Idle mgmt - *****************************************************************************/ - -static inline void sevl(void) -{ - /* empty */ -} - -static inline int wfe(void) -{ - return 1; -} - -#define monitor128(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor64(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor32(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor8(addr, mo) __atomic_load_n((addr), (mo)) - -static inline void doze(void) -{ - odp_cpu_pause(); -} +#include "odp_cpu_idling.h" #endif diff --git a/platform/linux-generic/arch/default/odp_cpu.h b/platform/linux-generic/arch/default/odp_cpu_idling.h similarity index 69% copy from platform/linux-generic/arch/default/odp_cpu.h copy to platform/linux-generic/arch/default/odp_cpu_idling.h index 12a44b93..db1eebd1 100644 --- a/platform/linux-generic/arch/default/odp_cpu.h +++ b/platform/linux-generic/arch/default/odp_cpu_idling.h @@ -6,15 +6,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef ODP_DEFAULT_CPU_H_ -#define ODP_DEFAULT_CPU_H_ - -/****************************************************************************** - * Atomics - *****************************************************************************/ - -#define atomic_store_release(loc, val, ro) \ - __atomic_store_n(loc, val, __ATOMIC_RELEASE) +#ifndef ODP_DEFAULT_CPU_IDLING_H_ +#define ODP_DEFAULT_CPU_IDLING_H_ /****************************************************************************** * Idle mgmt commit 41472f5887d172234aaa89af0775b9e32f2209e9 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Oct 4 21:07:02 2017 +0300 linux-gen: update api-next to follow merged changes There were changes in master branch on the way architecture files are treated. Update api-next after merging in master to follow those changes. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 8f6c6570..f830d69f 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CPPFLAGS += -I$(top_builddir)/include AM_CPPFLAGS += -Iinclude AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) +AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/default AM_CPPFLAGS += -Iinclude AM_CPPFLAGS += -DSYSCONFDIR=\"@sysconfdir@\" @@ -195,22 +196,6 @@ noinst_HEADERS = \ ${srcdir}/include/protocols/thash.h \ ${srcdir}/include/protocols/udp.h -if ARCH_IS_ARM -noinst_HEADERS += ${srcdir}/arch/arm/odp_atomic.h \ - ${srcdir}/arch/arm/odp_cpu.h \ - ${srcdir}/arch/arm/odp_cpu_idling.h \ - ${srcdir}/arch/arm/odp_llsc.h -endif -if ARCH_IS_MIPS64 -noinst_HEADERS += ${srcdir}/arch/mips64/odp_cpu.h -endif -if ARCH_IS_POWERPC -noinst_HEADERS += ${srcdir}/arch/powerpc/odp_cpu.h -endif -if ARCH_IS_X86 -noinst_HEADERS += ${srcdir}/arch/x86/odp_cpu.h -endif - __LIB__libodp_linux_la_SOURCES = \ _fdserver.c \ _ishm.c \ @@ -290,6 +275,10 @@ __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c arch_odp_headers = $(srcdir)/arch/arm/odp/api/cpu_arch.h +noinst_HEADERS += ${srcdir}/arch/arm/odp_atomic.h \ + ${srcdir}/arch/arm/odp_cpu.h \ + ${srcdir}/arch/arm/odp_cpu_idling.h \ + ${srcdir}/arch/arm/odp_llsc.h endif if ARCH_IS_AARCH64 __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ @@ -297,6 +286,10 @@ __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ arch/aarch64/odp_global_time.c \ arch/default/odp_sysinfo_parse.c arch_odp_headers = $(srcdir)/arch/aarch64/odp/api/cpu_arch.h +noinst_HEADERS += ${srcdir}/arch/aarch64/odp_atomic.h \ + ${srcdir}/arch/aarch64/odp_cpu.h \ + ${srcdir}/arch/aarch64/odp_cpu_idling.h \ + ${srcdir}/arch/aarch64/odp_llsc.h endif if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_arch.c \ @@ -304,6 +297,7 @@ __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_arch.c \ arch/default/odp_global_time.c \ arch/mips64/odp_sysinfo_parse.c arch_odp_headers = $(srcdir)/arch/mips64/odp/api/cpu_arch.h +noinst_HEADERS += ${srcdir}/arch/default/odp_cpu.h endif if ARCH_IS_POWERPC __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ @@ -311,6 +305,7 @@ __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ arch/default/odp_global_time.c \ arch/powerpc/odp_sysinfo_parse.c arch_odp_headers = $(srcdir)/arch/powerpc/odp/api/cpu_arch.h +noinst_HEADERS += ${srcdir}/arch/default/odp_cpu.h endif if ARCH_IS_X86 __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ @@ -320,6 +315,7 @@ __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ arch/x86/odp_sysinfo_parse.c arch_odp_headers = $(srcdir)/arch/x86/odp/api/cpu_arch.h noinst_HEADERS += $(srcdir)/arch/x86/cpu_flags.h +noinst_HEADERS += ${srcdir}/arch/default/odp_cpu.h endif noinst_HEADERS += $(srcdir)/arch/default/odp/api/cpu_arch.h diff --git a/platform/linux-generic/arch/arm/odp_atomic.h b/platform/linux-generic/arch/aarch64/odp_atomic.h similarity index 99% copy from platform/linux-generic/arch/arm/odp_atomic.h copy to platform/linux-generic/arch/aarch64/odp_atomic.h index 3a21a47b..23bf96c7 100644 --- a/platform/linux-generic/arch/arm/odp_atomic.h +++ b/platform/linux-generic/arch/aarch64/odp_atomic.h @@ -28,8 +28,6 @@ do { \ #endif /* CONFIG_DMBSTR */ -#ifdef __aarch64__ - #define HAS_ACQ(mo) ((mo) != __ATOMIC_RELAXED && (mo) != __ATOMIC_RELEASE) #define HAS_RLS(mo) ((mo) == __ATOMIC_RELEASE || (mo) == __ATOMIC_ACQ_REL || \ (mo) == __ATOMIC_SEQ_CST) @@ -207,6 +205,4 @@ static inline __int128 __lockfree_load_16(__int128 *var, int mo) return old; } -#endif /* __aarch64__ */ - #endif /* PLATFORM_LINUXGENERIC_ARCH_ARM_ODP_ATOMIC_H */ diff --git a/platform/linux-generic/arch/arm/odp_cpu.h b/platform/linux-generic/arch/aarch64/odp_cpu.h similarity index 85% copy from platform/linux-generic/arch/arm/odp_cpu.h copy to platform/linux-generic/arch/aarch64/odp_cpu.h index 72c81020..fc35a462 100644 --- a/platform/linux-generic/arch/arm/odp_cpu.h +++ b/platform/linux-generic/arch/aarch64/odp_cpu.h @@ -9,8 +9,8 @@ #ifndef PLATFORM_LINUXGENERIC_ARCH_ARM_ODP_CPU_H #define PLATFORM_LINUXGENERIC_ARCH_ARM_ODP_CPU_H -#if !defined(__arm__) && !defined(__aarch64__) -#error Use this file only when compiling for ARM architecture +#if !defined(__aarch64__) +#error Use this file only when compiling for ARMv8 architecture #endif #include <odp_debug_internal.h> @@ -38,17 +38,13 @@ * more scalable) and enables the CPU to enter a sleep state (lower power * consumption). */ -#ifdef __aarch64__ #define CONFIG_WFE -#endif static inline void dmb(void) { __asm__ volatile("dmb" : : : "memory"); } -#ifdef __aarch64__ - /* Only ARMv8 supports DMB ISHLD */ /* A load only barrier is much cheaper than full barrier */ #define _odp_release_barrier(ro) \ @@ -59,13 +55,6 @@ do { \ __asm__ volatile("dmb ish" ::: "memory"); \ } while (0) -#else - -#define _odp_release_barrier(ro) \ - __atomic_thread_fence(__ATOMIC_RELEASE) - -#endif /* __aarch64__ */ - #include "odp_llsc.h" #include "odp_atomic.h" #include "odp_cpu_idling.h" diff --git a/platform/linux-generic/arch/aarch64/odp_cpu_idling.h b/platform/linux-generic/arch/aarch64/odp_cpu_idling.h new file mode 100644 index 00000000..ab29455b --- /dev/null +++ b/platform/linux-generic/arch/aarch64/odp_cpu_idling.h @@ -0,0 +1,51 @@ +/* Copyright (c) 2017, ARM Limited. All rights reserved. + * + * Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef PLATFORM_LINUXGENERIC_ARCH_ARM_CPU_IDLING_H +#define PLATFORM_LINUXGENERIC_ARCH_ARM_CPU_IDLING_H + +#ifndef PLATFORM_LINUXGENERIC_ARCH_ARM_ODP_CPU_H +#error This file should not be included directly, please include odp_cpu.h +#endif + +static inline void sevl(void) +{ +#ifdef CONFIG_WFE + __asm__ volatile("sevl" : : : ); +#endif +} + +static inline int wfe(void) +{ +#ifdef CONFIG_WFE + __asm__ volatile("wfe" : : : "memory"); +#endif + return 1; +} + +static inline void doze(void) +{ +#ifndef CONFIG_WFE + /* When using WFE do not stall the pipeline using other means */ + odp_cpu_pause(); +#endif +} + +#ifdef CONFIG_WFE +#define monitor128(addr, mo) lld((addr), (mo)) +#define monitor64(addr, mo) ll64((addr), (mo)) +#define monitor32(addr, mo) ll32((addr), (mo)) +#define monitor8(addr, mo) ll8((addr), (mo)) +#else +#define monitor128(addr, mo) __atomic_load_n((addr), (mo)) +#define monitor64(addr, mo) __atomic_load_n((addr), (mo)) +#define monitor32(addr, mo) __atomic_load_n((addr), (mo)) +#define monitor8(addr, mo) __atomic_load_n((addr), (mo)) +#endif + +#endif /* PLATFORM_LINUXGENERIC_ARCH_ARM_CPU_IDLING_H */ diff --git a/platform/linux-generic/arch/arm/odp_llsc.h b/platform/linux-generic/arch/aarch64/odp_llsc.h similarity index 68% copy from platform/linux-generic/arch/arm/odp_llsc.h copy to platform/linux-generic/arch/aarch64/odp_llsc.h index 73c4d7b1..f5679293 100644 --- a/platform/linux-generic/arch/arm/odp_llsc.h +++ b/platform/linux-generic/arch/aarch64/odp_llsc.h @@ -13,92 +13,6 @@ #error This file should not be included directly, please include odp_cpu.h #endif -#ifdef __arm__ - -static inline uint32_t ll8(uint8_t *var, int mm) -{ - uint8_t old; - - __asm__ volatile("ldrexb %0, [%1]" - : "=&r" (old) - : "r" (var) - : ); - /* Barrier after an acquiring load */ - if (mm == __ATOMIC_ACQUIRE) - dmb(); - return old; -} - -static inline uint32_t ll(uint32_t *var, int mm) -{ - uint32_t old; - - __asm__ volatile("ldrex %0, [%1]" - : "=&r" (old) - : "r" (var) - : ); - /* Barrier after an acquiring load */ - if (mm == __ATOMIC_ACQUIRE) - dmb(); - return old; -} - -#define ll32(a, b) ll((a), (b)) - -/* Return 0 on success, 1 on failure */ -static inline uint32_t sc(uint32_t *var, uint32_t neu, int mm) -{ - uint32_t ret; - - /* Barrier before a releasing store */ - if (mm == __ATOMIC_RELEASE) - dmb(); - __asm__ volatile("strex %0, %1, [%2]" - : "=&r" (ret) - : "r" (neu), "r" (var) - : ); - return ret; -} - -#define sc32(a, b, c) sc((a), (b), (c)) - -static inline uint64_t lld(uint64_t *var, int mm) -{ - uint64_t old; - - __asm__ volatile("ldrexd %0, %H0, [%1]" - : "=&r" (old) - : "r" (var) - : ); - /* Barrier after an acquiring load */ - if (mm == __ATOMIC_ACQUIRE) - dmb(); - return old; -} - -#define ll64(a, b) lld((a), (b)) - -/* Return 0 on success, 1 on failure */ -static inline uint32_t scd(uint64_t *var, uint64_t neu, int mm) -{ - uint32_t ret; - - /* Barrier before a releasing store */ - if (mm == __ATOMIC_RELEASE) - dmb(); - __asm__ volatile("strexd %0, %1, %H1, [%2]" - : "=&r" (ret) - : "r" (neu), "r" (var) - : ); - return ret; -} - -#define sc64(a, b, c) scd((a), (b), (c)) - -#endif /* __arm__ */ - -#ifdef __aarch64__ - static inline uint16_t ll8(uint8_t *var, int mm) { uint16_t old; @@ -248,6 +162,4 @@ static inline uint32_t scd(__int128 *var, __int128 neu, int mm) return ret; } -#endif /* __aarch64__ */ - #endif /* PLATFORM_LINUXGENERIC_ARCH_ARM_LLSC_H */ diff --git a/platform/linux-generic/arch/arm/odp_atomic.h b/platform/linux-generic/arch/arm/odp_atomic.h index 3a21a47b..590bdf4a 100644 --- a/platform/linux-generic/arch/arm/odp_atomic.h +++ b/platform/linux-generic/arch/arm/odp_atomic.h @@ -28,185 +28,4 @@ do { \ #endif /* CONFIG_DMBSTR */ -#ifdef __aarch64__ - -#define HAS_ACQ(mo) ((mo) != __ATOMIC_RELAXED && (mo) != __ATOMIC_RELEASE) -#define HAS_RLS(mo) ((mo) == __ATOMIC_RELEASE || (mo) == __ATOMIC_ACQ_REL || \ - (mo) == __ATOMIC_SEQ_CST) - -#define LL_MO(mo) (HAS_ACQ((mo)) ? __ATOMIC_ACQUIRE : __ATOMIC_RELAXED) -#define SC_MO(mo) (HAS_RLS((mo)) ? __ATOMIC_RELEASE : __ATOMIC_RELAXED) - -#ifndef __ARM_FEATURE_QRDMX /* Feature only available in v8.1a and beyond */ -static inline bool -__lockfree_compare_exchange_16(register __int128 *var, __int128 *exp, - register __int128 neu, bool weak, int mo_success, - int mo_failure) -{ - (void)weak; /* Always do strong CAS or we can't perform atomic read */ - /* Ignore memory ordering for failure, memory order for - * success must be stronger or equal. */ - (void)mo_failure; - register __int128 old; - register __int128 expected; - int ll_mo = LL_MO(mo_success); - int sc_mo = SC_MO(mo_success); - - expected = *exp; - __asm__ volatile("" ::: "memory"); - do { - /* Atomicity of LLD is not guaranteed */ - old = lld(var, ll_mo); - /* Must write back neu or old to verify atomicity of LLD */ - } while (odp_unlikely(scd(var, old == expected ? neu : old, sc_mo))); - *exp = old; /* Always update, atomically read value */ - return old == expected; -} - -static inline __int128 __lockfree_exchange_16(__int128 *var, __int128 neu, - int mo) -{ - register __int128 old; - int ll_mo = LL_MO(mo); - int sc_mo = SC_MO(mo); - - do { - /* Atomicity of LLD is not guaranteed */ - old = lld(var, ll_mo); - /* Must successfully write back to verify atomicity of LLD */ - } while (odp_unlikely(scd(var, neu, sc_mo))); - return old; -} - -static inline __int128 __lockfree_fetch_and_16(__int128 *var, __int128 mask, - int mo) -{ - register __int128 old; - int ll_mo = LL_MO(mo); - int sc_mo = SC_MO(mo); - - do { - /* Atomicity of LLD is not guaranteed */ - old = lld(var, ll_mo); - /* Must successfully write back to verify atomicity of LLD */ - } while (odp_unlikely(scd(var, old & mask, sc_mo))); - return old; -} - -static inline __int128 __lockfree_fetch_or_16(__int128 *var, __int128 mask, - int mo) -{ - register __int128 old; - int ll_mo = LL_MO(mo); - int sc_mo = SC_MO(mo); - - do { - /* Atomicity of LLD is not guaranteed */ - old = lld(var, ll_mo); - /* Must successfully write back to verify atomicity of LLD */ - } while (odp_unlikely(scd(var, old | mask, sc_mo))); - return old; -} - -#else - -static inline __int128 casp(__int128 *var, __int128 old, __int128 neu, int mo) -{ - if (mo == __ATOMIC_RELAXED) { - __asm__ volatile("casp %0, %H0, %1, %H1, [%2]" - : "+r" (old) - : "r" (neu), "r" (var) - : "memory"); - } else if (mo == __ATOMIC_ACQUIRE) { - __asm__ volatile("caspa %0, %H0, %1, %H1, [%2]" - : "+r" (old) - : "r" (neu), "r" (var) - : "memory"); - } else if (mo == __ATOMIC_ACQ_REL) { - __asm__ volatile("caspal %0, %H0, %1, %H1, [%2]" - : "+r" (old) - : "r" (neu), "r" (var) - : "memory"); - } else if (mo == __ATOMIC_RELEASE) { - __asm__ volatile("caspl %0, %H0, %1, %H1, [%2]" - : "+r" (old) - : "r" (neu), "r" (var) - : "memory"); - } else { - abort(); - } - return old; -} - -static inline bool -__lockfree_compare_exchange_16(register __int128 *var, __int128 *exp, - register __int128 neu, bool weak, int mo_success, - int mo_failure) -{ - (void)weak; - (void)mo_failure; - __int128 old; - __int128 expected; - - expected = *exp; - old = casp(var, expected, neu, mo_success); - *exp = old; /* Always update, atomically read value */ - return old == expected; -} - -static inline __int128 __lockfree_exchange_16(__int128 *var, __int128 neu, - int mo) -{ - __int128 old; - __int128 expected; - - do { - expected = *var; - old = casp(var, expected, neu, mo); - } while (old != expected); - return old; -} - -static inline __int128 __lockfree_fetch_and_16(__int128 *var, __int128 mask, - int mo) -{ - __int128 old; - __int128 expected; - - do { - expected = *var; - old = casp(var, expected, expected & mask, mo); - } while (old != expected); - return old; -} - -static inline __int128 __lockfree_fetch_or_16(__int128 *var, __int128 mask, - int mo) -{ - __int128 old; - __int128 expected; - - do { - expected = *var; - old = casp(var, expected, expected | mask, mo); - } while (old != expected); - return old; -} - -#endif /* __ARM_FEATURE_QRDMX */ - -static inline __int128 __lockfree_load_16(__int128 *var, int mo) -{ - __int128 old = *var; /* Possibly torn read */ - - /* Do CAS to ensure atomicity - * Either CAS succeeds (writing back the same value) - * Or CAS fails and returns the old value (atomic read) - */ - (void)__lockfree_compare_exchange_16(var, &old, old, false, mo, mo); - return old; -} - -#endif /* __aarch64__ */ - #endif /* PLATFORM_LINUXGENERIC_ARCH_ARM_ODP_ATOMIC_H */ diff --git a/platform/linux-generic/arch/arm/odp_cpu.h b/platform/linux-generic/arch/arm/odp_cpu.h index 72c81020..d77c8521 100644 --- a/platform/linux-generic/arch/arm/odp_cpu.h +++ b/platform/linux-generic/arch/arm/odp_cpu.h @@ -9,7 +9,7 @@ #ifndef PLATFORM_LINUXGENERIC_ARCH_ARM_ODP_CPU_H #define PLATFORM_LINUXGENERIC_ARCH_ARM_ODP_CPU_H -#if !defined(__arm__) && !defined(__aarch64__) +#if !defined(__arm__) #error Use this file only when compiling for ARM architecture #endif @@ -38,34 +38,16 @@ * more scalable) and enables the CPU to enter a sleep state (lower power * consumption). */ -#ifdef __aarch64__ -#define CONFIG_WFE -#endif +/* #define CONFIG_WFE */ static inline void dmb(void) { __asm__ volatile("dmb" : : : "memory"); } -#ifdef __aarch64__ - -/* Only ARMv8 supports DMB ISHLD */ -/* A load only barrier is much cheaper than full barrier */ -#define _odp_release_barrier(ro) \ -do { \ - if (ro) \ - __asm__ volatile("dmb ishld" ::: "memory"); \ - else \ - __asm__ volatile("dmb ish" ::: "memory"); \ -} while (0) - -#else - #define _odp_release_barrier(ro) \ __atomic_thread_fence(__ATOMIC_RELEASE) -#endif /* __aarch64__ */ - #include "odp_llsc.h" #include "odp_atomic.h" #include "odp_cpu_idling.h" diff --git a/platform/linux-generic/arch/arm/odp_llsc.h b/platform/linux-generic/arch/arm/odp_llsc.h index 73c4d7b1..b53cedc2 100644 --- a/platform/linux-generic/arch/arm/odp_llsc.h +++ b/platform/linux-generic/arch/arm/odp_llsc.h @@ -13,8 +13,6 @@ #error This file should not be included directly, please include odp_cpu.h #endif -#ifdef __arm__ - static inline uint32_t ll8(uint8_t *var, int mm) { uint8_t old; @@ -95,159 +93,4 @@ static inline uint32_t scd(uint64_t *var, uint64_t neu, int mm) #define sc64(a, b, c) scd((a), (b), (c)) -#endif /* __arm__ */ - -#ifdef __aarch64__ - -static inline uint16_t ll8(uint8_t *var, int mm) -{ - uint16_t old; - - if (mm == __ATOMIC_ACQUIRE) - __asm__ volatile("ldaxrb %w0, [%1]" - : "=&r" (old) - : "r" (var) - : "memory"); - else if (mm == __ATOMIC_RELAXED) - __asm__ volatile("ldxrb %w0, [%1]" - : "=&r" (old) - : "r" (var) - : ); - else - ODP_ABORT(); - return old; -} - -static inline uint32_t ll32(uint32_t *var, int mm) -{ - uint32_t old; - - if (mm == __ATOMIC_ACQUIRE) - __asm__ volatile("ldaxr %w0, [%1]" - : "=&r" (old) - : "r" (var) - : "memory"); - else if (mm == __ATOMIC_RELAXED) - __asm__ volatile("ldxr %w0, [%1]" - : "=&r" (old) - : "r" (var) - : ); - else - ODP_ABORT(); - return old; -} - -/* Return 0 on success, 1 on failure */ -static inline uint32_t sc32(uint32_t *var, uint32_t neu, int mm) -{ - uint32_t ret; - - if (mm == __ATOMIC_RELEASE) - __asm__ volatile("stlxr %w0, %w1, [%2]" - : "=&r" (ret) - : "r" (neu), "r" (var) - : "memory"); - else if (mm == __ATOMIC_RELAXED) - __asm__ volatile("stxr %w0, %w1, [%2]" - : "=&r" (ret) - : "r" (neu), "r" (var) - : ); - else - ODP_ABORT(); - return ret; -} - -static inline uint64_t ll(uint64_t *var, int mm) -{ - uint64_t old; - - if (mm == __ATOMIC_ACQUIRE) - __asm__ volatile("ldaxr %0, [%1]" - : "=&r" (old) - : "r" (var) - : "memory"); - else if (mm == __ATOMIC_RELAXED) - __asm__ volatile("ldxr %0, [%1]" - : "=&r" (old) - : "r" (var) - : ); - else - ODP_ABORT(); - return old; -} - -#define ll64(a, b) ll((a), (b)) - -/* Return 0 on success, 1 on failure */ -static inline uint32_t sc(uint64_t *var, uint64_t neu, int mm) -{ - uint32_t ret; - - if (mm == __ATOMIC_RELEASE) - __asm__ volatile("stlxr %w0, %1, [%2]" - : "=&r" (ret) - : "r" (neu), "r" (var) - : "memory"); - else if (mm == __ATOMIC_RELAXED) - __asm__ volatile("stxr %w0, %1, [%2]" - : "=&r" (ret) - : "r" (neu), "r" (var) - : ); - else - ODP_ABORT(); - return ret; -} - -#define sc64(a, b, c) sc((a), (b), (c)) - -union i128 { - __int128 i128; - int64_t i64[2]; -}; - -static inline __int128 lld(__int128 *var, int mm) -{ - union i128 old; - - if (mm == __ATOMIC_ACQUIRE) - __asm__ volatile("ldaxp %0, %1, [%2]" - : "=&r" (old.i64[0]), "=&r" (old.i64[1]) - : "r" (var) - : "memory"); - else if (mm == __ATOMIC_RELAXED) - __asm__ volatile("ldxp %0, %1, [%2]" - : "=&r" (old.i64[0]), "=&r" (old.i64[1]) - : "r" (var) - : ); - else - ODP_ABORT(); - return old.i128; -} - -/* Return 0 on success, 1 on failure */ -static inline uint32_t scd(__int128 *var, __int128 neu, int mm) -{ - uint32_t ret; - - if (mm == __ATOMIC_RELEASE) - __asm__ volatile("stlxp %w0, %1, %2, [%3]" - : "=&r" (ret) - : "r" (((union i128)neu).i64[0]), - "r" (((union i128)neu).i64[1]), - "r" (var) - : "memory"); - else if (mm == __ATOMIC_RELAXED) - __asm__ volatile("stxp %w0, %1, %2, [%3]" - : "=&r" (ret) - : "r" (((union i128)neu).i64[0]), - "r" (((union i128)neu).i64[1]), - "r" (var) - : ); - else - ODP_ABORT(); - return ret; -} - -#endif /* __aarch64__ */ - #endif /* PLATFORM_LINUXGENERIC_ARCH_ARM_LLSC_H */ diff --git a/platform/linux-generic/arch/mips64/odp_cpu.h b/platform/linux-generic/arch/mips64/odp_cpu.h deleted file mode 100644 index 1097f7bc..00000000 --- a/platform/linux-generic/arch/mips64/odp_cpu.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (c) 2017, ARM Limited. All rights reserved. - * - * Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_MIPS64_CPU_H_ -#define ODP_MIPS64_CPU_H_ - -/****************************************************************************** - * Atomics - *****************************************************************************/ - -#define atomic_store_release(loc, val, ro) \ - __atomic_store_n(loc, val, __ATOMIC_RELEASE) - -/****************************************************************************** - * Idle mgmt - *****************************************************************************/ - -static inline void sevl(void) -{ - /* empty */ -} - -static inline int wfe(void) -{ - return 1; -} - -#define monitor128(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor64(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor32(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor8(addr, mo) __atomic_load_n((addr), (mo)) - -static inline void doze(void) -{ - odp_cpu_pause(); -} - -#endif diff --git a/platform/linux-generic/arch/powerpc/odp_cpu.h b/platform/linux-generic/arch/powerpc/odp_cpu.h deleted file mode 100644 index cd27fe24..00000000 --- a/platform/linux-generic/arch/powerpc/odp_cpu.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (c) 2017, ARM Limited. All rights reserved. - * - * Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_POWERPC_CPU_H_ -#define ODP_POWERPC_CPU_H_ - -/****************************************************************************** - * Atomics - *****************************************************************************/ - -#define atomic_store_release(loc, val, ro) \ - __atomic_store_n(loc, val, __ATOMIC_RELEASE) - -/****************************************************************************** - * Idle mgmt - *****************************************************************************/ - -static inline void sevl(void) -{ - /* empty */ -} - -static inline int wfe(void) -{ - return 1; -} - -#define monitor128(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor64(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor32(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor8(addr, mo) __atomic_load_n((addr), (mo)) - -static inline void doze(void) -{ - odp_cpu_pause(); -} - -#endif diff --git a/platform/linux-generic/arch/x86/odp_cpu.h b/platform/linux-generic/arch/x86/odp_cpu.h deleted file mode 100644 index b5c89409..00000000 --- a/platform/linux-generic/arch/x86/odp_cpu.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (c) 2017, ARM Limited. All rights reserved. - * - * Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_X86_CPU_H_ -#define ODP_X86_CPU_H_ - -/****************************************************************************** - * Atomics - *****************************************************************************/ - -#define atomic_store_release(loc, val, ro) \ - __atomic_store_n(loc, val, __ATOMIC_RELEASE) - -/****************************************************************************** - * Idle mgmt - *****************************************************************************/ - -static inline void sevl(void) -{ - /* empty */ -} - -static inline int wfe(void) -{ - return 1; -} - -#define monitor128(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor64(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor32(addr, mo) __atomic_load_n((addr), (mo)) -#define monitor8(addr, mo) __atomic_load_n((addr), (mo)) - -static inline void doze(void) -{ - odp_cpu_pause(); -} - -#endif commit 8f63377237e1f783f77c2baf94922f07bcb24a55 Merge: 75cfc6f7 52cfe7ba Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu Oct 5 09:36:38 2017 +0300 Merge branch 'master' into api-next ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 +- platform/linux-generic/Makefile.am | 33 ++-- .../arch/{arm => aarch64}/odp_atomic.h | 4 - .../linux-generic/arch/{arm => aarch64}/odp_cpu.h | 15 +- .../arch/{arm => aarch64}/odp_cpu_idling.h | 20 +-- .../linux-generic/arch/{arm => aarch64}/odp_llsc.h | 88 ---------- platform/linux-generic/arch/arm/odp_atomic.h | 181 --------------------- platform/linux-generic/arch/arm/odp_cpu.h | 22 +-- platform/linux-generic/arch/arm/odp_cpu_idling.h | 20 +-- platform/linux-generic/arch/arm/odp_llsc.h | 157 ------------------ platform/linux-generic/arch/default/odp_cpu.h | 24 +-- .../{x86/odp_cpu.h => default/odp_cpu_idling.h} | 11 +- platform/linux-generic/arch/mips64/odp_cpu.h | 43 ----- platform/linux-generic/arch/powerpc/odp_cpu.h | 43 ----- 14 files changed, 39 insertions(+), 624 deletions(-) copy platform/linux-generic/arch/{arm => aarch64}/odp_atomic.h (99%) copy platform/linux-generic/arch/{arm => aarch64}/odp_cpu.h (85%) copy platform/linux-generic/arch/{arm => aarch64}/odp_cpu_idling.h (74%) copy platform/linux-generic/arch/{arm => aarch64}/odp_llsc.h (68%) rename platform/linux-generic/arch/{x86/odp_cpu.h => default/odp_cpu_idling.h} (70%) delete mode 100644 platform/linux-generic/arch/mips64/odp_cpu.h delete mode 100644 platform/linux-generic/arch/powerpc/odp_cpu.h hooks/post-receive --

7 years, 4 months

[COMMIT] branch master updated. v1.15.0.0-223-g52cfe7ba

by git＠git-us.linaro.org

7 years, 4 months

[COMMIT] branch master updated. v1.15.0.0-222-g052d2687

by git＠git-us.linaro.org

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, master has been updated via 052d2687930e5a99568e9349ca9704ae507e8dc5 (commit) via 0ff7861b8a958b5e23adc5b13783aeeff0629e03 (commit) from b4d17b1f6807cd980a1b2dd30573f17677ea371b (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: configure.ac | 3 +- platform/Makefile.inc | 19 ------ platform/linux-generic/Makefile.am | 43 ++++++++----- .../arch/{arm => aarch64}/odp/api/cpu_arch.h | 0 .../odp_cpu_arch.c => aarch64/odp_global_time.c} | 45 -------------- .../linux-generic/arch/arm/odp_sysinfo_parse.c | 28 --------- platform/linux-generic/arch/default/odp_cpu_arch.c | 28 --------- .../linux-generic/arch/default/odp_cpu_cycles.c | 11 +++- .../odp_cpu_arch.c => default/odp_global_time.c} | 28 ++------- platform/linux-generic/arch/mips64/odp_cpu_arch.c | 25 -------- platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 25 -------- .../linux-generic/arch/powerpc/odp_global_time.c | 15 +++++ platform/linux-generic/arch/x86/odp_cpu_arch.c | 72 ---------------------- .../arch/x86/{odp_cpu_arch.c => odp_global_time.c} | 34 ++-------- 14 files changed, 62 insertions(+), 314 deletions(-) copy platform/linux-generic/arch/{arm => aarch64}/odp/api/cpu_arch.h (100%) rename platform/linux-generic/arch/{arm/odp_cpu_arch.c => aarch64/odp_global_time.c} (65%) delete mode 100644 platform/linux-generic/arch/arm/odp_sysinfo_parse.c copy test/common_plat/validation/api/classification/classification_main.c => platform/linux-generic/arch/default/odp_cpu_cycles.c (50%) copy platform/linux-generic/arch/{mips64/odp_cpu_arch.c => default/odp_global_time.c} (53%) create mode 100644 platform/linux-generic/arch/powerpc/odp_global_time.c copy platform/linux-generic/arch/x86/{odp_cpu_arch.c => odp_global_time.c} (79%) hooks/post-receive --

7 years, 4 months

[COMMIT] branch api-next updated. v1.15.0.0-716-g75cfc6f7

by git＠git-us.linaro.org

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 75cfc6f70d5b21d6f04082e1d03a7e677a895280 (commit) via 052d2687930e5a99568e9349ca9704ae507e8dc5 (commit) via 0ff7861b8a958b5e23adc5b13783aeeff0629e03 (commit) from 50cb30d14d432257f0a80da45b71bce2ddacad8d (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 75cfc6f70d5b21d6f04082e1d03a7e677a895280 Merge: 50cb30d1 052d2687 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Oct 3 12:56:27 2017 +0300 Merge branch 'master' into api-next Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --cc platform/linux-generic/Makefile.am index 3e26aab4,0ebb6f76..8f6c6570 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@@ -290,16 -219,21 +277,26 @@@ __LIB__libodp_linux_la_SOURCES = odp_timer_wheel.c \ odp_traffic_mngr.c \ odp_version.c \ - odp_weak.c + odp_weak.c \ + drv_atomic.c \ + drv_barrier.c \ + drv_driver.c \ + drv_shm.c \ + drv_spinlock.c if ARCH_IS_ARM - __LIB__libodp_linux_la_SOURCES += arch/arm/odp_cpu_arch.c \ - arch/arm/odp_sysinfo_parse.c + __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ + arch/default/odp_cpu_cycles.c \ + arch/default/odp_global_time.c \ + arch/default/odp_sysinfo_parse.c + arch_odp_headers = $(srcdir)/arch/arm/odp/api/cpu_arch.h + endif + if ARCH_IS_AARCH64 + __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ + arch/default/odp_cpu_cycles.c \ + arch/aarch64/odp_global_time.c \ + arch/default/odp_sysinfo_parse.c + arch_odp_headers = $(srcdir)/arch/aarch64/odp/api/cpu_arch.h endif if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_arch.c \ ----------------------------------------------------------------------- Summary of changes: configure.ac | 3 +- platform/Makefile.inc | 19 ------ platform/linux-generic/Makefile.am | 43 ++++++++----- .../arch/{arm => aarch64}/odp/api/cpu_arch.h | 0 .../odp_cpu_arch.c => aarch64/odp_global_time.c} | 45 -------------- .../linux-generic/arch/arm/odp_sysinfo_parse.c | 28 --------- platform/linux-generic/arch/default/odp_cpu_arch.c | 28 --------- .../linux-generic/arch/default/odp_cpu_cycles.c | 11 +++- .../odp_cpu_arch.c => default/odp_global_time.c} | 28 ++------- platform/linux-generic/arch/mips64/odp_cpu_arch.c | 25 -------- platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 25 -------- .../linux-generic/arch/powerpc/odp_global_time.c | 15 +++++ platform/linux-generic/arch/x86/odp_cpu_arch.c | 72 ---------------------- .../arch/x86/{odp_cpu_arch.c => odp_global_time.c} | 34 ++-------- 14 files changed, 62 insertions(+), 314 deletions(-) copy platform/linux-generic/arch/{arm => aarch64}/odp/api/cpu_arch.h (100%) rename platform/linux-generic/arch/{arm/odp_cpu_arch.c => aarch64/odp_global_time.c} (65%) delete mode 100644 platform/linux-generic/arch/arm/odp_sysinfo_parse.c copy test/common_plat/validation/api/classification/classification_main.c => platform/linux-generic/arch/default/odp_cpu_cycles.c (50%) copy platform/linux-generic/arch/{mips64/odp_cpu_arch.c => default/odp_global_time.c} (53%) create mode 100644 platform/linux-generic/arch/powerpc/odp_global_time.c copy platform/linux-generic/arch/x86/{odp_cpu_arch.c => odp_global_time.c} (79%) hooks/post-receive --

7 years, 4 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp October 2017