From patchwork Wed Aug 29 10:47:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 43964 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2114A5F17; Wed, 29 Aug 2018 12:50:08 +0200 (CEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0045.outbound.protection.outlook.com [104.47.1.45]) by dpdk.org (Postfix) with ESMTP id C985B5911 for ; Wed, 29 Aug 2018 12:49:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=u6lM9PwZndaEgupBOcN8kQgTfq2N3MKoBzYdbAnvX60=; b=MrKMgascTWDsj8q2NsPCEMrT1UKAtZtQBPth6VmBwtNLA8lE1Pd6noEBUdgaOALxVzCyCmB/85opmWIgFUERIw5XKfgioBRNRjGUHHj5/W9gmwuueRmnc5cbTqAJGQTN07Fz9oJCnyKT+IFAvAe24FCrAauQlfuwrtN7rHyMCkk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.143.30.134) by VI1PR0401MB2543.eurprd04.prod.outlook.com (2603:10a6:800:56::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Wed, 29 Aug 2018 10:49:58 +0000 From: Hemant Agrawal To: dev@dpdk.org, ferruh.yigit@intel.com Cc: dpdk-up@NXP1.onmicrosoft.com Date: Wed, 29 Aug 2018 16:17:39 +0530 Message-Id: <1535539660-20228-13-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535539660-20228-1-git-send-email-hemant.agrawal@nxp.com> References: <1535539660-20228-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: BM1PR0101CA0071.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:19::33) To VI1PR0401MB2543.eurprd04.prod.outlook.com (2603:10a6:800:56::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c09e683a-da06-4ca1-bda2-08d60d9d2a2f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(5600074)(711020)(4618075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:VI1PR0401MB2543; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2543; 3:dVZSD7oWovzvbCPBWx/fUBZtXtqZARYc6K/NfrxMzdQ6s2zcRtDYXPYPwMi3pvibdbHR7yyh8aV3sZFzUXAf58DpxceTUqgRy2Be2VtF+Jrqv5WauVF8NdGhm5O71ZwqiJ1rY2PyyKVy8AmFiewfHlHIOIjFSDMAJ6IA1N4VHp6LnSJUEcDQWNC/YfIbk95SLiFWzWbLPSVCouPQGAHe6nn+uKRrVQlRrdnnKUYBKB2kJ3NbXDWFWUSrEhDTH70t; 25:GpNpQqxEgWdOXOslKsg8sOPuU+Rnm3UOKI4yY42TXwR/0p5ApVIxeI7JTBfXfzQAv6+ZpLvj+F/fYbKLLa72ABBEzQDxXfx9eJtSVoUTAAro72ePfSgmAYXia00680nfiLyUDF5Kh5wgJcE0bJoD0d8sWMnooP5nzLgO1gycqoH+MY7IdbKPYSSQTCgv53kwTU46i/0InSHZjQiu6QiRgldAEWRoumD1psfOJpXaFJ5eXpSTWilVE6KdkemZ5vf7spSEIOt7zxKQ/y8ts+45x/dfwXCw/UmSlnwWz3K21RWrlsbZbDyRMeyh+eIKZjpLLV172kob2RYb8mH7OgBWZw==; 31:W07bkCKroHBn5J6dt+Nq4Ejgnne+xLcaNFPvG4t09/awBNUjvSURvVxkVumEzWNRfI33YlPCCTYwnya9ESLct5mC20bCahLgcVM8c5AZ+zmTpj64ABJTycilIlsXqUewHv35qdW/xutwZHW/nSl7msdecN2/XM4gyTWhcmsJe8PLonm70Ro73dR/k/wK1F4f2PNYL8nl5AoqXNon2BMmVbiwZYEMEFa8J3iVK7UzDuo= X-MS-TrafficTypeDiagnostic: VI1PR0401MB2543: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2543; 20:oH48A2YvBwkx7+2PWJyfwKkoEQ+oYDvpjqoX3qI4scJDi5u/iH6CVxHS+6Ma3O5dIqVUswaV7RPQoSqHu5kFwdE1BOPNWEKdDegLWaxxIFPjdvmbqNMp9VE3a5Bu7w1ekPdxwa4/7Pz8BMY+jAym+FO5q6oThhYc7yDo8wIJaIAlGL3QQDUEp9o2iujmoa0L7wxup60mawJn6TxPCG7+rB6xkt5niy2Qnih48rFQ6UIXFaW3d3Sh4bYjrNcXM5ZICfhXTMdOEH2ztw9CXveKDxyKuYyOkvhP4U5ObDqxobOOkOpUtA0tYVVFFhHQbxaPqWPpvK2d9VHS6uAc5ZeJkoO008mlV3qjWOgb+iBxiMPKy+fBzqi1jZklIjVb+LlWQovsJ2mHLELjIWaep6Ia9LLb1H+OW0E4NIDn8hpAC/953yCXi8r4qG9DmDWZt7HcaDF6wT8bIzOcIGkjjhYC+zCOs5FrHjPdDBv5RJe6q7ODjSGsI+jKbVQAtY9kRRFZ; 4:tEZqCTq8TVY/kBEcHGxwkNR9VvSPPdP6xR7Us6KeTan+INto8n0ZhzNP3XbQ4xGn1PIHNGqUo7SsYiMuU1iPqt3Xb8hU4dBb5+7BHtPi9TOxSNnw5UJGyde1LRTc/Iz84NleHwh6/SpEh7fpZs19rNQ7UiXBnZ9UWN5P3sC7iZ2wavI89EPs/pdhyZ83g6xoivc5EI8tbKUG8a9GKY1OVdCq+MiAYuVUh4UiFpzKluRdl3mD2v+DdxN5j3ey3oGO2sJOmSHYLIXQnraNwWANN0wjM0xulSmcgvk09cHf9h+g6ERQI2rv8COPwzTLv1Mr X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(201708071742011)(7699016); SRVR:VI1PR0401MB2543; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0401MB2543; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(136003)(366004)(396003)(39860400002)(376002)(189003)(199004)(6512007)(6486002)(16526019)(53936002)(486006)(186003)(11346002)(105586002)(6116002)(106356001)(5660300001)(50466002)(68736007)(5009440100003)(2616005)(25786009)(48376002)(386003)(4326008)(55236004)(6666003)(73566003)(86362001)(956004)(107886003)(446003)(3846002)(26005)(6506007)(476003)(316002)(52116002)(50226002)(478600001)(47776003)(66066001)(8936002)(16586007)(76176011)(51416003)(97736004)(44832011)(81166006)(8676002)(7736002)(305945005)(36756003)(81156014)(14444005)(2906002)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0401MB2543; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0401MB2543; 23:3BRKZWHpipYqfA8CeKVjZXK6vjdrPZoc1KhJf6N?= kiR/B6Hsz2Jfjxf/SbvQXswK/zIQF5o2Yyw6Krd5NpACC7PO1lygSoZHPshUmn7rg2bswxwLLf8pbg69HhQ4G8DnANK2YFkXBs9wJm7KUC7ZBKtIvzffMU0MHkQYKesKqz8szTv9QZW1kW02ST5FuUhrew9LgaEaz0R78YLZm3Llg7Izo2nSjkSZfg+xT/YLPhV23spEUZ2Fk8rVTlZLwtYchX+icQlt3YxntbsfmCLJzp80fd7GRARVwHQHdc0osdx5RCwIOZPLyFsyy+5orsItw9+IhffP+Oe4z388XdMskRHgvLcKLxROYuF8CicVhYGbQIhIRk9ZZ7VGEqJ1AFYDO4O3SmKyAaem4NArr/5mUK7qZpfLhXwhASNjiXRFrY8pH6LTLxalmxTkflQ28xC1LVSSAQyP+eEQdTcGpyo6MzliZLgLyiwgVLpVV0S1erzHhfiCQbu2gIafVv7cW+SwmurCKoKYR64S7Myi7LISyefWcl7k/ZN3ShNsxb239L/v4B7xlXFK0M2B+YNWgoiJW984LS0nhnaoHFQ76dXY9BtFF4Qmup7L6zDbWu78Lb/3Y9qghRC09/MdWwDEOQ/tdIQcy2vN8+TyFGHcvJO5dvmGEwHkJaGuv1k91mUD3j4cwSMXdWSlOE2C7C/beKuCsk6RXuwhfb3PzHt3PE5NRDl7eiorh3MmuIIFkkwmmeKjBynG/dTCRZNIfdmPSEartrwzHrUQRMdg0CbjY/Ng4MPtRJV7Fw2pUCoftgWo8sfiZplzI9WqhbP8ujh8Ft2U890adrmdBtYBsmrubJk3cl21Mggpo+/t3rvAnII3eFz3FQ8nkz1XzOS3Cudsf7oeAEWO6JKw2tEvpCaB2KiqYKXQq2ppX5ZFA6P/rlgivoN/pKV3eg9Q72rfQmOJnARvPD32h7t6LbV2u03GRY4Zm8YRqrBgsoi4pYfs499kNAxAzbbTnFZv+85d3mZ8tjVkPTcqdNwWeoReHL/HVxj1VcpclhfuPi4CxFLefW723X5IztKZmXUdPaeE2a8wYR6+rcwCP1qIDi/Ey2trsymURWCcoeJDpcum+eg2FBvfR3wdigTaaBEqvntvnZ2zL1/l2hX0Uzc6DbafKtJ5JXWDZxz463UyIN6+KND1BT2PHEiKJEi4rUqEpKKY9H10vTU/yT1pXzPLyw6XmR7SCI0mLhsehiv0P0LjndGoE4mQlfn2GCCu59xTwROB0vguaCXBtaVuX2eMJKcQUd7hE0P402PjXDhgIMQovJ9n4SMcGnXE= X-Microsoft-Antispam-Message-Info: vOkKMORDoNNtYJ+5ueVZ2cIeiWCRjAOyMtDGijjsKEP+6BckuNt4VlUKeFwsRmF9yoOUcokpQihfYA8BH0dzrAGkRCJY/oMqvBLrdz39omKeOpx3rIzyt7eFsKKTkK0nuMbob5dzTk5Qr/WkR3AalSkvB6UGklltr/Dy3UtEhzbRcYkN6Em9u+pQABYrsENBnuleZ7CurfZql5v/5/NGr2JsNTniqqaAWXlEbsvwjzsD3PBUc4kMwdDWy0tX/8VbijO0UIClgOVVih87V8O24+Rnlxml/As1R1pfKYYV69VSvJMsaRaIymXJDOrJ7YsHyrZC+FwCD+kwDO9dy15DKuvNcvqHpaoLhX3pLZ7IPt0= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2543; 6:R6dOAlLqqeKNG3V2+UVj9r4On81doihwNqDhc2Fbte4uR+nThj8iFibTqh7h0Ego8bAr5v3vR70y0zixzRZgAJNjGXrHYT9wfCWGqS4U4QOL/nJsROPorp4+W+q8FqOmtW9Y7fX1NqS1ZSgEqKuawemkiFf3P47oGlwRzvpsDVAgOWZbh5MbG7f/H/fBf6iydSLJlc/cLDFuUR/4WeQ6Vwq98D4bFPdbasgFdybxesDhdaesfdeYLO+znZLgnFAmvJ9byzwGgyViTvcCgVEaMq5mQ7paNjJNiKle+0lcqJ82bDO8eHPl8joCsnC2h3eCdTG3hIsxVPnmED4yTRIrjx9iNgzYExlFL/iJsqtIMszsFlzawnLA5ZUbGaz1jbGCq0WD82p3danUogpNk9drRLWBN6E/sb+yCc7qW/3qIwk8/Ew7WXzuHiQOAmiiZxLI+yu8PNeiDPatqfHVKvytNA==; 5:EcRdlDSzVQs38tydcddVenPb/U3pAP6SCabD7PYWEId0jT18doFNiSPHHVguhf619ABFISumz6+WSIvCOnYa2evVnoj6mSdPpQQT8sOV+RqUKmQ8+BDJw4C2zRBrfZItxs5Hgt7owVDL7auZyFAMsIBlspDt6R5F0fQZQKegkvw=; 7:JlTDQQzQm3zsfs65T7cfESl5PVGM9Q9bPzbOcgt0K5Uu1HktG2phncEbGMKvFvdsgDF46qVTiYT/eCxM4P+7pZql/ibuAmVhlKRExlq5GksdVVHmZtQApnXSDoPA5Bsfirbm8q3vvixrQdVKtZc45LjNJ3/omtOM/2ZoBqE7pnQqSYoHwlUx0npXWma26ZSrHOPLldtMMorpqQMYr3Y7af+6lvmzAT9VxUWaP2P9et+t5lRTeMyikCxQaiyCXKJY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 10:49:58.0395 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c09e683a-da06-4ca1-bda2-08d60d9d2a2f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2543 Subject: [dpdk-dev] [PATCH 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" Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/include/compat.h | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) 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