Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/94335/?format=api
{ "id": 94335, "url": "https://patches.dpdk.org/api/patches/94335/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210617110005.4132926-11-jiawenwu@trustnetic.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210617110005.4132926-11-jiawenwu@trustnetic.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210617110005.4132926-11-jiawenwu@trustnetic.com", "date": "2021-06-17T10:59:56", "name": "[v6,10/19] net/ngbe: support link update", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "84c9a49a0c0ca26bf6338fbb2c0ab816dc41208d", "submitter": { "id": 1932, "url": "https://patches.dpdk.org/api/people/1932/?format=api", "name": "Jiawen Wu", "email": "jiawenwu@trustnetic.com" }, "delegate": { "id": 3961, "url": "https://patches.dpdk.org/api/users/3961/?format=api", "username": "arybchenko", "first_name": "Andrew", "last_name": "Rybchenko", "email": "andrew.rybchenko@oktetlabs.ru" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210617110005.4132926-11-jiawenwu@trustnetic.com/mbox/", "series": [ { "id": 17372, "url": "https://patches.dpdk.org/api/series/17372/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=17372", "date": "2021-06-17T10:59:46", "name": "net: ngbe PMD", "version": 6, "mbox": "https://patches.dpdk.org/series/17372/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/94335/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/94335/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id C54CCA0C4D;\n\tThu, 17 Jun 2021 12:59:25 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 99A2D4114A;\n\tThu, 17 Jun 2021 12:58:29 +0200 (CEST)", "from smtpbg511.qq.com (smtpbg511.qq.com [203.205.250.109])\n by mails.dpdk.org (Postfix) with ESMTP id 9A8D9410E7\n for <dev@dpdk.org>; Thu, 17 Jun 2021 12:58:26 +0200 (CEST)", "from wxdbg.localdomain.com (unknown [183.129.236.74])\n by esmtp6.qq.com (ESMTP) with\n id ; Thu, 17 Jun 2021 18:58:22 +0800 (CST)" ], "X-QQ-mid": "bizesmtp46t1623927503t0ef9w95", "X-QQ-SSF": "01400000000000D0E000B00A0000000", "X-QQ-FEAT": "O02On8uoBFMh3K2p5VxQh9S9yhszNy/17Z4nY7u3b5GyN70Nj7TYAIclU+fQz\n TYKqi/pjIkVhrW1fKtkcnjdUptGV+3ZQsS9pzjgqlELnypHMeuq8DMHG5bqIAUzmupiYp23\n kGjM8AD16iKCYwD4rXIhOv3VYx5MD+PiNfHW6ibQ3D0G7Rh9DOmlv5PRMCrykBWzDqsZp0N\n 2/VcNIjKIEYY8L8I/2YxeRKbec28PAwKDEtoAK/KGPJ7A4/0yzPM+VR+3BPJVeke5R1f0V9\n gAql9E0HUr1XbVTIc0Rau5okOAeDK6cy+CXur8tXGaoj20gjx14JSRvgD8W0pYoKlBd1NTj\n +TeTDcuQd/GMjZpbGk4Q5qBij5DpA==", "X-QQ-GoodBg": "2", "From": "Jiawen Wu <jiawenwu@trustnetic.com>", "To": "dev@dpdk.org", "Cc": "Jiawen Wu <jiawenwu@trustnetic.com>", "Date": "Thu, 17 Jun 2021 18:59:56 +0800", "Message-Id": "<20210617110005.4132926-11-jiawenwu@trustnetic.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20210617110005.4132926-1-jiawenwu@trustnetic.com>", "References": "<20210617110005.4132926-1-jiawenwu@trustnetic.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-QQ-SENDSIZE": "520", "Feedback-ID": "bizesmtp:trustnetic.com:qybgforeign:qybgforeign2", "X-QQ-Bgrelay": "1", "Subject": "[dpdk-dev] [PATCH v6 10/19] net/ngbe: support link update", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Register to handle device interrupt.\n\nSigned-off-by: Jiawen Wu <jiawenwu@trustnetic.com>\n---\n doc/guides/nics/features/ngbe.ini | 3 +\n doc/guides/nics/ngbe.rst | 5 +\n drivers/net/ngbe/base/ngbe_dummy.h | 6 +\n drivers/net/ngbe/base/ngbe_type.h | 11 +\n drivers/net/ngbe/ngbe_ethdev.c | 376 ++++++++++++++++++++++++++++-\n drivers/net/ngbe/ngbe_ethdev.h | 34 +++\n 6 files changed, 434 insertions(+), 1 deletion(-)", "diff": "diff --git a/doc/guides/nics/features/ngbe.ini b/doc/guides/nics/features/ngbe.ini\nindex 977286ac04..291a542a42 100644\n--- a/doc/guides/nics/features/ngbe.ini\n+++ b/doc/guides/nics/features/ngbe.ini\n@@ -4,6 +4,9 @@\n ; Refer to default.ini for the full list of available PMD features.\n ;\n [Features]\n+Speed capabilities = Y\n+Link status = Y\n+Link status event = Y\n Multiprocess aware = Y\n Linux = Y\n ARMv8 = Y\ndiff --git a/doc/guides/nics/ngbe.rst b/doc/guides/nics/ngbe.rst\nindex 54d0665db9..0918cc2918 100644\n--- a/doc/guides/nics/ngbe.rst\n+++ b/doc/guides/nics/ngbe.rst\n@@ -8,6 +8,11 @@ The NGBE PMD (librte_pmd_ngbe) provides poll mode driver support\n for Wangxun 1 Gigabit Ethernet NICs.\n \n \n+Features\n+--------\n+\n+- Link state information\n+\n Prerequisites\n -------------\n \ndiff --git a/drivers/net/ngbe/base/ngbe_dummy.h b/drivers/net/ngbe/base/ngbe_dummy.h\nindex 8462d6d1cb..4273e5af36 100644\n--- a/drivers/net/ngbe/base/ngbe_dummy.h\n+++ b/drivers/net/ngbe/base/ngbe_dummy.h\n@@ -64,6 +64,11 @@ static inline void ngbe_mac_release_swfw_sync_dummy(struct ngbe_hw *TUP0,\n \t\t\t\t\tu32 TUP1)\n {\n }\n+static inline s32 ngbe_mac_check_link_dummy(struct ngbe_hw *TUP0, u32 *TUP1,\n+\t\t\t\t\tbool *TUP3, bool TUP4)\n+{\n+\treturn NGBE_ERR_OPS_DUMMY;\n+}\n static inline s32 ngbe_mac_set_rar_dummy(struct ngbe_hw *TUP0, u32 TUP1,\n \t\t\t\t\tu8 *TUP2, u32 TUP3, u32 TUP4)\n {\n@@ -135,6 +140,7 @@ static inline void ngbe_init_ops_dummy(struct ngbe_hw *hw)\n \thw->mac.get_mac_addr = ngbe_mac_get_mac_addr_dummy;\n \thw->mac.acquire_swfw_sync = ngbe_mac_acquire_swfw_sync_dummy;\n \thw->mac.release_swfw_sync = ngbe_mac_release_swfw_sync_dummy;\n+\thw->mac.check_link = ngbe_mac_check_link_dummy;\n \thw->mac.set_rar = ngbe_mac_set_rar_dummy;\n \thw->mac.clear_rar = ngbe_mac_clear_rar_dummy;\n \thw->mac.set_vmdq = ngbe_mac_set_vmdq_dummy;\ndiff --git a/drivers/net/ngbe/base/ngbe_type.h b/drivers/net/ngbe/base/ngbe_type.h\nindex 517db3380d..04c1cac422 100644\n--- a/drivers/net/ngbe/base/ngbe_type.h\n+++ b/drivers/net/ngbe/base/ngbe_type.h\n@@ -97,6 +97,8 @@ struct ngbe_mac_info {\n \ts32 (*acquire_swfw_sync)(struct ngbe_hw *hw, u32 mask);\n \tvoid (*release_swfw_sync)(struct ngbe_hw *hw, u32 mask);\n \n+\ts32 (*check_link)(struct ngbe_hw *hw, u32 *speed,\n+\t\t\t bool *link_up, bool link_up_wait_to_complete);\n \t/* RAR */\n \ts32 (*set_rar)(struct ngbe_hw *hw, u32 index, u8 *addr, u32 vmdq,\n \t\t\t u32 enable_addr);\n@@ -117,6 +119,7 @@ struct ngbe_mac_info {\n \tu32 num_rar_entries;\n \tu32 max_tx_queues;\n \tu32 max_rx_queues;\n+\tbool get_link_status;\n \tstruct ngbe_thermal_sensor_data thermal_sensor_data;\n \tbool set_lben;\n };\n@@ -142,6 +145,14 @@ struct ngbe_phy_info {\n \tbool reset_disable;\n };\n \n+enum ngbe_isb_idx {\n+\tNGBE_ISB_HEADER,\n+\tNGBE_ISB_MISC,\n+\tNGBE_ISB_VEC0,\n+\tNGBE_ISB_VEC1,\n+\tNGBE_ISB_MAX\n+};\n+\n struct ngbe_hw {\n \tvoid IOMEM *hw_addr;\n \tvoid *back;\ndiff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c\nindex deca64137d..c952023e8b 100644\n--- a/drivers/net/ngbe/ngbe_ethdev.c\n+++ b/drivers/net/ngbe/ngbe_ethdev.c\n@@ -7,12 +7,17 @@\n #include <rte_common.h>\n #include <ethdev_pci.h>\n \n+#include <rte_alarm.h>\n+\n #include \"ngbe_logs.h\"\n #include \"base/ngbe.h\"\n #include \"ngbe_ethdev.h\"\n \n static int ngbe_dev_close(struct rte_eth_dev *dev);\n \n+static void ngbe_dev_interrupt_handler(void *param);\n+static void ngbe_dev_interrupt_delayed_handler(void *param);\n+\n /*\n * The set of PCI devices this driver supports\n */\n@@ -32,6 +37,28 @@ static const struct rte_pci_id pci_id_ngbe_map[] = {\n \t{ .vendor_id = 0, /* sentinel */ },\n };\n \n+static const struct eth_dev_ops ngbe_eth_dev_ops;\n+\n+static inline void\n+ngbe_enable_intr(struct rte_eth_dev *dev)\n+{\n+\tstruct ngbe_interrupt *intr = ngbe_dev_intr(dev);\n+\tstruct ngbe_hw *hw = ngbe_dev_hw(dev);\n+\n+\twr32(hw, NGBE_IENMISC, intr->mask_misc);\n+\twr32(hw, NGBE_IMC(0), intr->mask & BIT_MASK32);\n+\tngbe_flush(hw);\n+}\n+\n+static void\n+ngbe_disable_intr(struct ngbe_hw *hw)\n+{\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\twr32(hw, NGBE_IMS(0), NGBE_IMS_MASK);\n+\tngbe_flush(hw);\n+}\n+\n /*\n * Ensure that all locks are released before first NVM or PHY access\n */\n@@ -60,11 +87,15 @@ eth_ngbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)\n {\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n \tstruct ngbe_hw *hw = ngbe_dev_hw(eth_dev);\n+\tstruct rte_intr_handle *intr_handle = &pci_dev->intr_handle;\n \tconst struct rte_memzone *mz;\n+\tuint32_t ctrl_ext;\n \tint err;\n \n \tPMD_INIT_FUNC_TRACE();\n \n+\teth_dev->dev_ops = &ngbe_eth_dev_ops;\n+\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n \t\treturn 0;\n \n@@ -116,6 +147,9 @@ eth_ngbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)\n \t\treturn -EIO;\n \t}\n \n+\t/* disable interrupt */\n+\tngbe_disable_intr(hw);\n+\n \t/* Allocate memory for storing MAC addresses */\n \teth_dev->data->mac_addrs = rte_zmalloc(\"ngbe\", RTE_ETHER_ADDR_LEN *\n \t\t\t\t\t hw->mac.num_rar_entries, 0);\n@@ -141,6 +175,23 @@ eth_ngbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)\n \t\treturn -ENOMEM;\n \t}\n \n+\tctrl_ext = rd32(hw, NGBE_PORTCTL);\n+\t/* let hardware know driver is loaded */\n+\tctrl_ext |= NGBE_PORTCTL_DRVLOAD;\n+\t/* Set PF Reset Done bit so PF/VF Mail Ops can work */\n+\tctrl_ext |= NGBE_PORTCTL_RSTDONE;\n+\twr32(hw, NGBE_PORTCTL, ctrl_ext);\n+\tngbe_flush(hw);\n+\n+\trte_intr_callback_register(intr_handle,\n+\t\t\t\t ngbe_dev_interrupt_handler, eth_dev);\n+\n+\t/* enable uio/vfio intr/eventfd mapping */\n+\trte_intr_enable(intr_handle);\n+\n+\t/* enable support intr */\n+\tngbe_enable_intr(eth_dev);\n+\n \treturn 0;\n }\n \n@@ -180,11 +231,25 @@ static int eth_ngbe_pci_remove(struct rte_pci_device *pci_dev)\n \n static struct rte_pci_driver rte_ngbe_pmd = {\n \t.id_table = pci_id_ngbe_map,\n-\t.drv_flags = RTE_PCI_DRV_NEED_MAPPING,\n+\t.drv_flags = RTE_PCI_DRV_NEED_MAPPING |\n+\t\t RTE_PCI_DRV_INTR_LSC,\n \t.probe = eth_ngbe_pci_probe,\n \t.remove = eth_ngbe_pci_remove,\n };\n \n+static int\n+ngbe_dev_configure(struct rte_eth_dev *dev)\n+{\n+\tstruct ngbe_interrupt *intr = ngbe_dev_intr(dev);\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\t/* set flag to update link status after init */\n+\tintr->flags |= NGBE_FLAG_NEED_LINK_UPDATE;\n+\n+\treturn 0;\n+}\n+\n /*\n * Reset and stop device.\n */\n@@ -198,6 +263,315 @@ ngbe_dev_close(struct rte_eth_dev *dev)\n \treturn -EINVAL;\n }\n \n+static int\n+ngbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n+{\n+\tRTE_SET_USED(dev);\n+\n+\tdev_info->speed_capa = ETH_LINK_SPEED_1G | ETH_LINK_SPEED_100M |\n+\t\t\t\tETH_LINK_SPEED_10M;\n+\n+\treturn 0;\n+}\n+\n+/* return 0 means link status changed, -1 means not changed */\n+int\n+ngbe_dev_link_update_share(struct rte_eth_dev *dev,\n+\t\t\t int wait_to_complete)\n+{\n+\tstruct ngbe_hw *hw = ngbe_dev_hw(dev);\n+\tstruct rte_eth_link link;\n+\tu32 link_speed = NGBE_LINK_SPEED_UNKNOWN;\n+\tu32 lan_speed = 0;\n+\tstruct ngbe_interrupt *intr = ngbe_dev_intr(dev);\n+\tbool link_up;\n+\tint err;\n+\tint wait = 1;\n+\n+\tmemset(&link, 0, sizeof(link));\n+\tlink.link_status = ETH_LINK_DOWN;\n+\tlink.link_speed = ETH_SPEED_NUM_NONE;\n+\tlink.link_duplex = ETH_LINK_HALF_DUPLEX;\n+\tlink.link_autoneg = !(dev->data->dev_conf.link_speeds &\n+\t\t\t~ETH_LINK_SPEED_AUTONEG);\n+\n+\thw->mac.get_link_status = true;\n+\n+\tif (intr->flags & NGBE_FLAG_NEED_LINK_CONFIG)\n+\t\treturn rte_eth_linkstatus_set(dev, &link);\n+\n+\t/* check if it needs to wait to complete, if lsc interrupt is enabled */\n+\tif (wait_to_complete == 0 || dev->data->dev_conf.intr_conf.lsc != 0)\n+\t\twait = 0;\n+\n+\terr = hw->mac.check_link(hw, &link_speed, &link_up, wait);\n+\n+\tif (err != 0) {\n+\t\tlink.link_speed = ETH_SPEED_NUM_100M;\n+\t\tlink.link_duplex = ETH_LINK_FULL_DUPLEX;\n+\t\treturn rte_eth_linkstatus_set(dev, &link);\n+\t}\n+\n+\tif (!link_up)\n+\t\treturn rte_eth_linkstatus_set(dev, &link);\n+\n+\tintr->flags &= ~NGBE_FLAG_NEED_LINK_CONFIG;\n+\tlink.link_status = ETH_LINK_UP;\n+\tlink.link_duplex = ETH_LINK_FULL_DUPLEX;\n+\n+\tswitch (link_speed) {\n+\tdefault:\n+\tcase NGBE_LINK_SPEED_UNKNOWN:\n+\t\tlink.link_duplex = ETH_LINK_FULL_DUPLEX;\n+\t\tlink.link_speed = ETH_SPEED_NUM_100M;\n+\t\tbreak;\n+\n+\tcase NGBE_LINK_SPEED_10M_FULL:\n+\t\tlink.link_speed = ETH_SPEED_NUM_10M;\n+\t\tlan_speed = 0;\n+\t\tbreak;\n+\n+\tcase NGBE_LINK_SPEED_100M_FULL:\n+\t\tlink.link_speed = ETH_SPEED_NUM_100M;\n+\t\tlan_speed = 1;\n+\t\tbreak;\n+\n+\tcase NGBE_LINK_SPEED_1GB_FULL:\n+\t\tlink.link_speed = ETH_SPEED_NUM_1G;\n+\t\tlan_speed = 2;\n+\t\tbreak;\n+\t}\n+\n+\tif (hw->is_pf) {\n+\t\twr32m(hw, NGBE_LAN_SPEED, NGBE_LAN_SPEED_MASK, lan_speed);\n+\t\tif (link_speed & (NGBE_LINK_SPEED_1GB_FULL |\n+\t\t\tNGBE_LINK_SPEED_100M_FULL | NGBE_LINK_SPEED_10M_FULL)) {\n+\t\t\twr32m(hw, NGBE_MACTXCFG, NGBE_MACTXCFG_SPEED_MASK,\n+\t\t\t\tNGBE_MACTXCFG_SPEED_1G | NGBE_MACTXCFG_TE);\n+\t\t}\n+\t}\n+\n+\treturn rte_eth_linkstatus_set(dev, &link);\n+}\n+\n+static int\n+ngbe_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)\n+{\n+\treturn ngbe_dev_link_update_share(dev, wait_to_complete);\n+}\n+\n+/*\n+ * It reads ICR and sets flag for the link_update.\n+ *\n+ * @param dev\n+ * Pointer to struct rte_eth_dev.\n+ *\n+ * @return\n+ * - On success, zero.\n+ * - On failure, a negative value.\n+ */\n+static int\n+ngbe_dev_interrupt_get_status(struct rte_eth_dev *dev)\n+{\n+\tuint32_t eicr;\n+\tstruct ngbe_hw *hw = ngbe_dev_hw(dev);\n+\tstruct ngbe_interrupt *intr = ngbe_dev_intr(dev);\n+\n+\t/* clear all cause mask */\n+\tngbe_disable_intr(hw);\n+\n+\t/* read-on-clear nic registers here */\n+\teicr = ((u32 *)hw->isb_mem)[NGBE_ISB_MISC];\n+\tPMD_DRV_LOG(DEBUG, \"eicr %x\", eicr);\n+\n+\tintr->flags = 0;\n+\n+\t/* set flag for async link update */\n+\tif (eicr & NGBE_ICRMISC_PHY)\n+\t\tintr->flags |= NGBE_FLAG_NEED_LINK_UPDATE;\n+\n+\tif (eicr & NGBE_ICRMISC_VFMBX)\n+\t\tintr->flags |= NGBE_FLAG_MAILBOX;\n+\n+\tif (eicr & NGBE_ICRMISC_LNKSEC)\n+\t\tintr->flags |= NGBE_FLAG_MACSEC;\n+\n+\tif (eicr & NGBE_ICRMISC_GPIO)\n+\t\tintr->flags |= NGBE_FLAG_NEED_LINK_UPDATE;\n+\n+\treturn 0;\n+}\n+\n+/**\n+ * It gets and then prints the link status.\n+ *\n+ * @param dev\n+ * Pointer to struct rte_eth_dev.\n+ *\n+ * @return\n+ * - On success, zero.\n+ * - On failure, a negative value.\n+ */\n+static void\n+ngbe_dev_link_status_print(struct rte_eth_dev *dev)\n+{\n+\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n+\tstruct rte_eth_link link;\n+\n+\trte_eth_linkstatus_get(dev, &link);\n+\n+\tif (link.link_status == ETH_LINK_UP) {\n+\t\tPMD_INIT_LOG(INFO, \"Port %d: Link Up - speed %u Mbps - %s\",\n+\t\t\t\t\t(int)(dev->data->port_id),\n+\t\t\t\t\t(unsigned int)link.link_speed,\n+\t\t\tlink.link_duplex == ETH_LINK_FULL_DUPLEX ?\n+\t\t\t\t\t\"full-duplex\" : \"half-duplex\");\n+\t} else {\n+\t\tPMD_INIT_LOG(INFO, \" Port %d: Link Down\",\n+\t\t\t\t(int)(dev->data->port_id));\n+\t}\n+\tPMD_INIT_LOG(DEBUG, \"PCI Address: \" PCI_PRI_FMT,\n+\t\t\t\tpci_dev->addr.domain,\n+\t\t\t\tpci_dev->addr.bus,\n+\t\t\t\tpci_dev->addr.devid,\n+\t\t\t\tpci_dev->addr.function);\n+}\n+\n+/*\n+ * It executes link_update after knowing an interrupt occurred.\n+ *\n+ * @param dev\n+ * Pointer to struct rte_eth_dev.\n+ *\n+ * @return\n+ * - On success, zero.\n+ * - On failure, a negative value.\n+ */\n+static int\n+ngbe_dev_interrupt_action(struct rte_eth_dev *dev)\n+{\n+\tstruct ngbe_interrupt *intr = ngbe_dev_intr(dev);\n+\tint64_t timeout;\n+\n+\tPMD_DRV_LOG(DEBUG, \"intr action type %d\", intr->flags);\n+\n+\tif (intr->flags & NGBE_FLAG_NEED_LINK_UPDATE) {\n+\t\tstruct rte_eth_link link;\n+\n+\t\t/*get the link status before link update, for predicting later*/\n+\t\trte_eth_linkstatus_get(dev, &link);\n+\n+\t\tngbe_dev_link_update(dev, 0);\n+\n+\t\t/* likely to up */\n+\t\tif (link.link_status != ETH_LINK_UP)\n+\t\t\t/* handle it 1 sec later, wait it being stable */\n+\t\t\ttimeout = NGBE_LINK_UP_CHECK_TIMEOUT;\n+\t\t/* likely to down */\n+\t\telse\n+\t\t\t/* handle it 4 sec later, wait it being stable */\n+\t\t\ttimeout = NGBE_LINK_DOWN_CHECK_TIMEOUT;\n+\n+\t\tngbe_dev_link_status_print(dev);\n+\t\tif (rte_eal_alarm_set(timeout * 1000,\n+\t\t\t\t ngbe_dev_interrupt_delayed_handler,\n+\t\t\t\t (void *)dev) < 0) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Error setting alarm\");\n+\t\t} else {\n+\t\t\t/* remember original mask */\n+\t\t\tintr->mask_misc_orig = intr->mask_misc;\n+\t\t\t/* only disable lsc interrupt */\n+\t\t\tintr->mask_misc &= ~NGBE_ICRMISC_PHY;\n+\n+\t\t\tintr->mask_orig = intr->mask;\n+\t\t\t/* only disable all misc interrupts */\n+\t\t\tintr->mask &= ~(1ULL << NGBE_MISC_VEC_ID);\n+\t\t}\n+\t}\n+\n+\tPMD_DRV_LOG(DEBUG, \"enable intr immediately\");\n+\tngbe_enable_intr(dev);\n+\n+\treturn 0;\n+}\n+\n+/**\n+ * Interrupt handler which shall be registered for alarm callback for delayed\n+ * handling specific interrupt to wait for the stable nic state. As the\n+ * NIC interrupt state is not stable for ngbe after link is just down,\n+ * it needs to wait 4 seconds to get the stable status.\n+ *\n+ * @param handle\n+ * Pointer to interrupt handle.\n+ * @param param\n+ * The address of parameter (struct rte_eth_dev *) registered before.\n+ *\n+ * @return\n+ * void\n+ */\n+static void\n+ngbe_dev_interrupt_delayed_handler(void *param)\n+{\n+\tstruct rte_eth_dev *dev = (struct rte_eth_dev *)param;\n+\tstruct ngbe_interrupt *intr = ngbe_dev_intr(dev);\n+\tstruct ngbe_hw *hw = ngbe_dev_hw(dev);\n+\tuint32_t eicr;\n+\n+\tngbe_disable_intr(hw);\n+\n+\teicr = ((u32 *)hw->isb_mem)[NGBE_ISB_MISC];\n+\n+\tif (intr->flags & NGBE_FLAG_NEED_LINK_UPDATE) {\n+\t\tngbe_dev_link_update(dev, 0);\n+\t\tintr->flags &= ~NGBE_FLAG_NEED_LINK_UPDATE;\n+\t\tngbe_dev_link_status_print(dev);\n+\t\trte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,\n+\t\t\t\t\t NULL);\n+\t}\n+\n+\tif (intr->flags & NGBE_FLAG_MACSEC) {\n+\t\trte_eth_dev_callback_process(dev, RTE_ETH_EVENT_MACSEC,\n+\t\t\t\t\t NULL);\n+\t\tintr->flags &= ~NGBE_FLAG_MACSEC;\n+\t}\n+\n+\t/* restore original mask */\n+\tintr->mask_misc = intr->mask_misc_orig;\n+\tintr->mask_misc_orig = 0;\n+\tintr->mask = intr->mask_orig;\n+\tintr->mask_orig = 0;\n+\n+\tPMD_DRV_LOG(DEBUG, \"enable intr in delayed handler S[%08x]\", eicr);\n+\tngbe_enable_intr(dev);\n+}\n+\n+/**\n+ * Interrupt handler triggered by NIC for handling\n+ * specific interrupt.\n+ *\n+ * @param handle\n+ * Pointer to interrupt handle.\n+ * @param param\n+ * The address of parameter (struct rte_eth_dev *) registered before.\n+ *\n+ * @return\n+ * void\n+ */\n+static void\n+ngbe_dev_interrupt_handler(void *param)\n+{\n+\tstruct rte_eth_dev *dev = (struct rte_eth_dev *)param;\n+\n+\tngbe_dev_interrupt_get_status(dev);\n+\tngbe_dev_interrupt_action(dev);\n+}\n+\n+static const struct eth_dev_ops ngbe_eth_dev_ops = {\n+\t.dev_configure = ngbe_dev_configure,\n+\t.dev_infos_get = ngbe_dev_info_get,\n+\t.link_update = ngbe_dev_link_update,\n+};\n+\n RTE_PMD_REGISTER_PCI(net_ngbe, rte_ngbe_pmd);\n RTE_PMD_REGISTER_PCI_TABLE(net_ngbe, pci_id_ngbe_map);\n RTE_PMD_REGISTER_KMOD_DEP(net_ngbe, \"* igb_uio | uio_pci_generic | vfio-pci\");\ndiff --git a/drivers/net/ngbe/ngbe_ethdev.h b/drivers/net/ngbe/ngbe_ethdev.h\nindex 87cc1cff6b..b67508a3de 100644\n--- a/drivers/net/ngbe/ngbe_ethdev.h\n+++ b/drivers/net/ngbe/ngbe_ethdev.h\n@@ -6,11 +6,30 @@\n #ifndef _NGBE_ETHDEV_H_\n #define _NGBE_ETHDEV_H_\n \n+/* need update link, bit flag */\n+#define NGBE_FLAG_NEED_LINK_UPDATE (uint32_t)(1 << 0)\n+#define NGBE_FLAG_MAILBOX (uint32_t)(1 << 1)\n+#define NGBE_FLAG_PHY_INTERRUPT (uint32_t)(1 << 2)\n+#define NGBE_FLAG_MACSEC (uint32_t)(1 << 3)\n+#define NGBE_FLAG_NEED_LINK_CONFIG (uint32_t)(1 << 4)\n+\n+#define NGBE_MISC_VEC_ID RTE_INTR_VEC_ZERO_OFFSET\n+\n+/* structure for interrupt relative data */\n+struct ngbe_interrupt {\n+\tuint32_t flags;\n+\tuint32_t mask_misc;\n+\tuint32_t mask_misc_orig; /* save mask during delayed handler */\n+\tuint64_t mask;\n+\tuint64_t mask_orig; /* save mask during delayed handler */\n+};\n+\n /*\n * Structure to store private data for each driver instance (for each port).\n */\n struct ngbe_adapter {\n \tstruct ngbe_hw hw;\n+\tstruct ngbe_interrupt intr;\n };\n \n static inline struct ngbe_adapter *\n@@ -30,6 +49,21 @@ ngbe_dev_hw(struct rte_eth_dev *dev)\n \treturn hw;\n }\n \n+static inline struct ngbe_interrupt *\n+ngbe_dev_intr(struct rte_eth_dev *dev)\n+{\n+\tstruct ngbe_adapter *ad = ngbe_dev_adapter(dev);\n+\tstruct ngbe_interrupt *intr = &ad->intr;\n+\n+\treturn intr;\n+}\n+\n+int\n+ngbe_dev_link_update_share(struct rte_eth_dev *dev,\n+\t\tint wait_to_complete);\n+\n+#define NGBE_LINK_DOWN_CHECK_TIMEOUT 4000 /* ms */\n+#define NGBE_LINK_UP_CHECK_TIMEOUT 1000 /* ms */\n #define NGBE_VMDQ_NUM_UC_MAC 4096 /* Maximum nb. of UC MAC addr. */\n \n #endif /* _NGBE_ETHDEV_H_ */\n", "prefixes": [ "v6", "10/19" ] }