* [PATCH net 0/3] nfp: fixes and trivial cleanup
@ 2016-09-07 18:45 Jakub Kicinski
2016-09-07 18:45 ` [PATCH net 1/3] nfp: remove linux/version.h includes Jakub Kicinski
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Jakub Kicinski @ 2016-09-07 18:45 UTC (permalink / raw)
To: netdev; +Cc: Jakub Kicinski
Hi!
First patch drops unnecessary version.h includes. Second one
drops support for pre-release versions of FW ABI. Removing
FW ABI 0.0 from supported set is particularly good since 0
could just be uninitialized memory. Last but not least I drop
unnecessary padding of frames on RX which makes us count bytes
incorrectly for the VF2VF traffic.
Jakub Kicinski (3):
nfp: remove linux/version.h includes
nfp: drop support for old firmware ABIs
nfp: don't pad frames on receive
drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 5 -----
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 1 -
drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c | 7 ++-----
3 files changed, 2 insertions(+), 11 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net 1/3] nfp: remove linux/version.h includes
2016-09-07 18:45 [PATCH net 0/3] nfp: fixes and trivial cleanup Jakub Kicinski
@ 2016-09-07 18:45 ` Jakub Kicinski
2016-09-07 18:45 ` [PATCH net 2/3] nfp: drop support for old firmware ABIs Jakub Kicinski
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2016-09-07 18:45 UTC (permalink / raw)
To: netdev; +Cc: Jakub Kicinski
Remove unnecessary version.h includes.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Reviewed-by: Dinan Gunawardena <dinan.gunawardena@netronome.com>
---
drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 1 -
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 1 -
drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c | 1 -
3 files changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index 88678c172b19..e4fe0f080f34 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -41,7 +41,6 @@
* Chris Telfer <chris.telfer@netronome.com>
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
index 7d7933d00b8f..4c9897220969 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
@@ -40,7 +40,6 @@
* Brad Petrus <brad.petrus@netronome.com>
*/
-#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
index 37abef016a0a..6f22b0e12ac7 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
@@ -38,7 +38,6 @@
* Rolf Neugebauer <rolf.neugebauer@netronome.com>
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net 2/3] nfp: drop support for old firmware ABIs
2016-09-07 18:45 [PATCH net 0/3] nfp: fixes and trivial cleanup Jakub Kicinski
2016-09-07 18:45 ` [PATCH net 1/3] nfp: remove linux/version.h includes Jakub Kicinski
@ 2016-09-07 18:45 ` Jakub Kicinski
2016-09-07 18:45 ` [PATCH net 3/3] nfp: don't pad frames on receive Jakub Kicinski
2016-09-09 0:18 ` [PATCH net 0/3] nfp: fixes and trivial cleanup David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2016-09-07 18:45 UTC (permalink / raw)
To: netdev; +Cc: Jakub Kicinski
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 <jakub.kicinski@netronome.com>
Reviewed-by: Dinan Gunawardena <dinan.gunawardena@netronome.com>
---
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;
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net 3/3] nfp: don't pad frames on receive
2016-09-07 18:45 [PATCH net 0/3] nfp: fixes and trivial cleanup Jakub Kicinski
2016-09-07 18:45 ` [PATCH net 1/3] nfp: remove linux/version.h includes Jakub Kicinski
2016-09-07 18:45 ` [PATCH net 2/3] nfp: drop support for old firmware ABIs Jakub Kicinski
@ 2016-09-07 18:45 ` Jakub Kicinski
2016-09-09 0:18 ` [PATCH net 0/3] nfp: fixes and trivial cleanup David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2016-09-07 18:45 UTC (permalink / raw)
To: netdev; +Cc: Jakub Kicinski
There is no need to pad frames to ETH_ZLEN on RX.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Reviewed-by: Dinan Gunawardena <dinan.gunawardena@netronome.com>
---
drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index e4fe0f080f34..252e4924de0f 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -1440,10 +1440,6 @@ static int nfp_net_rx(struct nfp_net_rx_ring *rx_ring, int budget)
nfp_net_set_hash(nn->netdev, skb, rxd);
- /* Pad small frames to minimum */
- if (skb_put_padto(skb, 60))
- break;
-
/* Stats update */
u64_stats_update_begin(&r_vec->rx_sync);
r_vec->rx_pkts++;
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net 0/3] nfp: fixes and trivial cleanup
2016-09-07 18:45 [PATCH net 0/3] nfp: fixes and trivial cleanup Jakub Kicinski
` (2 preceding siblings ...)
2016-09-07 18:45 ` [PATCH net 3/3] nfp: don't pad frames on receive Jakub Kicinski
@ 2016-09-09 0:18 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2016-09-09 0:18 UTC (permalink / raw)
To: jakub.kicinski; +Cc: netdev
From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Wed, 7 Sep 2016 19:45:34 +0100
> First patch drops unnecessary version.h includes. Second one
> drops support for pre-release versions of FW ABI. Removing
> FW ABI 0.0 from supported set is particularly good since 0
> could just be uninitialized memory. Last but not least I drop
> unnecessary padding of frames on RX which makes us count bytes
> incorrectly for the VF2VF traffic.
Series applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-09-09 0:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-07 18:45 [PATCH net 0/3] nfp: fixes and trivial cleanup Jakub Kicinski
2016-09-07 18:45 ` [PATCH net 1/3] nfp: remove linux/version.h includes Jakub Kicinski
2016-09-07 18:45 ` [PATCH net 2/3] nfp: drop support for old firmware ABIs Jakub Kicinski
2016-09-07 18:45 ` [PATCH net 3/3] nfp: don't pad frames on receive Jakub Kicinski
2016-09-09 0:18 ` [PATCH net 0/3] nfp: fixes and trivial cleanup David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).