From f231d48d87ba0678685a4f8614f09163357a5b8b Mon Sep 17 00:00:00 2001 From: Rohit Raj Date: Tue, 7 Jul 2020 14:52:29 +0530 Subject: [PATCH] bus/dpaa: enable set link status Enabled set link status API to start/stop phy device from application. Signed-off-by: Rohit Raj Acked-by: Hemant Agrawal --- drivers/bus/dpaa/base/qbman/process.c | 27 +++++++++++++++++ drivers/bus/dpaa/include/process.h | 11 +++++++ drivers/bus/dpaa/rte_bus_dpaa_version.map | 1 + drivers/net/dpaa/dpaa_ethdev.c | 35 ++++++++++++++++------- 4 files changed, 63 insertions(+), 11 deletions(-) diff --git a/drivers/bus/dpaa/base/qbman/process.c b/drivers/bus/dpaa/base/qbman/process.c index 68b7af2435..6f7e37957a 100644 --- a/drivers/bus/dpaa/base/qbman/process.c +++ b/drivers/bus/dpaa/base/qbman/process.c @@ -366,3 +366,30 @@ int dpaa_get_link_status(char *if_name) return args.link_status; } + +#define DPAA_IOCTL_UPDATE_LINK_STATUS \ + _IOW(DPAA_IOCTL_MAGIC, 0x11, struct usdpaa_ioctl_update_link_status_args) + +int dpaa_update_link_status(char *if_name, int link_status) +{ + struct usdpaa_ioctl_update_link_status_args args; + int ret; + + ret = check_fd(); + if (ret) + return ret; + + strcpy(args.if_name, if_name); + args.link_status = link_status; + + ret = ioctl(fd, DPAA_IOCTL_UPDATE_LINK_STATUS, &args); + if (ret) { + if (errno == EINVAL) + printf("Failed to set link status: Not Supported\n"); + else + printf("Failed to set link status"); + return ret; + } + + return 0; +} diff --git a/drivers/bus/dpaa/include/process.h b/drivers/bus/dpaa/include/process.h index 7305762c28..f52ea16358 100644 --- a/drivers/bus/dpaa/include/process.h +++ b/drivers/bus/dpaa/include/process.h @@ -91,7 +91,18 @@ struct usdpaa_ioctl_link_status_args { char if_name[IF_NAME_MAX_LEN]; int link_status; }; + +struct usdpaa_ioctl_update_link_status_args { + /* network device node name */ + char if_name[IF_NAME_MAX_LEN]; + /* link status(ETH_LINK_UP/DOWN) */ + int link_status; +}; + __rte_internal int dpaa_get_link_status(char *if_name); +__rte_internal +int dpaa_update_link_status(char *if_name, int link_status); + #endif /* __PROCESS_H */ diff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map b/drivers/bus/dpaa/rte_bus_dpaa_version.map index 2e8b440a39..77840a5645 100644 --- a/drivers/bus/dpaa/rte_bus_dpaa_version.map +++ b/drivers/bus/dpaa/rte_bus_dpaa_version.map @@ -15,6 +15,7 @@ INTERNAL { dpaa_intr_disable; dpaa_intr_enable; dpaa_svr_family; + dpaa_update_link_status; fman_dealloc_bufs_mask_hi; fman_dealloc_bufs_mask_lo; fman_if_add_mac_addr; diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 3f805b2b0a..3a5b319d43 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -478,18 +478,15 @@ static int dpaa_eth_link_update(struct rte_eth_dev *dev, DPAA_PMD_ERR("invalid link_speed: %s, %d", dpaa_intf->name, fif->mac_type); - ret = dpaa_get_link_status(__fif->node_name); - if (ret < 0) { - if (ret == -EINVAL) { - DPAA_PMD_DEBUG("Using default link status-No Support"); - ret = 1; - } else { - DPAA_PMD_ERR("rte_dpaa_get_link_status %d", ret); + if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) { + ret = dpaa_get_link_status(__fif->node_name); + if (ret < 0) return ret; - } + link->link_status = ret; + } else { + link->link_status = dpaa_intf->valid; } - link->link_status = ret; link->link_duplex = ETH_LINK_FULL_DUPLEX; link->link_autoneg = ETH_LINK_AUTONEG; @@ -985,17 +982,33 @@ dpaa_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id) static int dpaa_link_down(struct rte_eth_dev *dev) { + struct fman_if *fif = dev->process_private; + struct __fman_if *__fif; + PMD_INIT_FUNC_TRACE(); - dpaa_eth_dev_stop(dev); + __fif = container_of(fif, struct __fman_if, __if); + + if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) + dpaa_update_link_status(__fif->node_name, ETH_LINK_DOWN); + else + dpaa_eth_dev_stop(dev); return 0; } static int dpaa_link_up(struct rte_eth_dev *dev) { + struct fman_if *fif = dev->process_private; + struct __fman_if *__fif; + PMD_INIT_FUNC_TRACE(); - dpaa_eth_dev_start(dev); + __fif = container_of(fif, struct __fman_if, __if); + + if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) + dpaa_update_link_status(__fif->node_name, ETH_LINK_UP); + else + dpaa_eth_dev_start(dev); return 0; } -- 2.20.1