From patchwork Tue Sep 18 13:31:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 146905 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp5052235ljw; Tue, 18 Sep 2018 06:36:03 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZB+6s/QK+iw+C7g34WpmzYzjOsmOyALjbuSZGdAf8p1+zfwfPt+ZKarKOFg+7d1lRGBOyn X-Received: by 2002:a1c:6486:: with SMTP id y128-v6mr15848448wmb.12.1537277763586; Tue, 18 Sep 2018 06:36:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537277763; cv=none; d=google.com; s=arc-20160816; b=Jqs8Hlk5eWDuT9bfbbnQUlQNWULUdqdWtbo/2Whp0l2cMewK7YDIDEfXmhjDxengMC wOqR818eNOu+b8J05y7P0bo/O/BdaGWEYvw5EVbfyO3R/reirBq59oe3ZIeGOC1p311E /q5R1siTDiA1KFHUKyVNA61gqX/ZF4ObSsFK6dGabzgxQnHTzIPz71te+rG3JfvKPHr1 dTqNw41N35jSxEEfw1EXBRRsbnTZ18UwizZwNZqmFYphuGfd5hhn/WkKAtxasZW8Ns8v Ta2R6HmQK5m67p/vCVeBVnH1Amq6aOfOGNbUfvhIz4ydBihepxVUfj1joW1oKzCNWRWV e5dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from; bh=ce+FZCsHkf0CJamKhb5d4Qd/9/++YzGbhLytFN7wisI=; b=ScpFPJQGikzDDz3//omoVxjaK7D/8rj0nkT/jRy3RNsY6Dg3Zb8BhCfM1fBZuFF4wY 0xeZZT2FnOWXO9J5DOgGcD3Zcc2iQ2U+llbI2CxlFXZVnRMcCtYqNZbG6UjhhfjScf7+ FVerH9jpTYSpPOSvgW5i8MbjIVd853ACyqsxwsEjIuISF9Oe567BVOsOqQx+tvb4GS9z 0x52vTPdmI4PH4nwpIMlQeDQzLJe7G1aAJkHE0ROFji6Zblr7imRwF0dcfXBJmzp2kVi 5yVucLSf44+IOfOjtzm+B6dSzfdTdf7M43v20m1y7WMsElrMWcgDAsIDz4tQtatjLEXQ 5UjA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id w130-v6si10766709wmf.34.2018.09.18.06.36.03; Tue, 18 Sep 2018 06:36:03 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B05405F1A; Tue, 18 Sep 2018 15:34:20 +0200 (CEST) Received: from inva020.nxp.com (inva020.nxp.com [92.121.34.13]) by dpdk.org (Postfix) with ESMTP id A493634F3 for ; Tue, 18 Sep 2018 15:34:08 +0200 (CEST) Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 71E511A0148; Tue, 18 Sep 2018 15:34:08 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 57B9C1A013C; Tue, 18 Sep 2018 15:34:06 +0200 (CEST) Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 086E240302; Tue, 18 Sep 2018 21:34:02 +0800 (SGT) From: Hemant Agrawal To: dev@dpdk.org, thomas@monjalon.net, ferruh.yigit@intel.com Date: Tue, 18 Sep 2018 19:01:55 +0530 Message-Id: <1537277516-8876-13-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537277516-8876-1-git-send-email-hemant.agrawal@nxp.com> References: <1535539660-20228-2-git-send-email-hemant.agrawal@nxp.com> <1537277516-8876-1-git-send-email-hemant.agrawal@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH v2 12/13] bus/dpaa: add check for re-definition in compat X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Few fields in compat are giving re-defination error with new drivers such as caam_jr. Checks have been added. Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/include/compat.h | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/drivers/bus/dpaa/include/compat.h b/drivers/bus/dpaa/include/compat.h index 92241d2..4122657 100644 --- a/drivers/bus/dpaa/include/compat.h +++ b/drivers/bus/dpaa/include/compat.h @@ -57,8 +57,9 @@ #ifndef __packed #define __packed __rte_packed #endif +#ifndef noinline #define noinline __attribute__((noinline)) - +#endif #define L1_CACHE_BYTES 64 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES))) #define __stringify_1(x) #x @@ -75,20 +76,25 @@ printf(fmt, ##args); \ fflush(stdout); \ } while (0) - +#ifndef pr_crit #define pr_crit(fmt, args...) prflush("CRIT:" fmt, ##args) +#endif +#ifndef pr_err #define pr_err(fmt, args...) prflush("ERR:" fmt, ##args) +#endif +#ifndef pr_warn #define pr_warn(fmt, args...) prflush("WARN:" fmt, ##args) +#endif +#ifndef pr_info #define pr_info(fmt, args...) prflush(fmt, ##args) - -#ifdef RTE_LIBRTE_DPAA_DEBUG_BUS -#ifdef pr_debug -#undef pr_debug #endif +#ifndef pr_debug +#ifdef RTE_LIBRTE_DPAA_DEBUG_BUS #define pr_debug(fmt, args...) printf(fmt, ##args) #else #define pr_debug(fmt, args...) {} #endif +#endif #define DPAA_BUG_ON(x) RTE_ASSERT(x) @@ -256,7 +262,9 @@ __bswap_24(uint32_t x) #define be16_to_cpu(x) rte_be_to_cpu_16(x) #define cpu_to_be64(x) rte_cpu_to_be_64(x) +#if !defined(cpu_to_be32) #define cpu_to_be32(x) rte_cpu_to_be_32(x) +#endif #define cpu_to_be16(x) rte_cpu_to_be_16(x) #if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN