d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

raw/ifpga/base: clean up

Browse Source 
clean up code:
1. use opae_memcpy instead of memcpy
2. use opae_memset instead of memset
3. disable opae_adapter_dump by default

Signed-off-by: Tianfei Zhang <tianfei.zhang@intel.com>
This commit is contained in:
Tianfei Zhang 2019-04-16 11:17:44 +08:00 committed by Ferruh Yigit
parent 6ad943ff49
commit 93bf4b3101
8 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/raw/ifpga_rawdev/base/ifpga_api.c
View File

@ -202,7 +202,7 @@ static int ifpga_adapter_enumerate(struct opae_adapter *adapter)
struct ifpga_hw *hw = malloc(sizeof(*hw));
if (hw) {
memset(hw, 0, sizeof(*hw));
opae_memset(hw, 0, sizeof(*hw));
hw->pci_data = adapter->data;
hw->adapter = adapter;
if (ifpga_bus_enumerate(hw))

4
drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c
View File

@ -77,8 +77,8 @@ int fpga_get_afu_uuid(struct ifpga_port_hw *port, struct uuid *uuid)
guidh = readq(&port_hdr->afu_header.guid.b[8]);
spinlock_unlock(&port->lock);
memcpy(uuid->b, &guidl, sizeof(u64));
memcpy(uuid->b + 8, &guidh, sizeof(u64));
opae_memcpy(uuid->b, &guidl, sizeof(u64));
opae_memcpy(uuid->b + 8, &guidh, sizeof(u64));
return 0;
}

2
drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c
View File

@ -257,7 +257,7 @@ static int fme_pr(struct ifpga_hw *hw, u32 port_id, void *buffer, u32 size,
return -EINVAL;
}
memset(&info, 0, sizeof(struct fpga_pr_info));
opae_memset(&info, 0, sizeof(struct fpga_pr_info));
info.flags = FPGA_MGR_PARTIAL_RECONFIG;
info.port_id = port_id;

16
drivers/raw/ifpga_rawdev/base/opae_debug.c
View File

@ -78,13 +78,13 @@ void opae_adapter_dump(struct opae_adapter *adapter, int verbose)
{
struct opae_accelerator *acc;
opae_log("=====%s=====\n", __func__);
opae_log("OPAE Adapter %s\n", adapter->name);
opae_log("OPAE Adapter OPs = %p\n", adapter->ops);
opae_log("OPAE Adapter Private Data = %p\n", adapter->data);
opae_log("OPAE Manager (downstream) = %p\n", adapter->mgr);
if (verbose) {
opae_log("=====%s=====\n", __func__);
opae_log("OPAE Adapter %s\n", adapter->name);
opae_log("OPAE Adapter OPs = %p\n", adapter->ops);
opae_log("OPAE Adapter Private Data = %p\n", adapter->data);
opae_log("OPAE Manager (downstream) = %p\n", adapter->mgr);
if (adapter->mgr)
opae_manager_dump(adapter->mgr);
@ -93,7 +93,7 @@ void opae_adapter_dump(struct opae_adapter *adapter, int verbose)
if (adapter->data)
opae_adapter_data_dump(adapter->data);
}
opae_log("==========================\n");
opae_log("==========================\n");
}
}

2
drivers/raw/ifpga_rawdev/base/opae_hw_api.c
View File

@ -341,7 +341,7 @@ int opae_adapter_enumerate(struct opae_adapter *adapter)
ret = adapter->ops->enumerate(adapter);
if (!ret)
opae_adapter_dump(adapter, 1);
opae_adapter_dump(adapter, 0);
return ret;
}

1
drivers/raw/ifpga_rawdev/base/opae_osdep.h
View File

@ -76,4 +76,5 @@ struct uuid {
#define msleep(x) opae_udelay(1000 * (x))
#define usleep_range(min, max) msleep(DIV_ROUND_UP(min, 1000))
#define opae_memset(a, b, c) memset((a), (b), (c))
#endif

1
drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h
View File

@ -71,5 +71,6 @@ static inline void opae_writeq(uint64_t value, volatile void *addr)
}
#define opae_free(addr) free(addr)
#define opae_memcpy(a, b, c) memcpy((a), (b), (c))
#endif

2
drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h
View File

@ -11,6 +11,7 @@
#include <rte_log.h>
#include <rte_io.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
#define dev_printf(level, fmt, args...) \
RTE_LOG(level, PMD, "osdep_rte: " fmt, ## args)
@ -42,4 +43,5 @@
#define spinlock_lock(x) rte_spinlock_lock(x)
#define spinlock_unlock(x) rte_spinlock_unlock(x)
#define opae_memcpy(a, b, c) rte_memcpy((a), (b), (c))
#endif