git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eal: rename lcore master and slave
[dpdk.git]
/
drivers
/
net
/
ark
/
ark_ethdev.c
diff --git
a/drivers/net/ark/ark_ethdev.c
b/drivers/net/ark/ark_ethdev.c
index
c364201
..
168b365
100644
(file)
--- a/
drivers/net/ark/ark_ethdev.c
+++ b/
drivers/net/ark/ark_ethdev.c
@@
-29,8
+29,8
@@
static int ark_config_device(struct rte_eth_dev *dev);
static int eth_ark_dev_uninit(struct rte_eth_dev *eth_dev);
static int eth_ark_dev_configure(struct rte_eth_dev *dev);
static int eth_ark_dev_start(struct rte_eth_dev *dev);
static int eth_ark_dev_uninit(struct rte_eth_dev *eth_dev);
static int eth_ark_dev_configure(struct rte_eth_dev *dev);
static int eth_ark_dev_start(struct rte_eth_dev *dev);
-static
void
eth_ark_dev_stop(struct rte_eth_dev *dev);
-static
void
eth_ark_dev_close(struct rte_eth_dev *dev);
+static
int
eth_ark_dev_stop(struct rte_eth_dev *dev);
+static
int
eth_ark_dev_close(struct rte_eth_dev *dev);
static int eth_ark_dev_info_get(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info);
static int eth_ark_dev_link_update(struct rte_eth_dev *dev,
static int eth_ark_dev_info_get(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info);
static int eth_ark_dev_link_update(struct rte_eth_dev *dev,
@@
-78,8
+78,6
@@
static int eth_ark_set_mtu(struct rte_eth_dev *dev, uint16_t size);
#define ARK_TX_MAX_QUEUE (4096 * 4)
#define ARK_TX_MIN_QUEUE (256)
#define ARK_TX_MAX_QUEUE (4096 * 4)
#define ARK_TX_MIN_QUEUE (256)
-int ark_logtype;
-
static const char * const valid_arguments[] = {
ARK_PKTGEN_ARG,
ARK_PKTCHKR_ARG,
static const char * const valid_arguments[] = {
ARK_PKTGEN_ARG,
ARK_PKTCHKR_ARG,
@@
-107,7
+105,7
@@
eth_ark_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
ret = eth_ark_dev_init(eth_dev);
if (ret)
ret = eth_ark_dev_init(eth_dev);
if (ret)
- rte_eth_dev_
pci_release
(eth_dev);
+ rte_eth_dev_
release_port
(eth_dev);
return ret;
}
return ret;
}
@@
-134,7
+132,6
@@
static const struct eth_dev_ops ark_eth_dev_ops = {
.dev_infos_get = eth_ark_dev_info_get,
.rx_queue_setup = eth_ark_dev_rx_queue_setup,
.dev_infos_get = eth_ark_dev_info_get,
.rx_queue_setup = eth_ark_dev_rx_queue_setup,
- .rx_queue_count = eth_ark_dev_rx_queue_count,
.tx_queue_setup = eth_ark_tx_queue_setup,
.link_update = eth_ark_dev_link_update,
.tx_queue_setup = eth_ark_tx_queue_setup,
.link_update = eth_ark_dev_link_update,
@@
-166,26
+163,26
@@
check_for_ext(struct ark_adapter *ark)
const char *dllpath = getenv("ARK_EXT_PATH");
if (dllpath == NULL) {
const char *dllpath = getenv("ARK_EXT_PATH");
if (dllpath == NULL) {
-
PMD_DEBUG_LOG(DEBUG, "ARK
EXT NO dll path specified\n");
+
ARK_PMD_LOG(DEBUG, "
EXT NO dll path specified\n");
return 0;
}
return 0;
}
-
PMD_DRV_LOG(INFO, "ARK
EXT found dll path at %s\n", dllpath);
+
ARK_PMD_LOG(NOTICE, "
EXT found dll path at %s\n", dllpath);
/* Open and load the .so */
ark->d_handle = dlopen(dllpath, RTLD_LOCAL | RTLD_LAZY);
if (ark->d_handle == NULL) {
/* Open and load the .so */
ark->d_handle = dlopen(dllpath, RTLD_LOCAL | RTLD_LAZY);
if (ark->d_handle == NULL) {
-
PMD_DRV
_LOG(ERR, "Could not load user extension %s\n",
+
ARK_PMD
_LOG(ERR, "Could not load user extension %s\n",
dllpath);
return -1;
}
dllpath);
return -1;
}
-
PMD_DRV_LOG(INFO
, "SUCCESS: loaded user extension %s\n",
+
ARK_PMD_LOG(DEBUG
, "SUCCESS: loaded user extension %s\n",
dllpath);
/* Get the entry points */
ark->user_ext.dev_init =
(void *(*)(struct rte_eth_dev *, void *, int))
dlsym(ark->d_handle, "dev_init");
dllpath);
/* Get the entry points */
ark->user_ext.dev_init =
(void *(*)(struct rte_eth_dev *, void *, int))
dlsym(ark->d_handle, "dev_init");
-
PMD_DEBUG
_LOG(DEBUG, "device ext init pointer = %p\n",
+
ARK_PMD
_LOG(DEBUG, "device ext init pointer = %p\n",
ark->user_ext.dev_init);
ark->user_ext.dev_get_port_count =
(int (*)(struct rte_eth_dev *, void *))
ark->user_ext.dev_init);
ark->user_ext.dev_get_port_count =
(int (*)(struct rte_eth_dev *, void *))
@@
-251,7
+248,7
@@
eth_ark_dev_init(struct rte_eth_dev *dev)
ark->eth_dev = dev;
ark->eth_dev = dev;
-
PMD_FUNC
_LOG(DEBUG, "\n");
+
ARK_PMD
_LOG(DEBUG, "\n");
/* Check to see if there is an extension that we need to load */
ret = check_for_ext(ark);
/* Check to see if there is an extension that we need to load */
ret = check_for_ext(ark);
@@
-259,12
+256,11
@@
eth_ark_dev_init(struct rte_eth_dev *dev)
return ret;
pci_dev = RTE_ETH_DEV_TO_PCI(dev);
rte_eth_copy_pci_info(dev, pci_dev);
return ret;
pci_dev = RTE_ETH_DEV_TO_PCI(dev);
rte_eth_copy_pci_info(dev, pci_dev);
+ dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
/* Use dummy function until setup */
dev->rx_pkt_burst = ð_ark_recv_pkts_noop;
dev->tx_pkt_burst = ð_ark_xmit_pkts_noop;
/* Use dummy function until setup */
dev->rx_pkt_burst = ð_ark_recv_pkts_noop;
dev->tx_pkt_burst = ð_ark_xmit_pkts_noop;
- /* Let rte_eth_dev_close() release the port resources */
- dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
ark->bar0 = (uint8_t *)pci_dev->mem_resource[0].addr;
ark->a_bar = (uint8_t *)pci_dev->mem_resource[2].addr;
ark->bar0 = (uint8_t *)pci_dev->mem_resource[0].addr;
ark->a_bar = (uint8_t *)pci_dev->mem_resource[2].addr;
@@
-284,15
+280,15
@@
eth_ark_dev_init(struct rte_eth_dev *dev)
(struct ark_rqpace_t *)(ark->bar0 + ARK_RCPACING_BASE);
ark->started = 0;
(struct ark_rqpace_t *)(ark->bar0 + ARK_RCPACING_BASE);
ark->started = 0;
-
PMD_DEBUG
_LOG(INFO, "Sys Ctrl Const = 0x%x HW Commit_ID: %08x\n",
+
ARK_PMD
_LOG(INFO, "Sys Ctrl Const = 0x%x HW Commit_ID: %08x\n",
ark->sysctrl.t32[4],
rte_be_to_cpu_32(ark->sysctrl.t32[0x20 / 4]));
ark->sysctrl.t32[4],
rte_be_to_cpu_32(ark->sysctrl.t32[0x20 / 4]));
-
PMD_DRV_LOG(INFO
, "Arkville HW Commit_ID: %08x\n",
+
ARK_PMD_LOG(NOTICE
, "Arkville HW Commit_ID: %08x\n",
rte_be_to_cpu_32(ark->sysctrl.t32[0x20 / 4]));
/* If HW sanity test fails, return an error */
if (ark->sysctrl.t32[4] != 0xcafef00d) {
rte_be_to_cpu_32(ark->sysctrl.t32[0x20 / 4]));
/* If HW sanity test fails, return an error */
if (ark->sysctrl.t32[4] != 0xcafef00d) {
-
PMD_DRV
_LOG(ERR,
+
ARK_PMD
_LOG(ERR,
"HW Sanity test has failed, expected constant"
" 0x%x, read 0x%x (%s)\n",
0xcafef00d,
"HW Sanity test has failed, expected constant"
" 0x%x, read 0x%x (%s)\n",
0xcafef00d,
@@
-301,15
+297,15
@@
eth_ark_dev_init(struct rte_eth_dev *dev)
}
if (ark->sysctrl.t32[3] != 0) {
if (ark_rqp_lasped(ark->rqpacing)) {
}
if (ark->sysctrl.t32[3] != 0) {
if (ark_rqp_lasped(ark->rqpacing)) {
-
PMD_DRV
_LOG(ERR, "Arkville Evaluation System - "
+
ARK_PMD
_LOG(ERR, "Arkville Evaluation System - "
"Timer has Expired\n");
return -1;
}
"Timer has Expired\n");
return -1;
}
-
PMD_DRV
_LOG(WARNING, "Arkville Evaluation System - "
+
ARK_PMD
_LOG(WARNING, "Arkville Evaluation System - "
"Timer is Running\n");
}
"Timer is Running\n");
}
-
PMD_DRV_LOG(INFO
,
+
ARK_PMD_LOG(DEBUG
,
"HW Sanity test has PASSED, expected constant"
" 0x%x, read 0x%x (%s)\n",
0xcafef00d, ark->sysctrl.t32[4], __func__);
"HW Sanity test has PASSED, expected constant"
" 0x%x, read 0x%x (%s)\n",
0xcafef00d, ark->sysctrl.t32[4], __func__);
@@
-320,10
+316,11
@@
eth_ark_dev_init(struct rte_eth_dev *dev)
return -1;
dev->dev_ops = &ark_eth_dev_ops;
return -1;
dev->dev_ops = &ark_eth_dev_ops;
+ dev->rx_queue_count = eth_ark_dev_rx_queue_count;
dev->data->mac_addrs = rte_zmalloc("ark", RTE_ETHER_ADDR_LEN, 0);
if (!dev->data->mac_addrs) {
dev->data->mac_addrs = rte_zmalloc("ark", RTE_ETHER_ADDR_LEN, 0);
if (!dev->data->mac_addrs) {
-
PMD_DRV
_LOG(ERR,
+
ARK_PMD
_LOG(ERR,
"Failed to allocated memory for storing mac address"
);
}
"Failed to allocated memory for storing mac address"
);
}
@@
-332,7
+329,7
@@
eth_ark_dev_init(struct rte_eth_dev *dev)
ark->user_data[dev->data->port_id] =
ark->user_ext.dev_init(dev, ark->a_bar, 0);
if (!ark->user_data[dev->data->port_id]) {
ark->user_data[dev->data->port_id] =
ark->user_ext.dev_init(dev, ark->a_bar, 0);
if (!ark->user_data[dev->data->port_id]) {
-
PMD_DRV_LOG(INFO
,
+
ARK_PMD_LOG(WARNING
,
"Failed to initialize PMD extension!"
" continuing without it\n");
memset(&ark->user_ext, 0, sizeof(struct ark_user_ext));
"Failed to initialize PMD extension!"
" continuing without it\n");
memset(&ark->user_ext, 0, sizeof(struct ark_user_ext));
@@
-343,7
+340,7
@@
eth_ark_dev_init(struct rte_eth_dev *dev)
if (pci_dev->device.devargs)
ret = eth_ark_check_args(ark, pci_dev->device.devargs->args);
else
if (pci_dev->device.devargs)
ret = eth_ark_check_args(ark, pci_dev->device.devargs->args);
else
-
PMD_DRV
_LOG(INFO, "No Device args found\n");
+
ARK_PMD
_LOG(INFO, "No Device args found\n");
if (ret)
goto error;
if (ret)
goto error;
@@
-374,7
+371,7
@@
eth_ark_dev_init(struct rte_eth_dev *dev)
/* reserve an ethdev entry */
eth_dev = rte_eth_dev_allocate(name);
if (!eth_dev) {
/* reserve an ethdev entry */
eth_dev = rte_eth_dev_allocate(name);
if (!eth_dev) {
-
PMD_DRV
_LOG(ERR,
+
ARK_PMD
_LOG(ERR,
"Could not allocate eth_dev for port %d\n",
p);
goto error;
"Could not allocate eth_dev for port %d\n",
p);
goto error;
@@
-387,11
+384,12
@@
eth_ark_dev_init(struct rte_eth_dev *dev)
eth_dev->rx_pkt_burst = ark->eth_dev->rx_pkt_burst;
rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->rx_pkt_burst = ark->eth_dev->rx_pkt_burst;
rte_eth_copy_pci_info(eth_dev, pci_dev);
+ eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
eth_dev->data->mac_addrs = rte_zmalloc(name,
RTE_ETHER_ADDR_LEN, 0);
if (!eth_dev->data->mac_addrs) {
eth_dev->data->mac_addrs = rte_zmalloc(name,
RTE_ETHER_ADDR_LEN, 0);
if (!eth_dev->data->mac_addrs) {
-
PMD_DRV
_LOG(ERR,
+
ARK_PMD
_LOG(ERR,
"Memory allocation for MAC failed!"
" Exiting.\n");
goto error;
"Memory allocation for MAC failed!"
" Exiting.\n");
goto error;
@@
-450,7
+448,7
@@
ark_config_device(struct rte_eth_dev *dev)
/* UDM */
if (ark_udm_reset(ark->udm.v)) {
/* UDM */
if (ark_udm_reset(ark->udm.v)) {
-
PMD_DRV
_LOG(ERR, "Unable to stop and reset UDM\n");
+
ARK_PMD
_LOG(ERR, "Unable to stop and reset UDM\n");
return -1;
}
/* Keep in reset until the MPU are cleared */
return -1;
}
/* Keep in reset until the MPU are cleared */
@@
-474,7
+472,7
@@
ark_config_device(struct rte_eth_dev *dev)
/* TX -- DDM */
if (ark_ddm_stop(ark->ddm.v, 1))
/* TX -- DDM */
if (ark_ddm_stop(ark->ddm.v, 1))
-
PMD_DRV
_LOG(ERR, "Unable to stop DDM\n");
+
ARK_PMD
_LOG(ERR, "Unable to stop DDM\n");
mpu = ark->mputx.v;
num_q = ark_api_num_queues(mpu);
mpu = ark->mputx.v;
num_q = ark_api_num_queues(mpu);
@@
-508,16
+506,12
@@
eth_ark_dev_uninit(struct rte_eth_dev *dev)
ark_pktgen_uninit(ark->pg);
ark_pktchkr_uninit(ark->pc);
ark_pktgen_uninit(ark->pg);
ark_pktchkr_uninit(ark->pc);
- dev->dev_ops = NULL;
- dev->rx_pkt_burst = NULL;
- dev->tx_pkt_burst = NULL;
return 0;
}
static int
eth_ark_dev_configure(struct rte_eth_dev *dev)
{
return 0;
}
static int
eth_ark_dev_configure(struct rte_eth_dev *dev)
{
- PMD_FUNC_LOG(DEBUG, "\n");
struct ark_adapter *ark = dev->data->dev_private;
eth_ark_dev_set_link_up(dev);
struct ark_adapter *ark = dev->data->dev_private;
eth_ark_dev_set_link_up(dev);
@@
-547,8
+541,6
@@
eth_ark_dev_start(struct rte_eth_dev *dev)
struct ark_adapter *ark = dev->data->dev_private;
int i;
struct ark_adapter *ark = dev->data->dev_private;
int i;
- PMD_FUNC_LOG(DEBUG, "\n");
-
/* RX Side */
/* start UDM */
ark_udm_start(ark->udm.v);
/* RX Side */
/* start UDM */
ark_udm_start(ark->udm.v);
@@
-578,7
+570,7
@@
eth_ark_dev_start(struct rte_eth_dev *dev)
* This is only used for sanity checking with internal generator
*/
if (pthread_create(&thread, NULL, delay_pg_start, ark)) {
* This is only used for sanity checking with internal generator
*/
if (pthread_create(&thread, NULL, delay_pg_start, ark)) {
-
PMD_DRV
_LOG(ERR, "Could not create pktgen "
+
ARK_PMD
_LOG(ERR, "Could not create pktgen "
"starter thread\n");
return -1;
}
"starter thread\n");
return -1;
}
@@
-591,7
+583,7
@@
eth_ark_dev_start(struct rte_eth_dev *dev)
return 0;
}
return 0;
}
-static
void
+static
int
eth_ark_dev_stop(struct rte_eth_dev *dev)
{
uint16_t i;
eth_ark_dev_stop(struct rte_eth_dev *dev)
{
uint16_t i;
@@
-599,11
+591,10
@@
eth_ark_dev_stop(struct rte_eth_dev *dev)
struct ark_adapter *ark = dev->data->dev_private;
struct ark_mpu_t *mpu;
struct ark_adapter *ark = dev->data->dev_private;
struct ark_mpu_t *mpu;
- PMD_FUNC_LOG(DEBUG, "\n");
-
if (ark->started == 0)
if (ark->started == 0)
- return;
+ return
0
;
ark->started = 0;
ark->started = 0;
+ dev->data->dev_started = 0;
/* Stop the extension first */
if (ark->user_ext.dev_stop)
/* Stop the extension first */
if (ark->user_ext.dev_stop)
@@
-622,7
+613,7
@@
eth_ark_dev_stop(struct rte_eth_dev *dev)
status = eth_ark_tx_queue_stop(dev, i);
if (status != 0) {
uint16_t port = dev->data->port_id;
status = eth_ark_tx_queue_stop(dev, i);
if (status != 0) {
uint16_t port = dev->data->port_id;
-
PMD_DRV
_LOG(ERR,
+
ARK_PMD
_LOG(ERR,
"tx_queue stop anomaly"
" port %u, queue %u\n",
port, i);
"tx_queue stop anomaly"
" port %u, queue %u\n",
port, i);
@@
-637,7
+628,7
@@
eth_ark_dev_stop(struct rte_eth_dev *dev)
break;
}
if (status || i != 0) {
break;
}
if (status || i != 0) {
-
PMD_DRV
_LOG(ERR, "DDM stop anomaly. status:"
+
ARK_PMD
_LOG(ERR, "DDM stop anomaly. status:"
" %d iter: %u. (%s)\n",
status,
i,
" %d iter: %u. (%s)\n",
status,
i,
@@
-659,7
+650,7
@@
eth_ark_dev_stop(struct rte_eth_dev *dev)
break;
}
if (status || i != 0) {
break;
}
if (status || i != 0) {
-
PMD_DRV
_LOG(ERR, "UDM stop anomaly. status %d iter: %u. (%s)\n",
+
ARK_PMD
_LOG(ERR, "UDM stop anomaly. status %d iter: %u. (%s)\n",
status, i, __func__);
ark_udm_dump(ark->udm.v, "Stop anomaly");
status, i, __func__);
ark_udm_dump(ark->udm.v, "Stop anomaly");
@@
-681,14
+672,19
@@
eth_ark_dev_stop(struct rte_eth_dev *dev)
ark_pktchkr_dump_stats(ark->pc);
ark_pktchkr_stop(ark->pc);
}
ark_pktchkr_dump_stats(ark->pc);
ark_pktchkr_stop(ark->pc);
}
+
+ return 0;
}
}
-static
void
+static
int
eth_ark_dev_close(struct rte_eth_dev *dev)
{
struct ark_adapter *ark = dev->data->dev_private;
uint16_t i;
eth_ark_dev_close(struct rte_eth_dev *dev)
{
struct ark_adapter *ark = dev->data->dev_private;
uint16_t i;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
if (ark->user_ext.dev_close)
ark->user_ext.dev_close(dev,
ark->user_data[dev->data->port_id]);
if (ark->user_ext.dev_close)
ark->user_ext.dev_close(dev,
ark->user_data[dev->data->port_id]);
@@
-711,8
+707,7
@@
eth_ark_dev_close(struct rte_eth_dev *dev)
dev->data->rx_queues[i] = 0;
}
dev->data->rx_queues[i] = 0;
}
- rte_free(dev->data->mac_addrs);
- dev->data->mac_addrs = 0;
+ return 0;
}
static int
}
static int
@@
-754,7
+749,7
@@
eth_ark_dev_info_get(struct rte_eth_dev *dev,
static int
eth_ark_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
{
static int
eth_ark_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
{
-
PMD_DEBUG
_LOG(DEBUG, "link status = %d\n",
+
ARK_PMD
_LOG(DEBUG, "link status = %d\n",
dev->data->dev_link.link_status);
struct ark_adapter *ark = dev->data->dev_private;
dev->data->dev_link.link_status);
struct ark_adapter *ark = dev->data->dev_private;
@@
-889,20
+884,20
@@
static inline int
process_pktdir_arg(const char *key, const char *value,
void *extra_args)
{
process_pktdir_arg(const char *key, const char *value,
void *extra_args)
{
-
PMD_FUNC
_LOG(DEBUG, "key = %s, value = %s\n",
+
ARK_PMD
_LOG(DEBUG, "key = %s, value = %s\n",
key, value);
struct ark_adapter *ark =
(struct ark_adapter *)extra_args;
ark->pkt_dir_v = strtol(value, NULL, 16);
key, value);
struct ark_adapter *ark =
(struct ark_adapter *)extra_args;
ark->pkt_dir_v = strtol(value, NULL, 16);
-
PMD_FUNC
_LOG(DEBUG, "pkt_dir_v = 0x%x\n", ark->pkt_dir_v);
+
ARK_PMD
_LOG(DEBUG, "pkt_dir_v = 0x%x\n", ark->pkt_dir_v);
return 0;
}
static inline int
process_file_args(const char *key, const char *value, void *extra_args)
{
return 0;
}
static inline int
process_file_args(const char *key, const char *value, void *extra_args)
{
-
PMD_FUNC
_LOG(DEBUG, "key = %s, value = %s\n",
+
ARK_PMD
_LOG(DEBUG, "key = %s, value = %s\n",
key, value);
char *args = (char *)extra_args;
key, value);
char *args = (char *)extra_args;
@@
-913,7
+908,7
@@
process_file_args(const char *key, const char *value, void *extra_args)
int first = 1;
if (file == NULL) {
int first = 1;
if (file == NULL) {
-
PMD_DRV
_LOG(ERR, "Unable to open "
+
ARK_PMD
_LOG(ERR, "Unable to open "
"config file %s\n", value);
return -1;
}
"config file %s\n", value);
return -1;
}
@@
-921,7
+916,7
@@
process_file_args(const char *key, const char *value, void *extra_args)
while (fgets(line, sizeof(line), file)) {
size += strlen(line);
if (size >= ARK_MAX_ARG_LEN) {
while (fgets(line, sizeof(line), file)) {
size += strlen(line);
if (size >= ARK_MAX_ARG_LEN) {
-
PMD_DRV
_LOG(ERR, "Unable to parse file %s args, "
+
ARK_PMD
_LOG(ERR, "Unable to parse file %s args, "
"parameter list is too long\n", value);
fclose(file);
return -1;
"parameter list is too long\n", value);
fclose(file);
return -1;
@@
-933,7
+928,7
@@
process_file_args(const char *key, const char *value, void *extra_args)
strncat(args, line, ARK_MAX_ARG_LEN);
}
}
strncat(args, line, ARK_MAX_ARG_LEN);
}
}
-
PMD_FUNC
_LOG(DEBUG, "file = %s\n", args);
+
ARK_PMD
_LOG(DEBUG, "file = %s\n", args);
fclose(file);
return 0;
}
fclose(file);
return 0;
}
@@
-955,7
+950,7
@@
eth_ark_check_args(struct ark_adapter *ark, const char *params)
for (k_idx = 0; k_idx < kvlist->count; k_idx++) {
pair = &kvlist->pairs[k_idx];
for (k_idx = 0; k_idx < kvlist->count; k_idx++) {
pair = &kvlist->pairs[k_idx];
-
PMD_FUNC
_LOG(DEBUG, "**** Arg passed to PMD = %s:%s\n",
+
ARK_PMD
_LOG(DEBUG, "**** Arg passed to PMD = %s:%s\n",
pair->key,
pair->value);
}
pair->key,
pair->value);
}
@@
-964,7
+959,7
@@
eth_ark_check_args(struct ark_adapter *ark, const char *params)
ARK_PKTDIR_ARG,
&process_pktdir_arg,
ark) != 0) {
ARK_PKTDIR_ARG,
&process_pktdir_arg,
ark) != 0) {
-
PMD_DRV
_LOG(ERR, "Unable to parse arg %s\n", ARK_PKTDIR_ARG);
+
ARK_PMD
_LOG(ERR, "Unable to parse arg %s\n", ARK_PKTDIR_ARG);
goto free_kvlist;
}
goto free_kvlist;
}
@@
-972,7
+967,7
@@
eth_ark_check_args(struct ark_adapter *ark, const char *params)
ARK_PKTGEN_ARG,
&process_file_args,
ark->pkt_gen_args) != 0) {
ARK_PKTGEN_ARG,
&process_file_args,
ark->pkt_gen_args) != 0) {
-
PMD_DRV
_LOG(ERR, "Unable to parse arg %s\n", ARK_PKTGEN_ARG);
+
ARK_PMD
_LOG(ERR, "Unable to parse arg %s\n", ARK_PKTGEN_ARG);
goto free_kvlist;
}
goto free_kvlist;
}
@@
-980,17
+975,17
@@
eth_ark_check_args(struct ark_adapter *ark, const char *params)
ARK_PKTCHKR_ARG,
&process_file_args,
ark->pkt_chkr_args) != 0) {
ARK_PKTCHKR_ARG,
&process_file_args,
ark->pkt_chkr_args) != 0) {
-
PMD_DRV
_LOG(ERR, "Unable to parse arg %s\n", ARK_PKTCHKR_ARG);
+
ARK_PMD
_LOG(ERR, "Unable to parse arg %s\n", ARK_PKTCHKR_ARG);
goto free_kvlist;
}
goto free_kvlist;
}
-
PMD_DRV
_LOG(INFO, "packet director set to 0x%x\n", ark->pkt_dir_v);
+
ARK_PMD
_LOG(INFO, "packet director set to 0x%x\n", ark->pkt_dir_v);
/* Setup the packet director */
ark_pktdir_setup(ark->pd, ark->pkt_dir_v);
/* Setup the packet generator */
if (ark->pkt_gen_args[0]) {
/* Setup the packet director */
ark_pktdir_setup(ark->pd, ark->pkt_dir_v);
/* Setup the packet generator */
if (ark->pkt_gen_args[0]) {
-
PMD_DRV_LOG(INFO
, "Setting up the packet generator\n");
+
ARK_PMD_LOG(DEBUG
, "Setting up the packet generator\n");
ark_pktgen_parse(ark->pkt_gen_args);
ark_pktgen_reset(ark->pg);
ark_pktgen_setup(ark->pg);
ark_pktgen_parse(ark->pkt_gen_args);
ark_pktgen_reset(ark->pg);
ark_pktgen_setup(ark->pg);
@@
-1018,10
+1013,4
@@
RTE_PMD_REGISTER_PARAM_STRING(net_ark,
ARK_PKTGEN_ARG "=<filename> "
ARK_PKTCHKR_ARG "=<filename> "
ARK_PKTDIR_ARG "=<bitmap>");
ARK_PKTGEN_ARG "=<filename> "
ARK_PKTCHKR_ARG "=<filename> "
ARK_PKTDIR_ARG "=<bitmap>");
-
-RTE_INIT(ark_init_log)
-{
- ark_logtype = rte_log_register("pmd.net.ark");
- if (ark_logtype >= 0)
- rte_log_set_level(ark_logtype, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(ark_logtype, pmd.net.ark, NOTICE);