From patchwork Mon Apr 28 11:41:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taras Kondratiuk X-Patchwork-Id: 29218 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f69.google.com (mail-qg0-f69.google.com [209.85.192.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 90A1120553 for ; Mon, 28 Apr 2014 11:42:34 +0000 (UTC) Received: by mail-qg0-f69.google.com with SMTP id a108sf16355760qge.8 for ; Mon, 28 Apr 2014 04:42:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=4giIDjAA9WNkh+B50xEJqoFzgPGT8DDS9JKRTm820Y0=; b=LnW9f+KxGx/cmllsG7FgyDa+EZBwn1eBNQxnie97RJG7Rx9tyiVfpeI4GlpmUVyHy+ TGVwOHDvrzBI9HNOPSIJzKSYasn81Y5nfLiQfI5idsv/ItcloLIULNSzEl5rzPOb/lOw nh65IBTeFtBkuMb/vsCNwDhf30Ybf5u6wXtpGb68qbgse2zYNwlJT9OZUlQgqDbn3QIt zt6s66pecYdYH9U62ZMY6PVPM4O0Svzbl4ADMi5m3/5r8AIXUcbHhP/hX+TktuMqSDlW QCc2yXLaFz3RLr/SEH1PclekTNop60L0DItCySt0Oi67DdwT74pL2/GKT61/cc0koK7y BnJg== X-Gm-Message-State: ALoCoQmFjO3FU84tJUE9SWiBC7DKAzXEDdRx87JislbJNOyGm6xIs5InedcnOcVSgWQcrgBBaMvi X-Received: by 10.236.35.33 with SMTP id t21mr11315272yha.11.1398685354370; Mon, 28 Apr 2014 04:42:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.81 with SMTP id e75ls1667965qgd.29.gmail; Mon, 28 Apr 2014 04:42:34 -0700 (PDT) X-Received: by 10.58.230.103 with SMTP id sx7mr1410993vec.28.1398685354264; Mon, 28 Apr 2014 04:42:34 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id ck5si3544619vdd.109.2014.04.28.04.42.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Apr 2014 04:42:34 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id ib6so1505962vcb.19 for ; Mon, 28 Apr 2014 04:42:34 -0700 (PDT) X-Received: by 10.52.34.4 with SMTP id v4mr129586vdi.42.1398685354180; Mon, 28 Apr 2014 04:42:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp110831vcb; Mon, 28 Apr 2014 04:42:33 -0700 (PDT) X-Received: by 10.224.125.74 with SMTP id x10mr2319308qar.99.1398685353757; Mon, 28 Apr 2014 04:42:33 -0700 (PDT) Received: from ip-10-141-164-156.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id c43si7678246qge.49.2014.04.28.04.42.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 28 Apr 2014 04:42:33 -0700 (PDT) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-141-164-156.ec2.internal) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Wejwi-0002qB-Ue; Mon, 28 Apr 2014 11:42:04 +0000 Received: from mail-lb0-f174.google.com ([209.85.217.174]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Wejvz-0002lz-C4 for lng-odp@lists.linaro.org; Mon, 28 Apr 2014 11:41:19 +0000 Received: by mail-lb0-f174.google.com with SMTP id c11so2036719lbj.33 for ; Mon, 28 Apr 2014 04:41:41 -0700 (PDT) X-Received: by 10.112.85.6 with SMTP id d6mr17795808lbz.8.1398685301510; Mon, 28 Apr 2014 04:41:41 -0700 (PDT) Received: from uglx0153363.itg.ti.com ([195.238.92.128]) by mx.google.com with ESMTPSA id x10sm9873857lad.1.2014.04.28.04.41.40 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Apr 2014 04:41:40 -0700 (PDT) From: Taras Kondratiuk To: lng-odp@lists.linaro.org Date: Mon, 28 Apr 2014 14:41:08 +0300 Message-Id: <1398685276-4610-10-git-send-email-taras.kondratiuk@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398685276-4610-1-git-send-email-taras.kondratiuk@linaro.org> References: <1398685276-4610-1-git-send-email-taras.kondratiuk@linaro.org> X-Topics: patch Cc: linaro-networking@linaro.org Subject: [lng-odp] [RFC PATCH 09/17] Split out platform-specific part of odp_coremask.h X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: taras.kondratiuk@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 --- include/odp_coremask.h | 46 +++------- platform/linux-generic/include/plat/odp_coremask.h | 91 ++++++++++++++++++++ 2 files changed, 101 insertions(+), 36 deletions(-) create mode 100644 platform/linux-generic/include/plat/odp_coremask.h diff --git a/include/odp_coremask.h b/include/odp_coremask.h index 163de22..d4e369c 100644 --- a/include/odp_coremask.h +++ b/include/odp_coremask.h @@ -18,23 +18,13 @@ extern "C" { #endif - - #include - -/** @internal */ -#define ODP_COREMASK_SIZE_U64 1 +#include /** * Core mask - * - * Don't access directly, use access functions. */ -typedef struct odp_coremask_t { - uint64_t _u64[ODP_COREMASK_SIZE_U64]; /**< @private Mask*/ - -} odp_coremask_t; - +typedef plat_odp_coremask_t odp_coremask_t; /** @@ -86,10 +76,7 @@ void odp_coremask_from_u64(const uint64_t *u64, int num, odp_coremask_t *mask); * Clear entire mask * @param mask Core mask to flush with zero value */ -static inline void odp_coremask_zero(odp_coremask_t *mask) -{ - mask->_u64[0] = 0; -} +void odp_coremask_zero(odp_coremask_t *mask); /** * Add core to mask @@ -129,11 +116,8 @@ int odp_coremask_count(const odp_coremask_t *mask); * @param src1 Source mask 1 * @param src2 Source mask 2 */ -static inline void odp_coremask_and(odp_coremask_t *dest, odp_coremask_t *src1, - odp_coremask_t *src2) -{ - dest->_u64[0] = src1->_u64[0] & src2->_u64[0]; -} +void odp_coremask_and(odp_coremask_t *dest, odp_coremask_t *src1, + odp_coremask_t *src2); /** * Logical OR over two source masks. @@ -142,11 +126,8 @@ static inline void odp_coremask_and(odp_coremask_t *dest, odp_coremask_t *src1, * @param src1 Source mask 1 * @param src2 Source mask 2 */ -static inline void odp_coremask_or(odp_coremask_t *dest, odp_coremask_t *src1, - odp_coremask_t *src2) -{ - dest->_u64[0] = src1->_u64[0] | src2->_u64[0]; -} +void odp_coremask_or(odp_coremask_t *dest, odp_coremask_t *src1, + odp_coremask_t *src2); /** * Logical XOR over two source masks. @@ -155,20 +136,13 @@ static inline void odp_coremask_or(odp_coremask_t *dest, odp_coremask_t *src1, * @param src1 Source mask 1 * @param src2 Source mask 2 */ -static inline void odp_coremask_xor(odp_coremask_t *dest, odp_coremask_t *src1, - odp_coremask_t *src2) -{ - dest->_u64[0] = src1->_u64[0] ^ src2->_u64[0]; -} +void odp_coremask_xor(odp_coremask_t *dest, odp_coremask_t *src1, + odp_coremask_t *src2); /** * Test if two masks contain the same cores */ -static inline int odp_coremask_equal(odp_coremask_t *mask1, - odp_coremask_t *mask2) -{ - return (mask1->_u64[0] == mask2->_u64[0]); -} +int odp_coremask_equal(odp_coremask_t *mask1, odp_coremask_t *mask2); #ifdef __cplusplus } diff --git a/platform/linux-generic/include/plat/odp_coremask.h b/platform/linux-generic/include/plat/odp_coremask.h new file mode 100644 index 0000000..ecbfb24 --- /dev/null +++ b/platform/linux-generic/include/plat/odp_coremask.h @@ -0,0 +1,91 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP core masks and enumeration + */ + +#ifndef ODP_COREMASK_H_ +#error This file should be included only into corresponding top level header +#else + +/** @internal */ +#define ODP_COREMASK_SIZE_U64 1 + +/** + * Core mask + * + * Don't access directly, use access functions. + */ +typedef struct odp_coremask_t { + uint64_t _u64[ODP_COREMASK_SIZE_U64]; /**< @private Mask*/ + +} plat_odp_coremask_t; + +/* Define odp_coremask_t to use in inline functions */ +typedef plat_odp_coremask_t odp_coremask_t; + +/** + * Clear entire mask + * @param mask Core mask to flush with zero value + */ +static inline void odp_coremask_zero(odp_coremask_t *mask) +{ + mask->_u64[0] = 0; +} + +/** + * Logical AND over two source masks. + * + * @param dest Destination mask, can be one of the source masks + * @param src1 Source mask 1 + * @param src2 Source mask 2 + */ +static inline void odp_coremask_and(odp_coremask_t *dest, odp_coremask_t *src1, + odp_coremask_t *src2) +{ + dest->_u64[0] = src1->_u64[0] & src2->_u64[0]; +} + +/** + * Logical OR over two source masks. + * + * @param dest Destination mask, can be one of the source masks + * @param src1 Source mask 1 + * @param src2 Source mask 2 + */ +static inline void odp_coremask_or(odp_coremask_t *dest, odp_coremask_t *src1, + odp_coremask_t *src2) +{ + dest->_u64[0] = src1->_u64[0] | src2->_u64[0]; +} + +/** + * Logical XOR over two source masks. + * + * @param dest Destination mask, can be one of the source masks + * @param src1 Source mask 1 + * @param src2 Source mask 2 + */ +static inline void odp_coremask_xor(odp_coremask_t *dest, odp_coremask_t *src1, + odp_coremask_t *src2) +{ + dest->_u64[0] = src1->_u64[0] ^ src2->_u64[0]; +} + +/** + * Test if two masks contain the same cores + */ +static inline int odp_coremask_equal(odp_coremask_t *mask1, + odp_coremask_t *mask2) +{ + return (mask1->_u64[0] == mask2->_u64[0]); +} + +#endif