net/atlantic: add link status and interrupt management

Implement link interrupt, link info, link polling.

Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: Pavel Belous <pavel.belous@aquantia.com>
This commit is contained in:
Pavel Belous 2018-10-12 11:09:29 +00:00 committed by Ferruh Yigit
parent 2b1472d715
commit 7943ba05f6
5 changed files with 466 additions and 2 deletions

View File

@ -4,6 +4,9 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
Speed capabilities = Y
Link status = Y
Link status event = Y
Queue start/stop = Y
Jumbo frame = Y
CRC offload = Y

View File

@ -18,8 +18,11 @@ static int eth_atl_dev_uninit(struct rte_eth_dev *eth_dev);
static int atl_dev_configure(struct rte_eth_dev *dev);
static int atl_dev_start(struct rte_eth_dev *dev);
static void atl_dev_stop(struct rte_eth_dev *dev);
static int atl_dev_set_link_up(struct rte_eth_dev *dev);
static int atl_dev_set_link_down(struct rte_eth_dev *dev);
static void atl_dev_close(struct rte_eth_dev *dev);
static int atl_dev_reset(struct rte_eth_dev *dev);
static int atl_dev_link_update(struct rte_eth_dev *dev, int wait);
static int atl_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
size_t fw_size);
@ -29,6 +32,16 @@ static void atl_dev_info_get(struct rte_eth_dev *dev,
static const uint32_t *atl_dev_supported_ptypes_get(struct rte_eth_dev *dev);
static void atl_dev_link_status_print(struct rte_eth_dev *dev);
/* Interrupts */
static int atl_dev_rxq_interrupt_setup(struct rte_eth_dev *dev);
static int atl_dev_lsc_interrupt_setup(struct rte_eth_dev *dev, uint8_t on);
static int atl_dev_interrupt_get_status(struct rte_eth_dev *dev);
static int atl_dev_interrupt_action(struct rte_eth_dev *dev,
struct rte_intr_handle *handle);
static void atl_dev_interrupt_handler(void *param);
static int eth_atl_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
struct rte_pci_device *pci_dev);
static int eth_atl_pci_remove(struct rte_pci_device *pci_dev);
@ -70,7 +83,7 @@ static const struct rte_pci_id pci_id_atl_map[] = {
static struct rte_pci_driver rte_atl_pmd = {
.id_table = pci_id_atl_map,
.drv_flags = RTE_PCI_DRV_NEED_MAPPING |
.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |
RTE_PCI_DRV_IOVA_AS_VA,
.probe = eth_atl_pci_probe,
.remove = eth_atl_pci_remove,
@ -107,9 +120,14 @@ static const struct eth_dev_ops atl_eth_dev_ops = {
.dev_configure = atl_dev_configure,
.dev_start = atl_dev_start,
.dev_stop = atl_dev_stop,
.dev_set_link_up = atl_dev_set_link_up,
.dev_set_link_down = atl_dev_set_link_down,
.dev_close = atl_dev_close,
.dev_reset = atl_dev_reset,
/* Link */
.link_update = atl_dev_link_update,
.fw_version_get = atl_fw_version_get,
.dev_infos_get = atl_dev_info_get,
.dev_supported_ptypes_get = atl_dev_supported_ptypes_get,
@ -124,6 +142,9 @@ static const struct eth_dev_ops atl_eth_dev_ops = {
.tx_queue_stop = atl_tx_queue_stop,
.tx_queue_setup = atl_tx_queue_setup,
.tx_queue_release = atl_tx_queue_release,
.rx_queue_intr_enable = atl_dev_rx_queue_intr_enable,
.rx_queue_intr_disable = atl_dev_rx_queue_intr_disable,
};
static inline int32_t
@ -132,12 +153,28 @@ atl_reset_hw(struct aq_hw_s *hw)
return hw_atl_b0_hw_reset(hw);
}
static inline void
atl_enable_intr(struct rte_eth_dev *dev)
{
struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
hw_atl_itr_irq_msk_setlsw_set(hw, 0xffffffff);
}
static void
atl_disable_intr(struct aq_hw_s *hw)
{
PMD_INIT_FUNC_TRACE();
hw_atl_itr_irq_msk_clearlsw_set(hw, 0xffffffff);
}
static int
eth_atl_dev_init(struct rte_eth_dev *eth_dev)
{
struct atl_adapter *adapter =
(struct atl_adapter *)eth_dev->data->dev_private;
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
int err = 0;
@ -160,9 +197,17 @@ eth_atl_dev_init(struct rte_eth_dev *eth_dev)
/* Hardware configuration - hardcode */
adapter->hw_cfg.is_lro = false;
adapter->hw_cfg.wol = false;
adapter->hw_cfg.link_speed_msk = AQ_NIC_RATE_10G |
AQ_NIC_RATE_5G |
AQ_NIC_RATE_2G5 |
AQ_NIC_RATE_1G |
AQ_NIC_RATE_100M;
hw->aq_nic_cfg = &adapter->hw_cfg;
/* disable interrupt */
atl_disable_intr(hw);
/* Allocate memory for storing MAC addresses */
eth_dev->data->mac_addrs = rte_zmalloc("atlantic", ETHER_ADDR_LEN, 0);
if (eth_dev->data->mac_addrs == NULL) {
@ -179,12 +224,23 @@ eth_atl_dev_init(struct rte_eth_dev *eth_dev)
eth_dev->data->mac_addrs->addr_bytes) != 0)
return -EINVAL;
rte_intr_callback_register(intr_handle,
atl_dev_interrupt_handler, eth_dev);
/* enable uio/vfio intr/eventfd mapping */
rte_intr_enable(intr_handle);
/* enable support intr */
atl_enable_intr(eth_dev);
return err;
}
static int
eth_atl_dev_uninit(struct rte_eth_dev *eth_dev)
{
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
struct aq_hw_s *hw;
PMD_INIT_FUNC_TRACE();
@ -201,6 +257,11 @@ eth_atl_dev_uninit(struct rte_eth_dev *eth_dev)
eth_dev->rx_pkt_burst = NULL;
eth_dev->tx_pkt_burst = NULL;
/* disable uio intr before callback unregister */
rte_intr_disable(intr_handle);
rte_intr_callback_unregister(intr_handle,
atl_dev_interrupt_handler, eth_dev);
rte_free(eth_dev->data->mac_addrs);
eth_dev->data->mac_addrs = NULL;
@ -222,8 +283,16 @@ eth_atl_pci_remove(struct rte_pci_device *pci_dev)
}
static int
atl_dev_configure(struct rte_eth_dev *dev __rte_unused)
atl_dev_configure(struct rte_eth_dev *dev)
{
struct atl_interrupt *intr =
ATL_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
PMD_INIT_FUNC_TRACE();
/* set flag to update link status after init */
intr->flags |= ATL_FLAG_NEED_LINK_UPDATE;
return 0;
}
@ -235,6 +304,11 @@ static int
atl_dev_start(struct rte_eth_dev *dev)
{
struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
uint32_t intr_vector = 0;
uint32_t *link_speeds;
uint32_t speed = 0;
int status;
int err;
@ -243,6 +317,16 @@ atl_dev_start(struct rte_eth_dev *dev)
/* set adapter started */
hw->adapter_stopped = 0;
if (dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED) {
PMD_INIT_LOG(ERR,
"Invalid link_speeds for port %u, fix speed not supported",
dev->data->port_id);
return -EINVAL;
}
/* disable uio/vfio intr/eventfd mapping */
rte_intr_disable(intr_handle);
/* reinitialize adapter
* this calls reset and start
*/
@ -253,6 +337,32 @@ atl_dev_start(struct rte_eth_dev *dev)
err = hw_atl_b0_hw_init(hw, dev->data->mac_addrs->addr_bytes);
hw_atl_b0_hw_start(hw);
/* check and configure queue intr-vector mapping */
if ((rte_intr_cap_multiple(intr_handle) ||
!RTE_ETH_DEV_SRIOV(dev).active) &&
dev->data->dev_conf.intr_conf.rxq != 0) {
intr_vector = dev->data->nb_rx_queues;
if (intr_vector > ATL_MAX_INTR_QUEUE_NUM) {
PMD_INIT_LOG(ERR, "At most %d intr queues supported",
ATL_MAX_INTR_QUEUE_NUM);
return -ENOTSUP;
}
if (rte_intr_efd_enable(intr_handle, intr_vector)) {
PMD_INIT_LOG(ERR, "rte_intr_efd_enable failed");
return -1;
}
}
if (rte_intr_dp_is_en(intr_handle) && !intr_handle->intr_vec) {
intr_handle->intr_vec = rte_zmalloc("intr_vec",
dev->data->nb_rx_queues * sizeof(int), 0);
if (intr_handle->intr_vec == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate %d rx_queues"
" intr_vec", dev->data->nb_rx_queues);
return -ENOMEM;
}
}
/* initialize transmission unit */
atl_tx_init(dev);
@ -275,6 +385,61 @@ atl_dev_start(struct rte_eth_dev *dev)
goto error;
}
err = hw->aq_fw_ops->update_link_status(hw);
if (err)
goto error;
dev->data->dev_link.link_status = hw->aq_link_status.mbps != 0;
link_speeds = &dev->data->dev_conf.link_speeds;
speed = 0x0;
if (*link_speeds == ETH_LINK_SPEED_AUTONEG) {
speed = hw->aq_nic_cfg->link_speed_msk;
} else {
if (*link_speeds & ETH_LINK_SPEED_10G)
speed |= AQ_NIC_RATE_10G;
if (*link_speeds & ETH_LINK_SPEED_5G)
speed |= AQ_NIC_RATE_5G;
if (*link_speeds & ETH_LINK_SPEED_1G)
speed |= AQ_NIC_RATE_1G;
if (*link_speeds & ETH_LINK_SPEED_2_5G)
speed |= AQ_NIC_RATE_2G5;
if (*link_speeds & ETH_LINK_SPEED_100M)
speed |= AQ_NIC_RATE_100M;
}
err = hw->aq_fw_ops->set_link_speed(hw, speed);
if (err)
goto error;
if (rte_intr_allow_others(intr_handle)) {
/* check if lsc interrupt is enabled */
if (dev->data->dev_conf.intr_conf.lsc != 0)
atl_dev_lsc_interrupt_setup(dev, true);
else
atl_dev_lsc_interrupt_setup(dev, false);
} else {
rte_intr_callback_unregister(intr_handle,
atl_dev_interrupt_handler, dev);
if (dev->data->dev_conf.intr_conf.lsc != 0)
PMD_INIT_LOG(INFO, "lsc won't enable because of"
" no intr multiplex");
}
/* check if rxq interrupt is enabled */
if (dev->data->dev_conf.intr_conf.rxq != 0 &&
rte_intr_dp_is_en(intr_handle))
atl_dev_rxq_interrupt_setup(dev);
/* enable uio/vfio intr/eventfd mapping */
rte_intr_enable(intr_handle);
/* resume enabled intr since hw reset */
atl_enable_intr(dev);
return 0;
error:
@ -288,8 +453,16 @@ error:
static void
atl_dev_stop(struct rte_eth_dev *dev)
{
struct rte_eth_link link;
struct aq_hw_s *hw =
ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
PMD_INIT_FUNC_TRACE();
/* disable interrupts */
atl_disable_intr(hw);
/* reset the NIC */
atl_reset_hw(hw);
@ -300,6 +473,46 @@ atl_dev_stop(struct rte_eth_dev *dev)
/* Clear stored conf */
dev->data->scattered_rx = 0;
dev->data->lro = 0;
/* Clear recorded link status */
memset(&link, 0, sizeof(link));
rte_eth_linkstatus_set(dev, &link);
if (!rte_intr_allow_others(intr_handle))
/* resume to the default handler */
rte_intr_callback_register(intr_handle,
atl_dev_interrupt_handler,
(void *)dev);
/* Clean datapath event and queue/vec mapping */
rte_intr_efd_disable(intr_handle);
if (intr_handle->intr_vec != NULL) {
rte_free(intr_handle->intr_vec);
intr_handle->intr_vec = NULL;
}
}
/*
* Set device link up: enable tx.
*/
static int
atl_dev_set_link_up(struct rte_eth_dev *dev)
{
struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
return hw->aq_fw_ops->set_link_speed(hw,
hw->aq_nic_cfg->link_speed_msk);
}
/*
* Set device link down: disable tx.
*/
static int
atl_dev_set_link_down(struct rte_eth_dev *dev)
{
struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
return hw->aq_fw_ops->set_link_speed(hw, 0);
}
/*
@ -383,6 +596,11 @@ atl_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
dev_info->rx_desc_lim = rx_desc_lim;
dev_info->tx_desc_lim = tx_desc_lim;
dev_info->speed_capa = ETH_LINK_SPEED_1G | ETH_LINK_SPEED_10G;
dev_info->speed_capa |= ETH_LINK_SPEED_100M;
dev_info->speed_capa |= ETH_LINK_SPEED_2_5G;
dev_info->speed_capa |= ETH_LINK_SPEED_5G;
}
static const uint32_t *
@ -407,6 +625,195 @@ atl_dev_supported_ptypes_get(struct rte_eth_dev *dev)
return NULL;
}
/* return 0 means link status changed, -1 means not changed */
static int
atl_dev_link_update(struct rte_eth_dev *dev, int wait __rte_unused)
{
struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct atl_interrupt *intr =
ATL_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
struct rte_eth_link link, old;
int err = 0;
link.link_status = ETH_LINK_DOWN;
link.link_speed = 0;
link.link_duplex = ETH_LINK_FULL_DUPLEX;
link.link_autoneg = hw->is_autoneg ? ETH_LINK_AUTONEG : ETH_LINK_FIXED;
memset(&old, 0, sizeof(old));
/* load old link status */
rte_eth_linkstatus_get(dev, &old);
/* read current link status */
err = hw->aq_fw_ops->update_link_status(hw);
if (err)
return 0;
if (hw->aq_link_status.mbps == 0) {
/* write default (down) link status */
rte_eth_linkstatus_set(dev, &link);
if (link.link_status == old.link_status)
return -1;
return 0;
}
intr->flags &= ~ATL_FLAG_NEED_LINK_CONFIG;
link.link_status = ETH_LINK_UP;
link.link_duplex = ETH_LINK_FULL_DUPLEX;
link.link_speed = hw->aq_link_status.mbps;
rte_eth_linkstatus_set(dev, &link);
if (link.link_status == old.link_status)
return -1;
return 0;
}
/**
* It clears the interrupt causes and enables the interrupt.
* It will be called once only during nic initialized.
*
* @param dev
* Pointer to struct rte_eth_dev.
* @param on
* Enable or Disable.
*
* @return
* - On success, zero.
* - On failure, a negative value.
*/
static int
atl_dev_lsc_interrupt_setup(struct rte_eth_dev *dev, uint8_t on __rte_unused)
{
atl_dev_link_status_print(dev);
return 0;
}
static int
atl_dev_rxq_interrupt_setup(struct rte_eth_dev *dev __rte_unused)
{
return 0;
}
static int
atl_dev_interrupt_get_status(struct rte_eth_dev *dev)
{
struct atl_interrupt *intr =
ATL_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
u64 cause = 0;
hw_atl_b0_hw_irq_read(hw, &cause);
atl_disable_intr(hw);
intr->flags = cause & BIT(ATL_IRQ_CAUSE_LINK) ?
ATL_FLAG_NEED_LINK_UPDATE : 0;
return 0;
}
/**
* It gets and then prints the link status.
*
* @param dev
* Pointer to struct rte_eth_dev.
*
* @return
* - On success, zero.
* - On failure, a negative value.
*/
static void
atl_dev_link_status_print(struct rte_eth_dev *dev)
{
struct rte_eth_link link;
memset(&link, 0, sizeof(link));
rte_eth_linkstatus_get(dev, &link);
if (link.link_status) {
PMD_DRV_LOG(INFO, "Port %d: Link Up - speed %u Mbps - %s",
(int)(dev->data->port_id),
(unsigned int)link.link_speed,
link.link_duplex == ETH_LINK_FULL_DUPLEX ?
"full-duplex" : "half-duplex");
} else {
PMD_DRV_LOG(INFO, " Port %d: Link Down",
(int)(dev->data->port_id));
}
#ifdef DEBUG
{
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
PMD_DRV_LOG(DEBUG, "PCI Address: " PCI_PRI_FMT,
pci_dev->addr.domain,
pci_dev->addr.bus,
pci_dev->addr.devid,
pci_dev->addr.function);
}
#endif
PMD_DRV_LOG(INFO, "Link speed:%d", link.link_speed);
}
/*
* It executes link_update after knowing an interrupt occurred.
*
* @param dev
* Pointer to struct rte_eth_dev.
*
* @return
* - On success, zero.
* - On failure, a negative value.
*/
static int
atl_dev_interrupt_action(struct rte_eth_dev *dev,
struct rte_intr_handle *intr_handle)
{
struct atl_interrupt *intr =
ATL_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
if (intr->flags & ATL_FLAG_NEED_LINK_UPDATE) {
atl_dev_link_update(dev, 0);
intr->flags &= ~ATL_FLAG_NEED_LINK_UPDATE;
atl_dev_link_status_print(dev);
_rte_eth_dev_callback_process(dev,
RTE_ETH_EVENT_INTR_LSC, NULL);
}
atl_enable_intr(dev);
rte_intr_enable(intr_handle);
return 0;
}
/**
* Interrupt handler triggered by NIC for handling
* specific interrupt.
*
* @param handle
* Pointer to interrupt handle.
* @param param
* The address of parameter (struct rte_eth_dev *) regsitered before.
*
* @return
* void
*/
static void
atl_dev_interrupt_handler(void *param)
{
struct rte_eth_dev *dev = (struct rte_eth_dev *)param;
atl_dev_interrupt_get_status(dev);
atl_dev_interrupt_action(dev, dev->intr_handle);
}
RTE_PMD_REGISTER_PCI(net_atlantic, rte_atl_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_atlantic, pci_id_atl_map);
RTE_PMD_REGISTER_KMOD_DEP(net_atlantic, "* igb_uio | uio_pci_generic");

