From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0089.outbound.protection.outlook.com [104.47.34.89]) by dpdk.org (Postfix) with ESMTP id 45039199D2 for ; Fri, 8 Sep 2017 10:46:06 +0200 (CEST) Received: from BN3PR03CA0110.namprd03.prod.outlook.com (10.174.66.28) by DM5PR03MB3324.namprd03.prod.outlook.com (10.174.241.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.12; Fri, 8 Sep 2017 08:46:04 +0000 Received: from BL2FFO11FD027.protection.gbl (2a01:111:f400:7c09::158) by BN3PR03CA0110.outlook.office365.com (2603:10b6:400:4::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.12 via Frontend Transport; Fri, 8 Sep 2017 08:46:04 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD027.mail.protection.outlook.com (10.173.161.106) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Fri, 8 Sep 2017 08:46:04 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v888jmod023063; Fri, 8 Sep 2017 01:46:02 -0700 From: Hemant Agrawal To: CC: , Date: Fri, 8 Sep 2017 14:15:04 +0530 Message-ID: <1504860327-18451-8-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504860327-18451-1-git-send-email-hemant.agrawal@nxp.com> References: <1503658183-4078-1-git-send-email-hemant.agrawal@nxp.com> <1504860327-18451-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131493339644717907; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(8936002)(68736007)(33646002)(110136004)(6916009)(2950100002)(53936002)(47776003)(104016004)(5003940100001)(5660300001)(85426001)(48376002)(50466002)(50226002)(4326008)(77096006)(54906002)(356003)(305945005)(8676002)(81166006)(36756003)(498600001)(2906002)(97736004)(86362001)(2351001)(8656003)(76176999)(105606002)(106466001)(189998001)(50986999)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB3324; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD027; 1:5w5nV6I6Il0zitlHPQK88yB7C1LURy/U95qok49fUX7KdcrVgNaoDhuj0s9kCN25HJ/OyQxqRG90Lq3QuHkYAVasn1oTLOEJ7yo7ox9dvEE9zKErTkUkUHVH2duRHQa4 MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 426edb6a-19cd-485f-6b53-08d4f6960a51 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:DM5PR03MB3324; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB3324; 3:x9RnbzHtM45xKMTedgxD0VJlwzApThSCTOG3egvG3D14nnX8URj2RIAyAzqKL2IAU5VTphBpoPjrZthHRZOI9QH8S3kVkvrFgxihkL7CXjw1rGpymHCFlkbBsm/3955SrXz3HtTI8rNLBOQnpN4nVDc7VW9HiZOUuD1R+o+Ic5zWAUr7irH/xPvT1E94m+eDkYdlK68EmVP+bkGK3hQrWaooenkxU8tyViDWYicS/d3IG4FsRNzmZ09nW/hww5hX0CA4YqqAtAiDUljL4cr5NKLMOaeGIRL+SqR2J+8tWAC64x9lT34gvbm/98JjQ2rBU8Ox07R6NHxjTFpw9n5EFmThqldkm3S4q1Xpf7SE3dc=; 25:aJvbr7T72YavAFf+V8chon1/BqjKhYnPh31fR+zfnxQiYfl0j993/+zRxUXsa/gKM5Fjy/tY1cLV3ENdHuyzDejPIulEXETJtBqBaJ8WhkZgIrI8WgafXLXS9l7UB7djDvz3xXuUCk8/ho/gANq497AOYIt2lRvv+wmNBRIR5HeDtY6lvWrAYZdq9f4HYB4iGPmvWNDYLXeLXmSVURZGvy5gPawNr0Pjxr/bpFqXShcMNgJZiEEIKzjSJcXnobyzRjMLNOFskTIRyeIDb14Q2Qyz4Ba1543v1rPOJ9MLul7h5jht7Hmtha+qzfiNMvRGo/I12FHuj5hEisPaJg3ffQ== X-MS-TrafficTypeDiagnostic: DM5PR03MB3324: X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB3324; 31:bJ/gzRNdfvzl05t9v059FKY6lMsJCsM43qwBe2Pi8x/Q81GOK6KXuu2d8ofOiY64x1DcmPaPG57HC7zm9S69GLhbCdNLk0297ivuuKdWsnjxWKUG/8xI7fbqc8mgxlQDKGJehXYmEbpK+ZbJai/UvbKQfVvHDeVO8Rl5vg9mtLnZmu2xDJyF3IY/pHDDZNrR47jCaLynLY3bP+HaJONn2iuTJyYPeHlJZXkt0Az/y9k=; 4:LzFshdUBNTEQMta8EzfzU/bWBidActEfQ7fU9yPaqTT3L51Lg6m7bYpanFt7yjexW6LFva7bIsv7pidRndf3kzkOUdSQoZ251fEDU6tfQIU5uzvifsMCzA1ZBn4f5LSWYnNcngNaaiyl7bwmtmH9r3lxcE1Z6uurWjpOW5Igpf6v+23DiwinPV2EGSO94F4zZelEKGK30SAeaqJpYtuL/U63DMuFHjNZ3OJpfgpC2EB7xF4Awun367zbBe4visxpz+jcQUYHAuSlgs+/+b/UrSqVV5TjBWXgTQNLJySQ1Q8= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(6055026)(6096035)(20161123556025)(20161123559100)(20161123561025)(20161123563025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR03MB3324; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR03MB3324; X-Forefront-PRVS: 04244E0DC5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB3324; 23:uWkPasuUYbICJWU1xQZfdWaAOlECHY07HPZZRTzo6?= =?us-ascii?Q?H6B41yY+qmn81ublP0M3+pI8yx/xsvICy3N1ibvyXBB6GB7hQTJ2VYgGIGiX?= =?us-ascii?Q?fyGgo5ub1TM7X+kkQl5oOXjX9Kn31a37sDvGwiX8eogqOXzNLKKUN5iUTnnR?= =?us-ascii?Q?lhidCHjlMiFzM50IyXUmqpN0D56x30gQy71oUURBqEwO0dgLvBEXDcQ1I70s?= =?us-ascii?Q?AWEv6/QMhofmbjp4rzqXwv8rg4LQPosSEVXY3HZ5SO6j3fXqX8K81CkWqLHL?= =?us-ascii?Q?mletBPnxUpCmObmTo6SwtYS8wizl7FKTlB8H1lRwwFA1W9jyVQ08Pdhyg8DP?= =?us-ascii?Q?olL3rDJbOUR896w70dtXb4wpUVL8ojqLeOl+s1HWDK/XGs4gdX8Dv72f//z9?= =?us-ascii?Q?W0kqU1S3LO4kOYNmGdTzs45ayCGbkkyRBGi3f7V7mjbbjuQNNwL+Dh/GhGQA?= =?us-ascii?Q?qViE4g6TSU7fJLaB0KwWehBNzVSypg8SIaySRioWyxaPC+PsMy8hIy7Y26eY?= =?us-ascii?Q?QpbuRy6kNV6iZobKjXtwbpoXJTcidSG3d73C0GYz/3kAQE3XT3yVMM0HN6Q3?= =?us-ascii?Q?0XSgaGex4+hIhe5sMsYo57Zx2U/JgzjJ3LRCwdIKF7Lqq6iibjhjBaTjpOal?= =?us-ascii?Q?56weWunCqefufLs5y4ELPWkA/M/0BRi3joYE/S1H4dr/+/8kKDC5oZfxw+3I?= =?us-ascii?Q?nj3N8Xre+yoeyuDpkc17CQHsmhaR4BKIOQuHyAlBOfYgSxRa+M9YwsijJiUt?= =?us-ascii?Q?xcTv5yNDMcQAzddF0mh5rZXOZt+eAGkRXQv1LHHY53x2haExmronfddQEPzV?= =?us-ascii?Q?YW/vhWh/EfCbvt3PNdg4xlNzaQ3TZSxJ3qmL5Uy/PoRT+bEU0FxIHj0mnvE/?= =?us-ascii?Q?cNM3yJ+oz3yK94Q5uiTsZjAQu2dS2jUlrb12DY+trcm7gMZbPxyNkJ/uQD15?= =?us-ascii?Q?fK3172iTnkLKPVqH2PntqRG/A2C9rMOrdWHIonlzsYr0fRR99+rxoVHuOKQ7?= =?us-ascii?Q?WmV8my+92Q2SyzwTLAjI0IsW2eyn8EdVGLulmv4VKKL/jM1yQprXGEIk1SMc?= =?us-ascii?Q?nO7yZ8gUyJe6zR66CScPRSstqN+Iuhzm4LM8jrPVyeNWnkhlg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB3324; 6:3znplURyHu4SmNSAbdynKfKYfSI47aNJKmnNvLo2PApUFlqU/wlGZdaPC+8NdoJ42knpYJUfQqkTY9wdfsGAVp0JcNSHOiSKhNpzjnhlkKs5LZ+lLn9CZfu+25DYERTa9ZXQfGTpJOt3xPfEkHPaffhsAruNm36nHyxm+6YAfnw0NonZAsyzBZkZWfULX45RhSwaDi4Jt0LQaDXRJB7T3Uf42Tr7xdzS75HpHaO9rqAsBu590Dx+9aGTZlJ0kgr58xbL3H6sXuDSoOEF8Ds2kgGwNt4Cnf6MDtM235rTe/M68eJ9ICLH3RIyuZgVxaM/xKUMihbsrb+d7Y8A0ypV5w==; 5:lGSDCmKNhjxm2fxeS4OMehaZSD7aaTFbQSevIoIx5DnhqTYUUn7zhfm7Wm74F0HWIvISyOJlFW2VVpN30sr4mYk4JrI+DUC0jCjn2M5/BUPkit5293d6zkxFaGkERjviQrEHRWPok74DNlVrlWgdUQ==; 24:u2rhHKC4LEPVUqLKpeyq1FsrVYvFSliHc+Kp/sS9SPXgMa35kHvSIkqZbgDKHN4GICEimpYs368jp803q+UXPRB7feFLa8ZeFOAUc5AmAsU=; 7:TyVTCYxlsSGtaIk+PFXbccbyxRlAWJQvurf5r5JXIM0R2pRNmiVPITHJVu0yTok+SLJsKoKeq+EiqRFbhiANzYwOyIyuZyltLficNk/9Rs89zJOf1JFwgqovVJ0KprbQseIqLhaDKhwjVCIk/JJdVkf9Wa/u/P4EX7bEPy/9WHpMST6xUgG5gF0w/gfCpeZnwJKoY4zbX2cMkabSsQuvZsohftAbJJHUNcW8uWnX0VU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2017 08:46:04.3001 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB3324 Subject: [dpdk-dev] [PATCH v2 07/30] bus/fslmc: cleanup compat file 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: , X-List-Received-Date: Fri, 08 Sep 2017 08:46:08 -0000 Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/qbman/include/compat.h | 188 +------------------------------ drivers/bus/fslmc/qbman/qbman_private.h | 2 +- 2 files changed, 4 insertions(+), 186 deletions(-) diff --git a/drivers/bus/fslmc/qbman/include/compat.h b/drivers/bus/fslmc/qbman/include/compat.h index 7b69fd1..8885d60 100644 --- a/drivers/bus/fslmc/qbman/include/compat.h +++ b/drivers/bus/fslmc/qbman/include/compat.h @@ -65,16 +65,9 @@ */ /* Required compiler attributes */ -#define __user #define likely(x) __builtin_expect(!!(x), 1) #define unlikely(x) __builtin_expect(!!(x), 0) #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES))) -#undef container_of -#define container_of(ptr, type, member) ({ \ - typeof(((type *)0)->member)(*__mptr) = (ptr); \ - (type *)((char *)__mptr - offsetof(type, member)); }) -#define __stringify_1(x) #x -#define __stringify(x) __stringify_1(x) #ifdef ARRAY_SIZE #undef ARRAY_SIZE @@ -88,17 +81,8 @@ typedef uint32_t u32; typedef uint64_t u64; typedef uint64_t dma_addr_t; typedef cpu_set_t cpumask_t; -typedef u32 compat_uptr_t; - -static inline void __user *compat_ptr(compat_uptr_t uptr) -{ - return (void __user *)(unsigned long)uptr; -} - -static inline compat_uptr_t ptr_to_compat(void __user *uptr) -{ - return (u32)(unsigned long)uptr; -} +typedef unsigned int gfp_t; +typedef uint32_t phandle; /* I/O operations */ static inline u32 in_be32(volatile void *__p) @@ -124,12 +108,11 @@ static inline void out_be32(volatile void *__p, u32 val) #define pr_warn(fmt, args...) prflush("WARN:" fmt, ##args) #define pr_info(fmt, args...) prflush(fmt, ##args) +#ifdef RTE_LIBRTE_DPAA2_DEBUG_BUS #ifdef pr_debug #undef pr_debug #endif #define pr_debug(fmt, args...) {} -#define might_sleep_if(c) {} -#define msleep(x) {} #define WARN_ON(c, str) \ do { \ static int warned_##__LINE__; \ @@ -147,103 +130,20 @@ do { \ #define ALIGN(x, a) (((x) + ((typeof(x))(a) - 1)) & ~((typeof(x))(a) - 1)) -/****************/ -/* Linked-lists */ -/****************/ - -struct list_head { - struct list_head *prev; - struct list_head *next; -}; - -#define LIST_HEAD(n) \ -struct list_head n = { \ - .prev = &n, \ - .next = &n \ -} - -#define INIT_LIST_HEAD(p) \ -do { \ - struct list_head *__p298 = (p); \ - __p298->next = __p298; \ - __p298->prev = __p298->next; \ -} while (0) -#define list_entry(node, type, member) \ - (type *)((void *)node - offsetof(type, member)) -#define list_empty(p) \ -({ \ - const struct list_head *__p298 = (p); \ - ((__p298->next == __p298) && (__p298->prev == __p298)); \ -}) -#define list_add(p, l) \ -do { \ - struct list_head *__p298 = (p); \ - struct list_head *__l298 = (l); \ - __p298->next = __l298->next; \ - __p298->prev = __l298; \ - __l298->next->prev = __p298; \ - __l298->next = __p298; \ -} while (0) -#define list_add_tail(p, l) \ -do { \ - struct list_head *__p298 = (p); \ - struct list_head *__l298 = (l); \ - __p298->prev = __l298->prev; \ - __p298->next = __l298; \ - __l298->prev->next = __p298; \ - __l298->prev = __p298; \ -} while (0) -#define list_for_each(i, l) \ - for (i = (l)->next; i != (l); i = i->next) -#define list_for_each_safe(i, j, l) \ - for (i = (l)->next, j = i->next; i != (l); \ - i = j, j = i->next) -#define list_for_each_entry(i, l, name) \ - for (i = list_entry((l)->next, typeof(*i), name); &i->name != (l); \ - i = list_entry(i->name.next, typeof(*i), name)) -#define list_for_each_entry_safe(i, j, l, name) \ - for (i = list_entry((l)->next, typeof(*i), name), \ - j = list_entry(i->name.next, typeof(*j), name); \ - &i->name != (l); \ - i = j, j = list_entry(j->name.next, typeof(*j), name)) -#define list_del(i) \ -do { \ - (i)->next->prev = (i)->prev; \ - (i)->prev->next = (i)->next; \ -} while (0) - /* Other miscellaneous interfaces our APIs depend on; */ - #define lower_32_bits(x) ((u32)(x)) #define upper_32_bits(x) ((u32)(((x) >> 16) >> 16)) /* Compiler/type stuff */ -typedef unsigned int gfp_t; -typedef uint32_t phandle; #define __iomem -#define EINTR 4 -#define ENODEV 19 #define GFP_KERNEL 0 #define __raw_readb(p) (*(const volatile unsigned char *)(p)) #define __raw_readl(p) (*(const volatile unsigned int *)(p)) #define __raw_writel(v, p) {*(volatile unsigned int *)(p) = (v); } -/* Completion stuff */ -#define DECLARE_COMPLETION(n) int n = 0 -#define complete(n) { *n = 1; } -#define wait_for_completion(n) \ -do { \ - while (!*n) { \ - bman_poll(); \ - qman_poll(); \ - } \ - *n = 0; \ -} while (0) - /* Allocator stuff */ #define kmalloc(sz, t) malloc(sz) -#define vmalloc(sz) malloc(sz) #define kfree(p) { if (p) free(p); } static inline void *kzalloc(size_t sz, gfp_t __foo __rte_unused) { @@ -269,88 +169,6 @@ static inline void free_page(unsigned long p) free((void *)p); } -/* Bitfield stuff. */ -#define BITS_PER_ULONG (sizeof(unsigned long) << 3) -#define SHIFT_PER_ULONG (((1 << 5) == BITS_PER_ULONG) ? 5 : 6) -#define BITS_MASK(idx) ((unsigned long)1 << ((idx) & (BITS_PER_ULONG - 1))) -#define BITS_IDX(idx) ((idx) >> SHIFT_PER_ULONG) -static inline unsigned long test_bits(unsigned long mask, - volatile unsigned long *p) -{ - return *p & mask; -} - -static inline int test_bit(int idx, volatile unsigned long *bits) -{ - return test_bits(BITS_MASK(idx), bits + BITS_IDX(idx)); -} - -static inline void set_bits(unsigned long mask, volatile unsigned long *p) -{ - *p |= mask; -} - -static inline void set_bit(int idx, volatile unsigned long *bits) -{ - set_bits(BITS_MASK(idx), bits + BITS_IDX(idx)); -} - -static inline void clear_bits(unsigned long mask, volatile unsigned long *p) -{ - *p &= ~mask; -} - -static inline void clear_bit(int idx, volatile unsigned long *bits) -{ - clear_bits(BITS_MASK(idx), bits + BITS_IDX(idx)); -} - -static inline unsigned long test_and_set_bits(unsigned long mask, - volatile unsigned long *p) -{ - unsigned long ret = test_bits(mask, p); - - set_bits(mask, p); - return ret; -} - -static inline int test_and_set_bit(int idx, volatile unsigned long *bits) -{ - int ret = test_bit(idx, bits); - - set_bit(idx, bits); - return ret; -} - -static inline int test_and_clear_bit(int idx, volatile unsigned long *bits) -{ - int ret = test_bit(idx, bits); - - clear_bit(idx, bits); - return ret; -} - -static inline int find_next_zero_bit(unsigned long *bits, int limit, int idx) -{ - while ((++idx < limit) && test_bit(idx, bits)) - ; - return idx; -} - -static inline int find_first_zero_bit(unsigned long *bits, int limit) -{ - int idx = 0; - - while (test_bit(idx, bits) && (++idx < limit)) - ; - return idx; -} - -static inline u64 div64_u64(u64 n, u64 d) -{ - return n / d; -} - #define atomic_t rte_atomic32_t #define atomic_read(v) rte_atomic32_read(v) #define atomic_set(v, i) rte_atomic32_set(v, i) diff --git a/drivers/bus/fslmc/qbman/qbman_private.h b/drivers/bus/fslmc/qbman/qbman_private.h index 4f48b47..32e5c5d 100644 --- a/drivers/bus/fslmc/qbman/qbman_private.h +++ b/drivers/bus/fslmc/qbman/qbman_private.h @@ -27,7 +27,7 @@ */ /* Perform extra checking */ -#define QBMAN_CHECKING +/*#define QBMAN_CHECKING*/ /* To maximise the amount of logic that is common between the Linux driver and * other targets (such as the embedded MC firmware), we pivot here between the -- 2.7.4