{"id":813494,"url":"http://patchwork.ozlabs.org/api/patches/813494/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170913155131.18090-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":"<20170913155131.18090-3-jakub.kicinski@netronome.com>","list_archive_url":null,"date":"2017-09-13T15:51:30","name":"[net,2/3] nfp: wait for board state before talking to the NSP","commit_ref":null,"pull_url":null,"state":"changes-requested","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/20170913155131.18090-3-jakub.kicinski@netronome.com/mbox/","series":[{"id":2942,"url":"http://patchwork.ozlabs.org/api/series/2942/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=2942","date":"2017-09-13T15:51:28","name":"nfp: wait more carefully for card init","version":1,"mbox":"http://patchwork.ozlabs.org/series/2942/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813494/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813494/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=\"IZfaAZzt\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xsmPb4mSJz9ryv\n\tfor ;\n\tThu, 14 Sep 2017 01:52:03 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751988AbdIMPwB (ORCPT );\n\tWed, 13 Sep 2017 11:52:01 -0400","from mail-pg0-f43.google.com ([74.125.83.43]:46461 \"EHLO\n\tmail-pg0-f43.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751501AbdIMPvp (ORCPT\n\t); Wed, 13 Sep 2017 11:51:45 -0400","by mail-pg0-f43.google.com with SMTP id i130so1137788pgc.3\n\tfor ; Wed, 13 Sep 2017 08:51:44 -0700 (PDT)","from jkicinski-Precision-T1700.netronome.com ([75.53.12.129])\n\tby smtp.gmail.com with ESMTPSA id\n\td69sm5024402pfl.50.2017.09.13.08.51.42\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 13 Sep 2017 08:51:43 -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=sFiEYr1C086ptRvNZnyAkFaEuYRFmzR3mEAq11wc/AI=;\n\tb=IZfaAZzt4mTPRJ8gxfL68PGuHIvAR2XciZUgCwJem4bdYnSImSQHfN8J1qkAGfuC0T\n\tkaH+D34MtNazv/aqFk70QIfNsj8MlbOeZd5BTl96B72MsYXktEbwmF2aCpcxkWZDKWs5\n\tLucKPmv7cb+pnet1dZWpRdPJCcfOtr3kaxOxbFOgHCURggoHqmIPp/IvVLfi9KCpxgPa\n\tmYafJwWireWlnjZbJm98oXtBjSfPdXmKxCBN3vw3e09jIRbq+t18erQOMR7zYPAWAAix\n\tK0VG8VjRVMUbADACGs38X772h6wCSvxnRhwGTOp5tggz3qd7OrL1wQRdCTtPHpNF/VXX\n\tQ4zQ==","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=sFiEYr1C086ptRvNZnyAkFaEuYRFmzR3mEAq11wc/AI=;\n\tb=p05NJy9ffN9G3jniM+oiLUxWHzR9Y2CA1rwFHzZnvsNQnDZT6LkDuPuJttQfBX75CI\n\t46tq/GePXeP+oHsqjupS5BMVd9IDeJu/dpqhoV6rU0awxK1wgNdqqwNJbTeIDkdVIi+w\n\tFAhDco/LqJuemGHq6H7FZ+KenfEhrj1Zbmv1YdjvU2RmLNfcQc2/GfBp7fPGOc52vBJc\n\tEr2JMF+74+BKCJ1irPniOE3B8qsi3rpgejEq1Kgpjx9E8zqxSu21XpU9LjXHNoywwdW3\n\tk8jL9JXEBHzY6YhWprekul2rlAu6a51yj6eM4hJd0dyLYmNZ3i3mPl/2cvlmVWV3wrCo\n\t3bpw==","X-Gm-Message-State":"AHPjjUi1y9OAc1kVIpudIrRvEDZFdfwrJSi7SufI/0NtsjSf3l46rgVH\n\tSMPUP7kC05bx/ySU7kU=","X-Google-Smtp-Source":"ADKCNb4VFWlJk9B5WeHNAszkNht1yrXDibch/sh0ebNvwFChANPlnRINtpRYcOjSIDex5PEWNVK8rQ==","X-Received":"by 10.99.104.138 with SMTP id d132mr7806349pgc.268.1505317904198;\n\tWed, 13 Sep 2017 08:51:44 -0700 (PDT)","From":"Jakub Kicinski ","To":"netdev@vger.kernel.org","Cc":"oss-drivers@netronome.com, Jakub Kicinski ","Subject":"[PATCH net 2/3] nfp: wait for board state before talking to the NSP","Date":"Wed, 13 Sep 2017 08:51:30 -0700","Message-Id":"<20170913155131.18090-3-jakub.kicinski@netronome.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170913155131.18090-1-jakub.kicinski@netronome.com>","References":"<20170913155131.18090-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 \nReviewed-by: Simon Horman \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","2/3"]}