From patchwork Fri Jan 27 14:29:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92655 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp229760obz; Fri, 27 Jan 2017 06:32:34 -0800 (PST) X-Received: by 10.37.161.2 with SMTP id z2mr1685893ybh.50.1485527554008; Fri, 27 Jan 2017 06:32:34 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t20si1405398ywh.144.2017.01.27.06.32.33; Fri, 27 Jan 2017 06:32:33 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 9DB2F609EF; Fri, 27 Jan 2017 14:32:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 8494E60DCC; Fri, 27 Jan 2017 14:29:59 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id F126D609AC; Fri, 27 Jan 2017 14:29:51 +0000 (UTC) Received: from mail-lf0-f46.google.com (mail-lf0-f46.google.com [209.85.215.46]) by lists.linaro.org (Postfix) with ESMTPS id E77BA609AC for ; Fri, 27 Jan 2017 14:29:50 +0000 (UTC) Received: by mail-lf0-f46.google.com with SMTP id z134so162791168lff.3 for ; Fri, 27 Jan 2017 06:29:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PuDtBgj40pTaIeJKIfluRgCOBEzTfpzrWqhCuOikBzc=; b=TtDmXSlg12A+3k25Ueyn8YsQG8qlqGpe3bYkcUPlIH+2Tf1Uif1mHI13MU7fKFm8pM edhJb9IxL02bYDbt42/nEkEIYnQUr/6DTH5qnjMyek3Nk4ivPGfXMKkSXfQQagoUotiu qYw1rVPDN7OeE0x5Kdcf4sHz30rHLPsMeCOcbvu0/tQHCHgnbMvUCCBWRGR5hMiMo16b tYDDNmyYN9tpJjLtlfBUmFwHI5mscbLTYH6GlGBuIY1fewAS91pum0fMD6mlVas7aTqg bXhoRxsAgEaJ9M5WqfAmgmcjBhqhd7BhsORDhVjLtTiZ9NumMOwU2OUQEAEVJ5ZULWVi 2d+Q== X-Gm-Message-State: AIkVDXK6dq2gM5NO2gubHMPE3uCwZXOsmyCXhIqummVFBaxsNI0lTO3VdXvLfUPwprjQzjoUDyY= X-Received: by 10.46.1.153 with SMTP id f25mr3121224lji.47.1485527389425; Fri, 27 Jan 2017 06:29:49 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:48 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:10 +0300 Message-Id: <20170127142921.29029-5-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 04/15] merge fix: odp_config_internal.h X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" --- .../linux-generic/include/odp_config_internal.h | 66 ++++++---------------- 1 file changed, 16 insertions(+), 50 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 64996f85..dadd59e7 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -76,7 +76,6 @@ extern "C" { * Maximum number of segments per packet */ #define CONFIG_PACKET_MAX_SEGS 6 -<<<<<<< HEAD /* * Maximum packet segment size including head- and tailrooms @@ -91,41 +90,6 @@ extern "C" { #define CONFIG_PACKET_MAX_SEG_LEN (CONFIG_PACKET_SEG_SIZE - \ CONFIG_PACKET_HEADROOM - \ CONFIG_PACKET_TAILROOM) -======= ->>>>>>> v1.13.0.0 - -/* - * Maximum packet segment size including head- and tailrooms - */ -<<<<<<< HEAD -#define CONFIG_PACKET_SEG_LEN_MIN CONFIG_PACKET_MAX_SEG_LEN - -/* Maximum number of shared memory blocks. - * - * This the the number of separate SHM areas that can be reserved concurrently - */ -#define ODP_CONFIG_SHM_BLOCKS (ODP_CONFIG_POOLS + 48) - -/* - * Size of the virtual address space pre-reserver for ISHM - * - * This is just virtual space preallocation size, not memory allocation. - * This address space is used by ISHM to map things at a common address in - * all ODP threads (when the _ODP_ISHM_SINGLE_VA flag is used). - * In bytes. - */ -#define ODP_CONFIG_ISHM_VA_PREALLOC_SZ (536870912L) -======= -#define CONFIG_PACKET_SEG_SIZE (8 * 1024) - -/* Maximum data length in a segment - * - * The user defined segment length (seg_len in odp_pool_param_t) must not - * be larger than this. -*/ -#define CONFIG_PACKET_MAX_SEG_LEN (CONFIG_PACKET_SEG_SIZE - \ - CONFIG_PACKET_HEADROOM - \ - CONFIG_PACKET_TAILROOM) /* * Minimum packet segment length @@ -135,7 +99,22 @@ extern "C" { * this value. */ #define CONFIG_PACKET_SEG_LEN_MIN CONFIG_PACKET_MAX_SEG_LEN ->>>>>>> v1.13.0.0 + +/* Maximum number of shared memory blocks. + * + * This the the number of separate SHM areas that can be reserved concurrently + */ +#define ODP_CONFIG_SHM_BLOCKS (ODP_CONFIG_POOLS + 48) + +/* + * Size of the virtual address space pre-reserver for ISHM + * + * This is just virtual space preallocation size, not memory allocation. + * This address space is used by ISHM to map things at a common address in + * all ODP threads (when the _ODP_ISHM_SINGLE_VA flag is used). + * In bytes. + */ +#define ODP_CONFIG_ISHM_VA_PREALLOC_SZ (536870912L) /* Maximum number of shared memory blocks available on the driver interface. * @@ -160,19 +139,6 @@ extern "C" { */ #define CONFIG_POOL_CACHE_SIZE 256 -<<<<<<< HEAD -======= -/* - * Size of the virtual address space pre-reserver for ISHM - * - * This is just virtual space preallocation size, not memory allocation. - * This address space is used by ISHM to map things at a common address in - * all ODP threads (when the _ODP_ISHM_SINGLE_VA flag is used). - * In bytes. - */ -#define ODP_CONFIG_ISHM_VA_PREALLOC_SZ (536870912L) - ->>>>>>> v1.13.0.0 #ifdef __cplusplus } #endif