{"id":813544,"url":"http://patchwork.ozlabs.org/api/patches/813544/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170913171600.31049-3-jakub.kicinski@netronome.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","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":"<20170913171600.31049-3-jakub.kicinski@netronome.com>","list_archive_url":null,"date":"2017-09-13T17:15:59","name":"[net,v2,2/3] nfp: wait for board state before talking to the NSP","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"1ca9a2a24b364945c42717dd52294296f71fa11c","submitter":{"id":67484,"url":"http://patchwork.ozlabs.org/api/people/67484/?format=json","name":"Jakub Kicinski","email":"jakub.kicinski@netronome.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170913171600.31049-3-jakub.kicinski@netronome.com/mbox/","series":[{"id":2954,"url":"http://patchwork.ozlabs.org/api/series/2954/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=2954","date":"2017-09-13T17:15:59","name":"nfp: wait more carefully for card init","version":2,"mbox":"http://patchwork.ozlabs.org/series/2954/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813544/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813544/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","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=\"SGvsR/4X\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xspHf48Fsz9sBW\n\tfor ;\n\tThu, 14 Sep 2017 03:17:02 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751457AbdIMRRA (ORCPT );\n\tWed, 13 Sep 2017 13:17:00 -0400","from mail-pg0-f53.google.com ([74.125.83.53]:44402 \"EHLO\n\tmail-pg0-f53.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751365AbdIMRQx (ORCPT\n\t); Wed, 13 Sep 2017 13:16:53 -0400","by mail-pg0-f53.google.com with SMTP id j16so1568119pga.1\n\tfor ; Wed, 13 Sep 2017 10:16:53 -0700 (PDT)","from jkicinski-Precision-T1700.netronome.com ([75.53.12.129])\n\tby smtp.gmail.com with ESMTPSA id\n\tm82sm22440568pfk.90.2017.09.13.10.16.51\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 13 Sep 2017 10:16:51 -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=bysooUUXCof9S3iBCbv6RlLxrUdpCzIkwnjGvbMKsh0=;\n\tb=SGvsR/4XD3lc+KrY79zK3tI4MckZYvRtqu/AmTUudHbnujpNWV4lsiDpFxg5y24/AA\n\tkev0hkmybRuQacbpvlTY6ItZuBBhlfGeLNH8nWozSaknev9YrnohZg5hhvBu7lNqYboq\n\tLnCRBahhtn1Y2L14Zbpu+JPNZdhdeuZn96MsWLCDiBITzp5/KsAA/qAQ1Y3zuhvFf+GV\n\tkvFnhAubxCAijFR4V5A1yyoyohYWI7RBpECx8SYtYvb/NJkuYLuW0EzHCx5ObE4GuGwj\n\thFNwgtLe4KdRrfhVktmIrLBCNlIfb67tC9FDux4H7xQdTuRTIRX8hsdzaLyRMuIQUr+Z\n\taLzQ==","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=bysooUUXCof9S3iBCbv6RlLxrUdpCzIkwnjGvbMKsh0=;\n\tb=DYg01Meo+yJBZbWTCJ2/79aGcDTtfaKS+te5BWyC4tH+ob86swrD9FGC8RYoetfUsV\n\tvhPI0AKXkgr4hek/MBTtDOskIi4ngH48ZD5zFN1Jmv3y2cVqM/V95kTpIcFDuVUrawHZ\n\tmlKxIIINSd1u3HI7Ek9UR9PVfv/mp+NlegNV3ggZd8e91icfI2pkCrdQhatRT5nAwVLH\n\tCWcD0GQ2puv0vD+syT+6fbip8+CBNMxSNi1CFr3uLF2IfBwxa3BZu3Mq26O6WP93GyUZ\n\tDyXQb/dHS4dZhy/9n8CY9S26ZtnkIb60CI8szoobvwC1t8dVlUtovMZYsmO/s6kIqmM4\n\tTBoA==","X-Gm-Message-State":"AHPjjUjy04txQNuSqpf5s0pVnEcQj07xC38FnTjggqSGJOzXFTSzdZ4n\n\tnAwUKPbRvg4E0IlORe0=","X-Google-Smtp-Source":"ADKCNb6kK3jzRidHQffBtHxrj4hTgdEJ5kH5jbvGdjSC4WGzFDJtVVVXCZlq+mB0KsXqZneEDlIoOg==","X-Received":"by 10.99.116.90 with SMTP id e26mr18639628pgn.290.1505323012657; \n\tWed, 13 Sep 2017 10:16:52 -0700 (PDT)","From":"Jakub Kicinski ","To":"netdev@vger.kernel.org","Cc":"oss-drivers@netronome.com, Jakub Kicinski ","Subject":"[PATCH net v2 2/3] nfp: wait for board state before talking to the\n\tNSP","Date":"Wed, 13 Sep 2017 10:15:59 -0700","Message-Id":"<20170913171600.31049-3-jakub.kicinski@netronome.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170913171600.31049-1-jakub.kicinski@netronome.com>","References":"<20170913171600.31049-1-jakub.kicinski@netronome.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Board state informs us which low-level initialization stages the card\nhas completed. We should wait for the card to be fully initialized\nbefore trying to communicate with it, not only before we configure\npassing traffic.\n\nSigned-off-by: Jakub Kicinski \n---\n drivers/net/ethernet/netronome/nfp/nfp_main.c | 43 +++++++++++++++++++++++\n drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 23 ------------\n 2 files changed, 43 insertions(+), 23 deletions(-)","diff":"diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c\nindex f055b1774d65..424707d41fbd 100644\n--- a/drivers/net/ethernet/netronome/nfp/nfp_main.c\n+++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c\n@@ -74,6 +74,45 @@ static const struct pci_device_id nfp_pci_device_ids[] = {\n };\n MODULE_DEVICE_TABLE(pci, nfp_pci_device_ids);\n \n+static bool nfp_board_ready(struct nfp_pf *pf)\n+{\n+\tconst char *cp;\n+\tlong state;\n+\tint err;\n+\n+\tcp = nfp_hwinfo_lookup(pf->hwinfo, \"board.state\");\n+\tif (!cp)\n+\t\treturn false;\n+\n+\terr = kstrtol(cp, 0, &state);\n+\tif (err < 0)\n+\t\treturn false;\n+\n+\treturn state == 15;\n+}\n+\n+static int nfp_pf_board_state_wait(struct nfp_pf *pf)\n+{\n+\tconst unsigned long wait_until = jiffies + 10 * HZ;\n+\n+\twhile (!nfp_board_ready(pf)) {\n+\t\tif (time_is_before_eq_jiffies(wait_until)) {\n+\t\t\tnfp_err(pf->cpp, \"NFP board initialization timeout\\n\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tnfp_info(pf->cpp, \"waiting for board initialization\\n\");\n+\t\tif (msleep_interruptible(500))\n+\t\t\treturn -ERESTARTSYS;\n+\n+\t\t/* Refresh cached information */\n+\t\tkfree(pf->hwinfo);\n+\t\tpf->hwinfo = nfp_hwinfo_read(pf->cpp);\n+\t}\n+\n+\treturn 0;\n+}\n+\n static int nfp_pcie_sriov_read_nfd_limit(struct nfp_pf *pf)\n {\n \tint err;\n@@ -425,6 +464,10 @@ static int nfp_pci_probe(struct pci_dev *pdev,\n \t\t nfp_hwinfo_lookup(pf->hwinfo, \"assembly.revision\"),\n \t\t nfp_hwinfo_lookup(pf->hwinfo, \"cpld.version\"));\n \n+\terr = nfp_pf_board_state_wait(pf);\n+\tif (err)\n+\t\tgoto err_hwinfo_free;\n+\n \terr = devlink_register(devlink, &pdev->dev);\n \tif (err)\n \t\tgoto err_hwinfo_free;\ndiff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c\nindex 5abb9ba31e7d..ff373acd28f3 100644\n--- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c\n+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c\n@@ -64,23 +64,6 @@\n \n #define NFP_PF_CSR_SLICE_SIZE\t(32 * 1024)\n \n-static int nfp_is_ready(struct nfp_pf *pf)\n-{\n-\tconst char *cp;\n-\tlong state;\n-\tint err;\n-\n-\tcp = nfp_hwinfo_lookup(pf->hwinfo, \"board.state\");\n-\tif (!cp)\n-\t\treturn 0;\n-\n-\terr = kstrtol(cp, 0, &state);\n-\tif (err < 0)\n-\t\treturn 0;\n-\n-\treturn state == 15;\n-}\n-\n /**\n * nfp_net_get_mac_addr() - Get the MAC address.\n * @pf: NFP PF handle\n@@ -725,12 +708,6 @@ int nfp_net_pci_probe(struct nfp_pf *pf)\n \n \tINIT_WORK(&pf->port_refresh_work, nfp_net_refresh_vnics);\n \n-\t/* Verify that the board has completed initialization */\n-\tif (!nfp_is_ready(pf)) {\n-\t\tnfp_err(pf->cpp, \"NFP is not ready for NIC operation.\\n\");\n-\t\treturn -EINVAL;\n-\t}\n-\n \tif (!pf->rtbl) {\n \t\tnfp_err(pf->cpp, \"No %s, giving up.\\n\",\n \t\t\tpf->fw_loaded ? \"symbol table\" : \"firmware found\");\n","prefixes":["net","v2","2/3"]}