netxen: cleanup rx handling
Subsystems (2)
PATCH 1/5 netxen: cleanup rx handling
o remove unused rx fragment handling code.
o imporove check for status descriptor ownership.
--- drivers/net/netxen/netxen_nic.h | 16 +------- drivers/net/netxen/netxen_nic_init.c | 71 +++++---------------------------- 2 files changed, 13 insertions(+), 74 deletions(-)
drivers/net/netxen/netxen_nic.h +2 -14
@@ -392,11 +392,8 @@ struct rcv_desc {#define STATUS_CKSUM_OK (2)/* owner bits of status_desc */ -#define STATUS_OWNER_HOST (0x1) -#define STATUS_OWNER_PHANTOM (0x2) - -#define NETXEN_PROT_IP (1) -#define NETXEN_PROT_UNKNOWN (0) +#define STATUS_OWNER_HOST (0x1ULL << 56) +#define STATUS_OWNER_PHANTOM (0x2ULL << 56)/* Note: sizeof(status_desc) should always be a mutliple of 2 */
@@ -422,15 +419,6 @@ struct rcv_desc {#define netxen_get_sts_opcode (sts_data) \ (((sts_data) >> 58) & 0x03F) -#define netxen_get_sts_owner (status_desc) \ - ((le64_to_cpu((status_desc)->status_desc_data) >> 56) & 0x03) -#define netxen_set_sts_owner (status_desc, val) { \ - (status_desc)->status_desc_data = \ - ((status_desc)->status_desc_data & \ - ~cpu_to_le64(0x3ULL << 56)) | \ - cpu_to_le64((u64)((val) & 0x3) << 56); \ -} -struct status_desc {/* Bit pattern: 0-3 port, 4-7 status, 8-11 type, 12-27 total_length 28-43 reference_handle, 44-47 protocol, 48-52 pkt_offset
drivers/net/netxen/netxen_nic_init.c +11 -60
129 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 2/5 netxen: small xmit optimizations
--- drivers/net/netxen/netxen_nic.h | 5 +---- drivers/net/netxen/netxen_nic_init.c | 2 ++ drivers/net/netxen/netxen_nic_main.c | 22 ++++++++++++++-------- 3 files changed, 17 insertions(+), 12 deletions(-)
drivers/net/netxen/netxen_nic.h +1 -4
@@ -358,10 +358,7 @@ struct cmd_desc_type0 {__le64 addr_buffer1; }; -__le16 buffer1_length; -__le16 buffer2_length; -__le16 buffer3_length; -__le16 buffer4_length; +__le16 buffer_length[4 ]; union { struct {
drivers/net/netxen/netxen_nic_init.c +2 -0
@@ -955,6 +955,7 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter)int done =0 ; last_consumer = adapter->last_cmd_consumer; +barrier ();/* cmd_consumer can change underneath */ consumer =le32_to_cpu (*(adapter->cmd_consumer));while (last_consumer != consumer) {
@@ -1005,6 +1006,7 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter)* There is still a possible race condition and the host could miss an * interrupt. The card has to take care of this. */ +barrier ();/* cmd_consumer can change underneath */ consumer =le32_to_cpu (*(adapter->cmd_consumer)); done = (last_consumer == consumer);
drivers/net/netxen/netxen_nic_main.c +14 -8
@@ -1209,7 +1209,16 @@ netxen_clean_tx_dma_mapping(struct pci_dev *pdev, } } -static int netxen_nic_xmit_frame (struct sk_buff *skb,struct net_device *netdev) +static inline void +netxen_clear_cmddesc (u64 *desc) +{ +int i; +for (i =0 ; i <8 ; i++) + desc[i] =0ULL ; +} + +static int +netxen_nic_xmit_frame (struct sk_buff *skb,struct net_device *netdev) {struct netxen_adapter *adapter =netdev_priv (netdev);struct netxen_hardware_context *hw = &adapter->ahw;
@@ -1242,7 +1251,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)/* Copy the descriptors into the hardware */ hwdesc = &hw->cmd_desc_head[producer]; -memset (hwdesc,0 ,sizeof (struct cmd_desc_type0 )); +netxen_clear_cmddesc ((u64 *)hwdesc);/* Take skb->data itself */ pbuf = &adapter->cmd_buf_arr[producer];
@@ -1261,7 +1270,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)netxen_set_tx_frags_len (hwdesc, frag_count, skb->len);netxen_set_tx_port (hwdesc, adapter->portnum); - hwdesc->buffer1_length =cpu_to_le16 (first_seg_len); + hwdesc->buffer_length[0 ] =cpu_to_le16 (first_seg_len); hwdesc->addr_buffer1 =cpu_to_le64 (buffrag->dma);for (i =1 , k =1 ; i < frag_count; i++, k++) {
@@ -1274,7 +1283,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) k =0 ; producer =get_next_index (producer, num_txd); hwdesc = &hw->cmd_desc_head[producer]; -memset (hwdesc,0 ,sizeof (struct cmd_desc_type0 )); +netxen_clear_cmddesc ((u64 *)hwdesc); pbuf = &adapter->cmd_buf_arr[producer]; pbuf->skb =NULL ; }
@@ -1294,21 +1303,18 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) buffrag->dma = temp_dma; buffrag->length = temp_len; + hwdesc->buffer_length[k] =cpu_to_le16 (temp_len);switch (k) {case 0 : - hwdesc->buffer1_length =cpu_to_le16 (temp_len); hwdesc->addr_buffer1 =cpu_to_le64 (temp_dma);break ;case 1 : - hwdesc->buffer2_length =cpu_to_le16 (temp_len); hwdesc->addr_buffer2 =cpu_to_le64 (temp_dma);break ;case 2 : - hwdesc->buffer3_length =cpu_to_le16 (temp_len); hwdesc->addr_buffer3 =cpu_to_le64 (temp_dma);break ;case 3 : - hwdesc->buffer4_length =cpu_to_le16 (temp_len); hwdesc->addr_buffer4 =cpu_to_le64 (temp_dma);break ; }
Signature · 1 line
1.6.0.2
PATCH 3/5 netxen: refactor netdev open close
In reply to Dhananjay Phadkerearrange open and close into hardware attach(), detach() and nic up() and down(). this will be used for suspend/resume subsequently.
--- drivers/net/netxen/netxen_nic_main.c | 302 +++++++++++++++++++--------------- 1 files changed, 166 insertions(+), 136 deletions(-)
drivers/net/netxen/netxen_nic_main.c +166 -136
@@ -94,20 +94,6 @@ static struct pci_device_id netxen_pci_tbl[] __devinitdata = {MODULE_DEVICE_TABLE (pci, netxen_pci_tbl); -/* -* In netxen_nic_down(), we must wait for any pending callback requests into -* netxen_watchdog_task() to complete; eg otherwise the watchdog_timer could be -* reenabled right after it is deleted in netxen_nic_down(). -* FLUSH_SCHEDULED_WORK() does this synchronization. -* -* Normally, schedule_work()/flush_scheduled_work() could have worked, but -* netxen_nic_close() is invoked with kernel rtnl lock held. netif_carrier_off() -* call in netxen_nic_close() triggers a schedule_work(&linkwatch_work), and a -* subsequent call to flush_scheduled_work() in netxen_nic_down() would cause -* linkwatch_event() to be executed which also attempts to acquire the rtnl -* lock thus causing a deadlock. -*/ -static struct workqueue_struct *netxen_workq;#define SCHEDULE_WORK (tp) queue_work(netxen_workq, tp)#define FLUSH_SCHEDULED_WORK () flush_workqueue(netxen_workq)
@@ -719,6 +705,163 @@ netxen_start_firmware(struct netxen_adapter *adapter)return 0 ; } +static int +netxen_nic_request_irq (struct netxen_adapter *adapter) +{ +irq_handler_t handler; +unsigned long flags =IRQF_SAMPLE_RANDOM ; +struct net_device *netdev = adapter->netdev; + +if ((adapter->msi_mode !=MSI_MODE_MULTIFUNC ) || + (adapter->intr_scheme !=INTR_SCHEME_PERPORT )) { +printk (KERN_ERR "%s: Firmware interrupt scheme is " +"incompatible with driver\n" , + netdev->name); + adapter->driver_mismatch =1 ; +return -EINVAL ; + } + +if (adapter->flags &NETXEN_NIC_MSIX_ENABLED ) + handler = netxen_msix_intr; +else if (adapter->flags &NETXEN_NIC_MSI_ENABLED ) + handler = netxen_msi_intr; +else { + flags |=IRQF_SHARED ; + handler = netxen_intr; + } + adapter->irq = netdev->irq; + +return request_irq (adapter->irq, handler, + flags, netdev->name, adapter); +} + +static int +netxen_nic_up (struct netxen_adapter *adapter,struct net_device *netdev) +{ +int err; + + err = adapter->init_port (adapter, adapter->physical_port); +if (err) { +printk (KERN_ERR "%s: Failed to initialize port %d\n" , + netxen_nic_driver_name, adapter->portnum); +return err; + } + adapter->macaddr_set (adapter, netdev->dev_addr); + +netxen_nic_set_link_parameters (adapter); + +netxen_set_multicast_list (netdev); +if (adapter->set_mtu) + adapter->set_mtu (adapter, netdev->mtu); + + adapter->ahw.linkup =0 ; +mod_timer (&adapter->watchdog_timer, jiffies); + +napi_enable (&adapter->napi); +netxen_nic_enable_int (adapter); + +return 0 ; +} + +static void +netxen_nic_down (struct netxen_adapter *adapter,struct net_device *netdev) +{ +netif_carrier_off (netdev); +netif_stop_queue (netdev); +napi_disable (&adapter->napi); + +if (adapter->stop_port) + adapter->stop_port (adapter); + +netxen_nic_disable_int (adapter); + +netxen_release_tx_buffers (adapter); + +FLUSH_SCHEDULED_WORK (); +del_timer_sync (&adapter->watchdog_timer); +} + + +static int +netxen_nic_attach (struct netxen_adapter *adapter) +{ +struct net_device *netdev = adapter->netdev; +struct pci_dev *pdev = adapter->pdev; +int err, ctx, ring; + + err =netxen_init_firmware (adapter); +if (err !=0 ) { +printk (KERN_ERR "Failed to init firmware\n" ); +return -EIO ; + } + +if (adapter->fw_major <4 ) + adapter->max_rds_rings =3 ; +else + adapter->max_rds_rings =2 ; + + err =netxen_alloc_sw_resources (adapter); +if (err) { +printk (KERN_ERR "%s: Error in setting sw resources\n" , + netdev->name); +return err; + } + +netxen_nic_clear_stats (adapter); + + err =netxen_alloc_hw_resources (adapter); +if (err) { +printk (KERN_ERR "%s: Error in setting hw resources\n" , + netdev->name); + goto err_out_free_sw; + } + +if (adapter->fw_major <4 ) { + adapter->crb_addr_cmd_producer = + crb_cmd_producer[adapter->portnum]; + adapter->crb_addr_cmd_consumer = + crb_cmd_consumer[adapter->portnum]; + +netxen_nic_update_cmd_producer (adapter,0 ); +netxen_nic_update_cmd_consumer (adapter,0 ); + } + +for (ctx =0 ; ctx <MAX_RCV_CTX ; ++ctx) { +for (ring =0 ; ring < adapter->max_rds_rings; ring++) +netxen_post_rx_buffers (adapter, ctx, ring); + } + + err =netxen_nic_request_irq (adapter); +if (err) { +dev_err (&pdev->dev,"%s: failed to setup interrupt\n" , + netdev->name); + goto err_out_free_rxbuf; + } + + adapter->is_up =NETXEN_ADAPTER_UP_MAGIC ; +return 0 ; + +err_out_free_rxbuf: +netxen_release_rx_buffers (adapter); +netxen_free_hw_resources (adapter); +err_out_free_sw: +netxen_free_sw_resources (adapter); +return err; +} + +static void +netxen_nic_detach (struct netxen_adapter *adapter) +{ +if (adapter->irq) +free_irq (adapter->irq, adapter); + +netxen_release_rx_buffers (adapter); +netxen_free_hw_resources (adapter); +netxen_free_sw_resources (adapter); + + adapter->is_up =0 ; +} +static int __devinit netxen_nic_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {
@@ -970,9 +1113,7 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)unregister_netdev (netdev);if (adapter->is_up ==NETXEN_ADAPTER_UP_MAGIC ) { -netxen_free_hw_resources (adapter); -netxen_release_rx_buffers (adapter); -netxen_free_sw_resources (adapter); +netxen_nic_detach (adapter);if (NX_IS_REVISION_P3 (adapter->ahw.revision_id))netxen_p3_free_mac_list (adapter);
@@ -981,9 +1122,6 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)if (adapter->portnum ==0 )netxen_free_adapter_offload (adapter); -if (adapter->irq) -free_irq (adapter->irq, adapter); -netxen_teardown_intr (adapter);netxen_cleanup_pci_map (adapter);
@@ -995,125 +1133,30 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)free_netdev (netdev); } -/* -* Called when a network interface is made active -* @returns 0 on success, negative value on failure -*/ static int netxen_nic_open (struct net_device *netdev) {struct netxen_adapter *adapter =netdev_priv (netdev);int err =0 ; -int ctx, ring; -irq_handler_t handler; -unsigned long flags =IRQF_SAMPLE_RANDOM ;if (adapter->driver_mismatch)return -EIO ;if (adapter->is_up !=NETXEN_ADAPTER_UP_MAGIC ) { - err =netxen_init_firmware (adapter); -if (err !=0 ) { -printk (KERN_ERR "Failed to init firmware\n" ); -return -EIO ; - } - -if (adapter->fw_major <4 ) - adapter->max_rds_rings =3 ; -else - adapter->max_rds_rings =2 ; - - err =netxen_alloc_sw_resources (adapter); -if (err) { -printk (KERN_ERR "%s: Error in setting sw resources\n" , - netdev->name); + err =netxen_nic_attach (adapter); +if (err)return err; - } - -netxen_nic_clear_stats (adapter); - - err =netxen_alloc_hw_resources (adapter); -if (err) { -printk (KERN_ERR "%s: Error in setting hw resources\n" , - netdev->name); - goto err_out_free_sw; - } - -if ((adapter->msi_mode !=MSI_MODE_MULTIFUNC ) || - (adapter->intr_scheme !=INTR_SCHEME_PERPORT )) { -printk (KERN_ERR "%s: Firmware interrupt scheme is " -"incompatible with driver\n" , - netdev->name); - adapter->driver_mismatch =1 ; - goto err_out_free_hw; - } - -if (adapter->fw_major <4 ) { - adapter->crb_addr_cmd_producer = - crb_cmd_producer[adapter->portnum]; - adapter->crb_addr_cmd_consumer = - crb_cmd_consumer[adapter->portnum]; - -netxen_nic_update_cmd_producer (adapter,0 ); -netxen_nic_update_cmd_consumer (adapter,0 ); - } - -for (ctx =0 ; ctx <MAX_RCV_CTX ; ++ctx) { -for (ring =0 ; ring < adapter->max_rds_rings; ring++) -netxen_post_rx_buffers (adapter, ctx, ring); - } -if (adapter->flags &NETXEN_NIC_MSIX_ENABLED ) - handler = netxen_msix_intr; -else if (adapter->flags &NETXEN_NIC_MSI_ENABLED ) - handler = netxen_msi_intr; -else { - flags |=IRQF_SHARED ; - handler = netxen_intr; - } - adapter->irq = netdev->irq; - err =request_irq (adapter->irq, handler, - flags, netdev->name, adapter); -if (err) { -printk (KERN_ERR "request_irq failed with: %d\n" , err); - goto err_out_free_rxbuf; - } - - adapter->is_up =NETXEN_ADAPTER_UP_MAGIC ; } -/* Done here again so that even if phantom sw overwrote it, -* we set it */ - err = adapter->init_port (adapter, adapter->physical_port); -if (err) { -printk (KERN_ERR "%s: Failed to initialize port %d\n" , - netxen_nic_driver_name, adapter->portnum); - goto err_out_free_irq; - } - adapter->macaddr_set (adapter, netdev->dev_addr); - -netxen_nic_set_link_parameters (adapter); - -netxen_set_multicast_list (netdev); -if (adapter->set_mtu) - adapter->set_mtu (adapter, netdev->mtu); - - adapter->ahw.linkup =0 ; -mod_timer (&adapter->watchdog_timer, jiffies); - -napi_enable (&adapter->napi); -netxen_nic_enable_int (adapter); + err =netxen_nic_up (adapter, netdev); +if (err) + goto err_out;netif_start_queue (netdev);return 0 ; -err_out_free_irq: -free_irq (adapter->irq, adapter); -err_out_free_rxbuf: -netxen_release_rx_buffers (adapter); -err_out_free_hw: -netxen_free_hw_resources (adapter); -err_out_free_sw: -netxen_free_sw_resources (adapter); +err_out: +netxen_nic_detach (adapter);return err; }
@@ -1124,20 +1167,7 @@ static int netxen_nic_close(struct net_device *netdev) {struct netxen_adapter *adapter =netdev_priv (netdev); -netif_carrier_off (netdev); -netif_stop_queue (netdev); -napi_disable (&adapter->napi); - -if (adapter->stop_port) - adapter->stop_port (adapter); - -netxen_nic_disable_int (adapter); - -netxen_release_tx_buffers (adapter); - -FLUSH_SCHEDULED_WORK (); -del_timer_sync (&adapter->watchdog_timer); - +netxen_nic_down (adapter, netdev);return 0 ; }
Signature · 1 line
1.6.0.2
PATCH 4/5 netxen: cleanup superfluous multi-context code
In reply to Dhananjay PhadkeMAX_RCV_CTX was set to 1, there's only rx context per PCI function.
--- drivers/net/netxen/netxen_nic.h | 7 +- drivers/net/netxen/netxen_nic_ctx.c | 130 +++++++++---------- drivers/net/netxen/netxen_nic_ethtool.c | 11 +- drivers/net/netxen/netxen_nic_hdr.h | 6 - drivers/net/netxen/netxen_nic_init.c | 213 +++++++++++++++---------------- drivers/net/netxen/netxen_nic_main.c | 30 +---- 6 files changed, 178 insertions(+), 219 deletions(-)
drivers/net/netxen/netxen_nic.h +3 -4
@@ -1280,7 +1280,7 @@ struct netxen_adapter {* Receive instances. These can be either one per port, * or one per peg, etc. */ -struct netxen_recv_context recv_ctx[MAX_RCV_CTX ]; +struct netxen_recv_context recv_ctx;int is_up;struct netxen_dummy_dma dummy_dma;
@@ -1464,10 +1464,9 @@ void netxen_initialize_adapter_ops(struct netxen_adapter *adapter);int netxen_init_firmware (struct netxen_adapter *adapter);void netxen_nic_clear_stats (struct netxen_adapter *adapter);void netxen_watchdog_task (struct work_struct *work); -void netxen_post_rx_buffers (struct netxen_adapter *adapter,u32 ctx, -u32 ringid); +void netxen_post_rx_buffers (struct netxen_adapter *adapter,u32 ringid);int netxen_process_cmd_ring (struct netxen_adapter *adapter); -u32 netxen_process_rcv_ring (struct netxen_adapter *adapter,int ctx,int max); +int netxen_process_rcv_ring (struct netxen_adapter *adapter,int max);void netxen_p2_nic_set_multi (struct net_device *netdev);void netxen_p3_nic_set_multi (struct net_device *netdev);void netxen_p3_free_mac_list (struct netxen_adapter *adapter);
drivers/net/netxen/netxen_nic_ctx.c +62 -68
201 lines not on this page · raw message
drivers/net/netxen/netxen_nic_ethtool.c +4 -7
@@ -474,16 +474,13 @@ static void netxen_nic_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring) { struct netxen_adapter *adapter = netdev_priv(dev); -int i; ring->rx_pending =0 ; ring->rx_jumbo_pending =0 ; -for (i =0 ; i <MAX_RCV_CTX ; ++i) { - ring->rx_pending += adapter->recv_ctx[i]. - rds_rings[RCV_DESC_NORMAL_CTXID ].max_rx_desc_count; - ring->rx_jumbo_pending += adapter->recv_ctx[i]. - rds_rings[RCV_DESC_JUMBO_CTXID ].max_rx_desc_count; - } + ring->rx_pending += adapter->recv_ctx. + rds_rings[RCV_DESC_NORMAL_CTXID ].max_rx_desc_count; + ring->rx_jumbo_pending += adapter->recv_ctx. + rds_rings[RCV_DESC_JUMBO_CTXID ].max_rx_desc_count; ring->tx_pending = adapter->max_tx_desc_count;if (adapter->ahw.board_type ==NETXEN_NIC_GBE )
drivers/net/netxen/netxen_nic_hdr.h +0 -6
@@ -363,12 +363,6 @@ enum {#define NETXEN_HW_CRB_HUB_AGT_ADR_LPC \ ((NETXEN_HW_H6_CH_HUB_ADR << 7) | NETXEN_HW_LPC_CRB_AGT_ADR) -/* -* MAX_RCV_CTX : The number of receive contexts that are available on -* the phantom. -*/ -#define MAX_RCV_CTX 1 -#define NETXEN_SRE_INT_STATUS (NETXEN_CRB_SRE + 0x00034)#define NETXEN_SRE_PBI_ACTIVE_STATUS (NETXEN_CRB_SRE + 0x01014)#define NETXEN_SRE_L1RE_CTL (NETXEN_CRB_SRE + 0x03000)
drivers/net/netxen/netxen_nic_init.c +103 -110
296 lines not on this page · raw message
drivers/net/netxen/netxen_nic_main.c +6 -24
@@ -787,7 +787,7 @@ netxen_nic_attach(struct netxen_adapter *adapter) {struct net_device *netdev = adapter->netdev;struct pci_dev *pdev = adapter->pdev; -int err, ctx, ring; +int err, ring; err =netxen_init_firmware (adapter);if (err !=0 ) {
@@ -826,10 +826,8 @@ netxen_nic_attach(struct netxen_adapter *adapter)netxen_nic_update_cmd_consumer (adapter,0 ); } -for (ctx =0 ; ctx <MAX_RCV_CTX ; ++ctx) { -for (ring =0 ; ring < adapter->max_rds_rings; ring++) -netxen_post_rx_buffers (adapter, ctx, ring); - } +for (ring =0 ; ring < adapter->max_rds_rings; ring++) +netxen_post_rx_buffers (adapter, ring); err =netxen_nic_request_irq (adapter);if (err) {
@@ -1637,30 +1635,14 @@ static irqreturn_t netxen_msix_intr(int irq, void *data)static int netxen_nic_poll (struct napi_struct *napi,int budget) { - struct netxen_adapter *adapter = container_of(napi, struct netxen_adapter, napi); +struct netxen_adapter *adapter = + container_of(napi, struct netxen_adapter, napi);int tx_complete; -int ctx;int work_done; tx_complete =netxen_process_cmd_ring (adapter); - work_done =0 ; -for (ctx =0 ; ctx <MAX_RCV_CTX ; ++ctx) { -/* -* Fairness issue. This will give undue weight to the -* receive context 0. -*/ - -/* -* To avoid starvation, we give each of our receivers, -* a fraction of the quota. Sometimes, it might happen that we -* have enough quota to process every packet, but since all the -* packets are on one context, it gets only half of the quota, -* and ends up not processing it. -*/ - work_done +=netxen_process_rcv_ring (adapter, ctx, - budget /MAX_RCV_CTX ); - } + work_done =netxen_process_rcv_ring (adapter, budget);if ((work_done < budget) && tx_complete) {napi_complete (&adapter->napi);
Signature · 1 line
1.6.0.2
PATCH 5/5 netxen: annotate board_config and board_type
In reply to Dhananjay PhadkeRemove huge board config structure from each instance, read only necessary fields from flash.
Replace board_type with port_type (1G/10G), there's another board_type field describing card type (SFP/XFP/CX4).
--- drivers/net/netxen/netxen_nic.h | 12 ++-- drivers/net/netxen/netxen_nic_ethtool.c | 33 +++++----- drivers/net/netxen/netxen_nic_hw.c | 108 +++++++++++++++--------------- drivers/net/netxen/netxen_nic_hw.h | 1 - drivers/net/netxen/netxen_nic_init.c | 2 +- drivers/net/netxen/netxen_nic_main.c | 38 +++-------- 6 files changed, 85 insertions(+), 109 deletions(-)
drivers/net/netxen/netxen_nic.h +5 -7
@@ -90,7 +90,6 @@ (sizeof(struct netxen_rx_buffer) * rds_ring->max_rx_desc_count)#define find_diff_among (a,b,range) ((a)<(b)?((b)-(a)):((b)+(range)-(a))) -#define NETXEN_NETDEV_STATUS 0x1#define NETXEN_RCV_PRODUCER_OFFSET 0#define NETXEN_RCV_PEG_DB_ID 2#define NETXEN_HOST_DUMMY_DMA_SIZE 1024
@@ -795,21 +794,19 @@ struct netxen_hardware_context {void __iomem *pci_base0;void __iomem *pci_base1;void __iomem *pci_base2; -unsigned long first_page_group_end; -unsigned long first_page_group_start;void __iomem *db_base;unsigned long db_len;unsigned long pci_len0; -u8 cut_through;int qdr_sn_window;int ddr_mn_window;unsigned long mn_win_crb;unsigned long ms_win_crb; +u8 cut_through;u8 revision_id; -u16 board_type; -struct netxen_board_info boardcfg; +u16 port_type; +int board_type;u32 linkup;/* Address of cmd ring in Phantom */ struct cmd_desc_type0 *cmd_desc_head;
@@ -1260,6 +1257,7 @@ struct netxen_adapter {u32 temp;u32 fw_major; +u32 fw_version;u8 msix_supported;u8 max_possible_rss_rings;
@@ -1272,7 +1270,6 @@ struct netxen_adapter {u16 state;u16 link_autoneg;int rx_csum; -int status;struct netxen_cmd_buffer *cmd_buf_arr;/* Command buffers for xmit */
@@ -1391,6 +1388,7 @@ void netxen_nic_write_w1(struct netxen_adapter *adapter, u32 index, u32 value);void netxen_nic_read_w1 (struct netxen_adapter *adapter,u32 index,u32 *value);int netxen_nic_get_board_info (struct netxen_adapter *adapter); +void netxen_nic_get_firmware_info (struct netxen_adapter *adapter);int netxen_nic_hw_read_wx_128M (struct netxen_adapter *adapter,ulong off,void *data,int len);
drivers/net/netxen/netxen_nic_ethtool.c +16 -17
@@ -115,10 +115,9 @@ static int netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) { struct netxen_adapter *adapter = netdev_priv(dev); -struct netxen_board_info *boardinfo = &adapter->ahw.boardcfg;/* read which mode */ - if (adapter->ahw.board_type == NETXEN_NIC_GBE) { + if (adapter->ahw.port_type == NETXEN_NIC_GBE) { ecmd->supported = (SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Half |
@@ -137,7 +136,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) ecmd->duplex = adapter->link_duplex; ecmd->autoneg = adapter->link_autoneg; - }else if (adapter->ahw.board_type ==NETXEN_NIC_XGBE ) { + }else if (adapter->ahw.port_type ==NETXEN_NIC_XGBE ) {u32 val; adapter->hw_read_wx (adapter,NETXEN_PORT_MODE_ADDR , &val,4 );
@@ -169,7 +168,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) ecmd->phy_address = adapter->physical_port; ecmd->transceiver =XCVR_EXTERNAL ; -switch ((netxen_brdtype_t ) boardinfo->board_type) { +switch ((netxen_brdtype_t )adapter->ahw.board_type) {case NETXEN_BRDTYPE_P2_SB35_4G :case NETXEN_BRDTYPE_P2_SB31_2G :case NETXEN_BRDTYPE_P3_REF_QG :
@@ -185,7 +184,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) ecmd->supported |=SUPPORTED_TP ; ecmd->advertising |=ADVERTISED_TP ; ecmd->port =PORT_TP ; - ecmd->autoneg = (boardinfo->board_type == + ecmd->autoneg = (adapter->ahw.board_type ==NETXEN_BRDTYPE_P2_SB31_10G_CX4 ) ? (AUTONEG_DISABLE ) : (adapter->link_autoneg);break ;
@@ -212,7 +211,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) ecmd->autoneg =AUTONEG_DISABLE ;break ;case NETXEN_BRDTYPE_P3_10G_TP : -if (adapter->ahw.board_type ==NETXEN_NIC_XGBE ) { +if (adapter->ahw.port_type ==NETXEN_NIC_XGBE ) { ecmd->autoneg =AUTONEG_DISABLE ; ecmd->supported |= (SUPPORTED_FIBRE |SUPPORTED_TP ); ecmd->advertising |=
@@ -228,7 +227,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)break ;default :printk (KERN_ERR "netxen-nic: Unsupported board model %d\n" , - (netxen_brdtype_t ) boardinfo->board_type); + (netxen_brdtype_t )adapter->ahw.board_type);return -EIO ; }
@@ -242,7 +241,7 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)__u32 status;/* read which mode */ - if (adapter->ahw.board_type == NETXEN_NIC_GBE) { + if (adapter->ahw.port_type == NETXEN_NIC_GBE) { /* autonegotiation */ if (adapter->phy_write && adapter->phy_write(adapter,
@@ -430,7 +429,7 @@ static u32 netxen_nic_test_link(struct net_device *dev)int val;/* read which mode */ - if (adapter->ahw.board_type == NETXEN_NIC_GBE) { + if (adapter->ahw.port_type == NETXEN_NIC_GBE) { if (adapter->phy_read && adapter->phy_read(adapter, NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
@@ -440,7 +439,7 @@ static u32 netxen_nic_test_link(struct net_device *dev) val =netxen_get_phy_link (status);return !val; } - }else if (adapter->ahw.board_type ==NETXEN_NIC_XGBE ) { + }else if (adapter->ahw.port_type ==NETXEN_NIC_XGBE ) { val = adapter->pci_read_normalize (adapter,CRB_XG_STATE );return (val ==XG_LINK_UP ) ?0 :1 ; }
@@ -483,7 +482,7 @@ netxen_nic_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring) rds_rings[RCV_DESC_JUMBO_CTXID ].max_rx_desc_count; ring->tx_pending = adapter->max_tx_desc_count; -if (adapter->ahw.board_type ==NETXEN_NIC_GBE ) +if (adapter->ahw.port_type ==NETXEN_NIC_GBE ) ring->rx_max_pending =MAX_RCV_DESCRIPTORS_1G ;else ring->rx_max_pending =MAX_RCV_DESCRIPTORS_10G ;
@@ -501,7 +500,7 @@ netxen_nic_get_pauseparam(struct net_device *dev,__u32 val;int port = adapter->physical_port; -if (adapter->ahw.board_type ==NETXEN_NIC_GBE ) { +if (adapter->ahw.port_type ==NETXEN_NIC_GBE ) {if ((port <0 ) || (port >NETXEN_NIU_MAX_GBE_PORTS ))return ;/* get flow control settings */
@@ -524,7 +523,7 @@ netxen_nic_get_pauseparam(struct net_device *dev, pause->tx_pause = !(netxen_gb_get_gb3_mask (val));break ; } - }else if (adapter->ahw.board_type ==NETXEN_NIC_XGBE ) { + }else if (adapter->ahw.port_type ==NETXEN_NIC_XGBE ) {if ((port <0 ) || (port >NETXEN_NIU_MAX_XG_PORTS ))return ; pause->rx_pause =1 ;
@@ -535,7 +534,7 @@ netxen_nic_get_pauseparam(struct net_device *dev, pause->tx_pause = !(netxen_xg_get_xg1_mask (val)); }else {printk (KERN_ERR "%s: Unknown board type: %x\n" , - netxen_nic_driver_name, adapter->ahw.board_type); + netxen_nic_driver_name, adapter->ahw.port_type); } }
@@ -547,7 +546,7 @@ netxen_nic_set_pauseparam(struct net_device *dev,__u32 val;int port = adapter->physical_port;/* read mode */ -if (adapter->ahw.board_type ==NETXEN_NIC_GBE ) { +if (adapter->ahw.port_type ==NETXEN_NIC_GBE ) {if ((port <0 ) || (port >NETXEN_NIU_MAX_GBE_PORTS ))return -EIO ;/* set flow control */
@@ -591,7 +590,7 @@ netxen_nic_set_pauseparam(struct net_device *dev,break ; }netxen_nic_write_w0 (adapter,NETXEN_NIU_GB_PAUSE_CTL , val); - }else if (adapter->ahw.board_type ==NETXEN_NIC_XGBE ) { + }else if (adapter->ahw.port_type ==NETXEN_NIC_XGBE ) {if ((port <0 ) || (port >NETXEN_NIU_MAX_XG_PORTS ))return -EIO ;netxen_nic_read_w0 (adapter,NETXEN_NIU_XG_PAUSE_CTL , &val);
@@ -610,7 +609,7 @@ netxen_nic_set_pauseparam(struct net_device *dev, }else {printk (KERN_ERR "%s: Unknown board type: %x\n" , netxen_nic_driver_name, - adapter->ahw.board_type); + adapter->ahw.port_type); }return 0 ; }
drivers/net/netxen/netxen_nic_hw.c +54 -54
184 lines not on this page · raw message
drivers/net/netxen/netxen_nic_hw.h +0 -1
@@ -57,7 +57,6 @@ struct netxen_adapter;struct netxen_port ;void netxen_nic_set_link_parameters (struct netxen_adapter *adapter); -void netxen_nic_flash_print (struct netxen_adapter *adapter);typedef u8 netxen_ethernet_macaddr_t [6 ];
drivers/net/netxen/netxen_nic_init.c +1 -1
@@ -316,7 +316,7 @@ err_out:void netxen_initialize_adapter_ops (struct netxen_adapter *adapter) { -switch (adapter->ahw.board_type) { +switch (adapter->ahw.port_type) {case NETXEN_NIC_GBE : adapter->enable_phy_interrupts = netxen_niu_gbe_enable_phy_interrupts;
drivers/net/netxen/netxen_nic_main.c +9 -29
@@ -212,7 +212,7 @@ nx_update_dma_mask(struct netxen_adapter *adapter)static void netxen_check_options (struct netxen_adapter *adapter) { -switch (adapter->ahw.boardcfg.board_type) { +switch (adapter->ahw.board_type) {case NETXEN_BRDTYPE_P3_HMEZ :case NETXEN_BRDTYPE_P3_XG_LOM :case NETXEN_BRDTYPE_P3_10G_CX4 :
@@ -250,7 +250,7 @@ static void netxen_check_options(struct netxen_adapter *adapter)case NETXEN_BRDTYPE_P3_10G_TP : adapter->msix_supported = !!use_msi_x; -if (adapter->ahw.board_type ==NETXEN_NIC_XGBE ) +if (adapter->ahw.port_type ==NETXEN_NIC_XGBE ) adapter->max_rx_desc_count =MAX_RCV_DESCRIPTORS_10G ;else adapter->max_rx_desc_count =MAX_RCV_DESCRIPTORS_1G ;
@@ -261,7 +261,7 @@ static void netxen_check_options(struct netxen_adapter *adapter) adapter->max_rx_desc_count =MAX_RCV_DESCRIPTORS_1G ;printk (KERN_WARNING "Unknown board type(0x%x)\n" , - adapter->ahw.boardcfg.board_type); + adapter->ahw.board_type);break ; }
@@ -330,7 +330,7 @@ static void netxen_set_port_mode(struct netxen_adapter *adapter) {u32 val, data; - val = adapter->ahw.boardcfg.board_type; + val = adapter->ahw.board_type;if ((val ==NETXEN_BRDTYPE_P3_HMEZ ) || (val ==NETXEN_BRDTYPE_P3_XG_LOM )) {if (port_mode ==NETXEN_PORT_MODE_802_3_AP ) {
@@ -520,8 +520,6 @@ netxen_setup_pci_map(struct netxen_adapter *adapter)void __iomem *mem_ptr2 =NULL ;void __iomem *db_ptr =NULL ; -unsigned long first_page_group_end; -unsigned long first_page_group_start;unsigned long mem_base, mem_len, db_base, db_len =0 , pci_len0 =0 ;struct pci_dev *pdev = adapter->pdev;
@@ -559,14 +557,10 @@ netxen_setup_pci_map(struct netxen_adapter *adapter) SECOND_PAGE_GROUP_SIZE); mem_ptr2 =ioremap (mem_base +THIRD_PAGE_GROUP_START ,THIRD_PAGE_GROUP_SIZE ); - first_page_group_start =FIRST_PAGE_GROUP_START ; - first_page_group_end =FIRST_PAGE_GROUP_END ; }else if (mem_len ==NETXEN_PCI_32MB_SIZE ) { mem_ptr1 =ioremap (mem_base,SECOND_PAGE_GROUP_SIZE ); mem_ptr2 =ioremap (mem_base +THIRD_PAGE_GROUP_START -SECOND_PAGE_GROUP_START ,THIRD_PAGE_GROUP_SIZE ); - first_page_group_start =0 ; - first_page_group_end =0 ; }else if (mem_len ==NETXEN_PCI_2MB_SIZE ) { adapter->hw_write_wx = netxen_nic_hw_write_wx_2M; adapter->hw_read_wx = netxen_nic_hw_read_wx_2M;
@@ -586,8 +580,6 @@ netxen_setup_pci_map(struct netxen_adapter *adapter)return -EIO ; } pci_len0 = mem_len; - first_page_group_start =0 ; - first_page_group_end =0 ; adapter->ahw.ddr_mn_window =0 ; adapter->ahw.qdr_sn_window =0 ;
@@ -608,8 +600,6 @@ netxen_setup_pci_map(struct netxen_adapter *adapter) adapter->ahw.pci_base0 = mem_ptr0; adapter->ahw.pci_len0 = pci_len0; - adapter->ahw.first_page_group_start = first_page_group_start; - adapter->ahw.first_page_group_end = first_page_group_end; adapter->ahw.pci_base1 = mem_ptr1; adapter->ahw.pci_base2 = mem_ptr2;
@@ -676,7 +666,7 @@ netxen_start_firmware(struct netxen_adapter *adapter)/* Initialize multicast addr pool owners */ val =0x7654 ; -if (adapter->ahw.board_type ==NETXEN_NIC_XGBE ) +if (adapter->ahw.port_type ==NETXEN_NIC_XGBE ) val |=0x0f000000 ;netxen_crb_writelit_adapter (adapter,NETXEN_MAC_ADDR_CNTL_REG , val);
@@ -867,7 +857,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)struct netxen_adapter *adapter =NULL ;int i =0 , err;int first_driver; -u32 val;int pci_func_id =PCI_FUNC (pdev->devfn);uint8_t revision_id;
@@ -933,7 +922,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)/* This will be reset for mezz cards */ adapter->portnum = pci_func_id; - adapter->status &= ~NETXEN_NETDEV_STATUS ; adapter->rx_csum =1 ; adapter->mc_enabled =0 ;if (NX_IS_REVISION_P3 (revision_id))
@@ -971,7 +959,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)netxen_initialize_adapter_ops (adapter);/* Mezz cards have PCI function 0,2,3 enabled */ -switch (adapter->ahw.boardcfg.board_type) { +switch (adapter->ahw.board_type) {case NETXEN_BRDTYPE_P2_SB31_10G_IMEZ :case NETXEN_BRDTYPE_P2_SB31_10G_HMEZ :if (pci_func_id >=2 )
@@ -1004,15 +992,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)nx_update_dma_mask (adapter); -netxen_nic_flash_print (adapter); - -if (NX_IS_REVISION_P3 (revision_id)) { - adapter->hw_read_wx (adapter, -NETXEN_MIU_MN_CONTROL , &val,4 ); - adapter->ahw.cut_through = (val &0x4 ) ?1 :0 ; -dev_info (&pdev->dev,"firmware running in %s mode\n" , - adapter->ahw.cut_through ?"cut through" :"legacy" ); - } +netxen_nic_get_firmware_info (adapter);/* * See if the firmware gave us a virtual-physical port mapping.
@@ -1063,7 +1043,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)pci_set_drvdata (pdev, adapter); -switch (adapter->ahw.board_type) { +switch (adapter->ahw.port_type) {case NETXEN_NIC_GBE :dev_info (&adapter->pdev->dev,"%s: GbE port initialized\n" , adapter->netdev->name);
@@ -1457,7 +1437,7 @@ static void netxen_nic_handle_phy_intr(struct netxen_adapter *adapter) linkup = (val ==XG_LINK_UP_P3 ); }else { val = adapter->pci_read_normalize (adapter,CRB_XG_STATE ); -if (adapter->ahw.board_type ==NETXEN_NIC_GBE ) +if (adapter->ahw.port_type ==NETXEN_NIC_GBE ) linkup = (val >> port) &1 ;else { val = (val >> port*8 ) &0xff ;
Signature · 1 line
1.6.0.2
From: Dhananjay Phadke <[email protected]>
Date: Mon, 9 Mar 2009 11:50:52 -0700
Quoted 4 lines
o remove unused rx fragment handling code.
o imporove check for status descriptor ownership.Signed-off-by Dhananjay Phadke <[email protected]>
Applied.