From patchwork Wed Sep 7 18:45:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 667132 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sTsr51Ny6z9s3s for ; Thu, 8 Sep 2016 04:46:29 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b=BEeM1srx; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757118AbcIGSqY (ORCPT ); Wed, 7 Sep 2016 14:46:24 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:36047 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756637AbcIGSqV (ORCPT ); Wed, 7 Sep 2016 14:46:21 -0400 Received: by mail-wm0-f52.google.com with SMTP id b187so130732915wme.1 for ; Wed, 07 Sep 2016 11:46:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UzVK3pYYLYo2ZVG858WBAaZZdKl6xVChKTFA4vbfQoI=; b=BEeM1srxV3hwNkKovta1k1VOImyA5XfKhcAU+9oLvQ0Rq1eVAj5g/tZl1Kf+9Whafl Dt1PGOUfDZiubA6Bn2Rwqqh9LB+0t4leX/oCKUMg+oq6suK/wjCEAKHPANBbsDIQBGnw YeMTjLfnD0XGZ/BqyF4osMOzllpr4EWHrSz7Xh9pkLhDEsyPRDTWnp/53h2f/7ztf9sh OAyn3PFgATCZpT9n5aJSyuzDA2P9HEXB8nLRMO4ivjm3P/dHerW3IkQIqhD3/6Ap+926 L8X14OzXcAmoB6XjIG2u2qNDbQDB4WVO3/tpDqfzjE4qq9skTnj78sVZeZeGzXIH9rrg SV2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UzVK3pYYLYo2ZVG858WBAaZZdKl6xVChKTFA4vbfQoI=; b=RsCdr4hn3vHibCcU24kee4IkQbSJuw6QkLzxg+21s5K65gqofrK54xij+UEomV2aO8 PhS/ZhaFPbvuWtOq1I329TvMBUnUsNSjT9ovy6+oGHcrCgn9BFLhTmXFRg9yg10/EaK6 zRguk+ENC4oQB2FnBfItBY7BGANp+hfX5mEBuhHV5hbjGPIU76SI84V1FXKpcxLx/NmN dFCaLaLsO8BOFx7eJ7FoAyNPHizmVKyNd9pm9tgpzYFfbneX1R9cu1ayFo2d7h+/apjI ImLNY2g7j49po6aH6+b3AHbeV/VSyz7NZlTa369lMv8oCa2fiohf3RtHnGEMNuSVwA73 Zllg== X-Gm-Message-State: AE9vXwPQOTQTmKYjmOjeVxxA61YY67SlbQFru5DbJgsI/ckC4x+1cYM1tnbyz05yh42oXeYa X-Received: by 10.28.173.205 with SMTP id w196mr5537817wme.86.1473273979915; Wed, 07 Sep 2016 11:46:19 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com (host-79-78-33-110.static.as9105.net. [79.78.33.110]) by smtp.gmail.com with ESMTPSA id f10sm40092136wje.14.2016.09.07.11.46.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Sep 2016 11:46:19 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: Jakub Kicinski Subject: [PATCH net 2/3] nfp: drop support for old firmware ABIs Date: Wed, 7 Sep 2016 19:45:36 +0100 Message-Id: <1473273937-9230-3-git-send-email-jakub.kicinski@netronome.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473273937-9230-1-git-send-email-jakub.kicinski@netronome.com> References: <1473273937-9230-1-git-send-email-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Be more strict about FW versions. Drop support for old transitional revisions which were never used in production. Dropping support for FW ABI version 0.0.0.0 is particularly useful because 0 could just be uninitialized memory. Signed-off-by: Jakub Kicinski Reviewed-by: Dinan Gunawardena --- drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c index 6f22b0e12ac7..f7062cb648e1 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c @@ -133,7 +133,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev, } nfp_net_get_fw_version(&fw_ver, ctrl_bar); - if (fw_ver.class != NFP_NET_CFG_VERSION_CLASS_GENERIC) { + if (fw_ver.resv || fw_ver.class != NFP_NET_CFG_VERSION_CLASS_GENERIC) { dev_err(&pdev->dev, "Unknown Firmware ABI %d.%d.%d.%d\n", fw_ver.resv, fw_ver.class, fw_ver.major, fw_ver.minor); err = -EINVAL; @@ -141,9 +141,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev, } /* Determine stride */ - if (nfp_net_fw_ver_eq(&fw_ver, 0, 0, 0, 0) || - nfp_net_fw_ver_eq(&fw_ver, 0, 0, 0, 1) || - nfp_net_fw_ver_eq(&fw_ver, 0, 0, 0x12, 0x48)) { + if (nfp_net_fw_ver_eq(&fw_ver, 0, 0, 0, 1)) { stride = 2; tx_bar_no = NFP_NET_Q0_BAR; rx_bar_no = NFP_NET_Q1_BAR;