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 void eth_ark_dev_info_get(struct rte_eth_dev *dev,
- struct rte_eth_dev_info *dev_info);
+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,
int wait_to_complete);
static int eth_ark_dev_set_link_up(struct rte_eth_dev *dev);
static int eth_ark_dev_set_link_down(struct rte_eth_dev *dev);
static int eth_ark_dev_stats_get(struct rte_eth_dev *dev,
struct rte_eth_stats *stats);
-static void eth_ark_dev_stats_reset(struct rte_eth_dev *dev);
+static int eth_ark_dev_stats_reset(struct rte_eth_dev *dev);
static int eth_ark_set_default_mac_addr(struct rte_eth_dev *dev,
- struct ether_addr *mac_addr);
+ struct rte_ether_addr *mac_addr);
static int eth_ark_macaddr_add(struct rte_eth_dev *dev,
- struct ether_addr *mac_addr,
+ struct rte_ether_addr *mac_addr,
uint32_t index,
uint32_t pool);
static void eth_ark_macaddr_remove(struct rte_eth_dev *dev,
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;
}
.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,
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;
}
- 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) {
- 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;
}
- 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");
- 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 *))
(void (*)(struct rte_eth_dev *, void *))
dlsym(ark->d_handle, "stats_reset");
ark->user_ext.mac_addr_add =
- (void (*)(struct rte_eth_dev *, struct ether_addr *, uint32_t,
- uint32_t, void *))
+ (void (*)(struct rte_eth_dev *, struct rte_ether_addr *,
+ uint32_t, uint32_t, void *))
dlsym(ark->d_handle, "mac_addr_add");
ark->user_ext.mac_addr_remove =
(void (*)(struct rte_eth_dev *, uint32_t, void *))
dlsym(ark->d_handle, "mac_addr_remove");
ark->user_ext.mac_addr_set =
- (void (*)(struct rte_eth_dev *, struct ether_addr *,
+ (void (*)(struct rte_eth_dev *, struct rte_ether_addr *,
void *))
dlsym(ark->d_handle, "mac_addr_set");
ark->user_ext.set_mtu =
static int
eth_ark_dev_init(struct rte_eth_dev *dev)
{
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
struct rte_pci_device *pci_dev;
int ret;
int port_count = 1;
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);
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;
(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]));
- 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) {
- PMD_DRV_LOG(ERR,
+ ARK_PMD_LOG(ERR,
"HW Sanity test has failed, expected constant"
" 0x%x, read 0x%x (%s)\n",
0xcafef00d,
}
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;
}
- PMD_DRV_LOG(WARNING, "Arkville Evaluation System - "
+ ARK_PMD_LOG(WARNING, "Arkville Evaluation System - "
"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__);
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", ETHER_ADDR_LEN, 0);
+ 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"
);
}
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));
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;
/* 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;
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, ETHER_ADDR_LEN, 0);
+ 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;
return ret;
- error:
- if (dev->data->mac_addrs)
- rte_free(dev->data->mac_addrs);
+error:
+ rte_free(dev->data->mac_addrs);
+ dev->data->mac_addrs = NULL;
return -1;
}
static int
ark_config_device(struct rte_eth_dev *dev)
{
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
uint16_t num_q, i;
struct ark_mpu_t *mpu;
/* 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 */
/* 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);
static int
eth_ark_dev_uninit(struct rte_eth_dev *dev)
{
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
ark_pktgen_uninit(ark->pg);
ark_pktchkr_uninit(ark->pc);
- dev->dev_ops = NULL;
- dev->rx_pkt_burst = NULL;
- dev->tx_pkt_burst = NULL;
- rte_free(dev->data->mac_addrs);
return 0;
}
static int
eth_ark_dev_configure(struct rte_eth_dev *dev)
{
- PMD_FUNC_LOG(DEBUG, "\n");
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
eth_ark_dev_set_link_up(dev);
if (ark->user_ext.dev_configure)
static int
eth_ark_dev_start(struct rte_eth_dev *dev)
{
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ 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);
* 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;
}
return 0;
}
-static void
+static int
eth_ark_dev_stop(struct rte_eth_dev *dev)
{
uint16_t i;
int status;
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
struct ark_mpu_t *mpu;
- PMD_FUNC_LOG(DEBUG, "\n");
-
if (ark->started == 0)
- return;
+ return 0;
ark->started = 0;
+ dev->data->dev_started = 0;
/* Stop the extension first */
if (ark->user_ext.dev_stop)
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);
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,
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");
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 =
- (struct ark_adapter *)dev->data->dev_private;
+ 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]);
eth_ark_dev_rx_queue_release(dev->data->rx_queues[i]);
dev->data->rx_queues[i] = 0;
}
+
+ return 0;
}
-static void
+static int
eth_ark_dev_info_get(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info)
{
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
struct ark_mpu_t *tx_mpu = RTE_PTR_ADD(ark->bar0, ARK_MPU_TX_BASE);
struct ark_mpu_t *rx_mpu = RTE_PTR_ADD(ark->bar0, ARK_MPU_RX_BASE);
uint16_t ports = ark->num_ports;
ETH_LINK_SPEED_40G |
ETH_LINK_SPEED_50G |
ETH_LINK_SPEED_100G);
+
+ return 0;
}
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 =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
if (ark->user_ext.link_update) {
return ark->user_ext.link_update
eth_ark_dev_set_link_up(struct rte_eth_dev *dev)
{
dev->data->dev_link.link_status = 1;
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
if (ark->user_ext.dev_set_link_up)
return ark->user_ext.dev_set_link_up(dev,
eth_ark_dev_set_link_down(struct rte_eth_dev *dev)
{
dev->data->dev_link.link_status = 0;
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
if (ark->user_ext.dev_set_link_down)
return ark->user_ext.dev_set_link_down(dev,
eth_ark_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
{
uint16_t i;
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
stats->ipackets = 0;
stats->ibytes = 0;
return 0;
}
-static void
+static int
eth_ark_dev_stats_reset(struct rte_eth_dev *dev)
{
uint16_t i;
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
for (i = 0; i < dev->data->nb_tx_queues; i++)
eth_tx_queue_stats_reset(dev->data->tx_queues[i]);
if (ark->user_ext.stats_reset)
ark->user_ext.stats_reset(dev,
ark->user_data[dev->data->port_id]);
+
+ return 0;
}
static int
eth_ark_macaddr_add(struct rte_eth_dev *dev,
- struct ether_addr *mac_addr,
+ struct rte_ether_addr *mac_addr,
uint32_t index,
uint32_t pool)
{
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
if (ark->user_ext.mac_addr_add) {
ark->user_ext.mac_addr_add(dev,
static void
eth_ark_macaddr_remove(struct rte_eth_dev *dev, uint32_t index)
{
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
if (ark->user_ext.mac_addr_remove)
ark->user_ext.mac_addr_remove(dev, index,
static int
eth_ark_set_default_mac_addr(struct rte_eth_dev *dev,
- struct ether_addr *mac_addr)
+ struct rte_ether_addr *mac_addr)
{
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
if (ark->user_ext.mac_addr_set) {
ark->user_ext.mac_addr_set(dev, mac_addr,
static int
eth_ark_set_mtu(struct rte_eth_dev *dev, uint16_t size)
{
- struct ark_adapter *ark =
- (struct ark_adapter *)dev->data->dev_private;
+ struct ark_adapter *ark = dev->data->dev_private;
if (ark->user_ext.set_mtu)
return ark->user_ext.set_mtu(dev, size,
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);
- 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)
{
- 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;
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;
}
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;
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;
}
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);
}
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;
}
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;
}
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;
}
- 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]) {
- 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_ARG "=<filename> "
ARK_PKTCHKR_ARG "=<filename> "
ARK_PKTDIR_ARG "=<bitmap>");
+RTE_LOG_REGISTER(ark_logtype, pmd.net.ark, NOTICE);
git.droids-corp.org / dpdk.git / blobdiff