View File

@ -16,6 +16,16 @@
#define ATL_DEV_TO_ADAPTER(dev) \
((struct atl_adapter *)(dev)->data->dev_private)
#define ATL_DEV_PRIVATE_TO_INTR(adapter) \
(&((struct atl_adapter *)adapter)->intr)
#define ATL_FLAG_NEED_LINK_UPDATE (uint32_t)(1 << 0)
#define ATL_FLAG_NEED_LINK_CONFIG (uint32_t)(4 << 0)
struct atl_interrupt {
uint32_t flags;
uint32_t mask;
};
/*
* Structure to store private data for each driver instance (for each port).
@ -23,6 +33,7 @@
struct atl_adapter {
struct aq_hw_s hw;
struct aq_hw_cfg_s hw_cfg;
struct atl_interrupt intr;
};
/*
@ -40,6 +51,11 @@ int atl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
uint16_t nb_tx_desc, unsigned int socket_id,
const struct rte_eth_txconf *tx_conf);
int atl_dev_rx_queue_intr_enable(struct rte_eth_dev *eth_dev,
uint16_t queue_id);
int atl_dev_rx_queue_intr_disable(struct rte_eth_dev *eth_dev,
uint16_t queue_id);
int atl_rx_init(struct rte_eth_dev *dev);
int atl_tx_init(struct rte_eth_dev *dev);

View File

@ -651,6 +651,42 @@ atl_stop_queues(struct rte_eth_dev *dev)
return 0;
}
static int
atl_rx_enable_intr(struct rte_eth_dev *dev, uint16_t queue_id, bool enable)
{
struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct atl_rx_queue *rxq;
PMD_INIT_FUNC_TRACE();
if (queue_id >= dev->data->nb_rx_queues) {
PMD_DRV_LOG(ERR, "Invalid RX queue id=%d", queue_id);
return -EINVAL;
}
rxq = dev->data->rx_queues[queue_id];
if (rxq == NULL)
return 0;
/* Mapping interrupt vector */
hw_atl_itr_irq_map_en_rx_set(hw, enable, queue_id);
return 0;
}
int
atl_dev_rx_queue_intr_enable(struct rte_eth_dev *eth_dev, uint16_t queue_id)
{
return atl_rx_enable_intr(eth_dev, queue_id, true);
}
int
atl_dev_rx_queue_intr_disable(struct rte_eth_dev *eth_dev, uint16_t queue_id)
{
return atl_rx_enable_intr(eth_dev, queue_id, false);
}
uint16_t
atl_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)

View File

@ -86,11 +86,13 @@ struct aq_hw_s {
void *mmio;
struct aq_hw_link_status_s aq_link_status;
bool is_autoneg;
struct hw_aq_atl_utils_mbox mbox;
struct hw_atl_stats_s last_stats;
struct aq_stats_s curr_stats;
u64 speed;
unsigned int chip_features;
u32 fw_ver_actual;
u32 mbox_addr;