Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/89222/?format=api
{ "id": 89222, "url": "https://patches.dpdk.org/api/patches/89222/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210316105149.110904-7-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": "<20210316105149.110904-7-jiawenwu@trustnetic.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210316105149.110904-7-jiawenwu@trustnetic.com", "date": "2021-03-16T10:51:48", "name": "[v2,6/7] net/txgbe: handle AN interrupt and link update", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "12f3b9ac3ee06570ff14ec13d58b240f8ade3b57", "submitter": { "id": 1932, "url": "https://patches.dpdk.org/api/people/1932/?format=api", "name": "Jiawen Wu", "email": "jiawenwu@trustnetic.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210316105149.110904-7-jiawenwu@trustnetic.com/mbox/", "series": [ { "id": 15691, "url": "https://patches.dpdk.org/api/series/15691/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=15691", "date": "2021-03-16T10:51:42", "name": "txgbe backplane AN training", "version": 2, "mbox": "https://patches.dpdk.org/series/15691/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/89222/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/89222/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 158F6A054F;\n\tTue, 16 Mar 2021 11:52:39 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3B2892428A5;\n\tTue, 16 Mar 2021 11:52:06 +0100 (CET)", "from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166])\n by mails.dpdk.org (Postfix) with ESMTP id 2333F24286C\n for <dev@dpdk.org>; Tue, 16 Mar 2021 11:52:01 +0100 (CET)", "from wxdbg.localdomain.com (unknown [183.129.236.74])\n by esmtp6.qq.com (ESMTP) with\n id ; Tue, 16 Mar 2021 18:51:55 +0800 (CST)" ], "X-QQ-mid": "bizesmtp11t1615891916tavf3vh6", "X-QQ-SSF": "01400000002000C0E000B00A0000000", "X-QQ-FEAT": "M9p8g7xKKAmAxa2f4KykkzFxPXizLWu4pp4JDvQhYfXBg/N2ftmBp6bSBXC46\n 32fpps0SEhrzYX6+LHaxe/GPw3PnQDVExFK8MFAD00Tn35nNxdcZ1gsRmz4hmkgnSXEm7uE\n FI4FPcL7PhkTCd4i0ASBDYywm8I5NGNRo+6TSeKKmhRAwgrkGWxpDf6ur6QMwNS0Bn9Dbpp\n WRIY8bj15mdnHOG4o46YOx6gwWbqaBKliw2QaEuOEmRVw1r1cM5g/QRowQM7Gizb+lSXtTe\n J+6ww2yHzH2kIKFYwm6qiTpSRYMPUW82lrDJ7LCYgLfRdIlVSnH1dgwoK5CMWegoizi7wc9\n OSqHpDUe3HuX30DwyUqsr7WwzABhQ==", "X-QQ-GoodBg": "2", "From": "Jiawen Wu <jiawenwu@trustnetic.com>", "To": "dev@dpdk.org", "Cc": "Jiawen Wu <jiawenwu@trustnetic.com>", "Date": "Tue, 16 Mar 2021 18:51:48 +0800", "Message-Id": "<20210316105149.110904-7-jiawenwu@trustnetic.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20210316105149.110904-1-jiawenwu@trustnetic.com>", "References": "<20210316105149.110904-1-jiawenwu@trustnetic.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-QQ-SENDSIZE": "520", "Feedback-ID": "bizesmtp:trustnetic.com:qybgforeign:qybgforeign7", "X-QQ-Bgrelay": "1", "Subject": "[dpdk-dev] [PATCH v2 6/7] net/txgbe: handle AN interrupt and link\n 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": "Read AN interrupt from misc, and do the AN configuration action.\nWhen link status is down, PHY power should be restarted to config KR\nmode again.\n\nSigned-off-by: Jiawen Wu <jiawenwu@trustnetic.com>\n---\n drivers/net/txgbe/base/txgbe_hw.c | 4 +-\n drivers/net/txgbe/base/txgbe_phy.c | 14 +++++++\n drivers/net/txgbe/base/txgbe_phy.h | 1 +\n drivers/net/txgbe/base/txgbe_type.h | 1 +\n drivers/net/txgbe/txgbe_ethdev.c | 58 +++++++++++++++++++++++++----\n drivers/net/txgbe/txgbe_ethdev.h | 7 ++--\n 6 files changed, 73 insertions(+), 12 deletions(-)", "diff": "diff --git a/drivers/net/txgbe/base/txgbe_hw.c b/drivers/net/txgbe/base/txgbe_hw.c\nindex 9a82a329a..917bd947f 100644\n--- a/drivers/net/txgbe/base/txgbe_hw.c\n+++ b/drivers/net/txgbe/base/txgbe_hw.c\n@@ -2574,8 +2574,10 @@ s32 txgbe_init_phy_raptor(struct txgbe_hw *hw)\n \t\t\t\t txgbe_get_copper_link_capabilities;\n \t}\n \n-\tif (phy->media_type == txgbe_media_type_backplane)\n+\tif (phy->media_type == txgbe_media_type_backplane) {\n \t\tmac->kr_handle = txgbe_kr_handle;\n+\t\tmac->bp_down_event = txgbe_bp_down_event;\n+\t}\n \n \t/* Set necessary function pointers based on PHY type */\n \tswitch (hw->phy.type) {\ndiff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c\nindex 140857121..5402a064f 100644\n--- a/drivers/net/txgbe/base/txgbe_phy.c\n+++ b/drivers/net/txgbe/base/txgbe_phy.c\n@@ -2304,6 +2304,20 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc)\n \t\tmactxcfg | TXGBE_MACTXCFG_TXE);\n }\n \n+void txgbe_bp_down_event(struct txgbe_hw *hw)\n+{\n+\tif (!(hw->devarg.auto_neg == 1))\n+\t\treturn;\n+\n+\tBP_LOG(\"restart phy power.\\n\");\n+\twr32_epcs(hw, VR_AN_KR_MODE_CL, 0);\n+\twr32_epcs(hw, SR_AN_CTRL, 0);\n+\twr32_epcs(hw, VR_AN_INTR_MSK, 0);\n+\n+\tmsleep(1050);\n+\ttxgbe_set_link_to_kr(hw, 0);\n+}\n+\n /**\n * txgbe_kr_handle - Handle the interrupt of auto-negotiation\n * @hw: pointer to hardware structure\ndiff --git a/drivers/net/txgbe/base/txgbe_phy.h b/drivers/net/txgbe/base/txgbe_phy.h\nindex ad4a915f8..d2f2b2f8e 100644\n--- a/drivers/net/txgbe/base/txgbe_phy.h\n+++ b/drivers/net/txgbe/base/txgbe_phy.h\n@@ -454,6 +454,7 @@ s32 txgbe_write_i2c_eeprom(struct txgbe_hw *hw, u8 byte_offset,\n \t\t\t\t u8 eeprom_data);\n u64 txgbe_autoc_read(struct txgbe_hw *hw);\n void txgbe_autoc_write(struct txgbe_hw *hw, u64 value);\n+void txgbe_bp_down_event(struct txgbe_hw *hw);\n s32 txgbe_kr_handle(struct txgbe_hw *hw);\n \n #endif /* _TXGBE_PHY_H_ */\ndiff --git a/drivers/net/txgbe/base/txgbe_type.h b/drivers/net/txgbe/base/txgbe_type.h\nindex a1fe7c467..9302943e3 100644\n--- a/drivers/net/txgbe/base/txgbe_type.h\n+++ b/drivers/net/txgbe/base/txgbe_type.h\n@@ -601,6 +601,7 @@ struct txgbe_mac_info {\n \ts32 (*setup_eee)(struct txgbe_hw *hw, bool enable_eee);\n \n \ts32 (*kr_handle)(struct txgbe_hw *hw);\n+\tvoid (*bp_down_event)(struct txgbe_hw *hw);\n \n \tenum txgbe_mac_type type;\n \tu8 addr[ETH_ADDR_LEN];\ndiff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c\nindex f951ecf4d..9f553fedf 100644\n--- a/drivers/net/txgbe/txgbe_ethdev.c\n+++ b/drivers/net/txgbe/txgbe_ethdev.c\n@@ -106,6 +106,7 @@ static void txgbe_vlan_hw_strip_disable(struct rte_eth_dev *dev,\n static void txgbe_dev_link_status_print(struct rte_eth_dev *dev);\n static int txgbe_dev_lsc_interrupt_setup(struct rte_eth_dev *dev, uint8_t on);\n static int txgbe_dev_macsec_interrupt_setup(struct rte_eth_dev *dev);\n+static int txgbe_dev_misc_interrupt_setup(struct rte_eth_dev *dev);\n static int txgbe_dev_rxq_interrupt_setup(struct rte_eth_dev *dev);\n static int txgbe_dev_interrupt_get_status(struct rte_eth_dev *dev);\n static int txgbe_dev_interrupt_action(struct rte_eth_dev *dev,\n@@ -1521,6 +1522,7 @@ txgbe_dev_phy_intr_setup(struct rte_eth_dev *dev)\n \tgpie |= TXGBE_GPIOBIT_6;\n \twr32(hw, TXGBE_GPIOINTEN, gpie);\n \tintr->mask_misc |= TXGBE_ICRMISC_GPIO;\n+\tintr->mask_misc |= TXGBE_ICRMISC_ANDONE;\n }\n \n int\n@@ -1754,7 +1756,8 @@ txgbe_dev_start(struct rte_eth_dev *dev)\n \t\thw->mac.enable_tx_laser(hw);\n \t}\n \n-\terr = hw->mac.check_link(hw, &speed, &link_up, 0);\n+\tif ((hw->subsystem_device_id & 0xFF) != TXGBE_DEV_ID_KR_KX_KX4)\n+\t\terr = hw->mac.check_link(hw, &speed, &link_up, 0);\n \tif (err)\n \t\tgoto error;\n \tdev->data->dev_link.link_status = link_up;\n@@ -1797,6 +1800,7 @@ txgbe_dev_start(struct rte_eth_dev *dev)\n skip_link_setup:\n \n \tif (rte_intr_allow_others(intr_handle)) {\n+\t\ttxgbe_dev_misc_interrupt_setup(dev);\n \t\t/* check if lsc interrupt is enabled */\n \t\tif (dev->data->dev_conf.intr_conf.lsc != 0)\n \t\t\ttxgbe_dev_lsc_interrupt_setup(dev, TRUE);\n@@ -2714,7 +2718,10 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev,\n \t}\n \n \tif (link_up == 0) {\n-\t\tif (hw->phy.media_type == txgbe_media_type_fiber) {\n+\t\tif ((hw->subsystem_device_id & 0xFF) ==\n+\t\t\t\tTXGBE_DEV_ID_KR_KX_KX4) {\n+\t\t\thw->mac.bp_down_event(hw);\n+\t\t} else if (hw->phy.media_type == txgbe_media_type_fiber) {\n \t\t\tintr->flags |= TXGBE_FLAG_NEED_LINK_CONFIG;\n \t\t\trte_eal_alarm_set(10,\n \t\t\t\ttxgbe_dev_setup_link_alarm_handler, dev);\n@@ -2849,6 +2856,20 @@ txgbe_dev_lsc_interrupt_setup(struct rte_eth_dev *dev, uint8_t on)\n \treturn 0;\n }\n \n+static int\n+txgbe_dev_misc_interrupt_setup(struct rte_eth_dev *dev)\n+{\n+\tstruct txgbe_interrupt *intr = TXGBE_DEV_INTR(dev);\n+\tu64 mask;\n+\n+\tmask = TXGBE_ICR_MASK;\n+\tmask &= (1ULL << TXGBE_MISC_VEC_ID);\n+\tintr->mask |= mask;\n+\tintr->mask_misc |= TXGBE_ICRMISC_GPIO;\n+\tintr->mask_misc |= TXGBE_ICRMISC_ANDONE;\n+\treturn 0;\n+}\n+\n /**\n * It clears the interrupt causes and enables the interrupt.\n * It will be called once only during nic initialized.\n@@ -2864,9 +2885,11 @@ static int\n txgbe_dev_rxq_interrupt_setup(struct rte_eth_dev *dev)\n {\n \tstruct txgbe_interrupt *intr = TXGBE_DEV_INTR(dev);\n+\tu64 mask;\n \n-\tintr->mask[0] |= TXGBE_ICR_MASK;\n-\tintr->mask[1] |= TXGBE_ICR_MASK;\n+\tmask = TXGBE_ICR_MASK;\n+\tmask &= ~((1ULL << TXGBE_RX_VEC_START) - 1);\n+\tintr->mask |= mask;\n \n \treturn 0;\n }\n@@ -2922,6 +2945,9 @@ txgbe_dev_interrupt_get_status(struct rte_eth_dev *dev)\n \tif (eicr & TXGBE_ICRMISC_LSC)\n \t\tintr->flags |= TXGBE_FLAG_NEED_LINK_UPDATE;\n \n+\tif (eicr & TXGBE_ICRMISC_ANDONE)\n+\t\tintr->flags |= TXGBE_FLAG_NEED_AN_CONFIG;\n+\n \tif (eicr & TXGBE_ICRMISC_VFMBX)\n \t\tintr->flags |= TXGBE_FLAG_MAILBOX;\n \n@@ -2999,6 +3025,13 @@ txgbe_dev_interrupt_action(struct rte_eth_dev *dev,\n \t\tintr->flags &= ~TXGBE_FLAG_PHY_INTERRUPT;\n \t}\n \n+\tif (intr->flags & TXGBE_FLAG_NEED_AN_CONFIG) {\n+\t\tif (hw->devarg.auto_neg == 1 && hw->devarg.poll == 0) {\n+\t\t\thw->mac.kr_handle(hw);\n+\t\t\tintr->flags &= ~TXGBE_FLAG_NEED_AN_CONFIG;\n+\t\t}\n+\t}\n+\n \tif (intr->flags & TXGBE_FLAG_NEED_LINK_UPDATE) {\n \t\tstruct rte_eth_link link;\n \n@@ -3012,6 +3045,11 @@ txgbe_dev_interrupt_action(struct rte_eth_dev *dev,\n \t\t\t/* handle it 1 sec later, wait it being stable */\n \t\t\ttimeout = TXGBE_LINK_UP_CHECK_TIMEOUT;\n \t\t/* likely to down */\n+\t\telse if ((hw->subsystem_device_id & 0xFF) ==\n+\t\t\t\tTXGBE_DEV_ID_KR_KX_KX4 &&\n+\t\t\t\thw->devarg.auto_neg == 1)\n+\t\t\t/* handle it 2 sec later for backplane AN73 */\n+\t\t\ttimeout = 2000;\n \t\telse\n \t\t\t/* handle it 4 sec later, wait it being stable */\n \t\t\ttimeout = TXGBE_LINK_DOWN_CHECK_TIMEOUT;\n@@ -3022,10 +3060,12 @@ txgbe_dev_interrupt_action(struct rte_eth_dev *dev,\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 &= ~TXGBE_ICRMISC_LSC;\n+\n+\t\t\tintr->mask_orig = intr->mask;\n+\t\t\t/* only disable all misc interrupts */\n+\t\t\tintr->mask &= ~(1ULL << TXGBE_MISC_VEC_ID);\n \t\t}\n \t}\n \n@@ -3086,8 +3126,10 @@ txgbe_dev_interrupt_delayed_handler(void *param)\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_misc |= TXGBE_ICRMISC_LSC;\n+\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 \ttxgbe_enable_intr(dev);\ndiff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h\nindex 5d4d9434a..8d46e6bb5 100644\n--- a/drivers/net/txgbe/txgbe_ethdev.h\n+++ b/drivers/net/txgbe/txgbe_ethdev.h\n@@ -28,6 +28,7 @@\n #define TXGBE_FLAG_PHY_INTERRUPT (uint32_t)(1 << 2)\n #define TXGBE_FLAG_MACSEC (uint32_t)(1 << 3)\n #define TXGBE_FLAG_NEED_LINK_CONFIG (uint32_t)(1 << 4)\n+#define TXGBE_FLAG_NEED_AN_CONFIG (uint32_t)(1 << 5)\n \n /*\n * Defines that were not part of txgbe_type.h as they are not used by the\n@@ -138,9 +139,9 @@ struct txgbe_rte_flow_rss_conf {\n struct txgbe_interrupt {\n \tuint32_t flags;\n \tuint32_t mask_misc;\n-\t/* to save original mask during delayed handler */\n-\tuint32_t mask_misc_orig;\n-\tuint32_t mask[2];\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 #define TXGBE_NB_STAT_MAPPING 32\n", "prefixes": [ "v2", "6/7" ] }