Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/809189/?format=api
{ "id": 809189, "url": "http://patchwork.ozlabs.org/api/patches/809189/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170903012605.7435-4-jakub.kicinski@netronome.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170903012605.7435-4-jakub.kicinski@netronome.com>", "list_archive_url": null, "date": "2017-09-03T01:26:02", "name": "[net-next,3/6] nfp: move the start/stop app callbacks back", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "11dc623f3448470d099dfbae49be377408696441", "submitter": { "id": 67484, "url": "http://patchwork.ozlabs.org/api/people/67484/?format=api", "name": "Jakub Kicinski", "email": "jakub.kicinski@netronome.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20170903012605.7435-4-jakub.kicinski@netronome.com/mbox/", "series": [ { "id": 1191, "url": "http://patchwork.ozlabs.org/api/series/1191/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=1191", "date": "2017-09-03T01:26:03", "name": "nfp: refactor app init, and minor flower fixes", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/1191/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/809189/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/809189/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming@ozlabs.org", "Delivered-To": "patchwork-incoming@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=netronome-com.20150623.gappssmtp.com\n\theader.i=@netronome-com.20150623.gappssmtp.com\n\theader.b=\"Mjc7Q6Fi\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlFgh6ZmNz9sPk\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSun, 3 Sep 2017 11:26:40 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753009AbdICB0i (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tSat, 2 Sep 2017 21:26:38 -0400", "from mail-pf0-f169.google.com ([209.85.192.169]:32884 \"EHLO\n\tmail-pf0-f169.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752959AbdICB0Q (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Sat, 2 Sep 2017 21:26:16 -0400", "by mail-pf0-f169.google.com with SMTP id n73so9572532pfj.0\n\tfor <netdev@vger.kernel.org>; Sat, 02 Sep 2017 18:26:16 -0700 (PDT)", "from jkicinski-Precision-T1700.netronome.com ([75.53.12.129])\n\tby smtp.gmail.com with ESMTPSA id\n\tb187sm5180400pfg.133.2017.09.02.18.26.14\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tSat, 02 Sep 2017 18:26:14 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=netronome-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=0P2GGfIWasINJJs1lgNMDpPOhjsZsdbr3Ccm/XSGqpw=;\n\tb=Mjc7Q6FiYYPHsnmBBT/E393QejwAa/35mokrWHQ7y0P1+ZVgT25NfJl8vWJgBFfEDw\n\tlBDFU6d1VTMHIICiXX5hLPPKmRP/Cus7OtE2JOJiVUNGgW6vjF7o/u49o77rlIX5TQfQ\n\tdE1qbja20eO3245zFfbnrQE5M0fsJXtVH7xGUg+EYvwnkPvYjonEqqWInoj+1+Dmo9nF\n\tW+vh3Ud4W3L2q5JboTPRp8GFmoy+KA6ciIsPixagCKRI4eVCB5ARNw1ul1x0TRjzTeO1\n\t+xftzhQ/MY9xr0axUt4Q9qALBlcbIX8Ui6z49kL6zDk/RzK1gXQNGJposDnDFRlRyZDc\n\toNzA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=0P2GGfIWasINJJs1lgNMDpPOhjsZsdbr3Ccm/XSGqpw=;\n\tb=K87zlacOnr22daYRE0sig0tj1ZmiQrli/SkSpYjBqLUD2NHSu9Rj0uSoE/J3l5PeD9\n\t5SCYfVYzIXXqc1HXuJP+w1VQx+1aVhvTbWzuIeiw7GFhZkY/8MKCjQSyzAI0/gkLbvbb\n\tc3FSLBJgP+QB9Fc09Tp3AcC95UFBJY0625wVniIk8o3JM+3oggXEHbKDg0jbs2IkTce5\n\tRFoVLQ6mXYU2V00YbfGTIo394akK1KCnA1Rxu5FHdK2dx21hC3ohz5HqS5hubm5GHvZ4\n\t4XabEEeW28avWe3OmSgEiaQZ/TlXFYWHugbTcOCt5NWmh8jR5eVkruz6u8mFQV1j88zW\n\tChxw==", "X-Gm-Message-State": "AHPjjUhd7xpxafKrEQVLI0q+0GH+15pXqrS/NquHhBXCuEI97EULwoEK\n\t/vBHgaL5dHVwJRopxUo=", "X-Google-Smtp-Source": "ADKCNb5C1bxR2TzucAC/Ai5vigSdAeZE1aCp2ZVhQ+qWm+MmIWr20+lv1BalHByxy3pcoq1D4vMrrg==", "X-Received": "by 10.98.27.210 with SMTP id b201mr2361687pfb.250.1504401975425; \n\tSat, 02 Sep 2017 18:26:15 -0700 (PDT)", "From": "Jakub Kicinski <jakub.kicinski@netronome.com>", "To": "netdev@vger.kernel.org", "Cc": "oss-drivers@netronome.com, Jakub Kicinski <jakub.kicinski@netronome.com>", "Subject": "[PATCH net-next 3/6] nfp: move the start/stop app callbacks back", "Date": "Sat, 2 Sep 2017 18:26:02 -0700", "Message-Id": "<20170903012605.7435-4-jakub.kicinski@netronome.com>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20170903012605.7435-1-jakub.kicinski@netronome.com>", "References": "<20170903012605.7435-1-jakub.kicinski@netronome.com>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Since representors are now created with a separate callback\nstart/stop app callbacks can be moved again to their original\nlocation. They are intended to app-specific init/clean up\nover the control channel.\n\nSigned-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>\nReviewed-by: Simon Horman <simon.horman@netronome.com>\n---\n drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 26 ++++++++++-------------\n 1 file changed, 11 insertions(+), 15 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c\nindex f2a1a4e2ce8b..5abb9ba31e7d 100644\n--- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c\n+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c\n@@ -469,10 +469,14 @@ static int nfp_net_pf_app_start(struct nfp_pf *pf)\n {\n \tint err;\n \n-\terr = nfp_app_start(pf->app, pf->ctrl_vnic);\n+\terr = nfp_net_pf_app_start_ctrl(pf);\n \tif (err)\n \t\treturn err;\n \n+\terr = nfp_app_start(pf->app, pf->ctrl_vnic);\n+\tif (err)\n+\t\tgoto err_ctrl_stop;\n+\n \tif (pf->num_vfs) {\n \t\terr = nfp_app_sriov_enable(pf->app, pf->num_vfs);\n \t\tif (err)\n@@ -483,6 +487,8 @@ static int nfp_net_pf_app_start(struct nfp_pf *pf)\n \n err_app_stop:\n \tnfp_app_stop(pf->app);\n+err_ctrl_stop:\n+\tnfp_net_pf_app_stop_ctrl(pf);\n \treturn err;\n }\n \n@@ -491,6 +497,7 @@ static void nfp_net_pf_app_stop(struct nfp_pf *pf)\n \tif (pf->num_vfs)\n \t\tnfp_app_sriov_disable(pf->app);\n \tnfp_app_stop(pf->app);\n+\tnfp_net_pf_app_stop_ctrl(pf);\n }\n \n static void nfp_net_pci_unmap_mem(struct nfp_pf *pf)\n@@ -582,7 +589,7 @@ static int nfp_net_pci_map_mem(struct nfp_pf *pf)\n \n static void nfp_net_pci_remove_finish(struct nfp_pf *pf)\n {\n-\tnfp_net_pf_app_stop_ctrl(pf);\n+\tnfp_net_pf_app_stop(pf);\n \t/* stop app first, to avoid double free of ctrl vNIC's ddir */\n \tnfp_net_debugfs_dir_clean(&pf->ddir);\n \n@@ -713,7 +720,6 @@ int nfp_net_pci_probe(struct nfp_pf *pf)\n {\n \tstruct nfp_net_fw_version fw_ver;\n \tu8 __iomem *ctrl_bar, *qc_bar;\n-\tstruct nfp_net *nn;\n \tint stride;\n \tint err;\n \n@@ -790,7 +796,7 @@ int nfp_net_pci_probe(struct nfp_pf *pf)\n \tif (err)\n \t\tgoto err_free_vnics;\n \n-\terr = nfp_net_pf_app_start_ctrl(pf);\n+\terr = nfp_net_pf_app_start(pf);\n \tif (err)\n \t\tgoto err_free_irqs;\n \n@@ -798,20 +804,12 @@ int nfp_net_pci_probe(struct nfp_pf *pf)\n \tif (err)\n \t\tgoto err_stop_app;\n \n-\terr = nfp_net_pf_app_start(pf);\n-\tif (err)\n-\t\tgoto err_clean_vnics;\n-\n \tmutex_unlock(&pf->lock);\n \n \treturn 0;\n \n-err_clean_vnics:\n-\tlist_for_each_entry(nn, &pf->vnics, vnic_list)\n-\t\tif (nfp_net_is_data_vnic(nn))\n-\t\t\tnfp_net_pf_clean_vnic(pf, nn);\n err_stop_app:\n-\tnfp_net_pf_app_stop_ctrl(pf);\n+\tnfp_net_pf_app_stop(pf);\n err_free_irqs:\n \tnfp_net_pf_free_irqs(pf);\n err_free_vnics:\n@@ -835,8 +833,6 @@ void nfp_net_pci_remove(struct nfp_pf *pf)\n \tif (list_empty(&pf->vnics))\n \t\tgoto out;\n \n-\tnfp_net_pf_app_stop(pf);\n-\n \tlist_for_each_entry(nn, &pf->vnics, vnic_list)\n \t\tif (nfp_net_is_data_vnic(nn))\n \t\t\tnfp_net_pf_clean_vnic(pf, nn);\n", "prefixes": [ "net-next", "3/6" ] }