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
net/hns3: support PF device with copper PHYs
[dpdk.git]
/
drivers
/
net
/
liquidio
/
lio_ethdev.c
diff --git
a/drivers/net/liquidio/lio_ethdev.c
b/drivers/net/liquidio/lio_ethdev.c
index
1b01502
..
0b189d5
100644
(file)
--- a/
drivers/net/liquidio/lio_ethdev.c
+++ b/
drivers/net/liquidio/lio_ethdev.c
@@
-3,8
+3,8
@@
*/
#include <rte_string_fns.h>
*/
#include <rte_string_fns.h>
-#include <
rte_
ethdev_driver.h>
-#include <
rte_
ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
#include <rte_cycles.h>
#include <rte_malloc.h>
#include <rte_alarm.h>
#include <rte_cycles.h>
#include <rte_malloc.h>
#include <rte_alarm.h>
@@
-481,7
+481,7
@@
lio_dev_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
return -1;
}
return -1;
}
- if (frame_len >
RTE_ETHER
_MAX_LEN)
+ if (frame_len >
LIO_ETH
_MAX_LEN)
eth_dev->data->dev_conf.rxmode.offloads |=
DEV_RX_OFFLOAD_JUMBO_FRAME;
else
eth_dev->data->dev_conf.rxmode.offloads |=
DEV_RX_OFFLOAD_JUMBO_FRAME;
else
@@
-1465,7
+1465,7
@@
dev_lsc_handle_error:
}
/* Stop device and disable input/output functions */
}
/* Stop device and disable input/output functions */
-static
void
+static
int
lio_dev_stop(struct rte_eth_dev *eth_dev)
{
struct lio_device *lio_dev = LIO_DEV(eth_dev);
lio_dev_stop(struct rte_eth_dev *eth_dev)
{
struct lio_device *lio_dev = LIO_DEV(eth_dev);
@@
-1484,6
+1484,8
@@
lio_dev_stop(struct rte_eth_dev *eth_dev)
/* Clear recorded link status */
lio_dev->linfo.link.link_status64 = 0;
/* Clear recorded link status */
lio_dev->linfo.link.link_status64 = 0;
+
+ return 0;
}
static int
}
static int
@@
-1555,6
+1557,7
@@
static int
lio_dev_close(struct rte_eth_dev *eth_dev)
{
struct lio_device *lio_dev = LIO_DEV(eth_dev);
lio_dev_close(struct rte_eth_dev *eth_dev)
{
struct lio_device *lio_dev = LIO_DEV(eth_dev);
+ int ret = 0;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
@@
-1562,7
+1565,7
@@
lio_dev_close(struct rte_eth_dev *eth_dev)
lio_dev_info(lio_dev, "closing port %d\n", eth_dev->data->port_id);
if (lio_dev->intf_open)
lio_dev_info(lio_dev, "closing port %d\n", eth_dev->data->port_id);
if (lio_dev->intf_open)
- lio_dev_stop(eth_dev);
+
ret =
lio_dev_stop(eth_dev);
/* Reset ioq regs */
lio_dev->fn_list.setup_device_regs(lio_dev);
/* Reset ioq regs */
lio_dev->fn_list.setup_device_regs(lio_dev);
@@
-1586,7
+1589,7
@@
lio_dev_close(struct rte_eth_dev *eth_dev)
/* Delete all queues */
lio_dev_clear_queues(eth_dev);
/* Delete all queues */
lio_dev_clear_queues(eth_dev);
- return
0
;
+ return
ret
;
}
/**
}
/**
@@
-1704,6
+1707,7
@@
static int
lio_reconf_queues(struct rte_eth_dev *eth_dev, int num_txq, int num_rxq)
{
struct lio_device *lio_dev = LIO_DEV(eth_dev);
lio_reconf_queues(struct rte_eth_dev *eth_dev, int num_txq, int num_rxq)
{
struct lio_device *lio_dev = LIO_DEV(eth_dev);
+ int ret;
if (lio_dev->nb_rx_queues != num_rxq ||
lio_dev->nb_tx_queues != num_txq) {
if (lio_dev->nb_rx_queues != num_rxq ||
lio_dev->nb_tx_queues != num_txq) {
@@
-1713,8
+1717,11
@@
lio_reconf_queues(struct rte_eth_dev *eth_dev, int num_txq, int num_rxq)
lio_dev->nb_tx_queues = num_txq;
}
lio_dev->nb_tx_queues = num_txq;
}
- if (lio_dev->intf_open)
- lio_dev_stop(eth_dev);
+ if (lio_dev->intf_open) {
+ ret = lio_dev_stop(eth_dev);
+ if (ret != 0)
+ return ret;
+ }
/* Reset ioq registers */
if (lio_dev->fn_list.setup_device_regs(lio_dev)) {
/* Reset ioq registers */
if (lio_dev->fn_list.setup_device_regs(lio_dev)) {
@@
-2087,6
+2094,7
@@
lio_eth_dev_init(struct rte_eth_dev *eth_dev)
return 0;
rte_eth_copy_pci_info(eth_dev, pdev);
return 0;
rte_eth_copy_pci_info(eth_dev, pdev);
+ eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
if (pdev->mem_resource[0].addr) {
lio_dev->hw_addr = pdev->mem_resource[0].addr;
if (pdev->mem_resource[0].addr) {
lio_dev->hw_addr = pdev->mem_resource[0].addr;