From patchwork Thu Feb 22 03:50:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 876492 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) 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="P38NAXmo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zn0l23rTBz9sW9 for ; Thu, 22 Feb 2018 14:51:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752184AbeBVDvI (ORCPT ); Wed, 21 Feb 2018 22:51:08 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:38549 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752121AbeBVDvE (ORCPT ); Wed, 21 Feb 2018 22:51:04 -0500 Received: by mail-pf0-f195.google.com with SMTP id d26so1592795pfn.5 for ; Wed, 21 Feb 2018 19:51:04 -0800 (PST) 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=qDLduDcS/Q+lbIwBy1AzxdraK5SvJxGO/IORYYknQBM=; b=P38NAXmok0xXaXEgwNwHOiDa3+XATp5HQzdVfR3avbxuGlOzcnaJmtu4bwVVVd+5TN SErvVg6QJGToG3ipBHEwz6/gNpmnJAKD1MYSw3Y5X6wSl8ukay7aWELW061YCylg1pqE VrQy1We+YmyHyB2JlfnwanqyxQEKyDJKJ6E/OnYM9YcTQLIhat9n6vTtiDCC0sR1mX1C AtiFCPrx/BnaXfIdxUvqRnHr96juxK8YSmpEPzFXzFSr4E0Wq4e/69OsvrMrHmVJ2SCJ WojSrJ6Z1bB83Hunx1iDgg90aN7Rp7nhD/TPEWmA+QsPGBP9Zx8hdaq4rsKeQ+u6g6K0 sh+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qDLduDcS/Q+lbIwBy1AzxdraK5SvJxGO/IORYYknQBM=; b=qG+dR9MAL/SyiDXD1mzTPxJukLHme5Oiu3qQnLAeQFtaUzynX0Wx70JcEXtD75N58l HECx2xaTgZg+D++Z5rIsPw7wCLvk8cCZ8dfqErfNwz3IJHKShpwKX8RZYEHs9Vd4Z7J1 XKdbTGEGDf54WY+Yc+y9SPnff7Po23uYWfJTM4GlqWWkICRKHU06CUmTS7lEJqBvqnuE ck1ZKy05r4GocJwwPoMaDlIuT9ApxneoHNH4whscWP0FSoJx++kdosuu/e1R1P/zqiqd /sTJyg4GhNp2aA5TYua+rUb8e/bKwEQwHA2/31xqW7d1YwO4cjHYC2UjfqlQ+Kg/IoUz nLtQ== X-Gm-Message-State: APf1xPDnF4USEmQGi0HoA9VrdylCp2EuFRxkYrcmSPflE3IxKOPrSonE 8KqBBgvPUI39wE8YkZQEmJNkUQ== X-Google-Smtp-Source: AH8x226qbPMwr1qcjjK5JbT+sEKCn3uA6Ebcsf6Boo7/BgkHg0U93W1fQSgyIp8yivQfo7WoCpvAZA== X-Received: by 10.101.75.70 with SMTP id k6mr4638721pgt.335.1519271463833; Wed, 21 Feb 2018 19:51:03 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id z17sm24096951pfh.183.2018.02.21.19.51.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Feb 2018 19:51:03 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next 1/3] nfp: add Makefiles to all directories Date: Wed, 21 Feb 2018 19:50:05 -0800 Message-Id: <20180222035007.29805-2-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180222035007.29805-1-jakub.kicinski@netronome.com> References: <20180222035007.29805-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To be able to build separate objects we need to provide Kbuild with a Makefile in each directory. Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/bpf/Makefile | 2 ++ drivers/net/ethernet/netronome/nfp/flower/Makefile | 2 ++ drivers/net/ethernet/netronome/nfp/nfpcore/Makefile | 2 ++ drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile | 2 ++ drivers/net/ethernet/netronome/nfp/nic/Makefile | 2 ++ 5 files changed, 10 insertions(+) create mode 100644 drivers/net/ethernet/netronome/nfp/bpf/Makefile create mode 100644 drivers/net/ethernet/netronome/nfp/flower/Makefile create mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/Makefile create mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile create mode 100644 drivers/net/ethernet/netronome/nfp/nic/Makefile diff --git a/drivers/net/ethernet/netronome/nfp/bpf/Makefile b/drivers/net/ethernet/netronome/nfp/bpf/Makefile new file mode 100644 index 000000000000..805fa28f391a --- /dev/null +++ b/drivers/net/ethernet/netronome/nfp/bpf/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +# kbuild requires Makefile in a directory to build individual objects diff --git a/drivers/net/ethernet/netronome/nfp/flower/Makefile b/drivers/net/ethernet/netronome/nfp/flower/Makefile new file mode 100644 index 000000000000..805fa28f391a --- /dev/null +++ b/drivers/net/ethernet/netronome/nfp/flower/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +# kbuild requires Makefile in a directory to build individual objects diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/Makefile b/drivers/net/ethernet/netronome/nfp/nfpcore/Makefile new file mode 100644 index 000000000000..805fa28f391a --- /dev/null +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +# kbuild requires Makefile in a directory to build individual objects diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile new file mode 100644 index 000000000000..805fa28f391a --- /dev/null +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +# kbuild requires Makefile in a directory to build individual objects diff --git a/drivers/net/ethernet/netronome/nfp/nic/Makefile b/drivers/net/ethernet/netronome/nfp/nic/Makefile new file mode 100644 index 000000000000..805fa28f391a --- /dev/null +++ b/drivers/net/ethernet/netronome/nfp/nic/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +# kbuild requires Makefile in a directory to build individual objects From patchwork Thu Feb 22 03:50:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 876493 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) 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="DprOLuhN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zn0l64pRMz9sW9 for ; Thu, 22 Feb 2018 14:51:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752173AbeBVDvH (ORCPT ); Wed, 21 Feb 2018 22:51:07 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36577 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751978AbeBVDvF (ORCPT ); Wed, 21 Feb 2018 22:51:05 -0500 Received: by mail-pf0-f193.google.com with SMTP id 68so1597795pfx.3 for ; Wed, 21 Feb 2018 19:51:05 -0800 (PST) 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=urxHdNcIQaGP8SZqfFXKRS/pZjuUhfQ9zX0MbvYHrLo=; b=DprOLuhNSx19MpT0tkl4cmgjwcNweJGPIaaQelAnk32M0kD7lFVkX48mAyhZ8/l/tI roJ6I2D2qzTIYcravsG/gWV0r0JQ6ZxykRY6pKS8S0bC2ffmQOtyOoC1BB1ZkoVO/6HI 8PR5Hu/6p1/yXDRo70p/fpu376oCdzI2lkCEDTkX59UwrSBpIVWICMT/kNBVgOU75w46 AC48H0qXbOQgSfGgwHcvJ8BDScfk3hB8pQACZJazRKnJouWU8MumEWSaXaTKhrqlW6wt B5HdxPD+EVMXPghYxemXOx/qioCNijcWqyH6ipXOL1AJHNzcANuegWCvQBpBFGdXhhzd F/aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=urxHdNcIQaGP8SZqfFXKRS/pZjuUhfQ9zX0MbvYHrLo=; b=pMZGTDJkklL9eCoViFEu1j449sWX7MjnXCPyDlkUe3xWoQwRp5uEwSAT/V30Z34yu9 GFsnmTVBwzsQuoz7+DXjvPm1013T9GFJaK4PIcC2Bf4o7ldRfKUv3gu/sgMEVEYAKZyZ 2SHPT09CCK/sXK//4C6XCoJoarWtmpAk8AneMpHB94KOOL3AD+ABmdV0M/yMOS9WwSes O3bFfcKkbud0+LU9+2gYb+CIbvvAc02QOJvPRXQsbl4k7AuBKFG+BkiNS+CL2jZifdUl +wLn0sy2nxnOqUZhrWT3K8/Uy44chFsdhBVzyWdzq+C3dzf0Zla7X8GZybPTA7SuiYWR x0Ig== X-Gm-Message-State: APf1xPACEkCXHaxp9/bxE2nRhtBjcUf4nnKON4fAB7t4j6HCIGtTNoHu GSOvHCkcObZnk/TBwW9a8h/iBg== X-Google-Smtp-Source: AH8x227I7Q5DYhyhZ9A58iIFoCqjVwUKCydtm8UstaAuiBNIXctwyCJllWBFtWj19iADzJtu0xupcA== X-Received: by 10.99.0.139 with SMTP id 133mr4533773pga.267.1519271464782; Wed, 21 Feb 2018 19:51:04 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id z17sm24096951pfh.183.2018.02.21.19.51.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Feb 2018 19:51:04 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski , Igor Russkikh Subject: [PATCH net-next 2/3] aquantia: add Makefiles to all directories Date: Wed, 21 Feb 2018 19:50:06 -0800 Message-Id: <20180222035007.29805-3-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180222035007.29805-1-jakub.kicinski@netronome.com> References: <20180222035007.29805-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To be able to build separate objects we need to provide Kbuild with a Makefile in each directory. Signed-off-by: Jakub Kicinski --- CC: Igor Russkikh drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile b/drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile new file mode 100644 index 000000000000..805fa28f391a --- /dev/null +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +# kbuild requires Makefile in a directory to build individual objects From patchwork Thu Feb 22 03:50:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 876495 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) 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="Z1zgYu0+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zn0lJ3QWyz9rxp for ; Thu, 22 Feb 2018 14:51:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752207AbeBVDvW (ORCPT ); Wed, 21 Feb 2018 22:51:22 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:41997 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752063AbeBVDvG (ORCPT ); Wed, 21 Feb 2018 22:51:06 -0500 Received: by mail-pf0-f194.google.com with SMTP id t15so1590451pfh.9 for ; Wed, 21 Feb 2018 19:51:06 -0800 (PST) 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=sKIG4iFy0zTJ2oeF2O86GDwncBobKBPbdHsYKU47/2Y=; b=Z1zgYu0+LvgvkmK3x/6FggNEUWKYbMn0IXNurEvqYcHqztB4gf9DxHoojf18CESqGk XQb5hYVWAiOmn+M91+rM1lUyJWDPRglzB7k4xejWXMS1/sbhf0bEUlMMwFOIiZhfO5Jo NvBEnOCiMRppSkLsa3rZsu/4MGljTIaEKD0HlnGjCzP7dE0YxUvlW7mLODIktDrmauLA W+CeQxmvlENww8oLTpTd1jnyCLYgkr4772X4H3v1JJs/2++z2yqM9fpu2EkqgCd0cORt sA97/RAm7U7CTt4LEdDXnvWZPtCwoaF9hp9sU4SFq5WprxO404lQsc90D5WvEs8Rx5wT WZAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sKIG4iFy0zTJ2oeF2O86GDwncBobKBPbdHsYKU47/2Y=; b=AKLwoFP9iAs2u3VxXAAXurXvwa1FFSan7eYfI5BAE4yRqmE4X7AaAoZQAPKgKwVl+Y xY5agGePYCdGHW0XQwtWwvGWyWEYzhYlSInftx58GGEfgUMSm2DJh9H6hfwT9nmbUuRM 4YMnQT39iJkXFuyRd/Hwn2q5IzDXzPlvPWoUw55bqdR4AiEQkSQP+FsU2TpyRkIDF8df xueQqu2rDPW2K+7UntYTo9UTa9akrfRtrlc5Y+rrWSRPEYAjgIjoWiJKDoMokmbKLLUk CEQomF33e8v2jMELL/bC4AafExlG9IDRb3Oj5N6TNB0xpKo90msL1vYriBh6er+dffhN kC6A== X-Gm-Message-State: APf1xPA0PDj5qmIPs+vlQLh3Tu39oMutcfYIvKGvMTvToh7tAj5bdPiw vVNg+9cUnLfUdNH6qTFz8Z4s7g== X-Google-Smtp-Source: AH8x224zNfdbc+FLbebSCao5Zco+Oucv7nD7KWOv3Dz7CoJaijbrKXCe517SoIau3g98rV6fkmeVEQ== X-Received: by 10.98.166.85 with SMTP id t82mr5420250pfe.237.1519271465808; Wed, 21 Feb 2018 19:51:05 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id z17sm24096951pfh.183.2018.02.21.19.51.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Feb 2018 19:51:05 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Dirk van der Merwe Subject: [PATCH net-next 3/3] nfp: advertise firmware for mixed 10G/25G mode Date: Wed, 21 Feb 2018 19:50:07 -0800 Message-Id: <20180222035007.29805-4-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180222035007.29805-1-jakub.kicinski@netronome.com> References: <20180222035007.29805-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Dirk van der Merwe The AMDA0099-0001 platform can support the 1x10G + 1x25G mixed mode operation. Recently, firmware has been added for this configuration mode. Signed-off-by: Dirk van der Merwe Acked-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/nfp_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c index ab301d56430b..c4b1f344b4da 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c @@ -645,6 +645,7 @@ MODULE_FIRMWARE("netronome/nic_AMDA0097-0001_4x10_1x40.nffw"); MODULE_FIRMWARE("netronome/nic_AMDA0097-0001_8x10.nffw"); MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_2x10.nffw"); MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_2x25.nffw"); +MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_1x10_1x25.nffw"); MODULE_AUTHOR("Netronome Systems "); MODULE_LICENSE("GPL");