GIT 865b48b424d188ad2a3e783fef57a89fe8fab401 git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6.git#qla3xxx commit Author: Francois Romieu Date: Fri Sep 29 00:29:59 2006 +0200 qla3xxx: CodingStyle Signed-off-by: Francois Romieu commit 2d7435eb0a5492d3ab5222835007e189fb36e67c Author: Francois Romieu Date: Thu Sep 28 23:12:42 2006 +0200 qla3xxx: rename 'mem_map_registers' to 'ioaddr' It is just our usual ioremaped aread. Signed-off-by: Francois Romieu commit 8158e50b956ddfaec8c59457c0f3690415451ef6 Author: Francois Romieu Date: Thu Sep 28 23:01:12 2006 +0200 qla3xxx: remove unused field in struct ql3_adapter The symbol does not appear in the whole kernel sources nor does it prevent the driver to compile. Signed-off-by: Francois Romieu commit 69914775c0de3b827296cb598d569d4926b37986 Author: Francois Romieu Date: Thu Sep 28 22:57:39 2006 +0200 qla3xxx: rename 'hw_flags' to 'flags' for use with spinlock (cosmetic) Idiom Signed-off-by: Francois Romieu commit ae9a61b8c2a33ab17843fad657471098d0e37328 Author: Francois Romieu Date: Tue Sep 26 00:21:22 2006 +0200 qla3xxx: pot pourri - repel the invasion of the evil giant noodles in ql_wait_for_drvr_lock(); - rescue ql_reset_work() too; - kill a few extraneous casts; - mark the ssleep with spinlock held as FIXME (wow...). Signed-off-by: Francois Romieu commit 79888604bd77b170bd49aa70dca2e5cd23fd05c6 Author: Francois Romieu Date: Mon Sep 25 23:12:01 2006 +0200 qla3xxx: needless casts, netdev_priv() use and duplicate initialization Signed-off-by: Francois Romieu drivers/net/qla3xxx.c | 1097 ++++++++++++++++++++----------------------------- drivers/net/qla3xxx.h | 3 2 files changed, 455 insertions(+), 645 deletions(-) diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index ec640f6..f3268b0 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c @@ -49,9 +49,8 @@ MODULE_DESCRIPTION("QLogic ISP3XXX Netwo MODULE_LICENSE("GPL"); MODULE_VERSION(DRV_VERSION); -static const u32 default_msg - = NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK - | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN; +static const u32 default_msg = NETIF_MSG_DRV | NETIF_MSG_PROBE | + NETIF_MSG_LINK | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN; static int debug = -1; /* defaults above */ module_param(debug, int, 0); @@ -75,9 +74,9 @@ MODULE_DEVICE_TABLE(pci, ql3xxx_pci_tbl) static int ql_sem_spinlock(struct ql3_adapter *qdev, u32 sem_mask, u32 sem_bits) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; - u32 value; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; unsigned int seconds = 3; + u32 value; do { writel((sem_mask | sem_bits), @@ -86,20 +85,21 @@ static int ql_sem_spinlock(struct ql3_ad if ((value & (sem_mask >> 16)) == sem_bits) return 0; ssleep(1); - } while(--seconds); + } while (--seconds); return -1; } static void ql_sem_unlock(struct ql3_adapter *qdev, u32 sem_mask) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; + writel(sem_mask, &port_regs->CommonRegs.semaphoreReg); readl(&port_regs->CommonRegs.semaphoreReg); } static int ql_sem_lock(struct ql3_adapter *qdev, u32 sem_mask, u32 sem_bits) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 value; writel((sem_mask | sem_bits), &port_regs->CommonRegs.semaphoreReg); @@ -112,34 +112,25 @@ static int ql_sem_lock(struct ql3_adapte */ static int ql_wait_for_drvr_lock(struct ql3_adapter *qdev) { - int i = 0; + unsigned int i; - while (1) { - if (!ql_sem_lock(qdev, - QL_DRVR_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) - * 2) << 1)) { - if (i < 10) { - ssleep(1); - i++; - } else { - printk(KERN_ERR PFX "%s: Timed out waiting for " - "driver lock...\n", - qdev->ndev->name); - return 0; - } - } else { - printk(KERN_DEBUG PFX - "%s: driver lock acquired.\n", + for (i = 0; i < 10; i++) { + if (ql_sem_lock(qdev, QL_DRVR_SEM_MASK, + (QL_RESOURCE_BITS_BASE_CODE | qdev->mac_index * 2) << 1)) { + printk(KERN_DEBUG PFX "%s: driver lock acquired.\n", qdev->ndev->name); return 1; } + ssleep(1); } + printk(KERN_ERR PFX "%s: Timed out waiting for driver lock...\n", + qdev->ndev->name); + return 0; } static void ql_set_register_page(struct ql3_adapter *qdev, u32 page) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; writel(((ISP_CONTROL_NP_MASK << 16) | page), &port_regs->CommonRegs.ispControlStatus); @@ -147,37 +138,35 @@ static void ql_set_register_page(struct qdev->current_page = page; } -static u32 ql_read_common_reg_l(struct ql3_adapter *qdev, - u32 __iomem * reg) +static u32 ql_read_common_reg_l(struct ql3_adapter *qdev, u32 __iomem *reg) { + unsigned long flags; u32 value; - unsigned long hw_flags; - spin_lock_irqsave(&qdev->hw_lock, hw_flags); + spin_lock_irqsave(&qdev->hw_lock, flags); value = readl(reg); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); return value; } -static u32 ql_read_common_reg(struct ql3_adapter *qdev, - u32 __iomem * reg) +static u32 ql_read_common_reg(struct ql3_adapter *qdev, u32 __iomem * reg) { return readl(reg); } static u32 ql_read_page0_reg_l(struct ql3_adapter *qdev, u32 __iomem *reg) { + unsigned long flags; u32 value; - unsigned long hw_flags; - spin_lock_irqsave(&qdev->hw_lock, hw_flags); + spin_lock_irqsave(&qdev->hw_lock, flags); if (qdev->current_page != 0) ql_set_register_page(qdev,0); value = readl(reg); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); return value; } @@ -189,15 +178,14 @@ static u32 ql_read_page0_reg(struct ql3_ } static void ql_write_common_reg_l(struct ql3_adapter *qdev, - u32 __iomem *reg, u32 value) + u32 __iomem *reg, u32 value) { - unsigned long hw_flags; + unsigned long flags; - spin_lock_irqsave(&qdev->hw_lock, hw_flags); + spin_lock_irqsave(&qdev->hw_lock, flags); writel(value, reg); readl(reg); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); - return; + spin_unlock_irqrestore(&qdev->hw_lock, flags); } static void ql_write_common_reg(struct ql3_adapter *qdev, @@ -205,7 +193,6 @@ static void ql_write_common_reg(struct q { writel(value, reg); readl(reg); - return; } static void ql_write_page0_reg(struct ql3_adapter *qdev, @@ -215,7 +202,6 @@ static void ql_write_page0_reg(struct ql ql_set_register_page(qdev,0); writel(value, reg); readl(reg); - return; } /* @@ -228,7 +214,6 @@ static void ql_write_page1_reg(struct ql ql_set_register_page(qdev,1); writel(value, reg); readl(reg); - return; } /* @@ -241,12 +226,11 @@ static void ql_write_page2_reg(struct ql ql_set_register_page(qdev,2); writel(value, reg); readl(reg); - return; } static void ql_disable_interrupts(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; ql_write_common_reg_l(qdev, &port_regs->CommonRegs.ispInterruptMaskReg, (ISP_IMR_ENABLE_INT << 16)); @@ -255,7 +239,7 @@ static void ql_disable_interrupts(struct static void ql_enable_interrupts(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; ql_write_common_reg_l(qdev, &port_regs->CommonRegs.ispInterruptMaskReg, ((0xff << 16) | ISP_IMR_ENABLE_INT)); @@ -323,17 +307,12 @@ static struct ql_rcv_buf_cb *ql_get_from static u32 addrBits = EEPROM_NO_ADDR_BITS; static u32 dataBits = EEPROM_NO_DATA_BITS; -static void fm93c56a_deselect(struct ql3_adapter *qdev); -static void eeprom_readword(struct ql3_adapter *qdev, u32 eepromAddr, - unsigned short *value); - /* * Caller holds hw_lock. */ static void fm93c56a_select(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_1; ql_write_common_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg, @@ -347,25 +326,22 @@ static void fm93c56a_select(struct ql3_a */ static void fm93c56a_cmd(struct ql3_adapter *qdev, u32 cmd, u32 eepromAddr) { + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; int i; u32 mask; u32 dataBit; u32 previousBit; - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; /* Clock in a zero, then do the start bit */ ql_write_common_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg, ISP_NVRAM_MASK | qdev->eeprom_cmd_data | AUBURN_EEPROM_DO_1); ql_write_common_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | AUBURN_EEPROM_DO_1 | - AUBURN_EEPROM_CLK_RISE); + ISP_NVRAM_MASK | qdev->eeprom_cmd_data | + AUBURN_EEPROM_DO_1 | AUBURN_EEPROM_CLK_RISE); ql_write_common_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | AUBURN_EEPROM_DO_1 | - AUBURN_EEPROM_CLK_FALL); + ISP_NVRAM_MASK | qdev->eeprom_cmd_data | + AUBURN_EEPROM_DO_1 | AUBURN_EEPROM_CLK_FALL); mask = 1 << (FM93C56A_CMD_BITS - 1); /* Force the previous data bit to be different */ @@ -379,24 +355,19 @@ static void fm93c56a_cmd(struct ql3_adap * match */ ql_write_common_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | dataBit); + &port_regs->CommonRegs.serialPortInterfaceReg, + ISP_NVRAM_MASK | qdev->eeprom_cmd_data | + dataBit); previousBit = dataBit; } ql_write_common_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | dataBit | - AUBURN_EEPROM_CLK_RISE); + &port_regs->CommonRegs.serialPortInterfaceReg, + ISP_NVRAM_MASK | qdev->eeprom_cmd_data | dataBit | + AUBURN_EEPROM_CLK_RISE); ql_write_common_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | dataBit | - AUBURN_EEPROM_CLK_FALL); + &port_regs->CommonRegs.serialPortInterfaceReg, + ISP_NVRAM_MASK | qdev->eeprom_cmd_data | dataBit | + AUBURN_EEPROM_CLK_FALL); cmd = cmd << 1; } @@ -404,33 +375,27 @@ static void fm93c56a_cmd(struct ql3_adap /* Force the previous data bit to be different */ previousBit = 0xffff; for (i = 0; i < addrBits; i++) { - dataBit = - (eepromAddr & mask) ? AUBURN_EEPROM_DO_1 : - AUBURN_EEPROM_DO_0; + dataBit = (eepromAddr & mask) ? + AUBURN_EEPROM_DO_1 : AUBURN_EEPROM_DO_0; if (previousBit != dataBit) { /* * If the bit changed, then change the DO state to * match */ ql_write_common_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | dataBit); + &port_regs->CommonRegs.serialPortInterfaceReg, + ISP_NVRAM_MASK | qdev->eeprom_cmd_data | + dataBit); previousBit = dataBit; } ql_write_common_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | dataBit | - AUBURN_EEPROM_CLK_RISE); + &port_regs->CommonRegs.serialPortInterfaceReg, + ISP_NVRAM_MASK | qdev->eeprom_cmd_data | dataBit | + AUBURN_EEPROM_CLK_RISE); ql_write_common_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | dataBit | - AUBURN_EEPROM_CLK_FALL); + &port_regs->CommonRegs.serialPortInterfaceReg, + ISP_NVRAM_MASK | qdev->eeprom_cmd_data | dataBit | + AUBURN_EEPROM_CLK_FALL); eepromAddr = eepromAddr << 1; } } @@ -440,8 +405,8 @@ static void fm93c56a_cmd(struct ql3_adap */ static void fm93c56a_deselect(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; + qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_0; ql_write_common_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg, ISP_NVRAM_MASK | qdev->eeprom_cmd_data); @@ -452,30 +417,20 @@ static void fm93c56a_deselect(struct ql3 */ static void fm93c56a_datain(struct ql3_adapter *qdev, unsigned short *value) { + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.serialPortInterfaceReg; int i; u32 data = 0; u32 dataBit; - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; /* Read the data bits */ /* The first bit is a dummy. Clock right over it. */ for (i = 0; i < dataBits; i++) { - ql_write_common_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev->eeprom_cmd_data | - AUBURN_EEPROM_CLK_RISE); - ql_write_common_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev->eeprom_cmd_data | - AUBURN_EEPROM_CLK_FALL); - dataBit = - (ql_read_common_reg - (qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg) & AUBURN_EEPROM_DI_1) ? 1 : 0; + ql_write_common_reg(qdev, reg, ISP_NVRAM_MASK | + qdev->eeprom_cmd_data | AUBURN_EEPROM_CLK_RISE); + ql_write_common_reg(qdev, reg, ISP_NVRAM_MASK | + qdev->eeprom_cmd_data | AUBURN_EEPROM_CLK_FALL); + dataBit = ql_read_common_reg(qdev, reg) & AUBURN_EEPROM_DI_1; + dataBit = dataBit ? 1 : 0; data = (data << 1) | dataBit; } *value = (u16) data; @@ -511,21 +466,20 @@ #endif static int ql_get_nvram_params(struct ql3_adapter *qdev) { + unsigned long flags; u16 *pEEPROMData; u16 checksum = 0; u32 index; - unsigned long hw_flags; - spin_lock_irqsave(&qdev->hw_lock, hw_flags); + spin_lock_irqsave(&qdev->hw_lock, flags); pEEPROMData = (u16 *) & qdev->nvram_data; qdev->eeprom_cmd_data = 0; - if(ql_sem_spinlock(qdev, QL_NVRAM_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * - 2) << 10)) { + if (ql_sem_spinlock(qdev, QL_NVRAM_SEM_MASK, + (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * 2) << 10)) { printk(KERN_ERR PFX"%s: Failed ql_sem_spinlock().\n", __func__); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); return -1; } @@ -539,7 +493,7 @@ static int ql_get_nvram_params(struct ql if (checksum != 0) { printk(KERN_ERR PFX "%s: checksum should be zero, is %x!!\n", qdev->ndev->name, checksum); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); return -1; } @@ -555,7 +509,7 @@ static int ql_get_nvram_params(struct ql pEEPROMData = (u16 *) & qdev->nvram_data.version; *pEEPROMData = le16_to_cpu(*pEEPROMData); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); return checksum; } @@ -565,8 +519,7 @@ static const u32 PHYAddr[2] = { static int ql_wait_for_mii_ready(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 temp; int count = 1000; @@ -582,8 +535,7 @@ static int ql_wait_for_mii_ready(struct static void ql_mii_enable_scan_mode(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 scanControl; if (qdev->numPorts > 1) { @@ -609,9 +561,8 @@ static void ql_mii_enable_scan_mode(stru static u8 ql_mii_disable_scan_mode(struct ql3_adapter *qdev) { + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u8 ret; - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; /* See if scan mode is enabled before we turn it off */ if (ql_read_page0_reg(qdev, &port_regs->macMIIMgmtControlReg) & @@ -640,8 +591,7 @@ static u8 ql_mii_disable_scan_mode(struc static int ql_mii_write_reg_ex(struct ql3_adapter *qdev, u16 regAddr, u16 value, u32 mac_index) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u8 scanWasEnabled; scanWasEnabled = ql_mii_disable_scan_mode(qdev); @@ -679,8 +629,7 @@ static int ql_mii_write_reg_ex(struct ql static int ql_mii_read_reg_ex(struct ql3_adapter *qdev, u16 regAddr, u16 * value, u32 mac_index) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u8 scanWasEnabled; u32 temp; @@ -725,8 +674,7 @@ static int ql_mii_read_reg_ex(struct ql3 static int ql_mii_write_reg(struct ql3_adapter *qdev, u16 regAddr, u16 value) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; ql_mii_disable_scan_mode(qdev); @@ -761,9 +709,8 @@ static int ql_mii_write_reg(struct ql3_a static int ql_mii_read_reg(struct ql3_adapter *qdev, u16 regAddr, u16 *value) { + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 temp; - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; ql_mii_disable_scan_mode(qdev); @@ -823,7 +770,6 @@ static void ql_petbi_start_neg(struct ql ql_mii_write_reg(qdev, PETBI_CONTROL_REG, PETBI_CTRL_AUTO_NEG | PETBI_CTRL_RESTART_NEG | PETBI_CTRL_FULL_DUPLEX | PETBI_CTRL_SPEED_1000); - } static void ql_petbi_reset_ex(struct ql3_adapter *qdev, u32 mac_index) @@ -916,8 +862,7 @@ static int ql_is_phy_neg_pause(struct ql */ static void ql_mac_enable(struct ql3_adapter *qdev, u32 enable) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 value; if (enable) @@ -936,8 +881,7 @@ static void ql_mac_enable(struct ql3_ada */ static void ql_mac_cfg_soft_reset(struct ql3_adapter *qdev, u32 enable) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 value; if (enable) @@ -956,8 +900,7 @@ static void ql_mac_cfg_soft_reset(struct */ static void ql_mac_cfg_gig(struct ql3_adapter *qdev, u32 enable) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 value; if (enable) @@ -976,8 +919,7 @@ static void ql_mac_cfg_gig(struct ql3_ad */ static void ql_mac_cfg_full_dup(struct ql3_adapter *qdev, u32 enable) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 value; if (enable) @@ -996,14 +938,12 @@ static void ql_mac_cfg_full_dup(struct q */ static void ql_mac_cfg_pause(struct ql3_adapter *qdev, u32 enable) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 value; if (enable) - value = - ((MAC_CONFIG_REG_TF | MAC_CONFIG_REG_RF) | - ((MAC_CONFIG_REG_TF | MAC_CONFIG_REG_RF) << 16)); + value = MAC_CONFIG_REG_TF | MAC_CONFIG_REG_RF | + ((MAC_CONFIG_REG_TF | MAC_CONFIG_REG_RF) << 16); else value = ((MAC_CONFIG_REG_TF | MAC_CONFIG_REG_RF) << 16); @@ -1018,8 +958,7 @@ static void ql_mac_cfg_pause(struct ql3_ */ static int ql_is_fiber(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 bitToCheck = 0; u32 temp; @@ -1039,6 +978,7 @@ static int ql_is_fiber(struct ql3_adapte static int ql_is_auto_cfg(struct ql3_adapter *qdev) { u16 reg; + ql_mii_read_reg(qdev, 0x00, ®); return (reg & 0x1000) != 0; } @@ -1048,8 +988,7 @@ static int ql_is_auto_cfg(struct ql3_ada */ static int ql_is_auto_neg_complete(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 bitToCheck = 0; u32 temp; @@ -1091,8 +1030,7 @@ static int ql_is_neg_pause(struct ql3_ad static int ql_auto_neg_error(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 bitToCheck = 0; u32 temp; @@ -1129,8 +1067,7 @@ static int ql_is_link_full_dup(struct ql */ static int ql_link_down_detect(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 bitToCheck = 0; u32 temp; @@ -1153,22 +1090,18 @@ static int ql_link_down_detect(struct ql */ static int ql_link_down_detect_clear(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; + u32 __iomem *reg = &port_regs->CommonRegs.ispControlStatus; switch (qdev->mac_index) { case 0: - ql_write_common_reg(qdev, - &port_regs->CommonRegs.ispControlStatus, - (ISP_CONTROL_LINK_DN_0) | - (ISP_CONTROL_LINK_DN_0 << 16)); + ql_write_common_reg(qdev, reg, + ISP_CONTROL_LINK_DN_0 | (ISP_CONTROL_LINK_DN_0 << 16)); break; case 1: - ql_write_common_reg(qdev, - &port_regs->CommonRegs.ispControlStatus, - (ISP_CONTROL_LINK_DN_1) | - (ISP_CONTROL_LINK_DN_1 << 16)); + ql_write_common_reg(qdev, reg, + ISP_CONTROL_LINK_DN_1 | (ISP_CONTROL_LINK_DN_1 << 16)); break; default: @@ -1184,8 +1117,7 @@ static int ql_link_down_detect_clear(str static int ql_this_adapter_controls_port(struct ql3_adapter *qdev, u32 mac_index) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 bitToCheck = 0; u32 temp; @@ -1242,8 +1174,7 @@ static void ql_phy_init_ex(struct ql3_ad */ static u32 ql_get_link_state(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 bitToCheck = 0; u32 temp, linkState; @@ -1269,9 +1200,8 @@ static u32 ql_get_link_state(struct ql3_ static int ql_port_start(struct ql3_adapter *qdev) { - if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * - 2) << 7)) + if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, + (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * 2) << 7)) return -1; if (ql_is_fiber(qdev)) { @@ -1288,38 +1218,29 @@ static int ql_port_start(struct ql3_adap static int ql_finish_auto_neg(struct ql3_adapter *qdev) { - if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * - 2) << 7)) + if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, + (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * 2) << 7)) return -1; if (!ql_auto_neg_error(qdev)) { - if (test_bit(QL_LINK_MASTER,&qdev->flags)) { + if (test_bit(QL_LINK_MASTER, &qdev->flags)) { /* configure the MAC */ if (netif_msg_link(qdev)) printk(KERN_DEBUG PFX "%s: Configuring link.\n", - qdev->ndev-> - name); + qdev->ndev->name); ql_mac_cfg_soft_reset(qdev, 1); ql_mac_cfg_gig(qdev, - (ql_get_link_speed - (qdev) == - SPEED_1000)); - ql_mac_cfg_full_dup(qdev, - ql_is_link_full_dup - (qdev)); - ql_mac_cfg_pause(qdev, - ql_is_neg_pause - (qdev)); + ql_get_link_speed(qdev) == SPEED_1000); + ql_mac_cfg_full_dup(qdev, ql_is_link_full_dup(qdev)); + ql_mac_cfg_pause(qdev, ql_is_neg_pause(qdev)); ql_mac_cfg_soft_reset(qdev, 0); /* enable the MAC */ if (netif_msg_link(qdev)) printk(KERN_DEBUG PFX "%s: Enabling mac.\n", - qdev->ndev-> - name); + qdev->ndev->name); ql_mac_enable(qdev, 1); } @@ -1333,26 +1254,22 @@ static int ql_finish_auto_neg(struct ql3 if (netif_msg_link(qdev)) printk(KERN_INFO PFX "%s: Link is up at %d Mbps, %s duplex.\n", - qdev->ndev->name, - ql_get_link_speed(qdev), - ql_is_link_full_dup(qdev) - ? "full" : "half"); + qdev->ndev->name, ql_get_link_speed(qdev), + ql_is_link_full_dup(qdev) ? "full" : "half"); } else { /* Remote error detected */ - - if (test_bit(QL_LINK_MASTER,&qdev->flags)) { + if (test_bit(QL_LINK_MASTER, &qdev->flags)) { if (netif_msg_link(qdev)) printk(KERN_DEBUG PFX "%s: Remote error detected. " "Calling ql_port_start().\n", - qdev->ndev-> - name); + qdev->ndev->name); /* * ql_port_start() is shared code and needs * to lock the PHY on it's own. */ ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK); - if(ql_port_start(qdev)) {/* Restart port */ + if (ql_port_start(qdev)) {/* Restart port */ return -1; } else return 0; @@ -1365,13 +1282,13 @@ static int ql_finish_auto_neg(struct ql3 static void ql_link_state_machine(struct ql3_adapter *qdev) { u32 curr_link_state; - unsigned long hw_flags; + unsigned long flags; - spin_lock_irqsave(&qdev->hw_lock, hw_flags); + spin_lock_irqsave(&qdev->hw_lock, flags); curr_link_state = ql_get_link_state(qdev); - if (test_bit(QL_RESET_ACTIVE,&qdev->flags)) { + if (test_bit(QL_RESET_ACTIVE, &qdev->flags)) { if (netif_msg_link(qdev)) printk(KERN_INFO PFX "%s: Reset in progress, skip processing link " @@ -1381,9 +1298,8 @@ static void ql_link_state_machine(struct switch (qdev->port_link_state) { default: - if (test_bit(QL_LINK_MASTER,&qdev->flags)) { + if (test_bit(QL_LINK_MASTER, &qdev->flags)) ql_port_start(qdev); - } qdev->port_link_state = LS_DOWN; /* Fall Through */ @@ -1402,7 +1318,6 @@ static void ql_link_state_machine(struct if (qdev->port_link_state == LS_UP) ql_link_down_detect_clear(qdev); - } break; @@ -1419,7 +1334,7 @@ static void ql_link_state_machine(struct } break; } - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); } /* @@ -1428,9 +1343,9 @@ static void ql_link_state_machine(struct static void ql_get_phy_owner(struct ql3_adapter *qdev) { if (ql_this_adapter_controls_port(qdev, qdev->mac_index)) - set_bit(QL_LINK_MASTER,&qdev->flags); + set_bit(QL_LINK_MASTER, &qdev->flags); else - clear_bit(QL_LINK_MASTER,&qdev->flags); + clear_bit(QL_LINK_MASTER, &qdev->flags); } /* @@ -1440,7 +1355,7 @@ static void ql_init_scan_mode(struct ql3 { ql_mii_enable_scan_mode(qdev); - if (test_bit(QL_LINK_OPTICAL,&qdev->flags)) { + if (test_bit(QL_LINK_OPTICAL, &qdev->flags)) { if (ql_this_adapter_controls_port(qdev, qdev->mac_index)) ql_petbi_init_ex(qdev, qdev->mac_index); } else { @@ -1457,13 +1372,11 @@ static void ql_init_scan_mode(struct ql3 */ static int ql_mii_setup(struct ql3_adapter *qdev) { + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 reg; - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; - if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * - 2) << 7)) + if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, + (QL_RESOURCE_BITS_BASE_CODE | qdev->mac_index * 2) << 7)) return -1; /* Divide 125MHz clock by 28 to meet PHY timing requirements */ @@ -1480,17 +1393,20 @@ static u32 ql_supported_modes(struct ql3 { u32 supported; - if (test_bit(QL_LINK_OPTICAL,&qdev->flags)) { - supported = SUPPORTED_1000baseT_Full | SUPPORTED_FIBRE - | SUPPORTED_Autoneg; + if (test_bit(QL_LINK_OPTICAL, &qdev->flags)) { + supported = + SUPPORTED_1000baseT_Full | + SUPPORTED_FIBRE | + SUPPORTED_Autoneg; } else { - supported = SUPPORTED_10baseT_Half - | SUPPORTED_10baseT_Full - | SUPPORTED_100baseT_Half - | SUPPORTED_100baseT_Full - | SUPPORTED_1000baseT_Half - | SUPPORTED_1000baseT_Full - | SUPPORTED_Autoneg | SUPPORTED_TP; + supported = + SUPPORTED_10baseT_Half | + SUPPORTED_10baseT_Full | + SUPPORTED_100baseT_Half | + SUPPORTED_100baseT_Full | + SUPPORTED_1000baseT_Half | + SUPPORTED_1000baseT_Full | + SUPPORTED_Autoneg | SUPPORTED_TP; } return supported; @@ -1498,46 +1414,46 @@ static u32 ql_supported_modes(struct ql3 static int ql_get_auto_cfg_status(struct ql3_adapter *qdev) { + unsigned long flags; int status; - unsigned long hw_flags; - spin_lock_irqsave(&qdev->hw_lock, hw_flags); - if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * - 2) << 7)) + + spin_lock_irqsave(&qdev->hw_lock, flags); + if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, + (QL_RESOURCE_BITS_BASE_CODE | qdev->mac_index * 2) << 7)) return 0; status = ql_is_auto_cfg(qdev); ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); return status; } static u32 ql_get_speed(struct ql3_adapter *qdev) { + unsigned long flags; u32 status; - unsigned long hw_flags; - spin_lock_irqsave(&qdev->hw_lock, hw_flags); - if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * - 2) << 7)) + + spin_lock_irqsave(&qdev->hw_lock, flags); + if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, + (QL_RESOURCE_BITS_BASE_CODE | qdev->mac_index * 2) << 7)) return 0; status = ql_get_link_speed(qdev); ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); return status; } static int ql_get_full_dup(struct ql3_adapter *qdev) { + unsigned long flags; int status; - unsigned long hw_flags; - spin_lock_irqsave(&qdev->hw_lock, hw_flags); - if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * - 2) << 7)) + + spin_lock_irqsave(&qdev->hw_lock, flags); + if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, + (QL_RESOURCE_BITS_BASE_CODE | qdev->mac_index * 2) << 7)) return 0; status = ql_is_link_full_dup(qdev); ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); return status; } @@ -1549,7 +1465,7 @@ static int ql_get_settings(struct net_de ecmd->transceiver = XCVR_INTERNAL; ecmd->supported = ql_supported_modes(qdev); - if (test_bit(QL_LINK_OPTICAL,&qdev->flags)) { + if (test_bit(QL_LINK_OPTICAL, &qdev->flags)) { ecmd->port = PORT_FIBRE; } else { ecmd->port = PORT_TP; @@ -1579,12 +1495,14 @@ static void ql_get_drvinfo(struct net_de static u32 ql_get_msglevel(struct net_device *ndev) { struct ql3_adapter *qdev = netdev_priv(ndev); + return qdev->msg_enable; } static void ql_set_msglevel(struct net_device *ndev, u32 value) { struct ql3_adapter *qdev = netdev_priv(ndev); + qdev->msg_enable = value; } @@ -1644,22 +1562,21 @@ static int ql_populate_free_queue(struct */ static void ql_update_lrg_bufq_prod_index(struct ql3_adapter *qdev) { + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; struct bufq_addr_element *lrg_buf_q_ele; int i; struct ql_rcv_buf_cb *lrg_buf_cb; - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; - if ((qdev->lrg_buf_free_count >= 8) - && (qdev->lrg_buf_release_cnt >= 16)) { + if ((qdev->lrg_buf_free_count >= 8) && + (qdev->lrg_buf_release_cnt >= 16)) { - if (qdev->lrg_buf_skb_check) - if (!ql_populate_free_queue(qdev)) - return; + if (qdev->lrg_buf_skb_check && !ql_populate_free_queue(qdev)) + return; lrg_buf_q_ele = qdev->lrg_buf_next_free; - while ((qdev->lrg_buf_release_cnt >= 16) - && (qdev->lrg_buf_free_count >= 8)) { + while ((qdev->lrg_buf_release_cnt >= 16) && + (qdev->lrg_buf_free_count >= 8)) { for (i = 0; i < 8; i++) { lrg_buf_cb = @@ -1851,10 +1768,10 @@ static void ql_process_macip_rx_intr(str static int ql_tx_rx_clean(struct ql3_adapter *qdev, int *tx_cleaned, int *rx_cleaned, int work_to_do) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; - struct net_rsp_iocb *net_rsp; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; struct net_device *ndev = qdev->ndev; - unsigned long hw_flags; + struct net_rsp_iocb *net_rsp; + unsigned long flags; /* While there are entries in the completion queue. */ while ((cpu_to_le32(*(qdev->prsp_producer_index)) != @@ -1865,28 +1782,27 @@ static int ql_tx_rx_clean(struct ql3_ada case OPCODE_OB_MAC_IOCB_FN0: case OPCODE_OB_MAC_IOCB_FN2: - ql_process_mac_tx_intr(qdev, (struct ob_mac_iocb_rsp *) - net_rsp); + ql_process_mac_tx_intr(qdev, + (struct ob_mac_iocb_rsp *) net_rsp); (*tx_cleaned)++; break; case OPCODE_IB_MAC_IOCB: - ql_process_mac_rx_intr(qdev, (struct ib_mac_iocb_rsp *) - net_rsp); + ql_process_mac_rx_intr(qdev, + (struct ib_mac_iocb_rsp *) net_rsp); (*rx_cleaned)++; break; case OPCODE_IB_IP_IOCB: - ql_process_macip_rx_intr(qdev, (struct ib_ip_iocb_rsp *) - net_rsp); + ql_process_macip_rx_intr(qdev, + (struct ib_ip_iocb_rsp *) net_rsp); (*rx_cleaned)++; break; default: { u32 *tmp = (u32 *) net_rsp; printk(KERN_ERR PFX - "%s: Hit default case, not " - "handled!\n" + "%s: Hit default case, not handled!\n" " dropping the packet, opcode = " "%x.\n", ndev->name, net_rsp->opcode); @@ -1909,7 +1825,7 @@ static int ql_tx_rx_clean(struct ql3_ada } } - spin_lock_irqsave(&qdev->hw_lock, hw_flags); + spin_lock_irqsave(&qdev->hw_lock, flags); ql_update_lrg_bufq_prod_index(qdev); @@ -1924,15 +1840,13 @@ static int ql_tx_rx_clean(struct ql3_ada } ql_write_common_reg(qdev, - &port_regs->CommonRegs. - rxSmallQProducerIndex, - qdev->small_buf_q_producer_index); + &port_regs->CommonRegs.rxSmallQProducerIndex, + qdev->small_buf_q_producer_index); } - ql_write_common_reg(qdev, - &port_regs->CommonRegs.rspQConsumerIndex, + ql_write_common_reg(qdev, &port_regs->CommonRegs.rspQConsumerIndex, qdev->rsp_consumer_index); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); if (unlikely(netif_queue_stopped(qdev->ndev))) { if (netif_queue_stopped(qdev->ndev) && @@ -1967,16 +1881,13 @@ quit_polling: static irqreturn_t ql3xxx_isr(int irq, void *dev_id) { - struct net_device *ndev = dev_id; struct ql3_adapter *qdev = netdev_priv(ndev); - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 value; int handled = 1; u32 var; - port_regs = qdev->mem_map_registers; - value = ql_read_common_reg_l(qdev, &port_regs->CommonRegs.ispControlStatus); @@ -1986,24 +1897,23 @@ static irqreturn_t ql3xxx_isr(int irq, v netif_carrier_off(qdev->ndev); ql_disable_interrupts(qdev); qdev->port_link_state = LS_DOWN; - set_bit(QL_RESET_ACTIVE,&qdev->flags) ; + set_bit(QL_RESET_ACTIVE, &qdev->flags) ; if (value & ISP_CONTROL_FE) { /* * Chip Fatal Error. */ - var = - ql_read_page0_reg_l(qdev, - &port_regs->PortFatalErrStatus); + var = ql_read_page0_reg_l(qdev, + &port_regs->PortFatalErrStatus); printk(KERN_WARNING PFX "%s: Resetting chip. PortFatalErrStatus " "register = 0x%x\n", ndev->name, var); - set_bit(QL_RESET_START,&qdev->flags) ; + set_bit(QL_RESET_START, &qdev->flags) ; } else { /* * Soft Reset Requested. */ - set_bit(QL_RESET_PER_SCSI,&qdev->flags) ; + set_bit(QL_RESET_PER_SCSI, &qdev->flags) ; printk(KERN_ERR PFX "%s: Another function issued a reset to the " "chip. ISR value = %x.\n", ndev->name, value); @@ -2025,8 +1935,8 @@ static irqreturn_t ql3xxx_isr(int irq, v static int ql3xxx_send(struct sk_buff *skb, struct net_device *ndev) { - struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev); - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; + struct ql3_adapter *qdev = netdev_priv(ndev); + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; struct ql_tx_buf_cb *tx_cb; struct ob_mac_iocb_req *mac_iocb_ptr; u64 map; @@ -2038,7 +1948,7 @@ static int ql3xxx_send(struct sk_buff *s } tx_cb = &qdev->tx_buf[qdev->req_producer_index] ; mac_iocb_ptr = tx_cb->queue_entry; - memset((void *)mac_iocb_ptr, 0, sizeof(struct ob_mac_iocb_req)); + memset(mac_iocb_ptr, 0, sizeof(struct ob_mac_iocb_req)); mac_iocb_ptr->opcode = qdev->mac_ob_opcode; mac_iocb_ptr->flags |= qdev->mb_bit_mask; mac_iocb_ptr->transaction_id = qdev->req_producer_index; @@ -2056,9 +1966,8 @@ static int ql3xxx_send(struct sk_buff *s if (qdev->req_producer_index == NUM_REQ_Q_ENTRIES) qdev->req_producer_index = 0; wmb(); - ql_write_common_reg_l(qdev, - &port_regs->CommonRegs.reqQProducerIndex, - qdev->req_producer_index); + ql_write_common_reg_l(qdev, &port_regs->CommonRegs.reqQProducerIndex, + qdev->req_producer_index); ndev->trans_start = jiffies; if (netif_msg_tx_queued(qdev)) @@ -2073,9 +1982,8 @@ static int ql_alloc_net_req_rsp_queues(s (u32) (NUM_REQ_Q_ENTRIES * sizeof(struct ob_mac_iocb_req)); qdev->req_q_virt_addr = - pci_alloc_consistent(qdev->pdev, - (size_t) qdev->req_q_size, - &qdev->req_q_phy_addr); + pci_alloc_consistent(qdev->pdev, (size_t) qdev->req_q_size, + &qdev->req_q_phy_addr); if ((qdev->req_q_virt_addr == NULL) || LS_64BITS(qdev->req_q_phy_addr) & (qdev->req_q_size - 1)) { @@ -2087,14 +1995,12 @@ static int ql_alloc_net_req_rsp_queues(s qdev->rsp_q_size = NUM_RSP_Q_ENTRIES * sizeof(struct net_rsp_iocb); qdev->rsp_q_virt_addr = - pci_alloc_consistent(qdev->pdev, - (size_t) qdev->rsp_q_size, - &qdev->rsp_q_phy_addr); + pci_alloc_consistent(qdev->pdev, (size_t) qdev->rsp_q_size, + &qdev->rsp_q_phy_addr); if ((qdev->rsp_q_virt_addr == NULL) || LS_64BITS(qdev->rsp_q_phy_addr) & (qdev->rsp_q_size - 1)) { - printk(KERN_ERR PFX - "%s: rspQ allocation failed\n", + printk(KERN_ERR PFX "%s: rspQ allocation failed\n", qdev->ndev->name); pci_free_consistent(qdev->pdev, (size_t) qdev->req_q_size, qdev->req_q_virt_addr, @@ -2102,32 +2008,30 @@ static int ql_alloc_net_req_rsp_queues(s return -ENOMEM; } - set_bit(QL_ALLOC_REQ_RSP_Q_DONE,&qdev->flags); + set_bit(QL_ALLOC_REQ_RSP_Q_DONE, &qdev->flags); return 0; } static void ql_free_net_req_rsp_queues(struct ql3_adapter *qdev) { - if (!test_bit(QL_ALLOC_REQ_RSP_Q_DONE,&qdev->flags)) { + if (!test_bit(QL_ALLOC_REQ_RSP_Q_DONE, &qdev->flags)) { printk(KERN_INFO PFX "%s: Already done.\n", qdev->ndev->name); return; } - pci_free_consistent(qdev->pdev, - qdev->req_q_size, + pci_free_consistent(qdev->pdev, qdev->req_q_size, qdev->req_q_virt_addr, qdev->req_q_phy_addr); qdev->req_q_virt_addr = NULL; - pci_free_consistent(qdev->pdev, - qdev->rsp_q_size, + pci_free_consistent(qdev->pdev, qdev->rsp_q_size, qdev->rsp_q_virt_addr, qdev->rsp_q_phy_addr); qdev->rsp_q_virt_addr = NULL; - clear_bit(QL_ALLOC_REQ_RSP_Q_DONE,&qdev->flags); + clear_bit(QL_ALLOC_REQ_RSP_Q_DONE, &qdev->flags); } static int ql_alloc_buffer_queues(struct ql3_adapter *qdev) @@ -2141,13 +2045,11 @@ static int ql_alloc_buffer_queues(struct qdev->lrg_buf_q_alloc_size = qdev->lrg_buf_q_size * 2; qdev->lrg_buf_q_alloc_virt_addr = - pci_alloc_consistent(qdev->pdev, - qdev->lrg_buf_q_alloc_size, - &qdev->lrg_buf_q_alloc_phy_addr); + pci_alloc_consistent(qdev->pdev, qdev->lrg_buf_q_alloc_size, + &qdev->lrg_buf_q_alloc_phy_addr); if (qdev->lrg_buf_q_alloc_virt_addr == NULL) { - printk(KERN_ERR PFX - "%s: lBufQ failed\n", qdev->ndev->name); + printk(KERN_ERR PFX "%s: lBufQ failed\n", qdev->ndev->name); return -ENOMEM; } qdev->lrg_buf_q_virt_addr = qdev->lrg_buf_q_alloc_virt_addr; @@ -2162,9 +2064,8 @@ static int ql_alloc_buffer_queues(struct qdev->small_buf_q_alloc_size = qdev->small_buf_q_size * 2; qdev->small_buf_q_alloc_virt_addr = - pci_alloc_consistent(qdev->pdev, - qdev->small_buf_q_alloc_size, - &qdev->small_buf_q_alloc_phy_addr); + pci_alloc_consistent(qdev->pdev, qdev->small_buf_q_alloc_size, + &qdev->small_buf_q_alloc_phy_addr); if (qdev->small_buf_q_alloc_virt_addr == NULL) { printk(KERN_ERR PFX @@ -2178,33 +2079,30 @@ static int ql_alloc_buffer_queues(struct qdev->small_buf_q_virt_addr = qdev->small_buf_q_alloc_virt_addr; qdev->small_buf_q_phy_addr = qdev->small_buf_q_alloc_phy_addr; - set_bit(QL_ALLOC_BUFQS_DONE,&qdev->flags); + set_bit(QL_ALLOC_BUFQS_DONE, &qdev->flags); return 0; } static void ql_free_buffer_queues(struct ql3_adapter *qdev) { - if (!test_bit(QL_ALLOC_BUFQS_DONE,&qdev->flags)) { - printk(KERN_INFO PFX - "%s: Already done.\n", qdev->ndev->name); + if (!test_bit(QL_ALLOC_BUFQS_DONE, &qdev->flags)) { + printk(KERN_INFO PFX "%s: Already done.\n", qdev->ndev->name); return; } - pci_free_consistent(qdev->pdev, - qdev->lrg_buf_q_alloc_size, + pci_free_consistent(qdev->pdev, qdev->lrg_buf_q_alloc_size, qdev->lrg_buf_q_alloc_virt_addr, qdev->lrg_buf_q_alloc_phy_addr); qdev->lrg_buf_q_virt_addr = NULL; - pci_free_consistent(qdev->pdev, - qdev->small_buf_q_alloc_size, + pci_free_consistent(qdev->pdev, qdev->small_buf_q_alloc_size, qdev->small_buf_q_alloc_virt_addr, qdev->small_buf_q_alloc_phy_addr); qdev->small_buf_q_virt_addr = NULL; - clear_bit(QL_ALLOC_BUFQS_DONE,&qdev->flags); + clear_bit(QL_ALLOC_BUFQS_DONE, &qdev->flags); } static int ql_alloc_small_buffers(struct ql3_adapter *qdev) @@ -2213,18 +2111,15 @@ static int ql_alloc_small_buffers(struct struct bufq_addr_element *small_buf_q_entry; /* Currently we allocate on one of memory and use it for smallbuffers */ - qdev->small_buf_total_size = - (QL_ADDR_ELE_PER_BUFQ_ENTRY * NUM_SBUFQ_ENTRIES * - QL_SMALL_BUFFER_SIZE); + qdev->small_buf_total_size = QL_ADDR_ELE_PER_BUFQ_ENTRY * + NUM_SBUFQ_ENTRIES * QL_SMALL_BUFFER_SIZE; qdev->small_buf_virt_addr = - pci_alloc_consistent(qdev->pdev, - qdev->small_buf_total_size, - &qdev->small_buf_phy_addr); + pci_alloc_consistent(qdev->pdev, qdev->small_buf_total_size, + &qdev->small_buf_phy_addr); if (qdev->small_buf_virt_addr == NULL) { - printk(KERN_ERR PFX - "%s: Failed to get small buffer memory.\n", + printk(KERN_ERR PFX "%s: Failed to get small buffer memory.\n", qdev->ndev->name); return -ENOMEM; } @@ -2246,22 +2141,19 @@ static int ql_alloc_small_buffers(struct small_buf_q_entry++; } qdev->small_buf_index = 0; - set_bit(QL_ALLOC_SMALL_BUF_DONE,&qdev->flags); + set_bit(QL_ALLOC_SMALL_BUF_DONE, &qdev->flags); return 0; } static void ql_free_small_buffers(struct ql3_adapter *qdev) { - if (!test_bit(QL_ALLOC_SMALL_BUF_DONE,&qdev->flags)) { - printk(KERN_INFO PFX - "%s: Already done.\n", qdev->ndev->name); + if (!test_bit(QL_ALLOC_SMALL_BUF_DONE, &qdev->flags)) { + printk(KERN_INFO PFX "%s: Already done.\n", qdev->ndev->name); return; } if (qdev->small_buf_virt_addr != NULL) { - pci_free_consistent(qdev->pdev, - qdev->small_buf_total_size, - qdev->small_buf_virt_addr, - qdev->small_buf_phy_addr); + pci_free_consistent(qdev->pdev, qdev->small_buf_total_size, + qdev->small_buf_virt_addr, qdev->small_buf_phy_addr); qdev->small_buf_virt_addr = NULL; } @@ -2274,16 +2166,14 @@ static void ql_free_large_buffers(struct for (i = 0; i < NUM_LARGE_BUFFERS; i++) { lrg_buf_cb = &qdev->lrg_buf[i]; - if (lrg_buf_cb->skb) { - dev_kfree_skb(lrg_buf_cb->skb); - pci_unmap_single(qdev->pdev, - pci_unmap_addr(lrg_buf_cb, mapaddr), - pci_unmap_len(lrg_buf_cb, maplen), - PCI_DMA_FROMDEVICE); - memset(lrg_buf_cb, 0, sizeof(struct ql_rcv_buf_cb)); - } else { + if (!lrg_buf_cb->skb) break; - } + + dev_kfree_skb(lrg_buf_cb->skb); + pci_unmap_single(qdev->pdev, + pci_unmap_addr(lrg_buf_cb, mapaddr), + pci_unmap_len(lrg_buf_cb, maplen), PCI_DMA_FROMDEVICE); + memset(lrg_buf_cb, 0, sizeof(struct ql_rcv_buf_cb)); } } @@ -2317,12 +2207,10 @@ static int ql_alloc_large_buffers(struct printk(KERN_ERR PFX "%s: large buff alloc failed, " "for %d bytes at index %d.\n", - qdev->ndev->name, - qdev->lrg_buffer_len * 2, i); + qdev->ndev->name, qdev->lrg_buffer_len * 2, i); ql_free_large_buffers(qdev); return -ENOMEM; } else { - lrg_buf_cb = &qdev->lrg_buf[i]; memset(lrg_buf_cb, 0, sizeof(struct ql_rcv_buf_cb)); lrg_buf_cb->index = i; @@ -2352,13 +2240,13 @@ static int ql_alloc_large_buffers(struct static void ql_create_send_free_list(struct ql3_adapter *qdev) { - struct ql_tx_buf_cb *tx_cb; + struct ob_mac_iocb_req *req_q_curr = qdev->req_q_virt_addr; int i; - struct ob_mac_iocb_req *req_q_curr = - qdev->req_q_virt_addr; /* Create free list of transmit buffers */ for (i = 0; i < NUM_REQ_Q_ENTRIES; i++) { + struct ql_tx_buf_cb *tx_cb; + tx_cb = &qdev->tx_buf[i]; tx_cb->skb = NULL; tx_cb->queue_entry = req_q_curr; @@ -2374,7 +2262,7 @@ static int ql_alloc_mem_resources(struct qdev->lrg_buffer_len = JUMBO_MTU_SIZE; } else { printk(KERN_ERR PFX - "%s: Invalid mtu size. Only 1500 and 9000 are accepted.\n", + "%s: Invalid mtu size. Only 1500 and 9000 are accepted.\n", qdev->ndev->name); return -ENOMEM; } @@ -2388,51 +2276,49 @@ static int ql_alloc_mem_resources(struct * Network Completion Queue Producer Index Register */ qdev->shadow_reg_virt_addr = - pci_alloc_consistent(qdev->pdev, - PAGE_SIZE, &qdev->shadow_reg_phy_addr); + pci_alloc_consistent(qdev->pdev, PAGE_SIZE, + &qdev->shadow_reg_phy_addr); if (qdev->shadow_reg_virt_addr != NULL) { qdev->preq_consumer_index = (u16 *) qdev->shadow_reg_virt_addr; qdev->req_consumer_index_phy_addr_high = - MS_64BITS(qdev->shadow_reg_phy_addr); + MS_64BITS(qdev->shadow_reg_phy_addr); qdev->req_consumer_index_phy_addr_low = - LS_64BITS(qdev->shadow_reg_phy_addr); + LS_64BITS(qdev->shadow_reg_phy_addr); qdev->prsp_producer_index = - (u32 *) (((u8 *) qdev->preq_consumer_index) + 8); + (u32 *) (((u8 *) qdev->preq_consumer_index) + 8); qdev->rsp_producer_index_phy_addr_high = - qdev->req_consumer_index_phy_addr_high; + qdev->req_consumer_index_phy_addr_high; qdev->rsp_producer_index_phy_addr_low = - qdev->req_consumer_index_phy_addr_low + 8; + qdev->req_consumer_index_phy_addr_low + 8; } else { - printk(KERN_ERR PFX - "%s: shadowReg Alloc failed.\n", qdev->ndev->name); + printk(KERN_ERR PFX "%s: shadowReg Alloc failed.\n", + qdev->ndev->name); return -ENOMEM; } if (ql_alloc_net_req_rsp_queues(qdev) != 0) { - printk(KERN_ERR PFX - "%s: ql_alloc_net_req_rsp_queues failed.\n", + printk(KERN_ERR PFX "%s: ql_alloc_net_req_rsp_queues failed.\n", qdev->ndev->name); goto err_req_rsp; } if (ql_alloc_buffer_queues(qdev) != 0) { - printk(KERN_ERR PFX - "%s: ql_alloc_buffer_queues failed.\n", + printk(KERN_ERR PFX "%s: ql_alloc_buffer_queues failed.\n", qdev->ndev->name); goto err_buffer_queues; } if (ql_alloc_small_buffers(qdev) != 0) { - printk(KERN_ERR PFX - "%s: ql_alloc_small_buffers failed\n", qdev->ndev->name); + printk(KERN_ERR PFX "%s: ql_alloc_small_buffers failed\n", + qdev->ndev->name); goto err_small_buffers; } if (ql_alloc_large_buffers(qdev) != 0) { - printk(KERN_ERR PFX - "%s: ql_alloc_large_buffers failed\n", qdev->ndev->name); + printk(KERN_ERR PFX "%s: ql_alloc_large_buffers failed\n", + qdev->ndev->name); goto err_small_buffers; } @@ -2449,11 +2335,8 @@ err_small_buffers: err_buffer_queues: ql_free_net_req_rsp_queues(qdev); err_req_rsp: - pci_free_consistent(qdev->pdev, - PAGE_SIZE, - qdev->shadow_reg_virt_addr, + pci_free_consistent(qdev->pdev, PAGE_SIZE, qdev->shadow_reg_virt_addr, qdev->shadow_reg_phy_addr); - return -ENOMEM; } @@ -2464,10 +2347,8 @@ static void ql_free_mem_resources(struct ql_free_buffer_queues(qdev); ql_free_net_req_rsp_queues(qdev); if (qdev->shadow_reg_virt_addr != NULL) { - pci_free_consistent(qdev->pdev, - PAGE_SIZE, - qdev->shadow_reg_virt_addr, - qdev->shadow_reg_phy_addr); + pci_free_consistent(qdev->pdev, PAGE_SIZE, + qdev->shadow_reg_virt_addr, qdev->shadow_reg_phy_addr); qdev->shadow_reg_virt_addr = NULL; } } @@ -2475,56 +2356,44 @@ static void ql_free_mem_resources(struct static int ql_init_misc_registers(struct ql3_adapter *qdev) { struct ql3xxx_local_ram_registers __iomem *local_ram = - (void __iomem *)qdev->mem_map_registers; + (void __iomem *)qdev->ioaddr; - if(ql_sem_spinlock(qdev, QL_DDR_RAM_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * - 2) << 4)) + if (ql_sem_spinlock(qdev, QL_DDR_RAM_SEM_MASK, + (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * 2) << 4)) return -1; - ql_write_page2_reg(qdev, - &local_ram->bufletSize, qdev->nvram_data.bufletSize); + ql_write_page2_reg(qdev, &local_ram->bufletSize, + qdev->nvram_data.bufletSize); - ql_write_page2_reg(qdev, - &local_ram->maxBufletCount, + ql_write_page2_reg(qdev, &local_ram->maxBufletCount, qdev->nvram_data.bufletCount); - ql_write_page2_reg(qdev, - &local_ram->freeBufletThresholdLow, + ql_write_page2_reg(qdev, &local_ram->freeBufletThresholdLow, (qdev->nvram_data.tcpWindowThreshold25 << 16) | - (qdev->nvram_data.tcpWindowThreshold0)); + qdev->nvram_data.tcpWindowThreshold0); - ql_write_page2_reg(qdev, - &local_ram->freeBufletThresholdHigh, + ql_write_page2_reg(qdev, &local_ram->freeBufletThresholdHigh, qdev->nvram_data.tcpWindowThreshold50); - ql_write_page2_reg(qdev, - &local_ram->ipHashTableBase, + ql_write_page2_reg(qdev, &local_ram->ipHashTableBase, (qdev->nvram_data.ipHashTableBaseHi << 16) | qdev->nvram_data.ipHashTableBaseLo); - ql_write_page2_reg(qdev, - &local_ram->ipHashTableCount, + ql_write_page2_reg(qdev, &local_ram->ipHashTableCount, qdev->nvram_data.ipHashTableSize); - ql_write_page2_reg(qdev, - &local_ram->tcpHashTableBase, + ql_write_page2_reg(qdev, &local_ram->tcpHashTableBase, (qdev->nvram_data.tcpHashTableBaseHi << 16) | qdev->nvram_data.tcpHashTableBaseLo); - ql_write_page2_reg(qdev, - &local_ram->tcpHashTableCount, + ql_write_page2_reg(qdev, &local_ram->tcpHashTableCount, qdev->nvram_data.tcpHashTableSize); - ql_write_page2_reg(qdev, - &local_ram->ncbBase, + ql_write_page2_reg(qdev, &local_ram->ncbBase, (qdev->nvram_data.ncbTableBaseHi << 16) | qdev->nvram_data.ncbTableBaseLo); - ql_write_page2_reg(qdev, - &local_ram->maxNcbCount, + ql_write_page2_reg(qdev, &local_ram->maxNcbCount, qdev->nvram_data.ncbTableSize); - ql_write_page2_reg(qdev, - &local_ram->drbBase, + ql_write_page2_reg(qdev, &local_ram->drbBase, (qdev->nvram_data.drbTableBaseHi << 16) | qdev->nvram_data.drbTableBaseLo); - ql_write_page2_reg(qdev, - &local_ram->maxDrbCount, + ql_write_page2_reg(qdev, &local_ram->maxDrbCount, qdev->nvram_data.drbTableSize); ql_sem_unlock(qdev, QL_DDR_RAM_SEM_MASK); return 0; @@ -2532,46 +2401,40 @@ static int ql_init_misc_registers(struct static int ql_adapter_initialize(struct ql3_adapter *qdev) { - u32 value; - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; struct ql3xxx_host_memory_registers __iomem *hmem_regs = - (void __iomem *)port_regs; + (void __iomem *)port_regs; u32 delay = 10; int status = 0; + u32 value; - if(ql_mii_setup(qdev)) + if (ql_mii_setup(qdev)) return -1; /* Bring out PHY out of reset */ ql_write_common_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg, - (ISP_SERIAL_PORT_IF_WE | - (ISP_SERIAL_PORT_IF_WE << 16))); + ISP_SERIAL_PORT_IF_WE | (ISP_SERIAL_PORT_IF_WE << 16)); qdev->port_link_state = LS_DOWN; netif_carrier_off(qdev->ndev); /* V2 chip fix for ARS-39168. */ ql_write_common_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg, - (ISP_SERIAL_PORT_IF_SDE | - (ISP_SERIAL_PORT_IF_SDE << 16))); + ISP_SERIAL_PORT_IF_SDE | (ISP_SERIAL_PORT_IF_SDE << 16)); /* Request Queue Registers */ *((u32 *) (qdev->preq_consumer_index)) = 0; atomic_set(&qdev->tx_count,NUM_REQ_Q_ENTRIES); qdev->req_producer_index = 0; - ql_write_page1_reg(qdev, - &hmem_regs->reqConsumerIndexAddrHigh, + ql_write_page1_reg(qdev, &hmem_regs->reqConsumerIndexAddrHigh, qdev->req_consumer_index_phy_addr_high); - ql_write_page1_reg(qdev, - &hmem_regs->reqConsumerIndexAddrLow, + ql_write_page1_reg(qdev, &hmem_regs->reqConsumerIndexAddrLow, qdev->req_consumer_index_phy_addr_low); - ql_write_page1_reg(qdev, - &hmem_regs->reqBaseAddrHigh, + ql_write_page1_reg(qdev, &hmem_regs->reqBaseAddrHigh, MS_64BITS(qdev->req_q_phy_addr)); - ql_write_page1_reg(qdev, - &hmem_regs->reqBaseAddrLow, + ql_write_page1_reg(qdev, &hmem_regs->reqBaseAddrLow, LS_64BITS(qdev->req_q_phy_addr)); ql_write_page1_reg(qdev, &hmem_regs->reqLength, NUM_REQ_Q_ENTRIES); @@ -2580,51 +2443,41 @@ static int ql_adapter_initialize(struct qdev->rsp_consumer_index = 0; qdev->rsp_current = qdev->rsp_q_virt_addr; - ql_write_page1_reg(qdev, - &hmem_regs->rspProducerIndexAddrHigh, + ql_write_page1_reg(qdev, &hmem_regs->rspProducerIndexAddrHigh, qdev->rsp_producer_index_phy_addr_high); - ql_write_page1_reg(qdev, - &hmem_regs->rspProducerIndexAddrLow, + ql_write_page1_reg(qdev, &hmem_regs->rspProducerIndexAddrLow, qdev->rsp_producer_index_phy_addr_low); - ql_write_page1_reg(qdev, - &hmem_regs->rspBaseAddrHigh, + ql_write_page1_reg(qdev, &hmem_regs->rspBaseAddrHigh, MS_64BITS(qdev->rsp_q_phy_addr)); - ql_write_page1_reg(qdev, - &hmem_regs->rspBaseAddrLow, + ql_write_page1_reg(qdev, &hmem_regs->rspBaseAddrLow, LS_64BITS(qdev->rsp_q_phy_addr)); ql_write_page1_reg(qdev, &hmem_regs->rspLength, NUM_RSP_Q_ENTRIES); /* Large Buffer Queue */ - ql_write_page1_reg(qdev, - &hmem_regs->rxLargeQBaseAddrHigh, + ql_write_page1_reg(qdev, &hmem_regs->rxLargeQBaseAddrHigh, MS_64BITS(qdev->lrg_buf_q_phy_addr)); - ql_write_page1_reg(qdev, - &hmem_regs->rxLargeQBaseAddrLow, + ql_write_page1_reg(qdev, &hmem_regs->rxLargeQBaseAddrLow, LS_64BITS(qdev->lrg_buf_q_phy_addr)); ql_write_page1_reg(qdev, &hmem_regs->rxLargeQLength, NUM_LBUFQ_ENTRIES); - ql_write_page1_reg(qdev, - &hmem_regs->rxLargeBufferLength, + ql_write_page1_reg(qdev, &hmem_regs->rxLargeBufferLength, qdev->lrg_buffer_len); /* Small Buffer Queue */ - ql_write_page1_reg(qdev, - &hmem_regs->rxSmallQBaseAddrHigh, + ql_write_page1_reg(qdev, &hmem_regs->rxSmallQBaseAddrHigh, MS_64BITS(qdev->small_buf_q_phy_addr)); - ql_write_page1_reg(qdev, - &hmem_regs->rxSmallQBaseAddrLow, + ql_write_page1_reg(qdev, &hmem_regs->rxSmallQBaseAddrLow, LS_64BITS(qdev->small_buf_q_phy_addr)); ql_write_page1_reg(qdev, &hmem_regs->rxSmallQLength, NUM_SBUFQ_ENTRIES); - ql_write_page1_reg(qdev, - &hmem_regs->rxSmallBufferLength, + ql_write_page1_reg(qdev, &hmem_regs->rxSmallBufferLength, QL_SMALL_BUFFER_SIZE); qdev->small_buf_q_producer_index = NUM_SBUFQ_ENTRIES - 1; @@ -2639,13 +2492,9 @@ static int ql_adapter_initialize(struct qdev->lrg_buf_free_head = NULL; qdev->lrg_buf_free_tail = NULL; - ql_write_common_reg(qdev, - &port_regs->CommonRegs. - rxSmallQProducerIndex, + ql_write_common_reg(qdev, &port_regs->CommonRegs.rxSmallQProducerIndex, qdev->small_buf_q_producer_index); - ql_write_common_reg(qdev, - &port_regs->CommonRegs. - rxLargeQProducerIndex, + ql_write_common_reg(qdev, &port_regs->CommonRegs.rxLargeQProducerIndex, qdev->lrg_buf_q_producer_index); /* @@ -2657,7 +2506,7 @@ static int ql_adapter_initialize(struct if ((value & PORT_STATUS_IC) == 0) { /* Chip has not been configured yet, so let it rip. */ - if(ql_init_misc_registers(qdev)) { + if (ql_init_misc_registers(qdev)) { status = -1; goto out; } @@ -2676,24 +2525,20 @@ static int ql_adapter_initialize(struct value = (0xFFFF << 16) | qdev->nvram_data.extHwConfig; - if(ql_sem_spinlock(qdev, QL_FLASH_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) - * 2) << 13)) { + if (ql_sem_spinlock(qdev, QL_FLASH_SEM_MASK, + (QL_RESOURCE_BITS_BASE_CODE | qdev->mac_index * 2) << 13)) { status = -1; goto out; } ql_write_page0_reg(qdev, &port_regs->ExternalHWConfig, value); ql_write_page0_reg(qdev, &port_regs->InternalChipConfig, - (((INTERNAL_CHIP_SD | INTERNAL_CHIP_WE) << - 16) | (INTERNAL_CHIP_SD | - INTERNAL_CHIP_WE))); + ((INTERNAL_CHIP_SD | INTERNAL_CHIP_WE) << 16) | + INTERNAL_CHIP_SD | INTERNAL_CHIP_WE); ql_sem_unlock(qdev, QL_FLASH_SEM_MASK); } - - if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * - 2) << 7)) { + if (ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, + (QL_RESOURCE_BITS_BASE_CODE | qdev->mac_index * 2) << 7)) { status = -1; goto out; } @@ -2707,41 +2552,36 @@ static int ql_adapter_initialize(struct ql_write_page0_reg(qdev, &port_regs->macAddrIndirectPtrReg, (MAC_ADDR_INDIRECT_PTR_REG_RP_MASK << 16)); ql_write_page0_reg(qdev, &port_regs->macAddrDataReg, - ((qdev->ndev->dev_addr[2] << 24) - | (qdev->ndev->dev_addr[3] << 16) - | (qdev->ndev->dev_addr[4] << 8) - | qdev->ndev->dev_addr[5])); + (qdev->ndev->dev_addr[2] << 24) | + (qdev->ndev->dev_addr[3] << 16) | + (qdev->ndev->dev_addr[4] << 8) | + qdev->ndev->dev_addr[5]); /* Program top 16 bits of the MAC address */ ql_write_page0_reg(qdev, &port_regs->macAddrIndirectPtrReg, - ((MAC_ADDR_INDIRECT_PTR_REG_RP_MASK << 16) | 1)); + (MAC_ADDR_INDIRECT_PTR_REG_RP_MASK << 16) | 1); ql_write_page0_reg(qdev, &port_regs->macAddrDataReg, - ((qdev->ndev->dev_addr[0] << 8) - | qdev->ndev->dev_addr[1])); + (qdev->ndev->dev_addr[0] << 8) | qdev->ndev->dev_addr[1]); /* Enable Primary MAC */ ql_write_page0_reg(qdev, &port_regs->macAddrIndirectPtrReg, - ((MAC_ADDR_INDIRECT_PTR_REG_PE << 16) | - MAC_ADDR_INDIRECT_PTR_REG_PE)); + (MAC_ADDR_INDIRECT_PTR_REG_PE << 16) | + MAC_ADDR_INDIRECT_PTR_REG_PE); /* Clear Primary and Secondary IP addresses */ ql_write_page0_reg(qdev, &port_regs->ipAddrIndexReg, - ((IP_ADDR_INDEX_REG_MASK << 16) | - (qdev->mac_index << 2))); + (IP_ADDR_INDEX_REG_MASK << 16) | (qdev->mac_index << 2)); ql_write_page0_reg(qdev, &port_regs->ipAddrDataReg, 0); ql_write_page0_reg(qdev, &port_regs->ipAddrIndexReg, - ((IP_ADDR_INDEX_REG_MASK << 16) | - ((qdev->mac_index << 2) + 1))); + (IP_ADDR_INDEX_REG_MASK << 16) | ((qdev->mac_index << 2) + 1)); ql_write_page0_reg(qdev, &port_regs->ipAddrDataReg, 0); ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK); /* Indicate Configuration Complete */ - ql_write_page0_reg(qdev, - &port_regs->portControl, - ((PORT_CONTROL_CC << 16) | PORT_CONTROL_CC)); - + ql_write_page0_reg(qdev, &port_regs->portControl, + (PORT_CONTROL_CC << 16) | PORT_CONTROL_CC); do { value = ql_read_page0_reg(qdev, &port_regs->portStatus); if (value & PORT_STATUS_IC) @@ -2750,19 +2590,17 @@ static int ql_adapter_initialize(struct } while (--delay); if (delay == 0) { - printk(KERN_ERR PFX - "%s: Hw Initialization timeout.\n", qdev->ndev->name); + printk(KERN_ERR PFX "%s: Hw Initialization timeout.\n", + qdev->ndev->name); status = -1; goto out; } /* Enable Ethernet Function */ - value = - (PORT_CONTROL_EF | PORT_CONTROL_ET | PORT_CONTROL_EI | - PORT_CONTROL_HH); + value = PORT_CONTROL_EF | PORT_CONTROL_ET | PORT_CONTROL_EI | + PORT_CONTROL_HH; ql_write_page0_reg(qdev, &port_regs->portControl, - ((value << 16) | value)); - + (value << 16) | value); out: return status; } @@ -2772,7 +2610,8 @@ out: */ static int ql_adapter_reset(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; + u32 __iomem *reg = &port_regs->CommonRegs.ispControlStatus; int status = 0; u16 value; int max_wait_time; @@ -2783,12 +2622,9 @@ static int ql_adapter_reset(struct ql3_a /* * Issue soft reset to chip. */ - printk(KERN_DEBUG PFX - "%s: Issue soft reset to chip.\n", + printk(KERN_DEBUG PFX "%s: Issue soft reset to chip.\n", qdev->ndev->name); - ql_write_common_reg(qdev, - &port_regs->CommonRegs.ispControlStatus, - ((ISP_CONTROL_SR << 16) | ISP_CONTROL_SR)); + ql_write_common_reg(qdev, reg, (ISP_CONTROL_SR << 16) | ISP_CONTROL_SR); /* Wait 3 seconds for reset to complete. */ printk(KERN_DEBUG PFX @@ -2798,9 +2634,7 @@ static int ql_adapter_reset(struct ql3_a /* Wait until the firmware tells us the Soft Reset is done */ max_wait_time = 5; do { - value = - ql_read_common_reg(qdev, - &port_regs->CommonRegs.ispControlStatus); + value = ql_read_common_reg(qdev, reg); if ((value & ISP_CONTROL_SR) == 0) break; @@ -2812,36 +2646,27 @@ static int ql_adapter_reset(struct ql3_a * cleared after the soft reset has taken place. */ value = - ql_read_common_reg(qdev, &port_regs->CommonRegs.ispControlStatus); + ql_read_common_reg(qdev, reg); if (value & ISP_CONTROL_RI) { printk(KERN_DEBUG PFX "ql_adapter_reset: clearing RI after reset.\n"); - ql_write_common_reg(qdev, - &port_regs->CommonRegs. - ispControlStatus, - ((ISP_CONTROL_RI << 16) | ISP_CONTROL_RI)); + ql_write_common_reg(qdev, reg, + (ISP_CONTROL_RI << 16) | ISP_CONTROL_RI); } if (max_wait_time == 0) { /* Issue Force Soft Reset */ - ql_write_common_reg(qdev, - &port_regs->CommonRegs. - ispControlStatus, - ((ISP_CONTROL_FSR << 16) | - ISP_CONTROL_FSR)); + ql_write_common_reg(qdev, reg, + (ISP_CONTROL_FSR << 16) | ISP_CONTROL_FSR); /* * Wait until the firmware tells us the Force Soft Reset is * done */ max_wait_time = 5; do { - value = - ql_read_common_reg(qdev, - &port_regs->CommonRegs. - ispControlStatus); - if ((value & ISP_CONTROL_FSR) == 0) { + value = ql_read_common_reg(qdev, reg); + if ((value & ISP_CONTROL_FSR) == 0) break; - } ssleep(1); } while ((--max_wait_time)); } @@ -2855,7 +2680,7 @@ static int ql_adapter_reset(struct ql3_a static void ql_set_mac_info(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 value, port_status; u8 func_number; @@ -2873,9 +2698,9 @@ static void ql_set_mac_info(struct ql3_a qdev->mb_bit_mask = FN0_MA_BITS_MASK; qdev->PHYAddr = PORT0_PHY_ADDRESS; if (port_status & PORT_STATUS_SM0) - set_bit(QL_LINK_OPTICAL,&qdev->flags); + set_bit(QL_LINK_OPTICAL, &qdev->flags); else - clear_bit(QL_LINK_OPTICAL,&qdev->flags); + clear_bit(QL_LINK_OPTICAL, &qdev->flags); break; case ISP_CONTROL_FN1_NET: @@ -2886,9 +2711,9 @@ static void ql_set_mac_info(struct ql3_a qdev->mb_bit_mask = FN1_MA_BITS_MASK; qdev->PHYAddr = PORT1_PHY_ADDRESS; if (port_status & PORT_STATUS_SM1) - set_bit(QL_LINK_OPTICAL,&qdev->flags); + set_bit(QL_LINK_OPTICAL, &qdev->flags); else - clear_bit(QL_LINK_OPTICAL,&qdev->flags); + clear_bit(QL_LINK_OPTICAL, &qdev->flags); break; case ISP_CONTROL_FN0_SCSI: @@ -2904,7 +2729,7 @@ static void ql_set_mac_info(struct ql3_a static void ql_display_dev_info(struct net_device *ndev) { - struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev); + struct ql3_adapter *qdev = netdev_priv(ndev); struct pci_dev *pdev = qdev->pdev; printk(KERN_INFO PFX @@ -2912,19 +2737,17 @@ static void ql_display_dev_info(struct n DRV_NAME, qdev->index, qdev->chip_rev_id, qdev->pci_slot); printk(KERN_INFO PFX "%s Interface.\n", - test_bit(QL_LINK_OPTICAL,&qdev->flags) ? "OPTICAL" : "COPPER"); + test_bit(QL_LINK_OPTICAL, &qdev->flags) ? "OPTICAL" : "COPPER"); /* * Print PCI bus width/type. */ - printk(KERN_INFO PFX - "Bus interface is %s %s.\n", + printk(KERN_INFO PFX "Bus interface is %s %s.\n", ((qdev->pci_width == 64) ? "64-bit" : "32-bit"), ((qdev->pci_x) ? "PCI-X" : "PCI")); printk(KERN_INFO PFX - "mem IO base address adjusted = 0x%p\n", - qdev->mem_map_registers); + "mem IO base address adjusted = 0x%p\n", qdev->ioaddr); printk(KERN_INFO PFX "Interrupt number = %d\n", pdev->irq); if (netif_msg_probe(qdev)) @@ -2943,17 +2766,17 @@ static int ql_adapter_down(struct ql3_ad netif_stop_queue(ndev); netif_carrier_off(ndev); - clear_bit(QL_ADAPTER_UP,&qdev->flags); - clear_bit(QL_LINK_MASTER,&qdev->flags); + clear_bit(QL_ADAPTER_UP, &qdev->flags); + clear_bit(QL_LINK_MASTER, &qdev->flags); ql_disable_interrupts(qdev); free_irq(qdev->pdev->irq, ndev); - if (qdev->msi && test_bit(QL_MSI_ENABLED,&qdev->flags)) { + if (qdev->msi && test_bit(QL_MSI_ENABLED, &qdev->flags)) { printk(KERN_INFO PFX "%s: calling pci_disable_msi().\n", qdev->ndev->name); - clear_bit(QL_MSI_ENABLED,&qdev->flags); + clear_bit(QL_MSI_ENABLED, &qdev->flags); pci_disable_msi(qdev->pdev); } @@ -2962,10 +2785,11 @@ static int ql_adapter_down(struct ql3_ad netif_poll_disable(ndev); if (do_reset) { + unsigned long flags; int soft_reset; - unsigned long hw_flags; - spin_lock_irqsave(&qdev->hw_lock, hw_flags); + /* FIXME: ssleep with spinlock held in ql_wait_for_drvr_lock */ + spin_lock_irqsave(&qdev->hw_lock, flags); if (ql_wait_for_drvr_lock(qdev)) { if ((soft_reset = ql_adapter_reset(qdev))) { printk(KERN_ERR PFX @@ -2980,7 +2804,7 @@ static int ql_adapter_down(struct ql3_ad "reset!\n", ndev->name); retval = -1; } - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); } ql_free_mem_resources(qdev); return retval; @@ -2991,7 +2815,7 @@ static int ql_adapter_up(struct ql3_adap struct net_device *ndev = qdev->ndev; int err; unsigned long irq_flags = SA_SAMPLE_RANDOM | SA_SHIRQ; - unsigned long hw_flags; + unsigned long flags; if (ql_alloc_mem_resources(qdev)) { printk(KERN_ERR PFX @@ -3008,21 +2832,22 @@ static int ql_adapter_up(struct ql3_adap qdev->msi = 0; } else { printk(KERN_INFO PFX "%s: MSI Enabled...\n", qdev->ndev->name); - set_bit(QL_MSI_ENABLED,&qdev->flags); + set_bit(QL_MSI_ENABLED, &qdev->flags); irq_flags &= ~SA_SHIRQ; } } - if ((err = request_irq(qdev->pdev->irq, - ql3xxx_isr, - irq_flags, ndev->name, ndev))) { + err = request_irq(qdev->pdev->irq, ql3xxx_isr, irq_flags, ndev->name, + ndev); + if (err < 0) { printk(KERN_ERR PFX "%s: Failed to reserve interrupt %d already in use.\n", ndev->name, qdev->pdev->irq); goto err_irq; } - spin_lock_irqsave(&qdev->hw_lock, hw_flags); + /* FIXME: ssleep with spinlock held in ql_wait_for_drvr_lock */ + spin_lock_irqsave(&qdev->hw_lock, flags); if ((err = ql_wait_for_drvr_lock(qdev))) { if ((err = ql_adapter_initialize(qdev))) { @@ -3041,9 +2866,9 @@ static int ql_adapter_up(struct ql3_adap goto err_lock; } - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); - set_bit(QL_ADAPTER_UP,&qdev->flags); + set_bit(QL_ADAPTER_UP, &qdev->flags); mod_timer(&qdev->adapter_timer, jiffies + HZ * 1); @@ -3056,11 +2881,11 @@ err_init: err_lock: free_irq(qdev->pdev->irq, ndev); err_irq: - if (qdev->msi && test_bit(QL_MSI_ENABLED,&qdev->flags)) { + if (qdev->msi && test_bit(QL_MSI_ENABLED, &qdev->flags)) { printk(KERN_INFO PFX "%s: calling pci_disable_msi().\n", qdev->ndev->name); - clear_bit(QL_MSI_ENABLED,&qdev->flags); + clear_bit(QL_MSI_ENABLED, &qdev->flags); pci_disable_msi(qdev->pdev); } return err; @@ -3068,7 +2893,7 @@ err_irq: static int ql_cycle_adapter(struct ql3_adapter *qdev, int reset) { - if( ql_adapter_down(qdev,reset) || ql_adapter_up(qdev)) { + if (ql_adapter_down(qdev,reset) || ql_adapter_up(qdev)) { printk(KERN_ERR PFX "%s: Driver up/down cycle failed, " "closing device\n",qdev->ndev->name); @@ -3086,7 +2911,7 @@ static int ql3xxx_close(struct net_devic * Wait for device to recover from a reset. * (Rarely happens, but possible.) */ - while (!test_bit(QL_ADAPTER_UP,&qdev->flags)) + while (!test_bit(QL_ADAPTER_UP, &qdev->flags)) msleep(50); ql_adapter_down(qdev,QL_DO_RESET); @@ -3096,12 +2921,14 @@ static int ql3xxx_close(struct net_devic static int ql3xxx_open(struct net_device *ndev) { struct ql3_adapter *qdev = netdev_priv(ndev); + return (ql_adapter_up(qdev)); } static struct net_device_stats *ql3xxx_get_stats(struct net_device *dev) { - struct ql3_adapter *qdev = (struct ql3_adapter *)dev->priv; + struct ql3_adapter *qdev = netdev_priv(dev); + return &qdev->stats; } @@ -3131,16 +2958,14 @@ static void ql3xxx_set_multicast_list(st /* * We are manually parsing the list in the net_device structure. */ - return; } static int ql3xxx_set_mac_address(struct net_device *ndev, void *p) { - struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev); - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + struct ql3_adapter *qdev = netdev_priv(ndev); + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; struct sockaddr *addr = p; - unsigned long hw_flags; + unsigned long flags; if (netif_running(ndev)) return -EBUSY; @@ -3150,28 +2975,29 @@ static int ql3xxx_set_mac_address(struct memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len); - spin_lock_irqsave(&qdev->hw_lock, hw_flags); + spin_lock_irqsave(&qdev->hw_lock, flags); /* Program lower 32 bits of the MAC address */ ql_write_page0_reg(qdev, &port_regs->macAddrIndirectPtrReg, (MAC_ADDR_INDIRECT_PTR_REG_RP_MASK << 16)); ql_write_page0_reg(qdev, &port_regs->macAddrDataReg, - ((ndev->dev_addr[2] << 24) | (ndev-> - dev_addr[3] << 16) | - (ndev->dev_addr[4] << 8) | ndev->dev_addr[5])); + (ndev->dev_addr[2] << 24) | + (ndev->dev_addr[3] << 16) | + (ndev->dev_addr[4] << 8) | + ndev->dev_addr[5]); /* Program top 16 bits of the MAC address */ ql_write_page0_reg(qdev, &port_regs->macAddrIndirectPtrReg, ((MAC_ADDR_INDIRECT_PTR_REG_RP_MASK << 16) | 1)); ql_write_page0_reg(qdev, &port_regs->macAddrDataReg, ((ndev->dev_addr[0] << 8) | ndev->dev_addr[1])); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); return 0; } static void ql3xxx_tx_timeout(struct net_device *ndev) { - struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev); + struct ql3_adapter *qdev = netdev_priv(ndev); printk(KERN_ERR PFX "%s: Resetting...\n", ndev->name); /* @@ -3185,107 +3011,97 @@ static void ql3xxx_tx_timeout(struct net queue_work(qdev->workqueue, &qdev->tx_timeout_work); } -static void ql_reset_work(struct ql3_adapter *qdev) +static void ql_reset_work(void *_data) { + struct ql3_adapter *qdev = _data; struct net_device *ndev = qdev->ndev; + struct ql3xxx_common_registers __iomem *regs = + &qdev->ioaddr->CommonRegs; + unsigned long flags; + unsigned int i; u32 value; - struct ql_tx_buf_cb *tx_cb; - int max_wait_time, i; - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; - unsigned long hw_flags; - if (test_bit((QL_RESET_PER_SCSI | QL_RESET_START),&qdev->flags)) { - clear_bit(QL_LINK_MASTER,&qdev->flags); - /* - * Loop through the active list and return the skb. - */ - for (i = 0; i < NUM_REQ_Q_ENTRIES; i++) { - tx_cb = &qdev->tx_buf[i]; - if (tx_cb->skb) { + if (!test_bit(QL_RESET_PER_SCSI | QL_RESET_START, &qdev->flags)) + return; - printk(KERN_DEBUG PFX - "%s: Freeing lost SKB.\n", - qdev->ndev->name); - pci_unmap_single(qdev->pdev, - pci_unmap_addr(tx_cb, mapaddr), - pci_unmap_len(tx_cb, maplen), PCI_DMA_TODEVICE); - dev_kfree_skb(tx_cb->skb); - tx_cb->skb = NULL; - } - } + clear_bit(QL_LINK_MASTER, &qdev->flags); - printk(KERN_ERR PFX - "%s: Clearing NRI after reset.\n", qdev->ndev->name); - spin_lock_irqsave(&qdev->hw_lock, hw_flags); - ql_write_common_reg(qdev, - &port_regs->CommonRegs. - ispControlStatus, - ((ISP_CONTROL_RI << 16) | ISP_CONTROL_RI)); - /* - * Wait the for Soft Reset to Complete. - */ - max_wait_time = 10; - do { - value = ql_read_common_reg(qdev, - &port_regs->CommonRegs. + /* + * Loop through the active list and return the skb. + */ + for (i = 0; i < NUM_REQ_Q_ENTRIES; i++) { + struct ql_tx_buf_cb *tx_cb = &qdev->tx_buf[i]; - ispControlStatus); - if ((value & ISP_CONTROL_SR) == 0) { - printk(KERN_DEBUG PFX - "%s: reset completed.\n", - qdev->ndev->name); - break; - } + if (!tx_cb->skb) + continue; - if (value & ISP_CONTROL_RI) { - printk(KERN_DEBUG PFX - "%s: clearing NRI after reset.\n", - qdev->ndev->name); - ql_write_common_reg(qdev, - &port_regs-> - CommonRegs. - ispControlStatus, - ((ISP_CONTROL_RI << - 16) | ISP_CONTROL_RI)); - } + printk(KERN_DEBUG PFX "%s: Freeing lost SKB.\n", ndev->name); + pci_unmap_single(qdev->pdev, pci_unmap_addr(tx_cb, mapaddr), + pci_unmap_len(tx_cb, maplen), PCI_DMA_TODEVICE); + dev_kfree_skb(tx_cb->skb); + tx_cb->skb = NULL; + } - ssleep(1); - } while (--max_wait_time); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + printk(KERN_ERR PFX "%s: Clearing NRI after reset.\n", ndev->name); - if (value & ISP_CONTROL_SR) { + /* FIXME: ssleep with spinlock held */ + spin_lock_irqsave(&qdev->hw_lock, flags); + ql_write_common_reg(qdev, ®s->ispControlStatus, + ((ISP_CONTROL_RI << 16) | ISP_CONTROL_RI)); + /* + * Wait the for Soft Reset to Complete. + */ + for (i = 0; i < 10; i++) { + value = ql_read_common_reg(qdev, ®s->ispControlStatus); + if ((value & ISP_CONTROL_SR) == 0) { + printk(KERN_DEBUG PFX + "%s: reset completed.\n", ndev->name); + break; + } - /* - * Set the reset flags and clear the board again. - * Nothing else to do... - */ - printk(KERN_ERR PFX - "%s: Timed out waiting for reset to " - "complete.\n", ndev->name); - printk(KERN_ERR PFX - "%s: Do a reset.\n", ndev->name); - clear_bit(QL_RESET_PER_SCSI,&qdev->flags); - clear_bit(QL_RESET_START,&qdev->flags); - ql_cycle_adapter(qdev,QL_DO_RESET); - return; + if (value & ISP_CONTROL_RI) { + printk(KERN_DEBUG PFX + "%s: clearing NRI after reset.\n", ndev->name); + ql_write_common_reg(qdev, ®s->ispControlStatus, + (ISP_CONTROL_RI << 16) | ISP_CONTROL_RI); } - clear_bit(QL_RESET_ACTIVE,&qdev->flags); - clear_bit(QL_RESET_PER_SCSI,&qdev->flags); - clear_bit(QL_RESET_START,&qdev->flags); - ql_cycle_adapter(qdev,QL_NO_RESET); + ssleep(1); + } + spin_unlock_irqrestore(&qdev->hw_lock, flags); + + if (value & ISP_CONTROL_SR) { + /* + * Set the reset flags and clear the board again. + * Nothing else to do... + */ + printk(KERN_ERR PFX + "%s: Timed out waiting for reset to complete.\n", + ndev->name); + printk(KERN_ERR PFX "%s: Do a reset.\n", ndev->name); + clear_bit(QL_RESET_PER_SCSI, &qdev->flags); + clear_bit(QL_RESET_START, &qdev->flags); + ql_cycle_adapter(qdev, QL_DO_RESET); + return; } + + clear_bit(QL_RESET_ACTIVE, &qdev->flags); + clear_bit(QL_RESET_PER_SCSI, &qdev->flags); + clear_bit(QL_RESET_START, &qdev->flags); + ql_cycle_adapter(qdev, QL_NO_RESET); } -static void ql_tx_timeout_work(struct ql3_adapter *qdev) +static void ql_tx_timeout_work(void *_data) { - ql_cycle_adapter(qdev,QL_DO_RESET); + struct ql3_adapter *qdev = _data; + + ql_cycle_adapter(qdev, QL_DO_RESET); } static void ql_get_board_info(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; u32 value; value = ql_read_page0_reg_l(qdev, &port_regs->portStatus); @@ -3306,9 +3122,8 @@ static void ql3xxx_timer(unsigned long p { struct ql3_adapter *qdev = (struct ql3_adapter *)ptr; - if (test_bit(QL_RESET_ACTIVE,&qdev->flags)) { - printk(KERN_DEBUG PFX - "%s: Reset in progress.\n", + if (test_bit(QL_RESET_ACTIVE, &qdev->flags)) { + printk(KERN_DEBUG PFX "%s: Reset in progress.\n", qdev->ndev->name); goto end; } @@ -3381,10 +3196,9 @@ static int __devinit ql3xxx_probe(struct qdev->msg_enable = netif_msg_init(debug, default_msg); - qdev->mem_map_registers = - ioremap_nocache(pci_resource_start(pdev, 1), - pci_resource_len(qdev->pdev, 1)); - if (!qdev->mem_map_registers) { + qdev->ioaddr = ioremap_nocache(pci_resource_start(pdev, 1), + pci_resource_len(pdev, 1)); + if (!qdev->ioaddr) { printk(KERN_ERR PFX "%s: cannot map device registers\n", pci_name(pdev)); goto err_out_free_ndev; @@ -3442,9 +3256,8 @@ static int __devinit ql3xxx_probe(struct * Set the Maximum Memory Read Byte Count value. We do this to handle * jumbo frames. */ - if (qdev->pci_x) { + if (qdev->pci_x) pci_write_config_word(pdev, (int)0x4e, (u16) 0x0036); - } err = register_netdev(ndev); if (err) { @@ -3459,19 +3272,18 @@ static int __devinit ql3xxx_probe(struct netif_stop_queue(ndev); qdev->workqueue = create_singlethread_workqueue(ndev->name); - INIT_WORK(&qdev->reset_work, (void (*)(void *))ql_reset_work, qdev); - INIT_WORK(&qdev->tx_timeout_work, - (void (*)(void *))ql_tx_timeout_work, qdev); + INIT_WORK(&qdev->reset_work, ql_reset_work, qdev); + INIT_WORK(&qdev->tx_timeout_work, ql_tx_timeout_work, qdev); init_timer(&qdev->adapter_timer); qdev->adapter_timer.function = ql3xxx_timer; qdev->adapter_timer.expires = jiffies + HZ * 2; /* two second delay */ qdev->adapter_timer.data = (unsigned long)qdev; - if(!cards_found) { + if (!cards_found) { printk(KERN_ALERT PFX "%s\n", DRV_STRING); printk(KERN_ALERT PFX "Driver name: %s, Version: %s.\n", - DRV_NAME, DRV_VERSION); + DRV_NAME, DRV_VERSION); } ql_display_dev_info(ndev); @@ -3479,7 +3291,7 @@ static int __devinit ql3xxx_probe(struct return 0; err_out_iounmap: - iounmap(qdev->mem_map_registers); + iounmap(qdev->ioaddr); err_out_free_ndev: free_netdev(ndev); err_out_free_regions: @@ -3497,7 +3309,6 @@ static void __devexit ql3xxx_remove(stru struct ql3_adapter *qdev = netdev_priv(ndev); unregister_netdev(ndev); - qdev = netdev_priv(ndev); ql_disable_interrupts(qdev); @@ -3508,7 +3319,7 @@ static void __devexit ql3xxx_remove(stru qdev->workqueue = NULL; } - iounmap(qdev->mem_map_registers); + iounmap(qdev->ioaddr); pci_release_regions(pdev); pci_set_drvdata(pdev, NULL); free_netdev(ndev); diff --git a/drivers/net/qla3xxx.h b/drivers/net/qla3xxx.h index 65da2c0..3f6d7f7 100644 --- a/drivers/net/qla3xxx.h +++ b/drivers/net/qla3xxx.h @@ -1093,8 +1093,7 @@ struct ql3_adapter { spinlock_t hw_lock; /* PCI Bus Relative Register Addresses */ - u8 __iomem *mmap_virt_base; /* stores return value from ioremap() */ - struct ql3xxx_port_registers __iomem *mem_map_registers; + struct ql3xxx_port_registers __iomem *ioaddr; u32 current_page; /* tracks current register page */ u32 msg_enable;