From patchwork Wed Mar 2 19:29:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 63410 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2558982lbc; Wed, 2 Mar 2016 11:31:26 -0800 (PST) X-Received: by 10.55.195.142 with SMTP id r14mr34471560qkl.59.1456947086518; Wed, 02 Mar 2016 11:31:26 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t131si22042696qhb.115.2016.03.02.11.31.26; Wed, 02 Mar 2016 11:31:26 -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 Received: by lists.linaro.org (Postfix, from userid 109) id 1FC4965103; Wed, 2 Mar 2016 19:31:26 +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_H2, URIBL_BLOCKED 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 AB71562EF6; Wed, 2 Mar 2016 19:30:49 +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 0F199650ED; Wed, 2 Mar 2016 19:30:45 +0000 (UTC) Received: from mail-qg0-f41.google.com (mail-qg0-f41.google.com [209.85.192.41]) by lists.linaro.org (Postfix) with ESMTPS id 1940861D7E for ; Wed, 2 Mar 2016 19:30:18 +0000 (UTC) Received: by mail-qg0-f41.google.com with SMTP id t4so21110686qge.0 for ; Wed, 02 Mar 2016 11:30:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wuzzl/O+cS78Ty2UrXApke0N2QXvep5r+VYg/Njebcc=; b=Ky/nGPH65KKyBjkHa90Q+mxj7nYxl1iQu8MoXXyEPvyf7ChX2BuWEUMhs8gNvrQDg2 S97Uy5uFgWoIHlsllxMqcmI0JduJiDJL6lfPtsrkHcfOaR8g5YKBYTAgbmtWRbPh8yGN 99U4IuGK/mwVNsllaP+REL5S6w14iTXEpaCNFkWkgGIDhLAuxHVBTDpdtf0mTd6svwHz tFyRVwnR83SYOZeg6TbJ9/AlTyiHT+Sm4TMnsAYQOyDdjiEuMfXWz8JaYcpw2Q/8O7Qk /lEvcB/le2TxoOF1O10r9IJNbi2St+TYiynbsiZQi9AjC1CNyIjc139lEvG9+TNcwr3N G5XA== X-Gm-Message-State: AD7BkJKbRcXVmZFq7OEMpuQk46Zu1q4YdU8j2XBThUasKKzMlSXvyqYMSPl5i0mXMTZjgYcvMGI= X-Received: by 10.140.202.212 with SMTP id x203mr38285775qha.19.1456947017815; Wed, 02 Mar 2016 11:30:17 -0800 (PST) Received: from localhost.localdomain (c-98-221-136-245.hsd1.nj.comcast.net. [98.221.136.245]) by smtp.gmail.com with ESMTPSA id a129sm15527538qkb.45.2016.03.02.11.30.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Mar 2016 11:30:17 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Wed, 2 Mar 2016 14:29:46 -0500 Message-Id: <1456946992-19251-3-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456946992-19251-1-git-send-email-mike.holmes@linaro.org> References: <1456946992-19251-1-git-send-email-mike.holmes@linaro.org> X-Topics: Architecture patch Subject: [lng-odp] [PATCH v5 2/8] linux-generic: separate MIPS ODP_CACHE_LINE_SIZE to its arch file 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: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Hongbo Zhang Currently all ODP_CACHE_LINE_SIZE macros for different architectures are held in one header file, they should be moved to their own arch file. This patch moves ODP_CACHE_LINE_SIZE for MIPS. Signed-off-by: Hongbo Zhang Reviewed-and-tested-by: Bill Fischofer --- platform/linux-generic/arch/mips64/odp/cpu_arch.h | 12 ++++++++++++ platform/linux-generic/include/odp/align.h | 4 ---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/platform/linux-generic/arch/mips64/odp/cpu_arch.h b/platform/linux-generic/arch/mips64/odp/cpu_arch.h index 3bfa0dc..7b5bfd2 100644 --- a/platform/linux-generic/arch/mips64/odp/cpu_arch.h +++ b/platform/linux-generic/arch/mips64/odp/cpu_arch.h @@ -11,6 +11,18 @@ extern "C" { #endif +/** @ingroup odp_compiler_optim + * @{ + */ + +#if defined __OCTEON__ +#define ODP_CACHE_LINE_SIZE 128 +#endif + +/** + * @} + */ + static inline void odp_cpu_pause(void) { __asm__ __volatile__ ("nop"); diff --git a/platform/linux-generic/include/odp/align.h b/platform/linux-generic/include/odp/align.h index 161a302..0f11569 100644 --- a/platform/linux-generic/include/odp/align.h +++ b/platform/linux-generic/include/odp/align.h @@ -35,10 +35,6 @@ extern "C" { #define ODP_CACHE_LINE_SIZE 64 -#elif defined __OCTEON__ - -#define ODP_CACHE_LINE_SIZE 128 - #elif defined __powerpc__ #define ODP_CACHE_LINE_SIZE 64