nexten: fixes and enhancements
Subsystems (2)
cover nexten: fixes and enhancements
Series of 6 driver enhancements / fixes, please apply to net-next-2.6.
Thanks,
Dhananjay
PATCH 1/6 netxen: handle firmware load errors
Unwind allocations and release file firmware when
when firmware load fails.
--- drivers/net/netxen/netxen_nic_hw.c | 3 +++ drivers/net/netxen/netxen_nic_init.c | 1 + drivers/net/netxen/netxen_nic_main.c | 20 ++++++++++++++++---- 3 files changed, 20 insertions(+), 4 deletions(-)
drivers/net/netxen/netxen_nic_hw.c +3 -0
@@ -566,6 +566,9 @@ netxen_send_cmd_descs(struct netxen_adapter *adapter, i =0 ; +if (adapter->is_up !=NETXEN_ADAPTER_UP_MAGIC ) +return -EIO ; + tx_ring = adapter->tx_ring;__netif_tx_lock_bh (tx_ring->txq);
drivers/net/netxen/netxen_nic_init.c +1 -0
@@ -905,6 +905,7 @@ netxen_release_firmware(struct netxen_adapter *adapter) {if (adapter->fw)release_firmware (adapter->fw); + adapter->fw =NULL ; }int netxen_init_dummy_dma (struct netxen_adapter *adapter)
drivers/net/netxen/netxen_nic_main.c +16 -4
@@ -757,7 +757,7 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw) err =netxen_need_fw_reset (adapter);if (err <0 ) -return err; + goto err_out;if (err ==0 ) goto wait_init;
@@ -771,7 +771,9 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw)if (NX_IS_REVISION_P3 (adapter->ahw.revision_id))netxen_set_port_mode (adapter); -netxen_load_firmware (adapter); + err =netxen_load_firmware (adapter); +if (err) + goto err_out;if (NX_IS_REVISION_P2 (adapter->ahw.revision_id)) {
@@ -785,7 +787,7 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw) err =netxen_init_dummy_dma (adapter);if (err) -return err; + goto err_out;/* * Tell the hardware our version number.
@@ -800,7 +802,7 @@ wait_init: err =netxen_phantom_init (adapter,NETXEN_NIC_PEG_TUNE );if (err) {netxen_free_dummy_dma (adapter); -return err; + goto err_out; }nx_update_dma_mask (adapter);
@@ -808,6 +810,10 @@ wait_init:netxen_nic_get_firmware_info (adapter);return 0 ; + +err_out: +netxen_release_firmware (adapter); +return err; } static int
@@ -876,6 +882,9 @@ netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev) {int err; +if (adapter->is_up !=NETXEN_ADAPTER_UP_MAGIC ) +return -EIO ; + err = adapter->init_port (adapter, adapter->physical_port);if (err) { printk(KERN_ERR "%s: Failed to initialize port %d\n",
@@ -914,6 +923,9 @@ netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev)static void netxen_nic_down (struct netxen_adapter *adapter,struct net_device *netdev) { +if (adapter->is_up !=NETXEN_ADAPTER_UP_MAGIC ) +return ; +spin_lock (&adapter->tx_clean_lock);netif_carrier_off (netdev);netif_tx_disable (netdev);
Signature · 1 line
1.6.0.2
PATCH 2/6 netxen: firmware hang detection
In reply to Dhananjay PhadkeImplement state machine to detect firmware hung state and recover. Since firmware will be shared by all PCI functions that have different class drivers (NIC or FCOE or iSCSI), explicit hardware based serialization is required for initializing firmware.
o Used global scratchpad register to maintain device reference count. Every probed pci function adds to ref count.
o Implement timer (delayed work) for each pci func that checks firmware heartbit every 5 sec and detaches itself if firmware is dead. Last detaching function reloads firmware. Other functions wait for firmware init, and re-attach themselves.
Heartbit is not supported by NX2031 firmware.
--- drivers/net/netxen/netxen_nic.h | 17 ++- drivers/net/netxen/netxen_nic_ctx.c | 8 + drivers/net/netxen/netxen_nic_hdr.h | 23 ++ drivers/net/netxen/netxen_nic_main.c | 388 ++++++++++++++++++++++++++-------- 4 files changed, 348 insertions(+), 88 deletions(-)
drivers/net/netxen/netxen_nic.h +13 -4
@@ -229,6 +229,8 @@#define MPORT_SINGLE_FUNCTION_MODE 0x1111#define MPORT_MULTI_FUNCTION_MODE 0x2222 +#define NX_MAX_PCI_FUNC 8 +/* * NetXen host-peg signal message structure *
@@ -1101,6 +1103,10 @@ typedef struct {#define NETXEN_ADAPTER_UP_MAGIC 777#define NETXEN_NIC_PEG_TUNE 0 +#define __NX_FW_ATTACHED 0 +#define __NX_DEV_UP 1 +#define __NX_RESETTING 2 +struct netxen_dummy_dma {void *addr;dma_addr_t phys_addr;
@@ -1137,7 +1143,9 @@ struct netxen_adapter {u8 max_mc_count;u8 rss_supported;u8 link_changed; -u32 resv3; +u8 fw_wait_cnt; +u8 fw_fail_cnt; +u16 resv4;u8 has_link_events;u8 fw_type;
@@ -1156,7 +1164,7 @@ struct netxen_adapter {u32 temp;u32 msi_tgt_status; -u32 resv4; +u32 heartbit;struct netxen_adapter_stats stats;
@@ -1187,14 +1195,15 @@ struct netxen_adapter {struct netxen_dummy_dma dummy_dma; -struct work_struct watchdog_task; -struct timer_list watchdog_timer; +struct delayed_work fw_work; +struct work_struct tx_timeout_task;struct net_device_stats net_stats;nx_nic_intr_coalesce_t coal; +unsigned long state;u32 resv5;u32 fw_version;const struct firmware *fw;
drivers/net/netxen/netxen_nic_ctx.c +8 -0
@@ -678,6 +678,9 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)if (!NX_IS_REVISION_P2 (adapter->ahw.revision_id)) { +if (test_and_set_bit (__NX_FW_ATTACHED, &adapter->state)) + goto done; + err =nx_fw_cmd_create_rx_ctx (adapter);if (err) goto err_out_free;
@@ -690,6 +693,7 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter) goto err_out_free; } +done:return 0 ; err_out_free:
@@ -708,6 +712,9 @@ void netxen_free_hw_resources(struct netxen_adapter *adapter)int port = adapter->portnum;if (!NX_IS_REVISION_P2 (adapter->ahw.revision_id)) { +if (!test_and_clear_bit (__NX_FW_ATTACHED, &adapter->state)) + goto done; +nx_fw_cmd_destroy_rx_ctx (adapter);nx_fw_cmd_destroy_tx_ctx (adapter); }else {
@@ -720,6 +727,7 @@ void netxen_free_hw_resources(struct netxen_adapter *adapter)/* Allow dma queues to drain after context reset */ msleep (20 ); +done: recv_ctx = &adapter->recv_ctx;if (recv_ctx->hwctx !=NULL ) {
drivers/net/netxen/netxen_nic_hdr.h +23 -0
@@ -433,6 +433,7 @@ enum {#define NETXEN_CRB_PEG_NET_1 NETXEN_PCI_CRB_WINDOW(NETXEN_HW_PX_MAP_CRB_PGN1)#define NETXEN_CRB_PEG_NET_2 NETXEN_PCI_CRB_WINDOW(NETXEN_HW_PX_MAP_CRB_PGN2)#define NETXEN_CRB_PEG_NET_3 NETXEN_PCI_CRB_WINDOW(NETXEN_HW_PX_MAP_CRB_PGN3) +#define NETXEN_CRB_PEG_NET_4 NETXEN_PCI_CRB_WINDOW(NETXEN_HW_PX_MAP_CRB_SQS2)#define NETXEN_CRB_PEG_NET_D NETXEN_PCI_CRB_WINDOW(NETXEN_HW_PX_MAP_CRB_PGND)#define NETXEN_CRB_PEG_NET_I NETXEN_PCI_CRB_WINDOW(NETXEN_HW_PX_MAP_CRB_PGNI)#define NETXEN_CRB_DDR_NET NETXEN_PCI_CRB_WINDOW(NETXEN_HW_PX_MAP_CRB_MN)
@@ -945,6 +946,28 @@ enum {#define NETXEN_DMA_WATCHDOG_CTRL (NETXEN_CAM_RAM(0x14))#define NETXEN_PEG_ALIVE_COUNTER (NETXEN_CAM_RAM(0xb0)) +#define NETXEN_PEG_HALT_STATUS1 (NETXEN_CAM_RAM(0xa8)) +#define NETXEN_PEG_HALT_STATUS2 (NETXEN_CAM_RAM(0xac)) +#define NX_CRB_DEV_REF_COUNT (NETXEN_CAM_RAM(0x138)) +#define NX_CRB_DEV_STATE (NETXEN_CAM_RAM(0x140)) + +/* Device State */ +#define NX_DEV_COLD 1 +#define NX_DEV_INITALIZING 2 +#define NX_DEV_READY 3 +#define NX_DEV_NEED_RESET 4 +#define NX_DEV_NEED_QUISCENT 5 +#define NX_DEV_FAILED 6 + +#define NX_RCODE_DRIVER_INFO 0x20000000 +#define NX_RCODE_DRIVER_CAN_RELOAD 0x40000000 +#define NX_RCODE_FATAL_ERROR 0x80000000 +#define NX_FWERROR_PEGNUM (code) ((code) & 0xff) +#define NX_FWERROR_CODE (code) ((code >> 8) & 0xfffff) + +#define FW_POLL_DELAY (2 * HZ) +#define FW_FAIL_THRESH 3 +#define FW_POLL_THRESH 10#define ISR_MSI_INT_TRIGGER (FUNC ) (NETXEN_PCIX_PS_REG(PCIX_MSI_F(FUNC)))#define ISR_LEGACY_INT_TRIGGERED (VAL ) (((VAL) & 0x300) == 0x200)
drivers/net/netxen/netxen_nic_main.c +304 -84
581 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 3/6 netxen: fix ip addr hashing after firmware reset
In reply to Dhananjay PhadkeFrom: Amit Kumar Salecha <[email protected]>
Reprogram local IP addresses after firmware is reset or after resuming from suspend.
--- drivers/net/netxen/netxen_nic_main.c | 61 +++++++++++++++++++++------------ 1 files changed, 39 insertions(+), 22 deletions(-)
drivers/net/netxen/netxen_nic_main.c +39 -22
@@ -86,6 +86,8 @@ static irqreturn_t netxen_intr(int irq, void *data);static irqreturn_t netxen_msi_intr (int irq,void *data);static irqreturn_t netxen_msix_intr (int irq,void *data); +static void netxen_config_indev_addr (struct net_device *dev,unsigned long ); +/* PCI Device ID Table */ #define ENTRY (device) \ {PCI_DEVICE(PCI_VENDOR_ID_NETXEN, (device)), \
@@ -1411,6 +1413,8 @@ netxen_nic_resume(struct pci_dev *pdev) goto err_out_detach;netif_device_attach (netdev); + +netxen_config_indev_addr (netdev,NETDEV_UP ); }netxen_schedule_work (adapter, netxen_fw_poll_work,FW_POLL_DELAY );
@@ -2057,6 +2061,7 @@ netxen_attach_work(struct work_struct *work) goto done; } +netxen_config_indev_addr (netdev,NETDEV_UP ); }netif_device_attach (netdev);
@@ -2282,12 +2287,43 @@ netxen_destip_supported(struct netxen_adapter *adapter)return 1 ; } +static void +netxen_config_indev_addr (struct net_device *dev,unsigned long event) +{ +struct in_device *indev; +struct netxen_adapter *adapter =netdev_priv (dev); + +if (netxen_destip_supported (adapter)) +return ; + + indev =in_dev_get (dev); +if (!indev) +return ; + +for_ifa (indev) { +switch (event) { +case NETDEV_UP : +netxen_config_ipaddr (adapter, + ifa->ifa_address,NX_IP_UP ); +break ; +case NETDEV_DOWN : +netxen_config_ipaddr (adapter, + ifa->ifa_address,NX_IP_DOWN ); +break ; +default : +break ; + } + }endfor_ifa (indev); + +in_dev_put (indev); +return ; +} +static int netxen_netdev_event (struct notifier_block *this,unsigned long event,void *ptr) {struct netxen_adapter *adapter;struct net_device *dev = (struct net_device *)ptr; -struct in_device *indev; recheck:if (dev ==NULL )
@@ -2303,32 +2339,13 @@ recheck: adapter =netdev_priv (dev); -if (!adapter || !netxen_destip_supported (adapter)) +if (!adapter) goto done;if (adapter->is_up !=NETXEN_ADAPTER_UP_MAGIC ) goto done; - indev =in_dev_get (dev); -if (!indev) - goto done; - -for_ifa (indev) { -switch (event) { -case NETDEV_UP : -netxen_config_ipaddr (adapter, - ifa->ifa_address,NX_IP_UP ); -break ; -case NETDEV_DOWN : -netxen_config_ipaddr (adapter, - ifa->ifa_address,NX_IP_DOWN ); -break ; -default : -break ; - } - }endfor_ifa (indev); - -in_dev_put (indev); +netxen_config_indev_addr (dev, event); done:return NOTIFY_DONE ; }
Signature · 1 line
1.6.0.2
PATCH 4/6 netxen: pre calculate register addresses
In reply to Dhananjay PhadkeFrom: Amit Kumar Salecha <[email protected]>
For registers accessed in fast path (interrupt / softirq) avoid expensive I/O address translation. These registers are directly mapped in PCI bar 0 and do not require any window checks.
--- drivers/net/netxen/netxen_nic.h | 75 +++++--------- drivers/net/netxen/netxen_nic_ctx.c | 21 +++-- drivers/net/netxen/netxen_nic_ethtool.c | 5 +- drivers/net/netxen/netxen_nic_hw.c | 176 +++++++++++++++++++++---------- drivers/net/netxen/netxen_nic_init.c | 34 +----- drivers/net/netxen/netxen_nic_main.c | 90 +++++++--------- 6 files changed, 210 insertions(+), 191 deletions(-)
drivers/net/netxen/netxen_nic.h +27 -48
@@ -584,11 +584,11 @@ struct netxen_adapter_stats {*/ struct nx_host_rds_ring {u32 producer; -u32 crb_rcv_producer;u32 num_desc;u32 dma_size;u32 skb_size;u32 flags; +void __iomem *crb_rcv_producer;struct rcv_desc *desc_head;struct netxen_rx_buffer *rx_buf_arr;struct list_head free_list;
@@ -598,9 +598,9 @@ struct nx_host_rds_ring {struct nx_host_sds_ring {u32 consumer; -u32 crb_sts_consumer; -u32 crb_intr_mask;u32 num_desc; +void __iomem *crb_sts_consumer; +void __iomem *crb_intr_mask;struct status_desc *desc_head;struct netxen_adapter *adapter;
@@ -617,8 +617,8 @@ struct nx_host_tx_ring {u32 producer;__le32 *hw_consumer;u32 sw_consumer; -u32 crb_cmd_producer; -u32 crb_cmd_consumer; +void __iomem *crb_cmd_producer; +void __iomem *crb_cmd_consumer;u32 num_desc;struct netdev_queue *txq;
@@ -1163,7 +1163,7 @@ struct netxen_adapter {u32 irq;u32 temp; -u32 msi_tgt_status; +u32 int_vec_bit;u32 heartbit;struct netxen_adapter_stats stats;
@@ -1180,16 +1180,23 @@ struct netxen_adapter {int (*init_port) (struct netxen_adapter *,int );int (*stop_port) (struct netxen_adapter *); -u32 (*hw_read_wx)(struct netxen_adapter *,ulong ); -int (*hw_write_wx)(struct netxen_adapter *,ulong ,u32 ); +u32 (*crb_read)(struct netxen_adapter *,ulong ); +int (*crb_write)(struct netxen_adapter *,ulong ,u32 ); +int (*pci_mem_read)(struct netxen_adapter *,u64 ,void *,int );int (*pci_mem_write)(struct netxen_adapter *,u64 ,void *,int ); -int (*pci_write_immediate)(struct netxen_adapter *,u64 ,u32 ); -u32 (*pci_read_immediate)(struct netxen_adapter *,u64 ); +unsigned long (*pci_set_window)(struct netxen_adapter *,unsigned long long ); -struct netxen_legacy_intr_set legacy_intr; +u32 (*io_read)(struct netxen_adapter *,void __iomem *); +void (*io_write)(struct netxen_adapter *,void __iomem *,u32 ); + +void __iomem *tgt_mask_reg; +void __iomem *pci_int_reg; +void __iomem *tgt_status_reg; +void __iomem *crb_int_state_reg; +void __iomem *isr_int_vec;struct msix_entry msix_entries[MSIX_ENTRIES_PER_ADAPTER ];
@@ -1223,9 +1230,13 @@ int netxen_p2_nic_set_mac_addr(struct netxen_adapter *adapter, u8 *addr);int netxen_p3_nic_set_mac_addr (struct netxen_adapter *adapter,u8 *addr);#define NXRD32 (adapter, off) \ - (adapter->hw_read_wx(adapter, off)) + (adapter->crb_read(adapter, off))#define NXWR32 (adapter, off, val) \ - (adapter->hw_write_wx(adapter, off, val)) + (adapter->crb_write(adapter, off, val)) +#define NXRDIO (adapter, addr) \ + (adapter->io_read(adapter, addr)) +#define NXWRIO (adapter, addr, val) \ + (adapter->io_write(adapter, addr, val))int netxen_pcie_sem_lock (struct netxen_adapter *,int ,u32 );void netxen_pcie_sem_unlock (struct netxen_adapter *,int );
@@ -1255,40 +1266,6 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter);void netxen_nic_get_firmware_info (struct netxen_adapter *adapter);int netxen_nic_wol_supported (struct netxen_adapter *adapter); -u32 netxen_nic_hw_read_wx_128M (struct netxen_adapter *adapter,ulong off); -int netxen_nic_hw_write_wx_128M (struct netxen_adapter *adapter, -ulong off,u32 data); -int netxen_nic_pci_mem_read_128M (struct netxen_adapter *adapter, -u64 off,void *data,int size); -int netxen_nic_pci_mem_write_128M (struct netxen_adapter *adapter, -u64 off,void *data,int size); -int netxen_nic_pci_write_immediate_128M (struct netxen_adapter *adapter, -u64 off,u32 data); -u32 netxen_nic_pci_read_immediate_128M (struct netxen_adapter *adapter,u64 off); -void netxen_nic_pci_write_normalize_128M (struct netxen_adapter *adapter, -u64 off,u32 data); -u32 netxen_nic_pci_read_normalize_128M (struct netxen_adapter *adapter,u64 off); -unsigned long netxen_nic_pci_set_window_128M (struct netxen_adapter *adapter, -unsigned long long addr); -void netxen_nic_pci_change_crbwindow_128M (struct netxen_adapter *adapter, -u32 wndw); - -u32 netxen_nic_hw_read_wx_2M (struct netxen_adapter *adapter,ulong off); -int netxen_nic_hw_write_wx_2M (struct netxen_adapter *adapter, -ulong off,u32 data); -int netxen_nic_pci_mem_read_2M (struct netxen_adapter *adapter, -u64 off,void *data,int size); -int netxen_nic_pci_mem_write_2M (struct netxen_adapter *adapter, -u64 off,void *data,int size); -int netxen_nic_pci_write_immediate_2M (struct netxen_adapter *adapter, -u64 off,u32 data); -u32 netxen_nic_pci_read_immediate_2M (struct netxen_adapter *adapter,u64 off); -void netxen_nic_pci_write_normalize_2M (struct netxen_adapter *adapter, -u64 off,u32 data); -u32 netxen_nic_pci_read_normalize_2M (struct netxen_adapter *adapter,u64 off); -unsigned long netxen_nic_pci_set_window_2M (struct netxen_adapter *adapter, -unsigned long long addr); -/* Functions from netxen_nic_init.c */ int netxen_init_dummy_dma (struct netxen_adapter *adapter);void netxen_free_dummy_dma (struct netxen_adapter *adapter);
@@ -1316,13 +1293,15 @@ int netxen_rom_se(struct netxen_adapter *adapter, int addr);int netxen_alloc_sw_resources (struct netxen_adapter *adapter);void netxen_free_sw_resources (struct netxen_adapter *adapter); +void netxen_setup_hwops (struct netxen_adapter *adapter); +void __iomem *netxen_get_ioaddr (struct netxen_adapter *,u32 ); +int netxen_alloc_hw_resources (struct netxen_adapter *adapter);void netxen_free_hw_resources (struct netxen_adapter *adapter);void netxen_release_rx_buffers (struct netxen_adapter *adapter);void netxen_release_tx_buffers (struct netxen_adapter *adapter); -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);
drivers/net/netxen/netxen_nic_ctx.c +14 -7
@@ -229,7 +229,8 @@ nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter) rds_ring = &recv_ctx->rds_rings[i]; reg =le32_to_cpu (prsp_rds[i].host_producer_crb); - rds_ring->crb_rcv_producer =NETXEN_NIC_REG (reg -0x200 ); + rds_ring->crb_rcv_producer =netxen_get_ioaddr (adapter, +NETXEN_NIC_REG (reg -0x200 )); } prsp_sds = ((nx_cardrsp_sds_ring_t *)
@@ -239,10 +240,12 @@ nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter) sds_ring = &recv_ctx->sds_rings[i]; reg =le32_to_cpu (prsp_sds[i].host_consumer_crb); - sds_ring->crb_sts_consumer =NETXEN_NIC_REG (reg -0x200 ); + sds_ring->crb_sts_consumer =netxen_get_ioaddr (adapter, +NETXEN_NIC_REG (reg -0x200 )); reg =le32_to_cpu (prsp_sds[i].interrupt_crb); - sds_ring->crb_intr_mask =NETXEN_NIC_REG (reg -0x200 ); + sds_ring->crb_intr_mask =netxen_get_ioaddr (adapter, +NETXEN_NIC_REG (reg -0x200 )); } recv_ctx->state =le32_to_cpu (prsp->host_ctx_state);
@@ -342,7 +345,8 @@ nx_fw_cmd_create_tx_ctx(struct netxen_adapter *adapter)if (err ==NX_RCODE_SUCCESS ) { temp =le32_to_cpu (prsp->cds_ring.host_producer_crb); - tx_ring->crb_cmd_producer =NETXEN_NIC_REG (temp -0x200 ); + tx_ring->crb_cmd_producer =netxen_get_ioaddr (adapter, +NETXEN_NIC_REG (temp -0x200 ));#if 0 adapter->tx_state =le32_to_cpu (prsp->host_ctx_state);
@@ -651,7 +655,8 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)if (NX_IS_REVISION_P2 (adapter->ahw.revision_id)) rds_ring->crb_rcv_producer = - recv_crb_registers[port].crb_rcv_producer[ring]; +netxen_get_ioaddr (adapter, + recv_crb_registers[port].crb_rcv_producer[ring]); }for (ring =0 ; ring < adapter->max_sds_rings; ring++) {
@@ -670,10 +675,12 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter) sds_ring->desc_head = (struct status_desc *)addr; sds_ring->crb_sts_consumer = - recv_crb_registers[port].crb_sts_consumer[ring]; +netxen_get_ioaddr (adapter, + recv_crb_registers[port].crb_sts_consumer[ring]); sds_ring->crb_intr_mask = - recv_crb_registers[port].sw_int_mask[ring]; +netxen_get_ioaddr (adapter, + recv_crb_registers[port].sw_int_mask[ring]); }
drivers/net/netxen/netxen_nic_ethtool.c +2 -3
@@ -84,18 +84,17 @@ static void netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo) { struct netxen_adapter *adapter = netdev_priv(dev); -unsigned long flags;u32 fw_major =0 ;u32 fw_minor =0 ;u32 fw_build =0 ;strncpy (drvinfo->driver, netxen_nic_driver_name,32 );strncpy (drvinfo->version,NETXEN_NIC_LINUX_VERSIONID ,32 ); -write_lock_irqsave (&adapter->adapter_lock, flags); +read_lock (&adapter->adapter_lock); fw_major =NXRD32 (adapter,NETXEN_FW_VERSION_MAJOR ); fw_minor =NXRD32 (adapter,NETXEN_FW_VERSION_MINOR ); fw_build =NXRD32 (adapter,NETXEN_FW_VERSION_SUB ); -write_unlock_irqrestore (&adapter->adapter_lock, flags); +read_unlock (&adapter->adapter_lock);sprintf (drvinfo->fw_version,"%d.%d.%d" , fw_major, fw_minor, fw_build);strncpy (drvinfo->bus_info,pci_name (adapter->pdev),32 );
drivers/net/netxen/netxen_nic_hw.c +120 -56
283 lines not on this page · raw message
drivers/net/netxen/netxen_nic_init.c +6 -28
@@ -323,29 +323,6 @@ err_out:return -ENOMEM ; } -void netxen_initialize_adapter_ops (struct netxen_adapter *adapter) -{ - adapter->init_port = netxen_niu_xg_init_port; - adapter->stop_port = netxen_niu_disable_xg_port; - -if (NX_IS_REVISION_P2 (adapter->ahw.revision_id)) { - adapter->macaddr_set = netxen_p2_nic_set_mac_addr; - adapter->set_multi = netxen_p2_nic_set_multi; - adapter->set_mtu = netxen_nic_set_mtu_xgb; - adapter->set_promisc = netxen_p2_nic_set_promisc; - }else { - adapter->set_mtu = nx_fw_cmd_set_mtu; - adapter->set_promisc = netxen_p3_nic_set_promisc; - adapter->macaddr_set = netxen_p3_nic_set_mac_addr; - adapter->set_multi = netxen_p3_nic_set_multi; - -if (adapter->ahw.port_type ==NETXEN_NIC_GBE ) { - adapter->phy_read = nx_fw_cmd_query_phy; - adapter->phy_write = nx_fw_cmd_set_phy; - } - } -} -/* * netxen_decode_crb_addr(0 - utility to translate from internal Phantom CRB * address to external PCI CRB address.
@@ -1395,7 +1372,7 @@ skip:if (count) { sds_ring->consumer = consumer; -NXWR32 (adapter, sds_ring->crb_sts_consumer, consumer); +NXWRIO (adapter, sds_ring->crb_sts_consumer, consumer); }return count;
@@ -1513,7 +1490,7 @@ netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ringid,if (count) { rds_ring->producer = producer; -NXWR32 (adapter, rds_ring->crb_rcv_producer, +NXWRIO (adapter, rds_ring->crb_rcv_producer, (producer-1 ) & (rds_ring->num_desc-1 ));if (NX_IS_REVISION_P2 (adapter->ahw.revision_id)) {
@@ -1529,9 +1506,10 @@ netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ringid, (rds_ring->num_desc - 1)));netxen_set_msg_ctxid (msg, adapter->portnum);netxen_set_msg_opcode (msg,NETXEN_RCV_PRODUCER (ringid)); -writel (msg, -DB_NORMALIZE (adapter, +read_lock (&adapter->adapter_lock); +writel (msg,DB_NORMALIZE (adapter,NETXEN_RCV_PRODUCER_OFFSET )); +read_unlock (&adapter->adapter_lock); } } }
@@ -1573,7 +1551,7 @@ netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter,if (count) { rds_ring->producer = producer; -NXWR32 (adapter, rds_ring->crb_rcv_producer, +NXWRIO (adapter, rds_ring->crb_rcv_producer, (producer -1 ) & (rds_ring->num_desc -1 )); }spin_unlock (&rds_ring->lock);
drivers/net/netxen/netxen_nic_main.c +41 -49
190 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 5/6 netxen: refactor firmware info code
In reply to Dhananjay Phadkeo Combine netxen_get_firmware_info(), netxen_check_options() so that they are updated every time firmware is reset.
o Set dma mask everytime firmware is reset.
--- drivers/net/netxen/netxen_nic.h | 1 - drivers/net/netxen/netxen_nic_hw.c | 59 -------------- drivers/net/netxen/netxen_nic_main.c | 141 +++++++++++++++++++++++---------- 3 files changed, 98 insertions(+), 103 deletions(-)
drivers/net/netxen/netxen_nic.h +0 -1
@@ -1263,7 +1263,6 @@ void netxen_pcie_sem_unlock(struct netxen_adapter *, int); netxen_pcie_sem_unlock((a), 7)int netxen_nic_get_board_info (struct netxen_adapter *adapter); -void netxen_nic_get_firmware_info (struct netxen_adapter *adapter);int netxen_nic_wol_supported (struct netxen_adapter *adapter);/* Functions from netxen_nic_init.c */
drivers/net/netxen/netxen_nic_hw.c +0 -59
65 lines not on this page · raw message
drivers/net/netxen/netxen_nic_main.c +98 -43
171 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 6/6 netxen: update version to 4.0.50
In reply to Dhananjay Phadke--- drivers/net/netxen/netxen_nic.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/netxen/netxen_nic.h +2 -2
@@ -58,8 +58,8 @@#define _NETXEN_NIC_LINUX_MAJOR 4#define _NETXEN_NIC_LINUX_MINOR 0 -#define _NETXEN_NIC_LINUX_SUBVERSION 41 -#define NETXEN_NIC_LINUX_VERSIONID "4.0.41" +#define _NETXEN_NIC_LINUX_SUBVERSION 50 +#define NETXEN_NIC_LINUX_VERSIONID "4.0.50"#define NETXEN_VERSION_CODE (a, b, c) (((a) << 24) + ((b) << 16) + (c))#define _major (v) (((v) >> 24) & 0xff)
Signature · 1 line
1.6.0.2
David Miller
maintainerFrom: Dhananjay Phadke <[email protected]>
Date: Sat, 5 Sep 2009 20:43:06 -0700
Quoted 1 line
Series of 6 driver enhancements / fixes, please apply to net-next-2.6.
All applied, thanks.