Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/46706/?format=api
{ "id": 46706, "url": "http://patches.dpdk.org/api/patches/46706/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/d1ee6544c1bb73094ec97f978d07ae48f006c07f.1539338074.git.igor.russkikh@aquantia.com/", "project": { "id": 1, "url": "http://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": "<d1ee6544c1bb73094ec97f978d07ae48f006c07f.1539338074.git.igor.russkikh@aquantia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/d1ee6544c1bb73094ec97f978d07ae48f006c07f.1539338074.git.igor.russkikh@aquantia.com", "date": "2018-10-12T11:09:29", "name": "[v6,11/22] net/atlantic: add link status and interrupt management", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "f0f3f5357c0645357595e2657ad9d349e7dc85ae", "submitter": { "id": 1124, "url": "http://patches.dpdk.org/api/people/1124/?format=api", "name": "Igor Russkikh", "email": "igor.russkikh@aquantia.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/d1ee6544c1bb73094ec97f978d07ae48f006c07f.1539338074.git.igor.russkikh@aquantia.com/mbox/", "series": [ { "id": 1862, "url": "http://patches.dpdk.org/api/series/1862/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1862", "date": "2018-10-12T11:09:01", "name": "net/atlantic: Aquantia aQtion 10G NIC Family DPDK PMD driver", "version": 6, "mbox": "http://patches.dpdk.org/series/1862/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/46706/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/46706/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 344361B5C0;\n\tFri, 12 Oct 2018 13:09:35 +0200 (CEST)", "from NAM02-BL2-obe.outbound.protection.outlook.com\n\t(mail-bl2nam02on0071.outbound.protection.outlook.com [104.47.38.71])\n\tby dpdk.org (Postfix) with ESMTP id 7EFD61B5B5\n\tfor <dev@dpdk.org>; Fri, 12 Oct 2018 13:09:31 +0200 (CEST)", "from BY1PR0701MB1660.namprd07.prod.outlook.com (10.162.110.22) by\n\tBY1PR0701MB1627.namprd07.prod.outlook.com (10.162.110.156) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n\t15.20.1228.22; Fri, 12 Oct 2018 11:09:29 +0000", "from BY1PR0701MB1660.namprd07.prod.outlook.com\n\t([fe80::346d:e756:e70e:17]) by\n\tBY1PR0701MB1660.namprd07.prod.outlook.com\n\t([fe80::346d:e756:e70e:17%3]) with mapi id 15.20.1228.020;\n\tFri, 12 Oct 2018 11:09:29 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n\tbh=sXeHeyy0ayM6WBTGJ/pl+CAibh/ES1nx2/rPm0MSFy8=;\n\tb=ANhM2EYzuz7bEcUb3KVQPKgjunL/sIAzU6LX6ZFfD5YHk4IbbSK+qNP8bb6c46g7DnqRLsW878MYMWumlRyrV/Of21B3AHX6mpd4HfHxs/f9KgebPZ9SQt1UKTV+Teuk9Vz62bvs0EUE+kK9+PxjaWPhTVZGOOE68ATcVjUJ0EA=", "From": "Igor Russkikh <Igor.Russkikh@aquantia.com>", "To": "\"dev@dpdk.org\" <dev@dpdk.org>", "CC": "Pavel Belous <Pavel.Belous@aquantia.com>, Igor Russkikh\n\t<Igor.Russkikh@aquantia.com>, \"ferruh.yigit@intel.com\"\n\t<ferruh.yigit@intel.com>", "Thread-Topic": "[PATCH v6 11/22] net/atlantic: add link status and interrupt\n\tmanagement", "Thread-Index": "AQHUYhwL9rJK6GGYpUGzyMw+lRdSWA==", "Date": "Fri, 12 Oct 2018 11:09:29 +0000", "Message-ID": "<d1ee6544c1bb73094ec97f978d07ae48f006c07f.1539338074.git.igor.russkikh@aquantia.com>", "References": "<cover.1539338074.git.igor.russkikh@aquantia.com>", "In-Reply-To": "<cover.1539338074.git.igor.russkikh@aquantia.com>", "Accept-Language": "en-US", "Content-Language": "en-US", "X-MS-Has-Attach": "", "X-MS-TNEF-Correlator": "", "x-clientproxiedby": "AM5PR0701CA0008.eurprd07.prod.outlook.com\n\t(2603:10a6:203:51::18) To BY1PR0701MB1660.namprd07.prod.outlook.com\n\t(2a01:111:e400:522a::22)", "authentication-results": "spf=none (sender IP is )\n\tsmtp.mailfrom=Igor.Russkikh@aquantia.com; ", "x-ms-exchange-messagesentrepresentingtype": "1", "x-originating-ip": "[95.79.108.179]", "x-ms-publictraffictype": "Email", "x-microsoft-exchange-diagnostics": "1; BY1PR0701MB1627;\n\t6:WQ3YMRPLerYYLB2W/xz1of/tLV3NlyWYNHQZSWoh9gR7pRMa3TVmtiOCIHZ5PQ6t7nHM1F0SC8VpvflROeAXQCPzsVMRw44cpB47GlpFmARCyXWj48nt6fu9C/+bVjL35PPl1oDlql8/NwrAG9jmAq+D8dxLDl4Jd4k0eWNX/H4jp45dutZw0lP+vZirKbsXNbAXdAx8DWvs8jF7115YMaa9Ng2I6p6BdhU2e/TfpApHyflFS/P79QsYyv38HmLCa69PZgisUba/+gsL+jkKvQrmWEswr6+1sy3zJejkLGQ6/UEBB0T+g8x81zx5yT5CkFiWF1aYGGyRPKKAqbOIcw8ws11BDJECB1LS5UuCCnDtEY2bbTPa/BqwGY3kL1QRHGRbzVFe8qxtnPXZ7h7NsMvF+twlYZe5GySSrsZedobVF26yYli78jsblAcFlyAY5Rlyndty3/M6QNOSiMD+U8aC06gjckqVjX0YURA0yFE=;\n\t5:EYfrf+k3cgN8o7Cuz8h4hT9/QB7d9+tATWBs+oEH0IabkbGxh+Nebvbq5ywqs7zxpbhGlKu6HkW6CDzrmh4CVd9uoFHultOVbRI/cjKbhz6Yfokw14Y/vDi6q3SmfVey6ETSiM+OgeKGO1/B/o+Pakkz9J6Us7wgkVvhxOE5oSE=;\n\t7:fnlj1fUZdDwt0k1+KLueKCythh5r52dAbro+y5x8PUyxSRdZTUIse5KFvm4mzoqx3zoK9juAh2CAo2+OzcKl2szPctFU4k3wTwfohijKxKgKdj/X8WOzaldeGFAUwwii4wY54OtHKyZ8/a53TDzdFN/It81BbTBIYxiU+1v6rs0q5WgFoHowaq04tVGpbCnAzhIx8GPz2aWOT4NcxUMl3hcyc/FUUWSlhxoD4n7DdJo/AxkCx12htIPx0CIeKIfh", "x-ms-office365-filtering-correlation-id": "32c227a4-1ac4-4ea8-0e54-08d630332dc2", "x-microsoft-antispam": "BCL:0; PCL:0;\n\tRULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020);\n\tSRVR:BY1PR0701MB1627; ", "x-ms-traffictypediagnostic": "BY1PR0701MB1627:", "x-microsoft-antispam-prvs": "<BY1PR0701MB162716B6EC76C184471DBD8898E20@BY1PR0701MB1627.namprd07.prod.outlook.com>", "x-exchange-antispam-report-test": "UriScan:(269456686620040);", "x-ms-exchange-senderadcheck": "1", "x-exchange-antispam-report-cfa-test": "BCL:0; PCL:0;\n\tRULEID:(6040522)(2401047)(8121501046)(5005006)(3231355)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(149066)(150057)(6041310)(20161123560045)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699051)(76991067);\n\tSRVR:BY1PR0701MB1627; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0701MB1627; ", "x-forefront-prvs": "0823A5777B", "x-forefront-antispam-report": "SFV:NSPM;\n\tSFS:(10009020)(346002)(366004)(376002)(136003)(39850400004)(396003)(189003)(199004)(186003)(6116002)(486006)(5640700003)(446003)(6436002)(6512007)(53936002)(71200400001)(71190400001)(14454004)(72206003)(316002)(2351001)(44832011)(3846002)(7736002)(305945005)(2906002)(4326008)(6486002)(97736004)(26005)(2501003)(102836004)(53946003)(5250100002)(11346002)(86362001)(575784001)(25786009)(4744004)(476003)(2616005)(106356001)(54906003)(105586002)(256004)(14444005)(5660300001)(66066001)(81166006)(81156014)(1730700003)(8676002)(478600001)(36756003)(68736007)(6916009)(8936002)(99286004)(386003)(6506007)(118296001)(2900100001)(52116002)(76176011)(579004);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0701MB1627;\n\tH:BY1PR0701MB1660.namprd07.prod.outlook.com; FPR:; SPF:None; LANG:en; \n\tPTR:InfoNoRecords; MX:1; A:1; ", "received-spf": "None (protection.outlook.com: aquantia.com does not designate\n\tpermitted sender hosts)", "x-microsoft-antispam-message-info": "2QBahycHmwinDul4rkK9tHOQ7nQesDhFgsAadcxLvOopOeFPUpuzUft85dTeYxiH9DcjcUSJqgs5MVQSJPEpFhio+ECpgmlGdWyOXJt8j5FDsV6j/c+ZZfkYg02kabjMk49x7+Gj6hayHOfazB0bFE9EUF/UByCzuXDkOW5luZlt32QyGlmuOGaHHxWIumYjlf7EOe0P+90n1mHaFUYLoiqEPooFlgy9E2nRqtGQKeQjPzpUflMdZU29wOnRMvVL13HSiLTf27hIchzfg4agUysN3n1G2R0T0HjwgBr0RJeypQvgJL5PJXcXU0LlnNLcJ9NhlyRqKLG0we7EGSG9Sv7T9whN1jgTEvkpnZ5dDf0=", "spamdiagnosticoutput": "1:99", "spamdiagnosticmetadata": "NSPM", "Content-Type": "text/plain; charset=\"iso-8859-1\"", "Content-Transfer-Encoding": "quoted-printable", "MIME-Version": "1.0", "X-OriginatorOrg": "aquantia.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "32c227a4-1ac4-4ea8-0e54-08d630332dc2", "X-MS-Exchange-CrossTenant-originalarrivaltime": "12 Oct 2018 11:09:29.5927\n\t(UTC)", "X-MS-Exchange-CrossTenant-fromentityheader": "Hosted", "X-MS-Exchange-CrossTenant-id": "83e2e134-991c-4ede-8ced-34d47e38e6b1", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "BY1PR0701MB1627", "Subject": "[dpdk-dev] [PATCH v6 11/22] net/atlantic: add link status and\n\tinterrupt management", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Pavel Belous <Pavel.Belous@aquantia.com>\n\nImplement link interrupt, link info, link polling.\n\nSigned-off-by: Igor Russkikh <igor.russkikh@aquantia.com>\nSigned-off-by: Pavel Belous <pavel.belous@aquantia.com>\n---\n doc/guides/nics/features/atlantic.ini | 3 +\n drivers/net/atlantic/atl_ethdev.c | 411 +++++++++++++++++++++++++++++++++-\n drivers/net/atlantic/atl_ethdev.h | 16 ++\n drivers/net/atlantic/atl_rxtx.c | 36 +++\n drivers/net/atlantic/atl_types.h | 2 +\n 5 files changed, 466 insertions(+), 2 deletions(-)", "diff": "diff --git a/doc/guides/nics/features/atlantic.ini b/doc/guides/nics/features/atlantic.ini\nindex 374cf9fb1061..f5650ae8f5f7 100644\n--- a/doc/guides/nics/features/atlantic.ini\n+++ b/doc/guides/nics/features/atlantic.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 Queue start/stop = Y\n Jumbo frame = Y\n CRC offload = Y\ndiff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c\nindex 156f1be99cdf..b4f2326b4b9a 100644\n--- a/drivers/net/atlantic/atl_ethdev.c\n+++ b/drivers/net/atlantic/atl_ethdev.c\n@@ -18,8 +18,11 @@ static int eth_atl_dev_uninit(struct rte_eth_dev *eth_dev);\n static int atl_dev_configure(struct rte_eth_dev *dev);\n static int atl_dev_start(struct rte_eth_dev *dev);\n static void atl_dev_stop(struct rte_eth_dev *dev);\n+static int atl_dev_set_link_up(struct rte_eth_dev *dev);\n+static int atl_dev_set_link_down(struct rte_eth_dev *dev);\n static void atl_dev_close(struct rte_eth_dev *dev);\n static int atl_dev_reset(struct rte_eth_dev *dev);\n+static int atl_dev_link_update(struct rte_eth_dev *dev, int wait);\n \n static int atl_fw_version_get(struct rte_eth_dev *dev, char *fw_version,\n \t\t\t size_t fw_size);\n@@ -29,6 +32,16 @@ static void atl_dev_info_get(struct rte_eth_dev *dev,\n \n static const uint32_t *atl_dev_supported_ptypes_get(struct rte_eth_dev *dev);\n \n+static void atl_dev_link_status_print(struct rte_eth_dev *dev);\n+\n+/* Interrupts */\n+static int atl_dev_rxq_interrupt_setup(struct rte_eth_dev *dev);\n+static int atl_dev_lsc_interrupt_setup(struct rte_eth_dev *dev, uint8_t on);\n+static int atl_dev_interrupt_get_status(struct rte_eth_dev *dev);\n+static int atl_dev_interrupt_action(struct rte_eth_dev *dev,\n+\t\t\t\t struct rte_intr_handle *handle);\n+static void atl_dev_interrupt_handler(void *param);\n+\n static int eth_atl_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \tstruct rte_pci_device *pci_dev);\n static int eth_atl_pci_remove(struct rte_pci_device *pci_dev);\n@@ -70,7 +83,7 @@ static const struct rte_pci_id pci_id_atl_map[] = {\n \n static struct rte_pci_driver rte_atl_pmd = {\n \t.id_table = pci_id_atl_map,\n-\t.drv_flags = RTE_PCI_DRV_NEED_MAPPING |\n+\t.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |\n \t\t RTE_PCI_DRV_IOVA_AS_VA,\n \t.probe = eth_atl_pci_probe,\n \t.remove = eth_atl_pci_remove,\n@@ -107,9 +120,14 @@ static const struct eth_dev_ops atl_eth_dev_ops = {\n \t.dev_configure\t = atl_dev_configure,\n \t.dev_start\t = atl_dev_start,\n \t.dev_stop\t = atl_dev_stop,\n+\t.dev_set_link_up = atl_dev_set_link_up,\n+\t.dev_set_link_down = atl_dev_set_link_down,\n \t.dev_close\t = atl_dev_close,\n \t.dev_reset\t = atl_dev_reset,\n \n+\t/* Link */\n+\t.link_update\t = atl_dev_link_update,\n+\n \t.fw_version_get = atl_fw_version_get,\n \t.dev_infos_get\t = atl_dev_info_get,\n \t.dev_supported_ptypes_get = atl_dev_supported_ptypes_get,\n@@ -124,6 +142,9 @@ static const struct eth_dev_ops atl_eth_dev_ops = {\n \t.tx_queue_stop\t = atl_tx_queue_stop,\n \t.tx_queue_setup = atl_tx_queue_setup,\n \t.tx_queue_release = atl_tx_queue_release,\n+\n+\t.rx_queue_intr_enable = atl_dev_rx_queue_intr_enable,\n+\t.rx_queue_intr_disable = atl_dev_rx_queue_intr_disable,\n };\n \n static inline int32_t\n@@ -132,12 +153,28 @@ atl_reset_hw(struct aq_hw_s *hw)\n \treturn hw_atl_b0_hw_reset(hw);\n }\n \n+static inline void\n+atl_enable_intr(struct rte_eth_dev *dev)\n+{\n+\tstruct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\n+\thw_atl_itr_irq_msk_setlsw_set(hw, 0xffffffff);\n+}\n+\n+static void\n+atl_disable_intr(struct aq_hw_s *hw)\n+{\n+\tPMD_INIT_FUNC_TRACE();\n+\thw_atl_itr_irq_msk_clearlsw_set(hw, 0xffffffff);\n+}\n+\n static int\n eth_atl_dev_init(struct rte_eth_dev *eth_dev)\n {\n \tstruct atl_adapter *adapter =\n \t\t(struct atl_adapter *)eth_dev->data->dev_private;\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n+\tstruct rte_intr_handle *intr_handle = &pci_dev->intr_handle;\n \tstruct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n \tint err = 0;\n \n@@ -160,9 +197,17 @@ eth_atl_dev_init(struct rte_eth_dev *eth_dev)\n \t/* Hardware configuration - hardcode */\n \tadapter->hw_cfg.is_lro = false;\n \tadapter->hw_cfg.wol = false;\n+\tadapter->hw_cfg.link_speed_msk = AQ_NIC_RATE_10G |\n+\t\t\t AQ_NIC_RATE_5G |\n+\t\t\t AQ_NIC_RATE_2G5 |\n+\t\t\t AQ_NIC_RATE_1G |\n+\t\t\t AQ_NIC_RATE_100M;\n \n \thw->aq_nic_cfg = &adapter->hw_cfg;\n \n+\t/* disable interrupt */\n+\tatl_disable_intr(hw);\n+\n \t/* Allocate memory for storing MAC addresses */\n \teth_dev->data->mac_addrs = rte_zmalloc(\"atlantic\", ETHER_ADDR_LEN, 0);\n \tif (eth_dev->data->mac_addrs == NULL) {\n@@ -179,12 +224,23 @@ eth_atl_dev_init(struct rte_eth_dev *eth_dev)\n \t\t\teth_dev->data->mac_addrs->addr_bytes) != 0)\n \t\treturn -EINVAL;\n \n+\trte_intr_callback_register(intr_handle,\n+\t\t\t\t atl_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+\tatl_enable_intr(eth_dev);\n+\n \treturn err;\n }\n \n static int\n eth_atl_dev_uninit(struct rte_eth_dev *eth_dev)\n {\n+\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n+\tstruct rte_intr_handle *intr_handle = &pci_dev->intr_handle;\n \tstruct aq_hw_s *hw;\n \n \tPMD_INIT_FUNC_TRACE();\n@@ -201,6 +257,11 @@ eth_atl_dev_uninit(struct rte_eth_dev *eth_dev)\n \teth_dev->rx_pkt_burst = NULL;\n \teth_dev->tx_pkt_burst = NULL;\n \n+\t/* disable uio intr before callback unregister */\n+\trte_intr_disable(intr_handle);\n+\trte_intr_callback_unregister(intr_handle,\n+\t\t\t\t atl_dev_interrupt_handler, eth_dev);\n+\n \trte_free(eth_dev->data->mac_addrs);\n \teth_dev->data->mac_addrs = NULL;\n \n@@ -222,8 +283,16 @@ eth_atl_pci_remove(struct rte_pci_device *pci_dev)\n }\n \n static int\n-atl_dev_configure(struct rte_eth_dev *dev __rte_unused)\n+atl_dev_configure(struct rte_eth_dev *dev)\n {\n+\tstruct atl_interrupt *intr =\n+\t\tATL_DEV_PRIVATE_TO_INTR(dev->data->dev_private);\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\t/* set flag to update link status after init */\n+\tintr->flags |= ATL_FLAG_NEED_LINK_UPDATE;\n+\n \treturn 0;\n }\n \n@@ -235,6 +304,11 @@ static int\n atl_dev_start(struct rte_eth_dev *dev)\n {\n \tstruct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n+\tstruct rte_intr_handle *intr_handle = &pci_dev->intr_handle;\n+\tuint32_t intr_vector = 0;\n+\tuint32_t *link_speeds;\n+\tuint32_t speed = 0;\n \tint status;\n \tint err;\n \n@@ -243,6 +317,16 @@ atl_dev_start(struct rte_eth_dev *dev)\n \t/* set adapter started */\n \thw->adapter_stopped = 0;\n \n+\tif (dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED) {\n+\t\tPMD_INIT_LOG(ERR,\n+\t\t\"Invalid link_speeds for port %u, fix speed not supported\",\n+\t\t\t\tdev->data->port_id);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/* disable uio/vfio intr/eventfd mapping */\n+\trte_intr_disable(intr_handle);\n+\n \t/* reinitialize adapter\n \t * this calls reset and start\n \t */\n@@ -253,6 +337,32 @@ atl_dev_start(struct rte_eth_dev *dev)\n \terr = hw_atl_b0_hw_init(hw, dev->data->mac_addrs->addr_bytes);\n \n \thw_atl_b0_hw_start(hw);\n+\t/* check and configure queue intr-vector mapping */\n+\tif ((rte_intr_cap_multiple(intr_handle) ||\n+\t !RTE_ETH_DEV_SRIOV(dev).active) &&\n+\t dev->data->dev_conf.intr_conf.rxq != 0) {\n+\t\tintr_vector = dev->data->nb_rx_queues;\n+\t\tif (intr_vector > ATL_MAX_INTR_QUEUE_NUM) {\n+\t\t\tPMD_INIT_LOG(ERR, \"At most %d intr queues supported\",\n+\t\t\t\t\tATL_MAX_INTR_QUEUE_NUM);\n+\t\t\treturn -ENOTSUP;\n+\t\t}\n+\t\tif (rte_intr_efd_enable(intr_handle, intr_vector)) {\n+\t\t\tPMD_INIT_LOG(ERR, \"rte_intr_efd_enable failed\");\n+\t\t\treturn -1;\n+\t\t}\n+\t}\n+\n+\tif (rte_intr_dp_is_en(intr_handle) && !intr_handle->intr_vec) {\n+\t\tintr_handle->intr_vec = rte_zmalloc(\"intr_vec\",\n+\t\t\t\t dev->data->nb_rx_queues * sizeof(int), 0);\n+\t\tif (intr_handle->intr_vec == NULL) {\n+\t\t\tPMD_INIT_LOG(ERR, \"Failed to allocate %d rx_queues\"\n+\t\t\t\t \" intr_vec\", dev->data->nb_rx_queues);\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\t}\n+\n \t/* initialize transmission unit */\n \tatl_tx_init(dev);\n \n@@ -275,6 +385,61 @@ atl_dev_start(struct rte_eth_dev *dev)\n \t\tgoto error;\n \t}\n \n+\terr = hw->aq_fw_ops->update_link_status(hw);\n+\n+\tif (err)\n+\t\tgoto error;\n+\n+\tdev->data->dev_link.link_status = hw->aq_link_status.mbps != 0;\n+\n+\tlink_speeds = &dev->data->dev_conf.link_speeds;\n+\n+\tspeed = 0x0;\n+\n+\tif (*link_speeds == ETH_LINK_SPEED_AUTONEG) {\n+\t\tspeed = hw->aq_nic_cfg->link_speed_msk;\n+\t} else {\n+\t\tif (*link_speeds & ETH_LINK_SPEED_10G)\n+\t\t\tspeed |= AQ_NIC_RATE_10G;\n+\t\tif (*link_speeds & ETH_LINK_SPEED_5G)\n+\t\t\tspeed |= AQ_NIC_RATE_5G;\n+\t\tif (*link_speeds & ETH_LINK_SPEED_1G)\n+\t\t\tspeed |= AQ_NIC_RATE_1G;\n+\t\tif (*link_speeds & ETH_LINK_SPEED_2_5G)\n+\t\t\tspeed |= AQ_NIC_RATE_2G5;\n+\t\tif (*link_speeds & ETH_LINK_SPEED_100M)\n+\t\t\tspeed |= AQ_NIC_RATE_100M;\n+\t}\n+\n+\terr = hw->aq_fw_ops->set_link_speed(hw, speed);\n+\tif (err)\n+\t\tgoto error;\n+\n+\tif (rte_intr_allow_others(intr_handle)) {\n+\t\t/* check if lsc interrupt is enabled */\n+\t\tif (dev->data->dev_conf.intr_conf.lsc != 0)\n+\t\t\tatl_dev_lsc_interrupt_setup(dev, true);\n+\t\telse\n+\t\t\tatl_dev_lsc_interrupt_setup(dev, false);\n+\t} else {\n+\t\trte_intr_callback_unregister(intr_handle,\n+\t\t\t\t\t atl_dev_interrupt_handler, dev);\n+\t\tif (dev->data->dev_conf.intr_conf.lsc != 0)\n+\t\t\tPMD_INIT_LOG(INFO, \"lsc won't enable because of\"\n+\t\t\t\t \" no intr multiplex\");\n+\t}\n+\n+\t/* check if rxq interrupt is enabled */\n+\tif (dev->data->dev_conf.intr_conf.rxq != 0 &&\n+\t rte_intr_dp_is_en(intr_handle))\n+\t\tatl_dev_rxq_interrupt_setup(dev);\n+\n+\t/* enable uio/vfio intr/eventfd mapping */\n+\trte_intr_enable(intr_handle);\n+\n+\t/* resume enabled intr since hw reset */\n+\tatl_enable_intr(dev);\n+\n \treturn 0;\n \n error:\n@@ -288,8 +453,16 @@ atl_dev_start(struct rte_eth_dev *dev)\n static void\n atl_dev_stop(struct rte_eth_dev *dev)\n {\n+\tstruct rte_eth_link link;\n \tstruct aq_hw_s *hw =\n \t\tATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n+\tstruct rte_intr_handle *intr_handle = &pci_dev->intr_handle;\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\t/* disable interrupts */\n+\tatl_disable_intr(hw);\n \n \t/* reset the NIC */\n \tatl_reset_hw(hw);\n@@ -300,6 +473,46 @@ atl_dev_stop(struct rte_eth_dev *dev)\n \t/* Clear stored conf */\n \tdev->data->scattered_rx = 0;\n \tdev->data->lro = 0;\n+\n+\t/* Clear recorded link status */\n+\tmemset(&link, 0, sizeof(link));\n+\trte_eth_linkstatus_set(dev, &link);\n+\n+\tif (!rte_intr_allow_others(intr_handle))\n+\t\t/* resume to the default handler */\n+\t\trte_intr_callback_register(intr_handle,\n+\t\t\t\t\t atl_dev_interrupt_handler,\n+\t\t\t\t\t (void *)dev);\n+\n+\t/* Clean datapath event and queue/vec mapping */\n+\trte_intr_efd_disable(intr_handle);\n+\tif (intr_handle->intr_vec != NULL) {\n+\t\trte_free(intr_handle->intr_vec);\n+\t\tintr_handle->intr_vec = NULL;\n+\t}\n+}\n+\n+/*\n+ * Set device link up: enable tx.\n+ */\n+static int\n+atl_dev_set_link_up(struct rte_eth_dev *dev)\n+{\n+\tstruct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\n+\treturn hw->aq_fw_ops->set_link_speed(hw,\n+\t\t\thw->aq_nic_cfg->link_speed_msk);\n+}\n+\n+/*\n+ * Set device link down: disable tx.\n+ */\n+static int\n+atl_dev_set_link_down(struct rte_eth_dev *dev)\n+{\n+\tstruct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\n+\treturn hw->aq_fw_ops->set_link_speed(hw, 0);\n }\n \n /*\n@@ -383,6 +596,11 @@ atl_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \n \tdev_info->rx_desc_lim = rx_desc_lim;\n \tdev_info->tx_desc_lim = tx_desc_lim;\n+\n+\tdev_info->speed_capa = ETH_LINK_SPEED_1G | ETH_LINK_SPEED_10G;\n+\tdev_info->speed_capa |= ETH_LINK_SPEED_100M;\n+\tdev_info->speed_capa |= ETH_LINK_SPEED_2_5G;\n+\tdev_info->speed_capa |= ETH_LINK_SPEED_5G;\n }\n \n static const uint32_t *\n@@ -407,6 +625,195 @@ atl_dev_supported_ptypes_get(struct rte_eth_dev *dev)\n \treturn NULL;\n }\n \n+/* return 0 means link status changed, -1 means not changed */\n+static int\n+atl_dev_link_update(struct rte_eth_dev *dev, int wait __rte_unused)\n+{\n+\tstruct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tstruct atl_interrupt *intr =\n+\t\tATL_DEV_PRIVATE_TO_INTR(dev->data->dev_private);\n+\tstruct rte_eth_link link, old;\n+\tint err = 0;\n+\n+\tlink.link_status = ETH_LINK_DOWN;\n+\tlink.link_speed = 0;\n+\tlink.link_duplex = ETH_LINK_FULL_DUPLEX;\n+\tlink.link_autoneg = hw->is_autoneg ? ETH_LINK_AUTONEG : ETH_LINK_FIXED;\n+\tmemset(&old, 0, sizeof(old));\n+\n+\t/* load old link status */\n+\trte_eth_linkstatus_get(dev, &old);\n+\n+\t/* read current link status */\n+\terr = hw->aq_fw_ops->update_link_status(hw);\n+\n+\tif (err)\n+\t\treturn 0;\n+\n+\tif (hw->aq_link_status.mbps == 0) {\n+\t\t/* write default (down) link status */\n+\t\trte_eth_linkstatus_set(dev, &link);\n+\t\tif (link.link_status == old.link_status)\n+\t\t\treturn -1;\n+\t\treturn 0;\n+\t}\n+\n+\tintr->flags &= ~ATL_FLAG_NEED_LINK_CONFIG;\n+\n+\tlink.link_status = ETH_LINK_UP;\n+\tlink.link_duplex = ETH_LINK_FULL_DUPLEX;\n+\tlink.link_speed = hw->aq_link_status.mbps;\n+\n+\trte_eth_linkstatus_set(dev, &link);\n+\n+\tif (link.link_status == old.link_status)\n+\t\treturn -1;\n+\n+\treturn 0;\n+}\n+\n+\n+/**\n+ * It clears the interrupt causes and enables the interrupt.\n+ * It will be called once only during nic initialized.\n+ *\n+ * @param dev\n+ * Pointer to struct rte_eth_dev.\n+ * @param on\n+ * Enable or Disable.\n+ *\n+ * @return\n+ * - On success, zero.\n+ * - On failure, a negative value.\n+ */\n+\n+static int\n+atl_dev_lsc_interrupt_setup(struct rte_eth_dev *dev, uint8_t on __rte_unused)\n+{\n+\tatl_dev_link_status_print(dev);\n+\treturn 0;\n+}\n+\n+static int\n+atl_dev_rxq_interrupt_setup(struct rte_eth_dev *dev __rte_unused)\n+{\n+\treturn 0;\n+}\n+\n+\n+static int\n+atl_dev_interrupt_get_status(struct rte_eth_dev *dev)\n+{\n+\tstruct atl_interrupt *intr =\n+\t\tATL_DEV_PRIVATE_TO_INTR(dev->data->dev_private);\n+\tstruct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tu64 cause = 0;\n+\n+\thw_atl_b0_hw_irq_read(hw, &cause);\n+\n+\tatl_disable_intr(hw);\n+\tintr->flags = cause & BIT(ATL_IRQ_CAUSE_LINK) ?\n+\t\t\tATL_FLAG_NEED_LINK_UPDATE : 0;\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+atl_dev_link_status_print(struct rte_eth_dev *dev)\n+{\n+\tstruct rte_eth_link link;\n+\n+\tmemset(&link, 0, sizeof(link));\n+\trte_eth_linkstatus_get(dev, &link);\n+\tif (link.link_status) {\n+\t\tPMD_DRV_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_DRV_LOG(INFO, \" Port %d: Link Down\",\n+\t\t\t\t(int)(dev->data->port_id));\n+\t}\n+\n+\n+#ifdef DEBUG\n+{\n+\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n+\n+\tPMD_DRV_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+#endif\n+\n+\tPMD_DRV_LOG(INFO, \"Link speed:%d\", link.link_speed);\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+atl_dev_interrupt_action(struct rte_eth_dev *dev,\n+\t\t\t struct rte_intr_handle *intr_handle)\n+{\n+\tstruct atl_interrupt *intr =\n+\t\tATL_DEV_PRIVATE_TO_INTR(dev->data->dev_private);\n+\n+\tif (intr->flags & ATL_FLAG_NEED_LINK_UPDATE) {\n+\t\tatl_dev_link_update(dev, 0);\n+\t\tintr->flags &= ~ATL_FLAG_NEED_LINK_UPDATE;\n+\t\tatl_dev_link_status_print(dev);\n+\t\t_rte_eth_dev_callback_process(dev,\n+\t\t\tRTE_ETH_EVENT_INTR_LSC, NULL);\n+\t}\n+\n+\tatl_enable_intr(dev);\n+\trte_intr_enable(intr_handle);\n+\n+\treturn 0;\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 *) regsitered before.\n+ *\n+ * @return\n+ * void\n+ */\n+static void\n+atl_dev_interrupt_handler(void *param)\n+{\n+\tstruct rte_eth_dev *dev = (struct rte_eth_dev *)param;\n+\n+\tatl_dev_interrupt_get_status(dev);\n+\tatl_dev_interrupt_action(dev, dev->intr_handle);\n+}\n+\n RTE_PMD_REGISTER_PCI(net_atlantic, rte_atl_pmd);\n RTE_PMD_REGISTER_PCI_TABLE(net_atlantic, pci_id_atl_map);\n RTE_PMD_REGISTER_KMOD_DEP(net_atlantic, \"* igb_uio | uio_pci_generic\");\ndiff --git a/drivers/net/atlantic/atl_ethdev.h b/drivers/net/atlantic/atl_ethdev.h\nindex 92bb302ffe55..55a7e0d6188c 100644\n--- a/drivers/net/atlantic/atl_ethdev.h\n+++ b/drivers/net/atlantic/atl_ethdev.h\n@@ -16,6 +16,16 @@\n #define ATL_DEV_TO_ADAPTER(dev) \\\n \t((struct atl_adapter *)(dev)->data->dev_private)\n \n+#define ATL_DEV_PRIVATE_TO_INTR(adapter) \\\n+\t(&((struct atl_adapter *)adapter)->intr)\n+\n+#define ATL_FLAG_NEED_LINK_UPDATE (uint32_t)(1 << 0)\n+#define ATL_FLAG_NEED_LINK_CONFIG (uint32_t)(4 << 0)\n+\n+struct atl_interrupt {\n+\tuint32_t flags;\n+\tuint32_t mask;\n+};\n \n /*\n * Structure to store private data for each driver instance (for each port).\n@@ -23,6 +33,7 @@\n struct atl_adapter {\n \tstruct aq_hw_s hw;\n \tstruct aq_hw_cfg_s hw_cfg;\n+\tstruct atl_interrupt intr;\n };\n \n /*\n@@ -40,6 +51,11 @@ int atl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,\n \t\tuint16_t nb_tx_desc, unsigned int socket_id,\n \t\tconst struct rte_eth_txconf *tx_conf);\n \n+int atl_dev_rx_queue_intr_enable(struct rte_eth_dev *eth_dev,\n+\t\t\t\t uint16_t queue_id);\n+int atl_dev_rx_queue_intr_disable(struct rte_eth_dev *eth_dev,\n+\t\t\t\t uint16_t queue_id);\n+\n int atl_rx_init(struct rte_eth_dev *dev);\n int atl_tx_init(struct rte_eth_dev *dev);\n \ndiff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c\nindex 1d4c8099325d..36141564f5c1 100644\n--- a/drivers/net/atlantic/atl_rxtx.c\n+++ b/drivers/net/atlantic/atl_rxtx.c\n@@ -651,6 +651,42 @@ atl_stop_queues(struct rte_eth_dev *dev)\n \treturn 0;\n }\n \n+static int\n+atl_rx_enable_intr(struct rte_eth_dev *dev, uint16_t queue_id, bool enable)\n+{\n+\tstruct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tstruct atl_rx_queue *rxq;\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\tif (queue_id >= dev->data->nb_rx_queues) {\n+\t\tPMD_DRV_LOG(ERR, \"Invalid RX queue id=%d\", queue_id);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\trxq = dev->data->rx_queues[queue_id];\n+\n+\tif (rxq == NULL)\n+\t\treturn 0;\n+\n+\t/* Mapping interrupt vector */\n+\thw_atl_itr_irq_map_en_rx_set(hw, enable, queue_id);\n+\n+\treturn 0;\n+}\n+\n+int\n+atl_dev_rx_queue_intr_enable(struct rte_eth_dev *eth_dev, uint16_t queue_id)\n+{\n+\treturn atl_rx_enable_intr(eth_dev, queue_id, true);\n+}\n+\n+int\n+atl_dev_rx_queue_intr_disable(struct rte_eth_dev *eth_dev, uint16_t queue_id)\n+{\n+\treturn atl_rx_enable_intr(eth_dev, queue_id, false);\n+}\n+\n uint16_t\n atl_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,\n \t uint16_t nb_pkts)\ndiff --git a/drivers/net/atlantic/atl_types.h b/drivers/net/atlantic/atl_types.h\nindex 37ad43a110f0..e636464955e3 100644\n--- a/drivers/net/atlantic/atl_types.h\n+++ b/drivers/net/atlantic/atl_types.h\n@@ -86,11 +86,13 @@ struct aq_hw_s {\n \tvoid *mmio;\n \n \tstruct aq_hw_link_status_s aq_link_status;\n+\tbool is_autoneg;\n \n \tstruct hw_aq_atl_utils_mbox mbox;\n \tstruct hw_atl_stats_s last_stats;\n \tstruct aq_stats_s curr_stats;\n \n+\tu64 speed;\n \tunsigned int chip_features;\n \tu32 fw_ver_actual;\n \tu32 mbox_addr;\n", "prefixes": [ "v6", "11/22" ] }