Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/63687/?format=api
{ "id": 63687, "url": "http://patches.dpdk.org/api/patches/63687/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191209214656.27347-11-cardigliano@ntop.org/", "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": "<20191209214656.27347-11-cardigliano@ntop.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20191209214656.27347-11-cardigliano@ntop.org", "date": "2019-12-09T21:46:49", "name": "[v3,10/17] net/ionic: add basic port operations", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1af8ffc72116eaf89424d4ce3d4d5393de09204d", "submitter": { "id": 1465, "url": "http://patches.dpdk.org/api/people/1465/?format=api", "name": "Alfredo Cardigliano", "email": "cardigliano@ntop.org" }, "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/20191209214656.27347-11-cardigliano@ntop.org/mbox/", "series": [ { "id": 7760, "url": "http://patches.dpdk.org/api/series/7760/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7760", "date": "2019-12-09T21:46:39", "name": "Introduces net/ionic PMD", "version": 3, "mbox": "http://patches.dpdk.org/series/7760/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/63687/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/63687/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 77876A04B3;\n\tMon, 9 Dec 2019 22:50:28 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 4CA291BFA0;\n\tMon, 9 Dec 2019 22:48:54 +0100 (CET)", "from mail.ntop.org (mail-digitalocean.ntop.org [167.99.215.164])\n by dpdk.org (Postfix) with ESMTP id 4452B5B3C\n for <dev@dpdk.org>; Mon, 9 Dec 2019 22:48:33 +0100 (CET)", "from devele.ntop.org (net-93-145-196-230.cust.vodafonedsl.it\n [93.145.196.230])\n by mail.ntop.org (Postfix) with ESMTPSA id E069F41B73;\n Mon, 9 Dec 2019 22:48:32 +0100 (CET)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ntop.org; s=mail;\n t=1575928113; bh=3xNAO1Y2cg/jcURTekHmn2PzAE+YB0kIJN8UsmJgJyI=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=meSOdG3+aXexvTOjuki/QOquxzzknMxQUsTB18PgtX0kJFxgHqBYtnKKR6X9DSlNd\n p8E/EZ7mDJQt4mXjei19KoLww9yAiqrOAA8w7XHIrUClSL4g+7dUw4QareLFmR7DvQ\n Y4chHV0TF5FRCCB72ZbSWAiyy3YO5xM18kS8Tj88=", "From": "Alfredo Cardigliano <cardigliano@ntop.org>", "To": "Alfredo Cardigliano <cardigliano@ntop.org>,\n John McNamara <john.mcnamara@intel.com>,\n Marko Kovacevic <marko.kovacevic@intel.com>", "Cc": "dev@dpdk.org", "Date": "Mon, 9 Dec 2019 22:46:49 +0100", "Message-Id": "<20191209214656.27347-11-cardigliano@ntop.org>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20191209214656.27347-1-cardigliano@ntop.org>", "References": "<20191209214656.27347-1-cardigliano@ntop.org>", "Subject": "[dpdk-dev] [PATCH v3 10/17] net/ionic: add basic port operations", "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 <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": "Add support for port start/stop and handle basic features\nincluding mtu and link up/down.\n\nSigned-off-by: Alfredo Cardigliano <cardigliano@ntop.org>\nReviewed-by: Shannon Nelson <snelson@pensando.io>\n---\n doc/guides/nics/features/ionic.ini | 4 +\n drivers/net/ionic/ionic.h | 1 +\n drivers/net/ionic/ionic_dev.h | 3 +\n drivers/net/ionic/ionic_ethdev.c | 322 +++++++++++++++++++++++++++++\n drivers/net/ionic/ionic_lif.c | 270 ++++++++++++++++++++++++\n drivers/net/ionic/ionic_lif.h | 10 +\n 6 files changed, 610 insertions(+)", "diff": "diff --git a/doc/guides/nics/features/ionic.ini b/doc/guides/nics/features/ionic.ini\nindex 6915d9c42..c69e5cbed 100644\n--- a/doc/guides/nics/features/ionic.ini\n+++ b/doc/guides/nics/features/ionic.ini\n@@ -4,6 +4,10 @@\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+MTU update = Y\n Linux UIO = Y\n Linux VFIO = Y\n x86-64 = Y\ndiff --git a/drivers/net/ionic/ionic.h b/drivers/net/ionic/ionic.h\nindex e7c8ad34b..ae4f6acc7 100644\n--- a/drivers/net/ionic/ionic.h\n+++ b/drivers/net/ionic/ionic.h\n@@ -54,6 +54,7 @@ struct ionic_adapter {\n \tuint32_t nlifs;\n \tuint32_t max_ntxqs_per_lif;\n \tuint32_t max_nrxqs_per_lif;\n+\tuint32_t max_mac_addrs;\n \tuint32_t link_speed;\n \tuint32_t nintrs;\n \tbool intrs[IONIC_INTR_CTRL_REGS_MAX];\ndiff --git a/drivers/net/ionic/ionic_dev.h b/drivers/net/ionic/ionic_dev.h\nindex a832ff405..61576621b 100644\n--- a/drivers/net/ionic/ionic_dev.h\n+++ b/drivers/net/ionic/ionic_dev.h\n@@ -9,6 +9,9 @@\n #include \"ionic_if.h\"\n #include \"ionic_regs.h\"\n \n+#define IONIC_MIN_MTU\t\t\tRTE_ETHER_MIN_MTU\n+#define IONIC_MAX_MTU\t\t\t9194\n+\n #define IONIC_MAX_RING_DESC\t\t32768\n #define IONIC_MIN_RING_DESC\t\t16\n \ndiff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c\nindex 75f5a16b9..3a6c14604 100644\n--- a/drivers/net/ionic/ionic_ethdev.c\n+++ b/drivers/net/ionic/ionic_ethdev.c\n@@ -18,6 +18,17 @@\n \n static int eth_ionic_dev_init(struct rte_eth_dev *eth_dev, void *init_params);\n static int eth_ionic_dev_uninit(struct rte_eth_dev *eth_dev);\n+static int ionic_dev_info_get(struct rte_eth_dev *eth_dev,\n+\tstruct rte_eth_dev_info *dev_info);\n+static int ionic_dev_configure(struct rte_eth_dev *dev);\n+static int ionic_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);\n+static int ionic_dev_start(struct rte_eth_dev *dev);\n+static void ionic_dev_stop(struct rte_eth_dev *dev);\n+static void ionic_dev_close(struct rte_eth_dev *dev);\n+static int ionic_dev_set_link_up(struct rte_eth_dev *dev);\n+static int ionic_dev_set_link_down(struct rte_eth_dev *dev);\n+static int ionic_dev_link_update(struct rte_eth_dev *eth_dev,\n+\tint wait_to_complete);\n \n int ionic_logtype_driver;\n \n@@ -29,6 +40,15 @@ static const struct rte_pci_id pci_id_ionic_map[] = {\n };\n \n static const struct eth_dev_ops ionic_eth_dev_ops = {\n+\t.dev_infos_get = ionic_dev_info_get,\n+\t.dev_configure = ionic_dev_configure,\n+\t.mtu_set = ionic_dev_mtu_set,\n+\t.dev_start = ionic_dev_start,\n+\t.dev_stop = ionic_dev_stop,\n+\t.dev_close = ionic_dev_close,\n+\t.link_update = ionic_dev_link_update,\n+\t.dev_set_link_up = ionic_dev_set_link_up,\n+\t.dev_set_link_down = ionic_dev_set_link_down,\n };\n \n /*\n@@ -39,6 +59,104 @@ static LIST_HEAD(ionic_pci_adapters_list, ionic_adapter) ionic_pci_adapters =\n \t\tLIST_HEAD_INITIALIZER(ionic_pci_adapters);\n static rte_spinlock_t ionic_pci_adapters_lock = RTE_SPINLOCK_INITIALIZER;\n \n+/*\n+ * Set device link up, enable tx.\n+ */\n+static int\n+ionic_dev_set_link_up(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tstruct ionic_adapter *adapter = lif->adapter;\n+\tstruct ionic_dev *idev = &adapter->idev;\n+\tint err;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\tionic_dev_cmd_port_state(idev, IONIC_PORT_ADMIN_STATE_UP);\n+\n+\terr = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT);\n+\n+\tif (err) {\n+\t\tIONIC_PRINT(WARNING, \"Failed to bring port UP\");\n+\t\treturn err;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+/*\n+ * Set device link down, disable tx.\n+ */\n+static int\n+ionic_dev_set_link_down(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tstruct ionic_adapter *adapter = lif->adapter;\n+\tstruct ionic_dev *idev = &adapter->idev;\n+\tint err;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\tionic_dev_cmd_port_state(idev, IONIC_PORT_ADMIN_STATE_DOWN);\n+\n+\terr = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT);\n+\n+\tif (err) {\n+\t\tIONIC_PRINT(WARNING, \"Failed to bring port DOWN\");\n+\t\treturn err;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+ionic_dev_link_update(struct rte_eth_dev *eth_dev,\n+\t\tint wait_to_complete __rte_unused)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tstruct ionic_adapter *adapter = lif->adapter;\n+\tstruct rte_eth_link link;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\t/* Initialize */\n+\tmemset(&link, 0, sizeof(link));\n+\tlink.link_autoneg = ETH_LINK_AUTONEG;\n+\n+\tif (!adapter->link_up) {\n+\t\t/* Interface is down */\n+\t\tlink.link_status = ETH_LINK_DOWN;\n+\t\tlink.link_duplex = ETH_LINK_HALF_DUPLEX;\n+\t\tlink.link_speed = ETH_SPEED_NUM_NONE;\n+\t} else {\n+\t\t/* Interface is up */\n+\t\tlink.link_status = ETH_LINK_UP;\n+\t\tlink.link_duplex = ETH_LINK_FULL_DUPLEX;\n+\t\tswitch (adapter->link_speed) {\n+\t\tcase 10000:\n+\t\t\tlink.link_speed = ETH_SPEED_NUM_10G;\n+\t\t\tbreak;\n+\t\tcase 25000:\n+\t\t\tlink.link_speed = ETH_SPEED_NUM_25G;\n+\t\t\tbreak;\n+\t\tcase 40000:\n+\t\t\tlink.link_speed = ETH_SPEED_NUM_40G;\n+\t\t\tbreak;\n+\t\tcase 50000:\n+\t\t\tlink.link_speed = ETH_SPEED_NUM_50G;\n+\t\t\tbreak;\n+\t\tcase 100000:\n+\t\t\tlink.link_speed = ETH_SPEED_NUM_100G;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tlink.link_speed = ETH_SPEED_NUM_NONE;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\treturn rte_eth_linkstatus_set(eth_dev, &link);\n+}\n+\n /**\n * Interrupt handler triggered by NIC for handling\n * specific interrupt.\n@@ -63,6 +181,189 @@ ionic_dev_interrupt_handler(void *param)\n \t}\n }\n \n+static int\n+ionic_dev_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tint err;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\t/*\n+\t * Max frame size is MTU + Ethernet header + VLAN + QinQ\n+\t * (plus ETHER_CRC_LEN if the adapter is able to keep CRC)\n+\t * uint32_t frame_size = mtu + RTE_ETHER_HDR_LEN + 4 + 4;\n+\t */\n+\n+\t/* Check that mtu is within the allowed range */\n+\tif (mtu < IONIC_MIN_MTU || mtu > IONIC_MAX_MTU)\n+\t\treturn -EINVAL;\n+\n+\terr = ionic_lif_change_mtu(lif, mtu);\n+\n+\tif (err)\n+\t\treturn err;\n+\n+\treturn 0;\n+}\n+\n+static int\n+ionic_dev_info_get(struct rte_eth_dev *eth_dev,\n+\t\tstruct rte_eth_dev_info *dev_info)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tstruct ionic_adapter *adapter = lif->adapter;\n+\tstruct ionic_identity *ident = &adapter->ident;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\tdev_info->max_rx_queues = (uint16_t)\n+\t\tident->lif.eth.config.queue_count[IONIC_QTYPE_RXQ];\n+\tdev_info->max_tx_queues = (uint16_t)\n+\t\tident->lif.eth.config.queue_count[IONIC_QTYPE_TXQ];\n+\t/* Also add ETHER_CRC_LEN if the adapter is able to keep CRC */\n+\tdev_info->min_rx_bufsize = IONIC_MIN_MTU + RTE_ETHER_HDR_LEN;\n+\tdev_info->max_rx_pktlen = IONIC_MAX_MTU + RTE_ETHER_HDR_LEN;\n+\tdev_info->max_mac_addrs = adapter->max_mac_addrs;\n+\tdev_info->min_mtu = IONIC_MIN_MTU;\n+\tdev_info->max_mtu = IONIC_MAX_MTU;\n+\n+\tdev_info->speed_capa =\n+\t\tETH_LINK_SPEED_10G |\n+\t\tETH_LINK_SPEED_25G |\n+\t\tETH_LINK_SPEED_40G |\n+\t\tETH_LINK_SPEED_50G |\n+\t\tETH_LINK_SPEED_100G;\n+\n+\treturn 0;\n+}\n+\n+static int\n+ionic_dev_configure(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tint err;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\terr = ionic_lif_configure(lif);\n+\n+\tif (err) {\n+\t\tIONIC_PRINT(ERR, \"Cannot configure LIF: %d\", err);\n+\t\treturn err;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static inline uint32_t\n+ionic_parse_link_speeds(uint16_t link_speeds)\n+{\n+\tif (link_speeds & ETH_LINK_SPEED_100G)\n+\t\treturn 100000;\n+\telse if (link_speeds & ETH_LINK_SPEED_50G)\n+\t\treturn 50000;\n+\telse if (link_speeds & ETH_LINK_SPEED_40G)\n+\t\treturn 40000;\n+\telse if (link_speeds & ETH_LINK_SPEED_25G)\n+\t\treturn 25000;\n+\telse if (link_speeds & ETH_LINK_SPEED_10G)\n+\t\treturn 10000;\n+\telse\n+\t\treturn 0;\n+}\n+\n+/*\n+ * Configure device link speed and setup link.\n+ * It returns 0 on success.\n+ */\n+static int\n+ionic_dev_start(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct rte_eth_conf *dev_conf = ð_dev->data->dev_conf;\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tstruct ionic_adapter *adapter = lif->adapter;\n+\tstruct ionic_dev *idev = &adapter->idev;\n+\tuint32_t allowed_speeds;\n+\tint err;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\tallowed_speeds =\n+\t\tETH_LINK_SPEED_FIXED |\n+\t\tETH_LINK_SPEED_10G |\n+\t\tETH_LINK_SPEED_25G |\n+\t\tETH_LINK_SPEED_40G |\n+\t\tETH_LINK_SPEED_50G |\n+\t\tETH_LINK_SPEED_100G;\n+\n+\tif (dev_conf->link_speeds & ~allowed_speeds) {\n+\t\tIONIC_PRINT(ERR, \"Invalid link setting\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\terr = ionic_lif_start(lif);\n+\n+\tif (err) {\n+\t\tIONIC_PRINT(ERR, \"Cannot start LIF: %d\", err);\n+\t\treturn err;\n+\t}\n+\n+\tif (eth_dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED) {\n+\t\tuint32_t speed = ionic_parse_link_speeds(dev_conf->link_speeds);\n+\n+\t\tif (speed)\n+\t\t\tionic_dev_cmd_port_speed(idev, speed);\n+\t}\n+\n+\tionic_dev_link_update(eth_dev, 0);\n+\n+\treturn 0;\n+}\n+\n+/*\n+ * Stop device: disable rx and tx functions to allow for reconfiguring.\n+ */\n+static void\n+ionic_dev_stop(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tint err;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\terr = ionic_lif_stop(lif);\n+\n+\tif (err)\n+\t\tIONIC_PRINT(ERR, \"Cannot stop LIF: %d\", err);\n+}\n+\n+/*\n+ * Reset and stop device.\n+ */\n+static void\n+ionic_dev_close(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tint err;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\terr = ionic_lif_stop(lif);\n+\n+\tif (err) {\n+\t\tIONIC_PRINT(ERR, \"Cannot stop LIF: %d\", err);\n+\t\treturn;\n+\t}\n+\n+\terr = eth_ionic_dev_uninit(eth_dev);\n+\n+\tif (err) {\n+\t\tIONIC_PRINT(ERR, \"Cannot destroy LIF: %d\", err);\n+\t\treturn;\n+\t}\n+}\n+\n static int\n eth_ionic_dev_init(struct rte_eth_dev *eth_dev, void *init_params)\n {\n@@ -86,6 +387,21 @@ eth_ionic_dev_init(struct rte_eth_dev *eth_dev, void *init_params)\n \tlif->adapter = adapter;\n \tadapter->lifs[adapter->nlifs] = lif;\n \n+\tIONIC_PRINT(DEBUG, \"Up to %u MAC addresses supported\",\n+\t\tadapter->max_mac_addrs);\n+\n+\t/* Allocate memory for storing MAC addresses */\n+\teth_dev->data->mac_addrs = rte_zmalloc(\"ionic\",\n+\t\tRTE_ETHER_ADDR_LEN * adapter->max_mac_addrs, 0);\n+\n+\tif (eth_dev->data->mac_addrs == NULL) {\n+\t\tIONIC_PRINT(ERR, \"Failed to allocate %u bytes needed to \"\n+\t\t\t\"store MAC addresses\",\n+\t\t\tRTE_ETHER_ADDR_LEN * adapter->max_mac_addrs);\n+\t\terr = -ENOMEM;\n+\t\tgoto err;\n+\t}\n+\n \terr = ionic_lif_alloc(lif);\n \n \tif (err) {\n@@ -101,6 +417,10 @@ eth_ionic_dev_init(struct rte_eth_dev *eth_dev, void *init_params)\n \t\tgoto err_free_lif;\n \t}\n \n+\t/* Copy the MAC address */\n+\trte_ether_addr_copy((struct rte_ether_addr *)lif->mac_addr,\n+\t\tð_dev->data->mac_addrs[0]);\n+\n \tIONIC_PRINT(DEBUG, \"Port %u initialized\", eth_dev->data->port_id);\n \n err_free_lif:\n@@ -304,6 +624,8 @@ eth_ionic_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \t\tgoto err_free_adapter;\n \t}\n \n+\tadapter->max_mac_addrs = adapter->ident.lif.eth.max_ucast_filters;\n+\n \tadapter->nlifs = 0;\n \tfor (i = 0; i < adapter->ident.dev.nlifs; i++) {\n \t\tsnprintf(name, sizeof(name), \"net_%s_lif_%lu\",\ndiff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c\nindex 497b01f1f..bf6a7566c 100644\n--- a/drivers/net/ionic/ionic_lif.c\n+++ b/drivers/net/ionic/ionic_lif.c\n@@ -10,6 +10,9 @@\n #include \"ionic_lif.h\"\n #include \"ionic_ethdev.h\"\n \n+static int ionic_lif_addr_add(struct ionic_lif *lif, const uint8_t *addr);\n+static int ionic_lif_addr_del(struct ionic_lif *lif, const uint8_t *addr);\n+\n int\n ionic_qcq_enable(struct ionic_qcq *qcq)\n {\n@@ -60,6 +63,107 @@ ionic_qcq_disable(struct ionic_qcq *qcq)\n \treturn ionic_adminq_post_wait(lif, &ctx);\n }\n \n+int\n+ionic_lif_stop(struct ionic_lif *lif __rte_unused)\n+{\n+\t/* Carrier OFF here */\n+\n+\treturn 0;\n+}\n+\n+void\n+ionic_lif_reset(struct ionic_lif *lif)\n+{\n+\tstruct ionic_dev *idev = &lif->adapter->idev;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\tionic_dev_cmd_lif_reset(idev, lif->index);\n+\tionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT);\n+}\n+\n+static int\n+ionic_lif_addr_add(struct ionic_lif *lif __rte_unused,\n+\t\tconst uint8_t *addr __rte_unused)\n+{\n+\tIONIC_PRINT(INFO, \"%s: stubbed\", __func__);\n+\n+\treturn 0;\n+}\n+\n+static int\n+ionic_lif_addr_del(struct ionic_lif *lif __rte_unused,\n+\t\tconst uint8_t *addr __rte_unused)\n+{\n+\tIONIC_PRINT(INFO, \"%s: stubbed\", __func__);\n+\n+\treturn 0;\n+}\n+\n+static void\n+ionic_lif_rx_mode(struct ionic_lif *lif, uint32_t rx_mode)\n+{\n+\tstruct ionic_admin_ctx ctx = {\n+\t\t.pending_work = true,\n+\t\t.cmd.rx_mode_set = {\n+\t\t\t.opcode = IONIC_CMD_RX_MODE_SET,\n+\t\t\t.lif_index = lif->index,\n+\t\t\t.rx_mode = rx_mode,\n+\t\t},\n+\t};\n+\tint err;\n+\n+\tif (rx_mode & IONIC_RX_MODE_F_UNICAST)\n+\t\tIONIC_PRINT(DEBUG, \"rx_mode IONIC_RX_MODE_F_UNICAST\");\n+\tif (rx_mode & IONIC_RX_MODE_F_MULTICAST)\n+\t\tIONIC_PRINT(DEBUG, \"rx_mode IONIC_RX_MODE_F_MULTICAST\");\n+\tif (rx_mode & IONIC_RX_MODE_F_BROADCAST)\n+\t\tIONIC_PRINT(DEBUG, \"rx_mode IONIC_RX_MODE_F_BROADCAST\");\n+\tif (rx_mode & IONIC_RX_MODE_F_PROMISC)\n+\t\tIONIC_PRINT(DEBUG, \"rx_mode IONIC_RX_MODE_F_PROMISC\");\n+\tif (rx_mode & IONIC_RX_MODE_F_ALLMULTI)\n+\t\tIONIC_PRINT(DEBUG, \"rx_mode IONIC_RX_MODE_F_ALLMULTI\");\n+\n+\terr = ionic_adminq_post_wait(lif, &ctx);\n+\n+\tif (err)\n+\t\tIONIC_PRINT(ERR, \"Failure setting RX mode\");\n+}\n+\n+static void\n+ionic_set_rx_mode(struct ionic_lif *lif, uint32_t rx_mode)\n+{\n+\tif (lif->rx_mode != rx_mode) {\n+\t\tlif->rx_mode = rx_mode;\n+\t\tionic_lif_rx_mode(lif, rx_mode);\n+\t}\n+}\n+\n+\n+int\n+ionic_lif_change_mtu(struct ionic_lif *lif, int new_mtu)\n+{\n+\tstruct ionic_admin_ctx ctx = {\n+\t\t.pending_work = true,\n+\t\t.cmd.lif_setattr = {\n+\t\t\t.opcode = IONIC_CMD_LIF_SETATTR,\n+\t\t\t.index = lif->index,\n+\t\t\t.attr = IONIC_LIF_ATTR_MTU,\n+\t\t\t.mtu = new_mtu,\n+\t\t},\n+\t};\n+\tint err;\n+\n+\terr = ionic_adminq_post_wait(lif, &ctx);\n+\n+\tif (err)\n+\t\treturn err;\n+\n+\tlif->mtu = new_mtu;\n+\n+\treturn 0;\n+}\n+\n int\n ionic_intr_alloc(struct ionic_lif *lif, struct ionic_intr_info *intr)\n {\n@@ -601,6 +705,124 @@ ionic_lif_notifyq_init(struct ionic_lif *lif)\n \treturn 0;\n }\n \n+int\n+ionic_lif_set_features(struct ionic_lif *lif)\n+{\n+\tstruct ionic_admin_ctx ctx = {\n+\t\t.pending_work = true,\n+\t\t.cmd.lif_setattr = {\n+\t\t\t.opcode = IONIC_CMD_LIF_SETATTR,\n+\t\t\t.index = lif->index,\n+\t\t\t.attr = IONIC_LIF_ATTR_FEATURES,\n+\t\t\t.features = lif->features,\n+\t\t},\n+\t};\n+\tint err;\n+\n+\terr = ionic_adminq_post_wait(lif, &ctx);\n+\tif (err)\n+\t\treturn err;\n+\n+\tlif->hw_features = (ctx.cmd.lif_setattr.features &\n+\t\tctx.comp.lif_setattr.features);\n+\n+\tif (lif->hw_features & IONIC_ETH_HW_VLAN_TX_TAG)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_VLAN_TX_TAG\");\n+\tif (lif->hw_features & IONIC_ETH_HW_VLAN_RX_STRIP)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_VLAN_RX_STRIP\");\n+\tif (lif->hw_features & IONIC_ETH_HW_VLAN_RX_FILTER)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_VLAN_RX_FILTER\");\n+\tif (lif->hw_features & IONIC_ETH_HW_RX_HASH)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_RX_HASH\");\n+\tif (lif->hw_features & IONIC_ETH_HW_TX_SG)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_TX_SG\");\n+\tif (lif->hw_features & IONIC_ETH_HW_RX_SG)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_RX_SG\");\n+\tif (lif->hw_features & IONIC_ETH_HW_TX_CSUM)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_TX_CSUM\");\n+\tif (lif->hw_features & IONIC_ETH_HW_RX_CSUM)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_RX_CSUM\");\n+\tif (lif->hw_features & IONIC_ETH_HW_TSO)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_TSO\");\n+\tif (lif->hw_features & IONIC_ETH_HW_TSO_IPV6)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_TSO_IPV6\");\n+\tif (lif->hw_features & IONIC_ETH_HW_TSO_ECN)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_TSO_ECN\");\n+\tif (lif->hw_features & IONIC_ETH_HW_TSO_GRE)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_TSO_GRE\");\n+\tif (lif->hw_features & IONIC_ETH_HW_TSO_GRE_CSUM)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_TSO_GRE_CSUM\");\n+\tif (lif->hw_features & IONIC_ETH_HW_TSO_IPXIP4)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_TSO_IPXIP4\");\n+\tif (lif->hw_features & IONIC_ETH_HW_TSO_IPXIP6)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_TSO_IPXIP6\");\n+\tif (lif->hw_features & IONIC_ETH_HW_TSO_UDP)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_TSO_UDP\");\n+\tif (lif->hw_features & IONIC_ETH_HW_TSO_UDP_CSUM)\n+\t\tIONIC_PRINT(DEBUG, \"feature IONIC_ETH_HW_TSO_UDP_CSUM\");\n+\n+\treturn 0;\n+}\n+\n+static int\n+ionic_station_set(struct ionic_lif *lif)\n+{\n+\tstruct ionic_admin_ctx ctx = {\n+\t\t.pending_work = true,\n+\t\t.cmd.lif_getattr = {\n+\t\t\t.opcode = IONIC_CMD_LIF_GETATTR,\n+\t\t\t.index = lif->index,\n+\t\t\t.attr = IONIC_LIF_ATTR_MAC,\n+\t\t},\n+\t};\n+\tint err;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\terr = ionic_adminq_post_wait(lif, &ctx);\n+\n+\tif (err)\n+\t\treturn err;\n+\n+\tif (!rte_is_zero_ether_addr((struct rte_ether_addr *)\n+\t\t\tlif->mac_addr)) {\n+\t\tIONIC_PRINT(INFO, \"deleting station MAC addr\");\n+\n+\t\tionic_lif_addr_del(lif, lif->mac_addr);\n+\t}\n+\n+\tmemcpy(lif->mac_addr, ctx.comp.lif_getattr.mac, RTE_ETHER_ADDR_LEN);\n+\n+\tif (rte_is_zero_ether_addr((struct rte_ether_addr *)lif->mac_addr)) {\n+\t\tIONIC_PRINT(NOTICE, \"empty MAC addr (VF?)\");\n+\t\treturn 0;\n+\t}\n+\n+\tIONIC_PRINT(DEBUG, \"adding station MAC addr\");\n+\n+\tionic_lif_addr_add(lif, lif->mac_addr);\n+\n+\treturn 0;\n+}\n+\n+static void\n+ionic_lif_set_name(struct ionic_lif *lif)\n+{\n+\tstruct ionic_admin_ctx ctx = {\n+\t\t.pending_work = true,\n+\t\t.cmd.lif_setattr = {\n+\t\t\t.opcode = IONIC_CMD_LIF_SETATTR,\n+\t\t\t.index = lif->index,\n+\t\t\t.attr = IONIC_LIF_ATTR_NAME,\n+\t\t},\n+\t};\n+\n+\tsnprintf(ctx.cmd.lif_setattr.name, sizeof(ctx.cmd.lif_setattr.name),\n+\t\t\"%d\", lif->port_id);\n+\n+\tionic_adminq_post_wait(lif, &ctx);\n+}\n+\n int\n ionic_lif_init(struct ionic_lif *lif)\n {\n@@ -626,10 +848,27 @@ ionic_lif_init(struct ionic_lif *lif)\n \tif (err)\n \t\tgoto err_out_adminq_deinit;\n \n+\tlif->features = 0;\n+\n+\terr = ionic_lif_set_features(lif);\n+\n+\tif (err)\n+\t\tgoto err_out_notifyq_deinit;\n+\n+\terr = ionic_station_set(lif);\n+\n+\tif (err)\n+\t\tgoto err_out_notifyq_deinit;\n+\n+\tionic_lif_set_name(lif);\n+\n \tlif->state |= IONIC_LIF_F_INITED;\n \n \treturn 0;\n \n+err_out_notifyq_deinit:\n+\tionic_lif_qcq_deinit(lif, lif->notifyqcq);\n+\n err_out_adminq_deinit:\n \tionic_lif_qcq_deinit(lif, lif->adminqcq);\n \n@@ -648,6 +887,37 @@ ionic_lif_deinit(struct ionic_lif *lif)\n \tlif->state &= ~IONIC_LIF_F_INITED;\n }\n \n+int\n+ionic_lif_configure(struct ionic_lif *lif)\n+{\n+\tlif->port_id = lif->eth_dev->data->port_id;\n+\n+\treturn 0;\n+}\n+\n+int\n+ionic_lif_start(struct ionic_lif *lif)\n+{\n+\tuint32_t rx_mode = 0;\n+\n+\tIONIC_PRINT(DEBUG, \"Setting RX mode on port %u\",\n+\t\tlif->port_id);\n+\n+\trx_mode |= IONIC_RX_MODE_F_UNICAST;\n+\trx_mode |= IONIC_RX_MODE_F_MULTICAST;\n+\trx_mode |= IONIC_RX_MODE_F_BROADCAST;\n+\n+\tlif->rx_mode = 0; /* set by ionic_set_rx_mode */\n+\n+\tionic_set_rx_mode(lif, rx_mode);\n+\n+\tionic_link_status_check(lif);\n+\n+\t/* Carrier ON here */\n+\n+\treturn 0;\n+}\n+\n int\n ionic_lif_identify(struct ionic_adapter *adapter)\n {\ndiff --git a/drivers/net/ionic/ionic_lif.h b/drivers/net/ionic/ionic_lif.h\nindex 78cf92db8..9dbc54e27 100644\n--- a/drivers/net/ionic/ionic_lif.h\n+++ b/drivers/net/ionic/ionic_lif.h\n@@ -44,6 +44,7 @@ struct ionic_lif {\n \tstruct ionic_adapter *adapter;\n \tstruct rte_eth_dev *eth_dev;\n \tuint16_t port_id; /**< Device port identifier */\n+\tuint16_t mtu;\n \tuint32_t index;\n \tuint32_t hw_index;\n \tuint32_t state;\n@@ -54,7 +55,11 @@ struct ionic_lif {\n \tstruct ionic_qcq *notifyqcq;\n \tstruct ionic_doorbell __iomem *kern_dbpage;\n \tuint64_t last_eid;\n+\tuint64_t features;\n+\tuint32_t hw_features;\n+\tuint32_t rx_mode;\n \tchar name[IONIC_LIF_NAME_MAX_SZ];\n+\tuint8_t mac_addr[RTE_ETHER_ADDR_LEN];\n \tuint32_t info_sz;\n \tstruct ionic_lif_info *info;\n \trte_iova_t info_pa;\n@@ -71,6 +76,7 @@ int ionic_lif_init(struct ionic_lif *lif);\n void ionic_lif_deinit(struct ionic_lif *lif);\n \n int ionic_lif_start(struct ionic_lif *lif);\n+int ionic_lif_stop(struct ionic_lif *lif);\n \n int ionic_lif_configure(struct ionic_lif *lif);\n void ionic_lif_reset(struct ionic_lif *lif);\n@@ -83,11 +89,15 @@ bool ionic_adminq_service(struct ionic_cq *cq, uint32_t cq_desc_index,\n int ionic_qcq_service(struct ionic_qcq *qcq, int budget, ionic_cq_cb cb,\n \tvoid *cb_arg);\n \n+int ionic_lif_change_mtu(struct ionic_lif *lif, int new_mtu);\n+\n void ionic_qcq_free(struct ionic_qcq *qcq);\n \n int ionic_qcq_enable(struct ionic_qcq *qcq);\n int ionic_qcq_disable(struct ionic_qcq *qcq);\n \n+int ionic_lif_set_features(struct ionic_lif *lif);\n+\n int ionic_notifyq_handler(struct ionic_lif *lif, int budget);\n \n #endif /* _IONIC_LIF_H_ */\n", "prefixes": [ "v3", "10/17" ] }