netxen: firmware download support
Subsystems (2)
PATCH 1/4 netxen: firmware download support
--- drivers/net/netxen/netxen_nic.h | 9 ++ drivers/net/netxen/netxen_nic_hdr.h | 3 + drivers/net/netxen/netxen_nic_hw.c | 175 +++++++++++++++++++++++++++++++-- drivers/net/netxen/netxen_nic_main.c | 125 ++++++++++++------------ 4 files changed, 238 insertions(+), 74 deletions(-)
drivers/net/netxen/netxen_nic.h +9 -0
@@ -712,6 +712,15 @@ typedef enum { NETXEN_FIXED_START = 0x3F0000 /* backup of crbinit */ } netxen_flash_map_t; +#define NX_FW_VERSION_OFFSET (NETXEN_USER_START+0x408) +#define NX_FW_SIZE_OFFSET (NETXEN_USER_START+0x40c) +#define NX_BIOS_VERSION_OFFSET (NETXEN_USER_START+0x83c) +#define NX_FW_MAGIC_OFFSET (NETXEN_BRDCFG_START+0x128) +#define NX_FW_MIN_SIZE (0x3fffff) +#define NX_P2_MN_ROMIMAGE "nxromimg.bin" +#define NX_P3_CT_ROMIMAGE "nx3fwct.bin" +#define NX_P3_MN_ROMIMAGE "nx3fwmn.bin" +#define NETXEN_USER_START_OLD NETXEN_PXE_START/* for backward compatibility */ #define NETXEN_FLASH_START (NETXEN_CRBINIT_START)
drivers/net/netxen/netxen_nic_hdr.h +3 -0
@@ -858,6 +858,9 @@ enum {#define NETXEN_PORT_MODE_ADDR (NETXEN_CAM_RAM(0x24))#define NETXEN_WOL_PORT_MODE (NETXEN_CAM_RAM(0x198)) +#define NX_PEG_TUNE_MN_PRESENT 0x1 +#define NX_PEG_TUNE_CAPABILITY (NETXEN_CAM_RAM(0x02c)) +#define NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL (0x14)#define ISR_MSI_INT_TRIGGER (FUNC ) (NETXEN_PCIX_PS_REG(PCIX_MSI_F(FUNC)))
drivers/net/netxen/netxen_nic_hw.c +164 -11
201 lines not on this page · raw message
drivers/net/netxen/netxen_nic_main.c +62 -63
157 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 2/4 netxen: advertise wake-on-lan support
Add ethtool wake on lan support.
--- drivers/net/netxen/netxen_nic_ethtool.c | 49 +++++++++++++++++++++++++++++++ drivers/net/netxen/netxen_nic_hdr.h | 3 ++ 2 files changed, 52 insertions(+), 0 deletions(-)
drivers/net/netxen/netxen_nic_ethtool.c +49 -0
@@ -810,6 +810,53 @@ static int netxen_nic_set_tso(struct net_device *dev, u32 data)return 0 ; } +static void +netxen_nic_get_wol (struct net_device *dev,struct ethtool_wolinfo *wol) +{ +struct netxen_adapter *adapter =netdev_priv (dev); +u32 wol_cfg =0 ; + + wol->supported =0 ; + wol->wolopts =0 ; + +if (NX_IS_REVISION_P2 (adapter->ahw.revision_id)) +return ; + + wol_cfg =netxen_nic_reg_read (adapter,NETXEN_WOL_CONFIG_NV ); +if (wol_cfg & (1UL << adapter->portnum)) + wol->supported |=WAKE_MAGIC ; + + wol_cfg =netxen_nic_reg_read (adapter,NETXEN_WOL_CONFIG ); +if (wol_cfg & (1UL << adapter->portnum)) + wol->wolopts |=WAKE_MAGIC ; +} + +static int +netxen_nic_set_wol (struct net_device *dev,struct ethtool_wolinfo *wol) +{ +struct netxen_adapter *adapter =netdev_priv (dev); +u32 wol_cfg =0 ; + +if (NX_IS_REVISION_P2 (adapter->ahw.revision_id)) +return -EOPNOTSUPP ; + +if (wol->wolopts & ~WAKE_MAGIC ) +return -EOPNOTSUPP ; + + wol_cfg =netxen_nic_reg_read (adapter,NETXEN_WOL_CONFIG_NV ); +if (!(wol_cfg & (1 << adapter->portnum))) +return -EOPNOTSUPP ; + + wol_cfg =netxen_nic_reg_read (adapter,NETXEN_WOL_CONFIG ); +if (wol->wolopts &WAKE_MAGIC ) + wol_cfg |=1UL << adapter->portnum; +else + wol_cfg &= ~(1UL << adapter->portnum); +netxen_nic_reg_write (adapter,NETXEN_WOL_CONFIG , wol_cfg); + +return 0 ; +} +/* * Set the coalescing parameters. Currently only normal is supported. * If rx_coalesce_usecs == 0 or rx_max_coalesced_frames == 0 then set the
@@ -916,6 +963,8 @@ struct ethtool_ops netxen_nic_ethtool_ops = { .set_sg = ethtool_op_set_sg, .get_tso = netxen_nic_get_tso, .set_tso = netxen_nic_set_tso, + .get_wol = netxen_nic_get_wol, + .set_wol = netxen_nic_set_wol, .self_test = netxen_nic_diag_test, .get_strings = netxen_nic_get_strings, .get_ethtool_stats = netxen_nic_get_ethtool_stats,
drivers/net/netxen/netxen_nic_hdr.h +3 -0
@@ -858,6 +858,9 @@ enum {#define NETXEN_PORT_MODE_ADDR (NETXEN_CAM_RAM(0x24))#define NETXEN_WOL_PORT_MODE (NETXEN_CAM_RAM(0x198)) +#define NETXEN_WOL_CONFIG_NV (NETXEN_CAM_RAM(0x184)) +#define NETXEN_WOL_CONFIG (NETXEN_CAM_RAM(0x188)) +#define NX_PEG_TUNE_MN_PRESENT 0x1#define NX_PEG_TUNE_CAPABILITY (NETXEN_CAM_RAM(0x02c))
Signature · 1 line
1.6.0.2
Re: [patch next 2/4] netxen: advertise wake-on-lan support
From: Dhananjay Phadke <[email protected]>
Date: Tue, 24 Feb 2009 11:39:08 -0800
Quoted 3 lines
Add ethtool wake on lan support.
Signed-off-by Dhananjay Phadke <[email protected]>
Applied.
PATCH 3/4 netxen: cleanup unused code
In reply to Dhananjay Phadke--- drivers/net/netxen/netxen_nic_ethtool.c | 75 ------- drivers/net/netxen/netxen_nic_hw.c | 13 -- drivers/net/netxen/netxen_nic_hw.h | 27 --- drivers/net/netxen/netxen_nic_init.c | 360 ------------------------------- drivers/net/netxen/netxen_nic_niu.c | 219 ------------------- 5 files changed, 0 insertions(+), 694 deletions(-)
drivers/net/netxen/netxen_nic_ethtool.c +0 -75
@@ -473,78 +473,6 @@ netxen_nic_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,return 0 ; } -#if 0 -static int -netxen_nic_set_eeprom (struct net_device *dev,struct ethtool_eeprom *eeprom, -u8 * bytes) -{ -struct netxen_adapter *adapter =netdev_priv (dev); -int offset = eeprom->offset; -static int flash_start; -static int ready_to_flash; -int ret; - -if (flash_start ==0 ) { -netxen_halt_pegs (adapter); - ret =netxen_flash_unlock (adapter); -if (ret <0 ) { -printk (KERN_ERR "%s: Flash unlock failed.\n" , - netxen_nic_driver_name); -return ret; - } -printk (KERN_INFO "%s: flash unlocked. \n" , - netxen_nic_driver_name); - ret =netxen_flash_erase_secondary (adapter); -if (ret !=FLASH_SUCCESS ) { -printk (KERN_ERR "%s: Flash erase failed.\n" , - netxen_nic_driver_name); -return ret; - } -printk (KERN_INFO "%s: secondary flash erased successfully.\n" , - netxen_nic_driver_name); - flash_start =1 ; -return 0 ; - } - -if (offset ==NETXEN_BOOTLD_START ) { - ret =netxen_flash_erase_primary (adapter); -if (ret !=FLASH_SUCCESS ) { -printk (KERN_ERR "%s: Flash erase failed.\n" , - netxen_nic_driver_name); -return ret; - } - - ret =netxen_rom_se (adapter,NETXEN_USER_START ); -if (ret !=FLASH_SUCCESS ) -return ret; - ret =netxen_rom_se (adapter,NETXEN_FIXED_START ); -if (ret !=FLASH_SUCCESS ) -return ret; - -printk (KERN_INFO "%s: primary flash erased successfully\n" , - netxen_nic_driver_name); - - ret =netxen_backup_crbinit (adapter); -if (ret !=FLASH_SUCCESS ) { -printk (KERN_ERR "%s: CRBinit backup failed.\n" , - netxen_nic_driver_name); -return ret; - } -printk (KERN_INFO "%s: CRBinit backup done.\n" , - netxen_nic_driver_name); - ready_to_flash =1 ; - } - -if (!ready_to_flash) { -printk (KERN_ERR "%s: Invalid write sequence, returning...\n" , - netxen_nic_driver_name); -return -EINVAL ; - } - -return netxen_rom_fast_write_words (adapter, offset, bytes, eeprom->len); -} -#endif /* 0 */ -static void netxen_nic_get_ringparam (struct net_device *dev,struct ethtool_ringparam *ring) {
@@ -953,9 +881,6 @@ struct ethtool_ops netxen_nic_ethtool_ops = { .get_link = ethtool_op_get_link, .get_eeprom_len = netxen_nic_get_eeprom_len, .get_eeprom = netxen_nic_get_eeprom, -#if 0 - .set_eeprom = netxen_nic_set_eeprom, -#endif .get_ringparam = netxen_nic_get_ringparam, .get_pauseparam = netxen_nic_get_pauseparam, .set_pauseparam = netxen_nic_set_pauseparam,
drivers/net/netxen/netxen_nic_hw.c +0 -13
@@ -2077,19 +2077,6 @@ u32 netxen_nic_pci_read_normalize_2M(struct netxen_adapter *adapter, u64 off)return temp; } -#if 0 -int -netxen_nic_erase_pxe (struct netxen_adapter *adapter) -{ -if (netxen_rom_fast_write (adapter,NETXEN_PXE_START ,0 ) ==-1 ) { -printk (KERN_ERR "%s: erase pxe failed\n" , - netxen_nic_driver_name); -return -1 ; - } -return 0 ; -} -#endif /* 0 */ -int netxen_nic_get_board_info (struct netxen_adapter *adapter) {int rv =0 ;
drivers/net/netxen/netxen_nic_hw.h +0 -27
@@ -124,33 +124,6 @@ typedef enum {#define netxen_gb_get_soft_reset (config_word) \ _netxen_crb_get_bit((config_word), 31) -/* -* NIU GB MAC Config Register 1 (applies to GB0, GB1, GB2, GB3) -* -* Bit 0 : duplex => 1:full duplex mode, 0:half duplex -* Bit 1 : crc_enable => 1:append CRC to xmit frames, 0:dont append -* Bit 2 : padshort => 1:pad short frames and add CRC, 0:dont pad -* Bit 4 : checklength => 1:check framelen with actual,0:dont check -* Bit 5 : hugeframes => 1:allow oversize xmit frames, 0:dont allow -* Bits 8-9 : intfmode => 01:nibble (10/100), 10:byte (1000) -* Bits 12-15 : preamblelen => preamble field length in bytes, default 7 -*/ - -#define netxen_gb_set_duplex (config_word) \ - ((config_word) |= 1 << 0) -#define netxen_gb_set_crc_enable (config_word) \ - ((config_word) |= 1 << 1) -#define netxen_gb_set_padshort (config_word) \ - ((config_word) |= 1 << 2) -#define netxen_gb_set_checklength (config_word) \ - ((config_word) |= 1 << 4) -#define netxen_gb_set_hugeframes (config_word) \ - ((config_word) |= 1 << 5) -#define netxen_gb_set_preamblelen (config_word, val) \ - ((config_word) |= ((val) << 12) & 0xF000) -#define netxen_gb_set_intfmode (config_word, val) \ - ((config_word) |= ((val) << 8) & 0x300) -#define netxen_gb_get_stationaddress_low (config_word) ((config_word) >> 16)#define netxen_gb_set_mii_mgmt_clockselect (config_word, val) \
drivers/net/netxen/netxen_nic_init.c +0 -360
390 lines not on this page · raw message
drivers/net/netxen/netxen_nic_niu.c +0 -219
243 lines not on this page · raw message
Signature · 1 line
1.6.0.2
Re: [patch next 3/4] netxen: cleanup unused code
From: Dhananjay Phadke <[email protected]>
Date: Tue, 24 Feb 2009 11:39:09 -0800
Quoted 1 line
Signed-off-by Dhananjay Phadke <[email protected]>
Applied.
PATCH 4/4 netxen: refactor pci probe
In reply to Dhananjay PhadkeSplit pci probe function into smaller logical blocks.
--- drivers/net/netxen/netxen_nic_main.c | 384 ++++++++++++++++++---------------- 1 files changed, 203 insertions(+), 181 deletions(-)
drivers/net/netxen/netxen_nic_main.c +203 -181
@@ -457,6 +457,202 @@ static const struct net_device_ops netxen_netdev_ops = {#endif }; +static void +netxen_setup_intr (struct netxen_adapter *adapter) +{ +struct netxen_legacy_intr_set *legacy_intrp; +struct pci_dev *pdev = adapter->pdev; + + adapter->flags &= ~(NETXEN_NIC_MSI_ENABLED |NETXEN_NIC_MSIX_ENABLED ); + adapter->intr_scheme =-1 ; + adapter->msi_mode =-1 ; + +if (adapter->ahw.revision_id >=NX_P3_B0 ) + legacy_intrp = &legacy_intr[adapter->ahw.pci_func]; +else + legacy_intrp = &legacy_intr[0 ]; + adapter->legacy_intr.int_vec_bit = legacy_intrp->int_vec_bit; + adapter->legacy_intr.tgt_status_reg = legacy_intrp->tgt_status_reg; + adapter->legacy_intr.tgt_mask_reg = legacy_intrp->tgt_mask_reg; + adapter->legacy_intr.pci_int_reg = legacy_intrp->pci_int_reg; + +netxen_set_msix_bit (pdev,0 ); + +if (adapter->msix_supported) { + +netxen_init_msix_entries (adapter); +if (pci_enable_msix (pdev, adapter->msix_entries, +MSIX_ENTRIES_PER_ADAPTER )) + goto request_msi; + + adapter->flags |=NETXEN_NIC_MSIX_ENABLED ; +netxen_set_msix_bit (pdev,1 ); +dev_info (&pdev->dev,"using msi-x interrupts\n" ); + + }else { +request_msi: +if (use_msi && !pci_enable_msi (pdev)) { + adapter->flags |=NETXEN_NIC_MSI_ENABLED ; +dev_info (&pdev->dev,"using msi interrupts\n" ); + }else +dev_info (&pdev->dev,"using legacy interrupts\n" ); + } +} + +static void +netxen_teardown_intr (struct netxen_adapter *adapter) +{ +if (adapter->flags &NETXEN_NIC_MSIX_ENABLED ) +pci_disable_msix (adapter->pdev); +if (adapter->flags &NETXEN_NIC_MSI_ENABLED ) +pci_disable_msi (adapter->pdev); +} + +static void +netxen_cleanup_pci_map (struct netxen_adapter *adapter) +{ +if (adapter->ahw.db_base !=NULL ) +iounmap (adapter->ahw.db_base); +if (adapter->ahw.pci_base0 !=NULL ) +iounmap (adapter->ahw.pci_base0); +if (adapter->ahw.pci_base1 !=NULL ) +iounmap (adapter->ahw.pci_base1); +if (adapter->ahw.pci_base2 !=NULL ) +iounmap (adapter->ahw.pci_base2); +} + +static int +netxen_setup_pci_map (struct netxen_adapter *adapter) +{ +void __iomem *mem_ptr0 =NULL ; +void __iomem *mem_ptr1 =NULL ; +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; +int pci_func = adapter->ahw.pci_func; + +int err =0 ; + +/* +* Set the CRB window to invalid. If any register in window 0 is +* accessed it should set the window to 0 and then reset it to 1. +*/ + adapter->curr_window =255 ; + adapter->ahw.qdr_sn_window =-1 ; + adapter->ahw.ddr_mn_window =-1 ; + +/* remap phys address */ + mem_base =pci_resource_start (pdev,0 );/* 0 is for BAR 0 */ + mem_len =pci_resource_len (pdev,0 ); + pci_len0 =0 ; + + adapter->hw_write_wx = netxen_nic_hw_write_wx_128M; + adapter->hw_read_wx = netxen_nic_hw_read_wx_128M; + adapter->pci_read_immediate = netxen_nic_pci_read_immediate_128M; + adapter->pci_write_immediate = netxen_nic_pci_write_immediate_128M; + adapter->pci_read_normalize = netxen_nic_pci_read_normalize_128M; + adapter->pci_write_normalize = netxen_nic_pci_write_normalize_128M; + adapter->pci_set_window = netxen_nic_pci_set_window_128M; + adapter->pci_mem_read = netxen_nic_pci_mem_read_128M; + adapter->pci_mem_write = netxen_nic_pci_mem_write_128M; + +/* 128 Meg of memory */ +if (mem_len ==NETXEN_PCI_128MB_SIZE ) { + mem_ptr0 =ioremap (mem_base,FIRST_PAGE_GROUP_SIZE ); + mem_ptr1 =ioremap (mem_base +SECOND_PAGE_GROUP_START , +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; + adapter->pci_read_immediate = netxen_nic_pci_read_immediate_2M; + adapter->pci_write_immediate = + netxen_nic_pci_write_immediate_2M; + adapter->pci_read_normalize = netxen_nic_pci_read_normalize_2M; + adapter->pci_write_normalize = + netxen_nic_pci_write_normalize_2M; + adapter->pci_set_window = netxen_nic_pci_set_window_2M; + adapter->pci_mem_read = netxen_nic_pci_mem_read_2M; + adapter->pci_mem_write = netxen_nic_pci_mem_write_2M; + + mem_ptr0 =pci_ioremap_bar (pdev,0 ); +if (mem_ptr0 ==NULL ) { +dev_err (&pdev->dev,"failed to map PCI bar 0\n" ); +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 ; + + adapter->ahw.mn_win_crb =0x100000 +PCIX_MN_WINDOW + + (pci_func *0x20 ); + adapter->ahw.ms_win_crb =0x100000 +PCIX_SN_WINDOW ; +if (pci_func <4 ) + adapter->ahw.ms_win_crb += (pci_func *0x20 ); +else + adapter->ahw.ms_win_crb += +0xA0 + ((pci_func -4 ) *0x10 ); + }else { +return -EIO ; + } + +dev_info (&pdev->dev,"%dMB memory map\n" , (int )(mem_len>>20 )); + + 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; + +if (NX_IS_REVISION_P3 (adapter->ahw.revision_id)) + goto skip_doorbell; + + db_base =pci_resource_start (pdev,4 );/* doorbell is on bar 4 */ + db_len =pci_resource_len (pdev,4 ); + +if (db_len ==0 ) { +printk (KERN_ERR "%s: doorbell is disabled\n" , + netxen_nic_driver_name); + err = -EIO ; + goto err_out; + } + + db_ptr =ioremap (db_base,NETXEN_DB_MAPSIZE_BYTES ); +if (!db_ptr) { +printk (KERN_ERR "%s: Failed to allocate doorbell map." , + netxen_nic_driver_name); + err = -EIO ; + goto err_out; + } + +skip_doorbell: + adapter->ahw.db_base = db_ptr; + adapter->ahw.db_len = db_len; +return 0 ; + +err_out: +netxen_cleanup_pci_map (adapter); +return err; +} +static int netxen_start_firmware (struct netxen_adapter *adapter) {
@@ -521,20 +717,10 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) {struct net_device *netdev =NULL ;struct netxen_adapter *adapter =NULL ; -void __iomem *mem_ptr0 =NULL ; -void __iomem *mem_ptr1 =NULL ; -void __iomem *mem_ptr2 =NULL ; -unsigned long first_page_group_end; -unsigned long first_page_group_start; - - -u8 __iomem *db_ptr =NULL ; -unsigned long mem_base, mem_len, db_base, db_len =0 , pci_len0 =0 ;int i =0 , err;int first_driver;u32 val;int pci_func_id =PCI_FUNC (pdev->devfn); -struct netxen_legacy_intr_set *legacy_intrp;uint8_t revision_id;if (pci_func_id ==0 )
@@ -589,128 +775,14 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out_free_netdev;rwlock_init (&adapter->adapter_lock); - adapter->ahw.qdr_sn_window =-1 ; - adapter->ahw.ddr_mn_window =-1 ; - -/* remap phys address */ - mem_base =pci_resource_start (pdev,0 );/* 0 is for BAR 0 */ - mem_len =pci_resource_len (pdev,0 ); - pci_len0 =0 ; - - adapter->hw_write_wx = netxen_nic_hw_write_wx_128M; - adapter->hw_read_wx = netxen_nic_hw_read_wx_128M; - adapter->pci_read_immediate = netxen_nic_pci_read_immediate_128M; - adapter->pci_write_immediate = netxen_nic_pci_write_immediate_128M; - adapter->pci_read_normalize = netxen_nic_pci_read_normalize_128M; - adapter->pci_write_normalize = netxen_nic_pci_write_normalize_128M; - adapter->pci_set_window = netxen_nic_pci_set_window_128M; - adapter->pci_mem_read = netxen_nic_pci_mem_read_128M; - adapter->pci_mem_write = netxen_nic_pci_mem_write_128M; - -/* 128 Meg of memory */ -if (mem_len ==NETXEN_PCI_128MB_SIZE ) { - mem_ptr0 =ioremap (mem_base,FIRST_PAGE_GROUP_SIZE ); - mem_ptr1 =ioremap (mem_base +SECOND_PAGE_GROUP_START , -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; - adapter->pci_read_immediate = netxen_nic_pci_read_immediate_2M; - adapter->pci_write_immediate = - netxen_nic_pci_write_immediate_2M; - adapter->pci_read_normalize = netxen_nic_pci_read_normalize_2M; - adapter->pci_write_normalize = - netxen_nic_pci_write_normalize_2M; - adapter->pci_set_window = netxen_nic_pci_set_window_2M; - adapter->pci_mem_read = netxen_nic_pci_mem_read_2M; - adapter->pci_mem_write = netxen_nic_pci_mem_write_2M; - mem_ptr0 =pci_ioremap_bar (pdev,0 ); -if (mem_ptr0 ==NULL ) { -dev_err (&pdev->dev,"failed to map PCI bar 0\n" ); -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 ; - - adapter->ahw.mn_win_crb =0x100000 +PCIX_MN_WINDOW + - (pci_func_id *0x20 ); - adapter->ahw.ms_win_crb =0x100000 +PCIX_SN_WINDOW ; -if (pci_func_id <4 ) - adapter->ahw.ms_win_crb += (pci_func_id *0x20 ); -else - adapter->ahw.ms_win_crb += -0xA0 + ((pci_func_id -4 ) *0x10 ); - }else { - err = -EIO ; + err =netxen_setup_pci_map (adapter); +if (err) goto err_out_free_netdev; - } - -dev_info (&pdev->dev,"%dMB memory map\n" , (int )(mem_len>>20 )); - -if (NX_IS_REVISION_P3 (revision_id)) - goto skip_doorbell; - - db_base =pci_resource_start (pdev,4 );/* doorbell is on bar 4 */ - db_len =pci_resource_len (pdev,4 ); - -if (db_len ==0 ) { -printk (KERN_ERR "%s: doorbell is disabled\n" , - netxen_nic_driver_name); - err = -EIO ; - goto err_out_iounmap; - } - - db_ptr =ioremap (db_base,NETXEN_DB_MAPSIZE_BYTES ); -if (!db_ptr) { -printk (KERN_ERR "%s: Failed to allocate doorbell map." , - netxen_nic_driver_name); - err = -EIO ; - goto err_out_iounmap; - } - -skip_doorbell: - 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; - adapter->ahw.db_base = db_ptr; - adapter->ahw.db_len = db_len;netif_napi_add (netdev, &adapter->napi, netxen_nic_poll,NETXEN_NETDEV_WEIGHT ); -if (revision_id >=NX_P3_B0 ) - legacy_intrp = &legacy_intr[pci_func_id]; -else - legacy_intrp = &legacy_intr[0 ]; - - adapter->legacy_intr.int_vec_bit = legacy_intrp->int_vec_bit; - adapter->legacy_intr.tgt_status_reg = legacy_intrp->tgt_status_reg; - adapter->legacy_intr.tgt_mask_reg = legacy_intrp->tgt_mask_reg; - adapter->legacy_intr.pci_int_reg = legacy_intrp->pci_int_reg; - -/* this will be read from FW later */ - adapter->intr_scheme =-1 ; - adapter->msi_mode =-1 ; -/* This will be reset for mezz cards */ adapter->portnum = pci_func_id; adapter->status &= ~NETXEN_NETDEV_STATUS ;
@@ -741,12 +813,6 @@ skip_doorbell: netdev->vlan_features |=NETIF_F_HIGHDMA ; } -/* -* Set the CRB window to invalid. If any register in window 0 is -* accessed it should set the window to 0 and then reset it to 1. -*/ - adapter->curr_window =255 ; -if (netxen_nic_get_board_info (adapter) !=0 ) {printk ("%s: Error getting board config info.\n" , netxen_nic_driver_name);
@@ -813,32 +879,7 @@ skip_doorbell:netxen_set_msix_bit (pdev,0 ); -if (NX_IS_REVISION_P3 (revision_id)) { -if ((mem_len !=NETXEN_PCI_128MB_SIZE ) && - mem_len !=NETXEN_PCI_2MB_SIZE ) - adapter->msix_supported =0 ; - } - -if (adapter->msix_supported) { - -netxen_init_msix_entries (adapter); - -if (pci_enable_msix (pdev, adapter->msix_entries, -MSIX_ENTRIES_PER_ADAPTER )) - goto request_msi; - - adapter->flags |=NETXEN_NIC_MSIX_ENABLED ; -netxen_set_msix_bit (pdev,1 ); -dev_info (&pdev->dev,"using msi-x interrupts\n" ); - - }else { -request_msi: -if (use_msi && !pci_enable_msi (pdev)) { - adapter->flags |=NETXEN_NIC_MSI_ENABLED ; -dev_info (&pdev->dev,"using msi interrupts\n" ); - }else -dev_info (&pdev->dev,"using legacy interrupts\n" ); - } +netxen_setup_intr (adapter);if (adapter->flags &NETXEN_NIC_MSIX_ENABLED ) netdev->irq = adapter->msix_entries[0 ].vector;
@@ -886,23 +927,13 @@ request_msi:return 0 ; err_out_disable_msi: -if (adapter->flags &NETXEN_NIC_MSIX_ENABLED ) -pci_disable_msix (pdev); -if (adapter->flags &NETXEN_NIC_MSI_ENABLED ) -pci_disable_msi (pdev); +netxen_teardown_intr (adapter);if (first_driver)netxen_free_adapter_offload (adapter); err_out_iounmap: -if (db_ptr) -iounmap (db_ptr); -if (mem_ptr0) -iounmap (mem_ptr0); -if (mem_ptr1) -iounmap (mem_ptr1); -if (mem_ptr2) -iounmap (mem_ptr2); +netxen_cleanup_pci_map (adapter); err_out_free_netdev:free_netdev (netdev);
@@ -944,18 +975,9 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)if (adapter->irq)free_irq (adapter->irq, adapter); -if (adapter->flags &NETXEN_NIC_MSIX_ENABLED ) -pci_disable_msix (pdev); -if (adapter->flags &NETXEN_NIC_MSI_ENABLED ) -pci_disable_msi (pdev); +netxen_teardown_intr (adapter); -iounmap (adapter->ahw.pci_base0); -if (adapter->ahw.db_base !=NULL ) -iounmap (adapter->ahw.db_base); -if (adapter->ahw.pci_base1 !=NULL ) -iounmap (adapter->ahw.pci_base1); -if (adapter->ahw.pci_base2 !=NULL ) -iounmap (adapter->ahw.pci_base2); +netxen_cleanup_pci_map (adapter);pci_release_regions (pdev);pci_disable_device (pdev);
Signature · 1 line
1.6.0.2
Re: [patch next 4/4] netxen: refactor pci probe
From: Dhananjay Phadke <[email protected]>
Date: Tue, 24 Feb 2009 11:39:10 -0800
Quoted 3 lines
Split pci probe function into smaller logical blocks.
Signed-off-by Dhananjay Phadke <[email protected]>
Applied.
From: Dhananjay Phadke <[email protected]>
Date: Tue, 24 Feb 2009 11:39:07 -0800
Quoted 1 line
Signed-off-by Dhananjay Phadke <[email protected]>
Applied.