cxgb4vf: minor cleanup
Subsystems (2)
cover cxgb4vf: minor cleanup
Fixes to comments, compiler warnings, etc.
drivers/net/cxgb4vf/adapter.h | 2 +- drivers/net/cxgb4vf/cxgb4vf_main.c | 32 ++++++++++++++++++++------------ drivers/net/cxgb4vf/sge.c | 9 ++++++--- drivers/net/cxgb4vf/t4vf_common.h | 28 ++++++++++++++-------------- drivers/net/cxgb4vf/t4vf_hw.c | 5 +++-- 5 files changed, 44 insertions(+), 32 deletions(-)
PATCH 1/5 cxgb4vf: minor comment/symbolic name cleanup.
Minor cleanup of comments and symbolic constant names for clarity.
--- drivers/net/cxgb4vf/adapter.h | 2 +- drivers/net/cxgb4vf/cxgb4vf_main.c | 11 ++++------- drivers/net/cxgb4vf/sge.c | 9 ++++++--- drivers/net/cxgb4vf/t4vf_hw.c | 5 +++-- 4 files changed, 14 insertions(+), 13 deletions(-)
drivers/net/cxgb4vf/adapter.h +1 -1
@@ -60,7 +60,7 @@ enum {* MSI-X interrupt index usage. */ MSIX_FW =0 ,/* MSI-X index for firmware Q */ -MSIX_NIQFLINT =1 ,/* MSI-X index base for Ingress Qs */ +MSIX_IQFLINT =1 ,/* MSI-X index base for Ingress Qs */ MSIX_EXTRAS =1 , MSIX_ENTRIES = MAX_ETH_QSETS + MSIX_EXTRAS,
drivers/net/cxgb4vf/cxgb4vf_main.c +4 -7
@@ -280,9 +280,7 @@ static void name_msix_vecs(struct adapter *adapter)const struct port_info *pi =netdev_priv (dev);int qs, msi; -for (qs =0 , msi =MSIX_NIQFLINT ; - qs < pi->nqsets; - qs++, msi++) { +for (qs =0 , msi =MSIX_IQFLINT ; qs < pi->nqsets; qs++, msi++) {snprintf (adapter->msix_info[msi].desc, namelen,"%s-%d" , dev->name, qs); adapter->msix_info[msi].desc[namelen] =0 ;
@@ -309,7 +307,7 @@ static int request_msix_queue_irqs(struct adapter *adapter)/* * Ethernet queues. */ - msi =MSIX_NIQFLINT ; + msi =MSIX_IQFLINT ;for_each_ethrxq (s, rxq) { err = request_irq(adapter->msix_info[msi].vec, t4vf_sge_intr_msix, 0,
@@ -337,7 +335,7 @@ static void free_msix_queue_irqs(struct adapter *adapter)int rxq, msi;free_irq (adapter->msix_info[MSIX_FW ].vec, &s->fw_evtq); - msi =MSIX_NIQFLINT ; + msi =MSIX_IQFLINT ;for_each_ethrxq (s, rxq)free_irq (adapter->msix_info[msi++].vec, &s->ethrxq[rxq].rspq);
@@ -527,7 +525,7 @@ static int setup_sge_queues(struct adapter *adapter)* brought up at which point lots of things get nailed down * permanently ... */ - msix =MSIX_NIQFLINT ; + msix =MSIX_IQFLINT ;for_each_port (adapter, pidx) {struct net_device *dev = adapter->port[pidx];struct port_info *pi =netdev_priv (dev);
@@ -2470,7 +2468,6 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev, version_printed =1 ; } -/* * Initialize generic PCI device state. */
drivers/net/cxgb4vf/sge.c +6 -3
@@ -1568,6 +1568,9 @@ int t4vf_ethrx_handler(struct sge_rspq *rspq, const __be64 *rsp, }else skb_checksum_none_assert (skb); +/* +* Deliver the packet to the stack. +*/ if (unlikely (pkt->vlan_ex)) {struct vlan_group *grp = pi->vlan_grp;
@@ -2143,7 +2146,7 @@ int t4vf_sge_alloc_rxq(struct adapter *adapter, struct sge_rspq *rspq,/* * Calculate the size of the hardware free list ring plus -* status page (which the SGE will place at the end of the +* Status Page (which the SGE will place after the end of the * free list ring) in Egress Queue Units. */ flsz = (fl->size / FL_PER_EQ_UNIT +
@@ -2240,8 +2243,8 @@ int t4vf_sge_alloc_eth_txq(struct adapter *adapter, struct sge_eth_txq *txq,struct port_info *pi =netdev_priv (dev);/* -* Calculate the size of the hardware TX Queue (including the -* status age on the end) in units of TX Descriptors. +* Calculate the size of the hardware TX Queue (including the Status +* Page on the end of the TX Queue) in units of TX Descriptors. */ nentries = txq->q.size +STAT_LEN /sizeof (struct tx_desc );
drivers/net/cxgb4vf/t4vf_hw.c +3 -2
@@ -1276,7 +1276,7 @@ int t4vf_eth_eq_free(struct adapter *adapter, unsigned int eqid)*/ int t4vf_handle_fw_rpl (struct adapter *adapter,const __be64 *rpl) { -struct fw_cmd_hdr *cmd_hdr = (struct fw_cmd_hdr *)rpl; +const struct fw_cmd_hdr *cmd_hdr = (const struct fw_cmd_hdr *)rpl;u8 opcode =FW_CMD_OP_GET (be32_to_cpu (cmd_hdr->hi));switch (opcode) {
@@ -1284,7 +1284,8 @@ int t4vf_handle_fw_rpl(struct adapter *adapter, const __be64 *rpl)/* * Link/module state change message. */ -const struct fw_port_cmd *port_cmd = (void *)rpl; +const struct fw_port_cmd *port_cmd = + (const struct fw_port_cmd *)rpl;u32 word;int action, port_id, link_ok, speed, fc, pidx;
Signature · 1 line
1.7.0.4
Re: [PATCH net-next-26 1/5] cxgb4vf: minor comment/symbolic name cleanup.
From: Casey Leedom <[email protected]>
Date: Thu, 11 Nov 2010 11:30:40 -0800
Quoted 3 lines
Minor cleanup of comments and symbolic constant names for clarity.
Signed-off-by Casey Leedom <[email protected]>
Applied.
PATCH 2/5 cxgb4vf: add ethtool statistics for GRO.
In reply to Casey LeedomAdd ethtool statistics for GRO.
--- drivers/net/cxgb4vf/cxgb4vf_main.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
drivers/net/cxgb4vf/cxgb4vf_main.c +6 -0
@@ -1346,6 +1346,8 @@ struct queue_port_stats {u64 rx_csum;u64 vlan_ex;u64 vlan_ins; +u64 lro_pkts; +u64 lro_merged; };/*
@@ -1383,6 +1385,8 @@ static const char stats_strings[][ETH_GSTRING_LEN] = {"RxCsumGood " ,"VLANextractions " ,"VLANinsertions " , +"GROPackets " , + "GROMerged ", };/*
@@ -1432,6 +1436,8 @@ static void collect_sge_port_stats(const struct adapter *adapter, stats->rx_csum += rxq->stats.rx_cso; stats->vlan_ex += rxq->stats.vlan_ex; stats->vlan_ins += txq->vlan_ins; + stats->lro_pkts += rxq->stats.lro_pkts; + stats->lro_merged += rxq->stats.lro_merged; } }
Signature · 1 line
1.7.0.4
Re: [PATCH net-next-26 2/5] cxgb4vf: add ethtool statistics for GRO.
From: Casey Leedom <[email protected]>
Date: Thu, 11 Nov 2010 11:30:41 -0800
Quoted 3 lines
Add ethtool statistics for GRO.
Signed-off-by Casey Leedom <[email protected]>
Applied.
PATCH 3/5 cxgb4vf: fix up "Section Mismatch" compiler warning.
In reply to Casey LeedomFix up "Section Mismatch" compiler warning and mark another routine as __devinit.
--- drivers/net/cxgb4vf/cxgb4vf_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/cxgb4vf/cxgb4vf_main.c +2 -2
@@ -2032,7 +2032,7 @@ static int __devinit setup_debugfs(struct adapter *adapter)* Tear down the /sys/kernel/debug/cxgb4vf sub-nodes created above. We leave * it to our caller to tear down the directory (debugfs_root). */ -static void __devexit cleanup_debugfs(struct adapter *adapter) +static void cleanup_debugfs (struct adapter *adapter) {BUG_ON (adapter->debugfs_root ==NULL );
@@ -2050,7 +2050,7 @@ static void __devexit cleanup_debugfs(struct adapter *adapter)* adapter parameters we're going to be using and initialize basic adapter * hardware support. */ -static int adap_init0 (struct adapter *adapter) +static int __devinit adap_init0 (struct adapter *adapter) {struct vf_resources *vfres = &adapter->params.vfres;struct sge_params *sge_params = &adapter->params.sge;
Signature · 1 line
1.7.0.4
Re: [PATCH net-next-26 3/5] cxgb4vf: fix up "Section Mismatch" compiler warning.
From: Casey Leedom <[email protected]>
Date: Thu, 11 Nov 2010 11:30:42 -0800
Quoted 4 lines
Fix up "Section Mismatch" compiler warning and mark another routine as
__devinit.Signed-off-by Casey Leedom <[email protected]>
Applied.
PATCH 4/5 cxgb4vf: Advertise NETIF_F_TSO_ECN.
In reply to Casey LeedomAdvertise NETIF_F_TSO_ECN.
--- drivers/net/cxgb4vf/cxgb4vf_main.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
drivers/net/cxgb4vf/cxgb4vf_main.c +8 -3
@@ -1534,14 +1534,19 @@ static void cxgb4vf_get_wol(struct net_device *dev, }/* +* TCP Segmentation Offload flags which we support. +*/ +#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN) + +/* * Set TCP Segmentation Offloading feature capabilities. */ static int cxgb4vf_set_tso (struct net_device *dev,u32 tso) {if (tso) - dev->features |=NETIF_F_TSO |NETIF_F_TSO6 ; + dev->features |=TSO_FLAGS ;else - dev->features &= ~(NETIF_F_TSO |NETIF_F_TSO6 ); + dev->features &= ~TSO_FLAGS ;return 0 ; }
@@ -2610,7 +2615,7 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,netif_carrier_off (netdev); netdev->irq = pdev->irq; - netdev->features = (NETIF_F_SG |NETIF_F_TSO |NETIF_F_TSO6 | + netdev->features = (NETIF_F_SG |TSO_FLAGS |NETIF_F_IP_CSUM |NETIF_F_IPV6_CSUM |NETIF_F_HW_VLAN_TX |NETIF_F_HW_VLAN_RX |NETIF_F_GRO );
Signature · 1 line
1.7.0.4
Re: [PATCH net-next-26 4/5] cxgb4vf: Advertise NETIF_F_TSO_ECN.
From: Casey Leedom <[email protected]>
Date: Thu, 11 Nov 2010 11:30:43 -0800
Quoted 3 lines
Advertise
NETIF_F_TSO_ECN.Signed-off-by Casey Leedom <[email protected]>
Applied.
PATCH 5/5 cxgb4vf: Mark "UDP [RSS Hash] Enable" as a 1-bit field.
In reply to Casey LeedomMark the UDP RSS Hash Enable field as 1-bit in length. Also clean up formatting from previous changeset which changed the RSS 1-bit fields from "int" to "unsigned int".
--- drivers/net/cxgb4vf/t4vf_common.h | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/net/cxgb4vf/t4vf_common.h +14 -14
@@ -132,15 +132,15 @@ struct rss_params {unsigned int mode;/* RSS mode */ union {struct { -unsigned int synmapen:1 ;/* SYN Map Enable */ -unsigned int syn4tupenipv6:1 ;/* enable hashing 4-tuple IPv6 SYNs */ -unsigned int syn2tupenipv6:1 ;/* enable hashing 2-tuple IPv6 SYNs */ -unsigned int syn4tupenipv4:1 ;/* enable hashing 4-tuple IPv4 SYNs */ -unsigned int syn2tupenipv4:1 ;/* enable hashing 2-tuple IPv4 SYNs */ -unsigned int ofdmapen:1 ;/* Offload Map Enable */ -unsigned int tnlmapen:1 ;/* Tunnel Map Enable */ -unsigned int tnlalllookup:1 ;/* Tunnel All Lookup */ -unsigned int hashtoeplitz:1 ;/* use Toeplitz hash */ +uint synmapen:1 ;/* SYN Map Enable */ +uint syn4tupenipv6:1 ;/* enable hashing 4-tuple IPv6 SYNs */ +uint syn2tupenipv6:1 ;/* enable hashing 2-tuple IPv6 SYNs */ +uint syn4tupenipv4:1 ;/* enable hashing 4-tuple IPv4 SYNs */ +uint syn2tupenipv4:1 ;/* enable hashing 2-tuple IPv4 SYNs */ +uint ofdmapen:1 ;/* Offload Map Enable */ +uint tnlmapen:1 ;/* Tunnel Map Enable */ +uint tnlalllookup:1 ;/* Tunnel All Lookup */ +uint hashtoeplitz:1 ;/* use Toeplitz hash */ } basicvirtual; } u; };
@@ -151,11 +151,11 @@ struct rss_params {union rss_vi_config {struct {u16 defaultq;/* Ingress Queue ID for !tnlalllookup */ -unsigned int ip6fourtupen:1 ;/* hash 4-tuple IPv6 ingress packets */ -unsigned int ip6twotupen:1 ;/* hash 2-tuple IPv6 ingress packets */ -unsigned int ip4fourtupen:1 ;/* hash 4-tuple IPv4 ingress packets */ -unsigned int ip4twotupen:1 ;/* hash 2-tuple IPv4 ingress packets */ -int udpen;/* hash 4-tuple UDP ingress packets */ +uint ip6fourtupen:1 ;/* hash 4-tuple IPv6 ingress packets */ +uint ip6twotupen:1 ;/* hash 2-tuple IPv6 ingress packets */ +uint ip4fourtupen:1 ;/* hash 4-tuple IPv4 ingress packets */ +uint ip4twotupen:1 ;/* hash 2-tuple IPv4 ingress packets */ +uint udpen:1 ;/* hash 4-tuple UDP ingress packets */ } basicvirtual; };
Signature · 1 line
1.7.0.4
David Miller
maintainerRe: [PATCH net-next-26 5/5] cxgb4vf: Mark "UDP [RSS Hash] Enable" as a 1-bit field.
From: Casey Leedom <[email protected]>
Date: Thu, 11 Nov 2010 11:30:44 -0800
drivers/net/cxgb4vf/t4vf_common.h struct rss_params { · line 135
Quoted 1 line
drivers/net/cxgb4vf/t4vf_common.h +1
-0+ uint synmapen:1; /* SYN Map Enable */
Please do not use the "uint" shorthand for "unsigned int", I know it's in linux/types.h but that is there for sysv compatibility in userspace and is ugly as hell.
Re: [PATCH net-next-26 5/5] cxgb4vf: Mark "UDP [RSS Hash] Enable" as a 1-bit field.
| From: David Miller <[email protected]> | Date: Monday, November 15, 2010 09:20 am | | From: Casey Leedom <[email protected]> | Date: Thu, 11 Nov 2010 11:30:44 -0800 | | > + uint synmapen:1; /* SYN Map Enable */ | | Please do not use the "uint" shorthand for "unsigned int", I know it's | in linux/types.h but that is there for sysv compatibility in | userspace and is ugly as hell.
Okay, sorry about that. I wasn't sure so I looked around and saw several
other network device drivers using "uint" and figured it was okay. I assume that it's okay to use u32, etc? I was just trying to be neet and solve the "greater than 80 column" restriction which the patch check script complains about for when a previous changeset converted "int" to "unsigned int". Just let me know what the correct action is and I'll respin this one patch. Thanks for your patience with my ignorance!
Casey