X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=blobdiff_plain;f=lib%2Flibrte_mempool%2Frte_dom0_mempool.c;h=8152b01cc8c88d57dfcd09b902112e80a5b0cc5f;hp=046821129ab39fa23c01c0672c9424d07f31c5a3;hb=3031749c2df04a63cdcef186dcce3781e61436e8;hpb=d10296d7ea9c7e4f0da51ff2fb9c89b838e06940

diff --git a/lib/librte_mempool/rte_dom0_mempool.c b/lib/librte_mempool/rte_dom0_mempool.c
index 046821129a..8152b01cc8 100644
--- a/lib/librte_mempool/rte_dom0_mempool.c
+++ b/lib/librte_mempool/rte_dom0_mempool.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -61,21 +61,21 @@
 #include "rte_mempool.h"
 
 static void
-get_phys_map(void *va, phys_addr_t pa[], uint32_t pg_num, 
-            uint32_t pg_sz, uint32_t memseg_id) 
+get_phys_map(void *va, phys_addr_t pa[], uint32_t pg_num,
+            uint32_t pg_sz, uint32_t memseg_id)
 {
     uint32_t i;
     uint64_t virt_addr, mfn_id;
     struct rte_mem_config *mcfg;
     uint32_t page_size = getpagesize();
-    
+
     /* get pointer to global configuration */
     mcfg = rte_eal_get_configuration()->mem_config;
     virt_addr =(uintptr_t) mcfg->memseg[memseg_id].addr;
-     
-    for (i = 0; i != pg_num; i++) { 
-        mfn_id = ((uintptr_t)va + i * pg_sz - virt_addr) / RTE_PGSIZE_2M;    
-        pa[i] = mcfg->memseg[memseg_id].mfn[mfn_id] * page_size; 
+
+    for (i = 0; i != pg_num; i++) {
+        mfn_id = ((uintptr_t)va + i * pg_sz - virt_addr) / RTE_PGSIZE_2M;
+        pa[i] = mcfg->memseg[memseg_id].mfn[mfn_id] * page_size;
     }
 }
 
@@ -87,30 +87,30 @@ rte_dom0_mempool_create(const char *name, unsigned elt_num, unsigned elt_size,
            rte_mempool_obj_ctor_t *obj_init, void *obj_init_arg,
            int socket_id, unsigned flags)
 {
-	struct rte_mempool *mp = NULL; 
-	phys_addr_t *pa; 
-	char *va; 
-	size_t sz; 
-	uint32_t pg_num, pg_shift, pg_sz, total_size; 
+	struct rte_mempool *mp = NULL;
+	phys_addr_t *pa;
+	char *va;
+	size_t sz;
+	uint32_t pg_num, pg_shift, pg_sz, total_size;
 	const struct rte_memzone *mz;
 	char mz_name[RTE_MEMZONE_NAMESIZE];
 	int mz_flags = RTE_MEMZONE_1GB|RTE_MEMZONE_SIZE_HINT_ONLY;
-    
-	pg_sz = RTE_PGSIZE_2M; 
-    
-	pg_shift = rte_bsf32(pg_sz); 
-	total_size = rte_mempool_calc_obj_size(elt_size, flags, NULL); 
-    
-	/* calc max memory size and max number of pages needed. */ 
-	sz = rte_mempool_xmem_size(elt_num, total_size, pg_shift) + 
+
+	pg_sz = RTE_PGSIZE_2M;
+
+	pg_shift = rte_bsf32(pg_sz);
+	total_size = rte_mempool_calc_obj_size(elt_size, flags, NULL);
+
+	/* calc max memory size and max number of pages needed. */
+	sz = rte_mempool_xmem_size(elt_num, total_size, pg_shift) +
 		RTE_PGSIZE_2M;
 	pg_num = sz >> pg_shift;
 
-	/* extract physical mappings of the allocated memory. */    
-	pa = calloc(pg_num, sizeof (*pa));      
+	/* extract physical mappings of the allocated memory. */
+	pa = calloc(pg_num, sizeof (*pa));
 	if (pa == NULL)
 		return mp;
-	
+
 	rte_snprintf(mz_name, sizeof(mz_name), RTE_MEMPOOL_OBJ_NAME, name);
 	mz = rte_memzone_reserve(mz_name, sz, socket_id, mz_flags);
 	if (mz == NULL) {
@@ -119,16 +119,16 @@ rte_dom0_mempool_create(const char *name, unsigned elt_num, unsigned elt_size,
 	}
 
 	va = (char *)RTE_ALIGN_CEIL((uintptr_t)mz->addr, RTE_PGSIZE_2M);
-	/* extract physical mappings of the allocated memory. */ 
+	/* extract physical mappings of the allocated memory. */
 	get_phys_map(va, pa, pg_num, pg_sz, mz->memseg_id);
 
-	mp = rte_mempool_xmem_create(name, elt_num, elt_size, 
-		cache_size, private_data_size, 
-		mp_init, mp_init_arg, 
-		obj_init, obj_init_arg, 
-		socket_id, flags, va, pa, pg_num, pg_shift); 
-   
+	mp = rte_mempool_xmem_create(name, elt_num, elt_size,
+		cache_size, private_data_size,
+		mp_init, mp_init_arg,
+		obj_init, obj_init_arg,
+		socket_id, flags, va, pa, pg_num, pg_shift);
+
 	free(pa);
-  
-	return (mp); 
+
+	return (mp);
 }