GIT 9259378d56a748a77f2defc9add87baa797652ce git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6.git#qla3xxx commit Author: Francois Romieu Date: Wed Jan 10 23:26:51 2007 +0100 qla3xxx: more unsigned int and reduction of the scope of local variables - removed a few useless as well (addrBits/dataBits adn forward declaration of fm93c56a_deselect/eeprom_readword) ; - ql_process_mac_tx_intr: more unmapping work is done in the loop to reduce the code ; - ql_tx_rx_clean: use the existing local alias for qdev->nedv ; - ql3xxx_send: ugly. Signed-off-by: Francois Romieu commit e739a9001c90f3f4d0c80774a91525d00a8cda6b Author: Francois Romieu Date: Wed Jan 10 22:19:54 2007 +0100 qla3xxx: curly braces and line breaks Signed-off-by: Francois Romieu commit 8045325e37834e7046812712af405dcdec08baab Author: Francois Romieu Date: Wed Dec 27 21:27:24 2006 +0100 qla3xxx: propagate the return status of ql_sem_spinlock Signed-off-by: Francois Romieu commit 93df39d05d84ec96e6e00b80ed902db2d748256b Author: Francois Romieu Date: Fri Dec 22 15:17:49 2006 +0100 qla3xxx: trim #include list Signed-off-by: Francois Romieu commit 8033e92bfb8bf1c6bfcdd9579ac414a35718dab3 Author: Francois Romieu Date: Fri Dec 22 15:13:59 2006 +0100 qla3xxx: minor ql3xxx_probe changes - ql_display_dev_info - display driver and device name on each line. - ql3xxx_probe - remove unneeded initializations - ql3_adapter.index is almost useless. Use ql_version_printed instead - error path review. No problem. Signed-off-by: Francois Romieu commit d88b86ca28a1beddb9be9bbbb35eebd87ad426b5 Author: Francois Romieu Date: Fri Dec 22 14:56:03 2006 +0100 qla3xxx: factor out ql_write_page[012]_reg Signed-off-by: Francois Romieu commit 388ecd6a90be9776ed1421c806be90dfa2cb41f2 Author: Francois Romieu Date: Fri Dec 22 14:52:49 2006 +0100 qla3xxx: prettify ql_populate_free_queue It is shorter too. Signed-off-by: Francois Romieu commit 57bd9cac1277251a7f3f9e51d9847b2828d41041 Author: Francois Romieu Date: Fri Dec 22 14:44:47 2006 +0100 qla3xxx: parenthesis diet Signed-off-by: Francois Romieu commit 38d17afa5d83990c56462b35c59d77decabc6388 Author: Francois Romieu Date: Fri Dec 22 13:56:51 2006 +0100 qla3xxx: add local variables to access the registers It makes the code shorter and helps with indentation. Signed-off-by: Francois Romieu commit 289d9c4276b7c336d267618fdc584dfc3ed9a563 Author: Francois Romieu Date: Thu Dec 21 18:57:16 2006 +0100 qla3xxx: add/remove spaces (codingstyle) Signed-off-by: Francois Romieu commit 95a5ce52bb4e6caa6a329d6c1932e872d09a0883 Author: Francois Romieu Date: Thu Dec 21 15:06:18 2006 +0100 qla3xxx: remove return statements in void returning functions commit 13891170bb2f1991f855b35618135071ed856b79 Author: Francois Romieu Date: Fri Dec 22 13:11:39 2006 +0100 qla3xxx: rename 'mem_map_registers' to 'ioaddr' It is just the usual netdev ioremaped area. Signed-off-by: Francois Romieu commit f318acb27f1b06f142e90cd6a10c03d5afff6442 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 b2d2515833bacb1c87a70865d7e6fe95511fffeb Author: Francois Romieu Date: Fri Dec 22 13:06:51 2006 +0100 qla3xxx: rename 'hw_flags' to 'flags' for use with spinlock (cosmetic) Idiom. Signed-off-by: Francois Romieu commit 71100d83e41222b10549c05cf68be5e506740829 Author: Francois Romieu Date: Fri Dec 22 13:05:26 2006 +0100 qla3xxx: prettify ql_reset_work() Signed-off-by: Francois Romieu commit 998367551f16e7fefb0d7b7f891fa5e83f2f068b Author: Francois Romieu Date: Wed Dec 20 22:42:46 2006 +0100 qla3xxx: de-obfuscate ql_wait_for_drvr_lock() Signed-off-by: Francois Romieu commit fa5ce7b0c40f2a12bfe026eff5694fc014345a27 Author: Francois Romieu Date: Tue Sep 26 00:21:22 2006 +0200 qla3xxx: tab/space and duplicate variable Signed-off-by: Francois Romieu commit 7224518e4ec7206db7f9d1cf303c185ee43c53e9 Author: Francois Romieu Date: Wed Dec 20 22:34:14 2006 +0100 qla3xxx: remove cast to void * Signed-off-by: Francois Romieu commit f9441bdea9fa1dbd4efb2595caa31f8c6aec1f92 Author: Francois Romieu Date: Tue Sep 26 00:21:22 2006 +0200 qla3xxx: comment broken ssleep They are issued with spinlock held. Signed-off-by: Francois Romieu commit 28a5a10068c0e5d1de47b6e2ff4cc9507311e926 Author: Francois Romieu Date: Wed Dec 20 22:27:50 2006 +0100 qla3xxx: netdev_priv() use and duplicate initialization Signed-off-by: Francois Romieu commit a3cdde0d4cca9f5d392ab9ec53720b5be6a936b1 Author: Francois Romieu Date: Wed Dec 20 22:26:38 2006 +0100 qla3xxx: needless casts Signed-off-by: Francois Romieu drivers/net/qla3xxx.c | 1656 ++++++++++++++++++++++--------------------------- drivers/net/qla3xxx.h | 4 2 files changed, 747 insertions(+), 913 deletions(-) diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c old mode 100755 new mode 100644 index 2429b27..0ead1a7 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c @@ -9,13 +9,8 @@ #include #include #include #include -#include #include #include -#include -#include -#include -#include #include #include #include @@ -23,22 +18,18 @@ #include #include #include #include -#include -#include #include -#include #include #include #include #include -#include #include #include #include "qla3xxx.h" -#define DRV_NAME "qla3xxx" -#define DRV_STRING "QLogic ISP3XXX Network Driver" +#define DRV_NAME "qla3xxx" +#define DRV_STRING "QLogic ISP3XXX Network Driver" #define DRV_VERSION "v2.02.00-k36" #define PFX DRV_NAME " " @@ -50,9 +41,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); @@ -63,10 +53,10 @@ module_param(msi, int, 0); MODULE_PARM_DESC(msi, "Turn on Message Signaled Interrupts."); static struct pci_device_id ql3xxx_pci_tbl[] __devinitdata = { - {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QL3022_DEVICE_ID)}, - {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QL3032_DEVICE_ID)}, + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QL3022_DEVICE_ID) }, + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QL3032_DEVICE_ID) }, /* required last entry */ - {0,} + { 0, } }; MODULE_DEVICE_TABLE(pci, ql3xxx_pci_tbl); @@ -74,39 +64,36 @@ MODULE_DEVICE_TABLE(pci, ql3xxx_pci_tbl) /* * Caller must take hw_lock. */ -static int ql_sem_spinlock(struct ql3_adapter *qdev, - u32 sem_mask, u32 sem_bits) +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; + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.semaphoreReg; unsigned int seconds = 3; + u32 value; do { - writel((sem_mask | sem_bits), - &port_regs->CommonRegs.semaphoreReg); - value = readl(&port_regs->CommonRegs.semaphoreReg); + writel(sem_mask | sem_bits, reg); + value = readl(reg); if ((value & (sem_mask >> 16)) == sem_bits) return 0; ssleep(1); - } while(--seconds); - return -1; + } while (--seconds); + return -EBUSY; } static void ql_sem_unlock(struct ql3_adapter *qdev, u32 sem_mask) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; - writel(sem_mask, &port_regs->CommonRegs.semaphoreReg); - readl(&port_regs->CommonRegs.semaphoreReg); + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.semaphoreReg; + + writel(sem_mask, reg); + readl(reg); } 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; - u32 value; + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.semaphoreReg; - writel((sem_mask | sem_bits), &port_regs->CommonRegs.semaphoreReg); - value = readl(&port_regs->CommonRegs.semaphoreReg); - return ((value & (sem_mask >> 16)) == sem_bits); + writel(sem_mask | sem_bits, reg); + return (readl(reg) & (sem_mask >> 16)) == sem_bits; } /* @@ -114,92 +101,79 @@ static int ql_sem_lock(struct ql3_adapte */ static int ql_wait_for_drvr_lock(struct ql3_adapter *qdev) { - int i = 0; - - 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", + u32 bits = (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index * 2)) << 1; + unsigned int i; + + for (i = 0; i < 10; i++) { + if (ql_sem_lock(qdev, QL_DRVR_SEM_MASK, bits)) { + 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; + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.ispControlStatus; - writel(((ISP_CONTROL_NP_MASK << 16) | page), - &port_regs->CommonRegs.ispControlStatus); - readl(&port_regs->CommonRegs.ispControlStatus); + writel((ISP_CONTROL_NP_MASK << 16) | page, reg); + readl(reg); 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); + 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; } static u32 ql_read_page0_reg(struct ql3_adapter *qdev, u32 __iomem *reg) { if (qdev->current_page != 0) - ql_set_register_page(qdev,0); + ql_set_register_page(qdev, 0); return readl(reg); } static void ql_write_common_reg_l(struct ql3_adapter *qdev, 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, @@ -207,7 +181,6 @@ static void ql_write_common_reg(struct q { writel(value, reg); readl(reg); - return; } static void ql_write_nvram_reg(struct ql3_adapter *qdev, @@ -216,17 +189,21 @@ static void ql_write_nvram_reg(struct ql writel(value, reg); readl(reg); udelay(1); - return; } -static void ql_write_page0_reg(struct ql3_adapter *qdev, - u32 __iomem *reg, u32 value) +static void ql_write_page_reg(struct ql3_adapter *qdev, + u32 __iomem *reg, u32 value, unsigned int page) { - if (qdev->current_page != 0) - ql_set_register_page(qdev,0); + if (qdev->current_page != page) + ql_set_register_page(qdev, page); writel(value, reg); readl(reg); - return; +} + +static void ql_write_page0_reg(struct ql3_adapter *qdev, + u32 __iomem *reg, u32 value) +{ + ql_write_page_reg(qdev, reg, value, 0); } /* @@ -235,11 +212,7 @@ static void ql_write_page0_reg(struct ql static void ql_write_page1_reg(struct ql3_adapter *qdev, u32 __iomem *reg, u32 value) { - if (qdev->current_page != 1) - ql_set_register_page(qdev,1); - writel(value, reg); - readl(reg); - return; + ql_write_page_reg(qdev, reg, value, 1); } /* @@ -248,29 +221,21 @@ static void ql_write_page1_reg(struct ql static void ql_write_page2_reg(struct ql3_adapter *qdev, u32 __iomem *reg, u32 value) { - if (qdev->current_page != 2) - ql_set_register_page(qdev,2); - writel(value, reg); - readl(reg); - return; + ql_write_page_reg(qdev, reg, value, 2); } static void ql_disable_interrupts(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; - - ql_write_common_reg_l(qdev, &port_regs->CommonRegs.ispInterruptMaskReg, - (ISP_IMR_ENABLE_INT << 16)); + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.ispInterruptMaskReg; + ql_write_common_reg_l(qdev, reg, ISP_IMR_ENABLE_INT << 16); } static void ql_enable_interrupts(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; - - ql_write_common_reg_l(qdev, &port_regs->CommonRegs.ispInterruptMaskReg, - ((0xff << 16) | ISP_IMR_ENABLE_INT)); + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.ispInterruptMaskReg; + ql_write_common_reg_l(qdev, reg, (0xff << 16) | ISP_IMR_ENABLE_INT); } static void ql_release_to_lrg_buf_free_list(struct ql3_adapter *qdev, @@ -320,10 +285,11 @@ static void ql_release_to_lrg_buf_free_l static struct ql_rcv_buf_cb *ql_get_from_lrg_buf_free_list(struct ql3_adapter *qdev) { - struct ql_rcv_buf_cb *lrg_buf_cb; + struct ql_rcv_buf_cb *lrg_buf_cb = qdev->lrg_buf_free_head; - if ((lrg_buf_cb = qdev->lrg_buf_free_head) != NULL) { - if ((qdev->lrg_buf_free_head = lrg_buf_cb->next) == NULL) + if (lrg_buf_cb) { + qdev->lrg_buf_free_head = lrg_buf_cb->next; + if (!qdev->lrg_buf_free_head) qdev->lrg_buf_free_tail = NULL; qdev->lrg_buf_free_count--; } @@ -331,26 +297,17 @@ static struct ql_rcv_buf_cb *ql_get_from return lrg_buf_cb; } -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; + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.serialPortInterfaceReg; qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_1; - ql_write_nvram_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev->eeprom_cmd_data); - ql_write_nvram_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg, - ((ISP_NVRAM_MASK << 16) | qdev->eeprom_cmd_data)); + ql_write_nvram_reg(qdev, reg, ISP_NVRAM_MASK | qdev->eeprom_cmd_data); + ql_write_nvram_reg(qdev, reg, + (ISP_NVRAM_MASK << 16) | qdev->eeprom_cmd_data); } /* @@ -358,90 +315,64 @@ static void fm93c56a_select(struct ql3_a */ static void fm93c56a_cmd(struct ql3_adapter *qdev, u32 cmd, u32 eepromAddr) { - int i; + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.serialPortInterfaceReg; u32 mask; - u32 dataBit; u32 previousBit; - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + unsigned int i; /* Clock in a zero, then do the start bit */ - ql_write_nvram_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev->eeprom_cmd_data | - AUBURN_EEPROM_DO_1); - ql_write_nvram_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | AUBURN_EEPROM_DO_1 | - AUBURN_EEPROM_CLK_RISE); - ql_write_nvram_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | AUBURN_EEPROM_DO_1 | - AUBURN_EEPROM_CLK_FALL); + ql_write_nvram_reg(qdev, reg, ISP_NVRAM_MASK | qdev->eeprom_cmd_data | + AUBURN_EEPROM_DO_1); + ql_write_nvram_reg(qdev, reg, ISP_NVRAM_MASK | qdev->eeprom_cmd_data | + AUBURN_EEPROM_DO_1 | AUBURN_EEPROM_CLK_RISE); + ql_write_nvram_reg(qdev, reg, 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 */ previousBit = 0xffff; for (i = 0; i < FM93C56A_CMD_BITS; i++) { - dataBit = + u32 dataBit = (cmd & 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_nvram_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | dataBit); + ql_write_nvram_reg(qdev, reg, ISP_NVRAM_MASK | + qdev->eeprom_cmd_data | dataBit); previousBit = dataBit; } - ql_write_nvram_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | dataBit | - AUBURN_EEPROM_CLK_RISE); - ql_write_nvram_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | dataBit | - AUBURN_EEPROM_CLK_FALL); + ql_write_nvram_reg(qdev, reg, ISP_NVRAM_MASK | + qdev->eeprom_cmd_data | dataBit | + AUBURN_EEPROM_CLK_RISE); + ql_write_nvram_reg(qdev, reg, ISP_NVRAM_MASK | + qdev->eeprom_cmd_data | dataBit | + AUBURN_EEPROM_CLK_FALL); cmd = cmd << 1; } - mask = 1 << (addrBits - 1); + mask = 1 << (EEPROM_NO_ADDR_BITS - 1); /* 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; + for (i = 0; i < EEPROM_NO_ADDR_BITS; i++) { + u32 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_nvram_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | dataBit); + ql_write_nvram_reg(qdev, reg, ISP_NVRAM_MASK | + qdev->eeprom_cmd_data | dataBit); previousBit = dataBit; } - ql_write_nvram_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | dataBit | - AUBURN_EEPROM_CLK_RISE); - ql_write_nvram_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev-> - eeprom_cmd_data | dataBit | - AUBURN_EEPROM_CLK_FALL); + ql_write_nvram_reg(qdev, reg, ISP_NVRAM_MASK | + qdev-> eeprom_cmd_data | dataBit | + AUBURN_EEPROM_CLK_RISE); + ql_write_nvram_reg(qdev, reg, ISP_NVRAM_MASK | + qdev->eeprom_cmd_data | dataBit | + AUBURN_EEPROM_CLK_FALL); eepromAddr = eepromAddr << 1; } } @@ -451,11 +382,10 @@ 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; + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.serialPortInterfaceReg; + qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_0; - ql_write_nvram_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev->eeprom_cmd_data); + ql_write_nvram_reg(qdev, reg, ISP_NVRAM_MASK | qdev->eeprom_cmd_data); } /* @@ -463,31 +393,23 @@ static void fm93c56a_deselect(struct ql3 */ static void fm93c56a_datain(struct ql3_adapter *qdev, unsigned short *value) { - int i; + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.serialPortInterfaceReg; + unsigned 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_nvram_reg(qdev, - &port_regs->CommonRegs. - serialPortInterfaceReg, - ISP_NVRAM_MASK | qdev->eeprom_cmd_data | - AUBURN_EEPROM_CLK_RISE); - ql_write_nvram_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; - data = (data << 1) | dataBit; + for (i = 0; i < EEPROM_NO_DATA_BITS; i++) { + u32 dataBit; + + ql_write_nvram_reg(qdev, reg, ISP_NVRAM_MASK | + qdev->eeprom_cmd_data | + AUBURN_EEPROM_CLK_RISE); + ql_write_nvram_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; + data = ((data ? 1 : 0) << 1) | dataBit; } *value = (u16) data; } @@ -522,22 +444,22 @@ #endif static int ql_get_nvram_params(struct ql3_adapter *qdev) { + u32 bits = (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index * 2)) << 10; + unsigned long flags; u16 *pEEPROMData; u16 checksum = 0; u32 index; - unsigned long hw_flags; + int rc; - spin_lock_irqsave(&qdev->hw_lock, hw_flags); + spin_lock_irqsave(&qdev->hw_lock, flags); - pEEPROMData = (u16 *) & qdev->nvram_data; + 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)) { + rc = ql_sem_spinlock(qdev, QL_NVRAM_SEM_MASK, bits); + if (rc < 0) { printk(KERN_ERR PFX"%s: Failed ql_sem_spinlock().\n", __func__); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); - return -1; + goto out_unlock; } for (index = 0; index < EEPROM_SIZE; index++) { @@ -550,8 +472,8 @@ 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); - return -1; + rc = -EIO; + goto out_unlock; } /* @@ -563,11 +485,13 @@ static int ql_get_nvram_params(struct ql ql_swap_mac_addr(qdev->nvram_data.funcCfg_fn1.macAddress); ql_swap_mac_addr(qdev->nvram_data.funcCfg_fn2.macAddress); ql_swap_mac_addr(qdev->nvram_data.funcCfg_fn3.macAddress); - pEEPROMData = (u16 *) & qdev->nvram_data.version; + pEEPROMData = (u16 *) &qdev->nvram_data.version; *pEEPROMData = le16_to_cpu(*pEEPROMData); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); - return checksum; +out_unlock: + spin_unlock_irqrestore(&qdev->hw_lock, flags); + + return rc; } static const u32 PHYAddr[2] = { @@ -576,30 +500,28 @@ 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; - u32 temp; - int count = 1000; + u32 __iomem *reg = &qdev->ioaddr->macMIIStatusReg; + unsigned int i; - while (count) { - temp = ql_read_page0_reg(qdev, &port_regs->macMIIStatusReg); - if (!(temp & MAC_MII_STATUS_BSY)) + for (i = 0; i < 1000; i++) { + if (!(ql_read_page0_reg(qdev, reg) & MAC_MII_STATUS_BSY)) return 0; udelay(10); - count--; } return -1; } +#define MAC_MII_CONTROL_SC_AS (MAC_MII_CONTROL_AS | MAC_MII_CONTROL_SC) + static void ql_mii_enable_scan_mode(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + u32 __iomem *ctrl = &qdev->ioaddr->macMIIMgmtControlReg; + u32 __iomem *addr = &qdev->ioaddr->macMIIMgmtAddrReg; u32 scanControl; if (qdev->numPorts > 1) { /* Auto scan will cycle through multiple ports */ - scanControl = MAC_MII_CONTROL_AS | MAC_MII_CONTROL_SC; + scanControl = MAC_MII_CONTROL_SC_AS; } else { scanControl = MAC_MII_CONTROL_SC; } @@ -610,40 +532,27 @@ static void ql_mii_enable_scan_mode(stru * The autoscan starts from the first register, completes * the last one before rolling over to the first */ - ql_write_page0_reg(qdev, &port_regs->macMIIMgmtAddrReg, - PHYAddr[0] | MII_SCAN_REGISTER); - - ql_write_page0_reg(qdev, &port_regs->macMIIMgmtControlReg, - (scanControl) | - ((MAC_MII_CONTROL_SC | MAC_MII_CONTROL_AS) << 16)); + ql_write_page0_reg(qdev, addr, PHYAddr[0] | MII_SCAN_REGISTER); + ql_write_page0_reg(qdev, ctrl, + scanControl | (MAC_MII_CONTROL_SC_AS << 16)); } static u8 ql_mii_disable_scan_mode(struct ql3_adapter *qdev) { + u32 __iomem *ctrl = &qdev->ioaddr->macMIIMgmtControlReg; + u32 __iomem *addr = &qdev->ioaddr->macMIIMgmtAddrReg; 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) & - (MAC_MII_CONTROL_AS | MAC_MII_CONTROL_SC)) { - /* Scan is enabled */ - ret = 1; - } else { - /* Scan is disabled */ - ret = 0; - } + + /* See if scan mode is enabled (1) or not (0) before we turn it off */ + ret = (ql_read_page0_reg(qdev, ctrl) & MAC_MII_CONTROL_SC_AS) ? 1 : 0; /* * When disabling scan mode you must first change the MII register * address */ - ql_write_page0_reg(qdev, &port_regs->macMIIMgmtAddrReg, - PHYAddr[0] | MII_SCAN_REGISTER); - - ql_write_page0_reg(qdev, &port_regs->macMIIMgmtControlReg, - ((MAC_MII_CONTROL_SC | MAC_MII_CONTROL_AS | - MAC_MII_CONTROL_RC) << 16)); + ql_write_page0_reg(qdev, addr, PHYAddr[0] | MII_SCAN_REGISTER); + ql_write_page0_reg(qdev, ctrl, + (MAC_MII_CONTROL_SC_AS | MAC_MII_CONTROL_RC) << 16); return ret; } @@ -651,33 +560,33 @@ 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; + u32 __iomem *addr = &qdev->ioaddr->macMIIMgmtAddrReg; + u32 __iomem *data = &qdev->ioaddr->macMIIMgmtDataReg; u8 scanWasEnabled; scanWasEnabled = ql_mii_disable_scan_mode(qdev); if (ql_wait_for_mii_ready(qdev)) { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_WARNING PFX "%s Timed out waiting for management port to " "get free before issuing command.\n", qdev->ndev->name); + } return -1; } - ql_write_page0_reg(qdev, &port_regs->macMIIMgmtAddrReg, - PHYAddr[mac_index] | regAddr); - - ql_write_page0_reg(qdev, &port_regs->macMIIMgmtDataReg, value); + ql_write_page0_reg(qdev, addr, PHYAddr[mac_index] | regAddr); + ql_write_page0_reg(qdev, data, value); /* Wait for write to complete 9/10/04 SJP */ if (ql_wait_for_mii_ready(qdev)) { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_WARNING PFX "%s: Timed out waiting for management port to" "get free before issuing command.\n", qdev->ndev->name); + } return -1; } @@ -690,19 +599,19 @@ 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; scanWasEnabled = ql_mii_disable_scan_mode(qdev); if (ql_wait_for_mii_ready(qdev)) { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_WARNING PFX "%s: Timed out waiting for management port to " "get free before issuing command.\n", qdev->ndev->name); + } return -1; } @@ -710,18 +619,19 @@ static int ql_mii_read_reg_ex(struct ql3 PHYAddr[mac_index] | regAddr); ql_write_page0_reg(qdev, &port_regs->macMIIMgmtControlReg, - (MAC_MII_CONTROL_RC << 16)); + MAC_MII_CONTROL_RC << 16); ql_write_page0_reg(qdev, &port_regs->macMIIMgmtControlReg, (MAC_MII_CONTROL_RC << 16) | MAC_MII_CONTROL_RC); /* Wait for the read to complete */ if (ql_wait_for_mii_ready(qdev)) { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_WARNING PFX "%s: Timed out waiting for management port to " "get free after issuing command.\n", qdev->ndev->name); + } return -1; } @@ -736,32 +646,32 @@ 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; + u32 __iomem *addr = &qdev->ioaddr->macMIIMgmtAddrReg; + u32 __iomem *data = &qdev->ioaddr->macMIIMgmtDataReg; ql_mii_disable_scan_mode(qdev); if (ql_wait_for_mii_ready(qdev)) { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_WARNING PFX "%s: Timed out waiting for management port to " "get free before issuing command.\n", qdev->ndev->name); + } return -1; } - ql_write_page0_reg(qdev, &port_regs->macMIIMgmtAddrReg, - qdev->PHYAddr | regAddr); - - ql_write_page0_reg(qdev, &port_regs->macMIIMgmtDataReg, value); + ql_write_page0_reg(qdev, addr, qdev->PHYAddr | regAddr); + ql_write_page0_reg(qdev, data, value); /* Wait for write to complete. */ if (ql_wait_for_mii_ready(qdev)) { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_WARNING PFX "%s: Timed out waiting for management port to " "get free before issuing command.\n", qdev->ndev->name); + } return -1; } @@ -772,18 +682,18 @@ 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); if (ql_wait_for_mii_ready(qdev)) { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_WARNING PFX "%s: Timed out waiting for management port to " "get free before issuing command.\n", qdev->ndev->name); + } return -1; } @@ -791,18 +701,19 @@ static int ql_mii_read_reg(struct ql3_ad qdev->PHYAddr | regAddr); ql_write_page0_reg(qdev, &port_regs->macMIIMgmtControlReg, - (MAC_MII_CONTROL_RC << 16)); + MAC_MII_CONTROL_RC << 16); ql_write_page0_reg(qdev, &port_regs->macMIIMgmtControlReg, (MAC_MII_CONTROL_RC << 16) | MAC_MII_CONTROL_RC); /* Wait for the read to complete */ if (ql_wait_for_mii_ready(qdev)) { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_WARNING PFX "%s: Timed out waiting for management port to " "get free before issuing command.\n", qdev->ndev->name); + } return -1; } @@ -890,7 +801,7 @@ static int ql_phy_get_speed(struct ql3_a if (ql_mii_read_reg(qdev, AUX_CONTROL_STATUS, ®) < 0) return 0; - reg = (((reg & 0x18) >> 3) & 3); + reg = ((reg & 0x18) >> 3) & 3; if (reg == 2) return SPEED_1000; @@ -927,14 +838,11 @@ 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; - u32 value; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; + u32 value = MAC_CONFIG_REG_PE << 16; if (enable) - value = (MAC_CONFIG_REG_PE | (MAC_CONFIG_REG_PE << 16)); - else - value = (MAC_CONFIG_REG_PE << 16); + value |= MAC_CONFIG_REG_PE; if (qdev->mac_index) ql_write_page0_reg(qdev, &port_regs->mac1ConfigReg, value); @@ -947,14 +855,11 @@ 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; - u32 value; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; + u32 value = MAC_CONFIG_REG_SR << 16; if (enable) - value = (MAC_CONFIG_REG_SR | (MAC_CONFIG_REG_SR << 16)); - else - value = (MAC_CONFIG_REG_SR << 16); + value |= MAC_CONFIG_REG_SR; if (qdev->mac_index) ql_write_page0_reg(qdev, &port_regs->mac1ConfigReg, value); @@ -967,14 +872,11 @@ 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; - u32 value; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; + u32 value = MAC_CONFIG_REG_GM << 16; if (enable) - value = (MAC_CONFIG_REG_GM | (MAC_CONFIG_REG_GM << 16)); - else - value = (MAC_CONFIG_REG_GM << 16); + value |= MAC_CONFIG_REG_GM; if (qdev->mac_index) ql_write_page0_reg(qdev, &port_regs->mac1ConfigReg, value); @@ -987,14 +889,11 @@ 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; - u32 value; + struct ql3xxx_port_registers __iomem *port_regs = qdev->ioaddr; + u32 value = MAC_CONFIG_REG_FD << 16; if (enable) - value = (MAC_CONFIG_REG_FD | (MAC_CONFIG_REG_FD << 16)); - else - value = (MAC_CONFIG_REG_FD << 16); + value |= MAC_CONFIG_REG_FD; if (qdev->mac_index) ql_write_page0_reg(qdev, &port_regs->mac1ConfigReg, value); @@ -1007,8 +906,7 @@ 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) @@ -1029,8 +927,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; @@ -1059,8 +956,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; @@ -1075,16 +971,18 @@ static int ql_is_auto_neg_complete(struc temp = ql_read_page0_reg(qdev, &port_regs->portStatus); if (temp & bitToCheck) { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_INFO PFX "%s: Auto-Negotiate complete.\n", qdev->ndev->name); + } return 1; } else { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_WARNING PFX "%s: Auto-Negotiate incomplete.\n", qdev->ndev->name); + } return 0; } } @@ -1102,8 +1000,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; @@ -1140,10 +1037,8 @@ 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; + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.ispControlStatus; u32 bitToCheck = 0; - u32 temp; switch (qdev->mac_index) { case 0: @@ -1154,9 +1049,7 @@ static int ql_link_down_detect(struct ql break; } - temp = - ql_read_common_reg(qdev, &port_regs->CommonRegs.ispControlStatus); - return (temp & bitToCheck) != 0; + return (ql_read_common_reg(qdev, reg) & bitToCheck) != 0; } /* @@ -1164,21 +1057,16 @@ 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; + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.ispControlStatus; switch (qdev->mac_index) { case 0: - ql_write_common_reg(qdev, - &port_regs->CommonRegs.ispControlStatus, - (ISP_CONTROL_LINK_DN_0) | + 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) | + ql_write_common_reg(qdev, reg, ISP_CONTROL_LINK_DN_1 | (ISP_CONTROL_LINK_DN_1 << 16)); break; @@ -1195,8 +1083,6 @@ 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; u32 bitToCheck = 0; u32 temp; @@ -1211,16 +1097,18 @@ static int ql_this_adapter_controls_port break; } - temp = ql_read_page0_reg(qdev, &port_regs->portStatus); + temp = ql_read_page0_reg(qdev, &qdev->ioaddr->portStatus); if (temp & bitToCheck) { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_DEBUG PFX "%s: is not link master.\n", qdev->ndev->name); + } return 0; } else { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_DEBUG PFX "%s: is link master.\n", qdev->ndev->name); + } return 1; } } @@ -1253,8 +1141,6 @@ 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; u32 bitToCheck = 0; u32 temp, linkState; @@ -1266,24 +1152,27 @@ static u32 ql_get_link_state(struct ql3_ bitToCheck = PORT_STATUS_UP1; break; } - temp = ql_read_page0_reg(qdev, &port_regs->portStatus); + temp = ql_read_page0_reg(qdev, &qdev->ioaddr->portStatus); if (temp & bitToCheck) { linkState = LS_UP; } else { linkState = LS_DOWN; - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_WARNING PFX "%s: Link is down.\n", qdev->ndev->name); + } } return linkState; } 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)) - return -1; + u32 bits = (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index * 2)) << 7; + int rc; + + rc = ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, bits); + if (rc < 0) + goto out; if (ql_is_fiber(qdev)) { ql_petbi_init(qdev); @@ -1293,121 +1182,120 @@ static int ql_port_start(struct ql3_adap } ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK); - return 0; +out: + return rc; } static int ql_finish_auto_neg(struct ql3_adapter *qdev) { + u32 bits = (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index * 2)) << 7; + int rc; - if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * - 2) << 7)) - return -1; + rc = ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, bits); + if (rc < 0) + goto out; if (!ql_auto_neg_error(qdev)) { 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); + if (netif_msg_link(qdev)) { + printk(KERN_DEBUG PFX "%s: Configuring link.\n", + 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); + if (netif_msg_link(qdev)) { + printk(KERN_DEBUG PFX "%s: Enabling mac.\n", + qdev->ndev->name); + } ql_mac_enable(qdev, 1); } - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_DEBUG PFX "%s: Change port_link_state LS_DOWN to LS_UP.\n", qdev->ndev->name); + } qdev->port_link_state = LS_UP; netif_start_queue(qdev->ndev); netif_carrier_on(qdev->ndev); - if (netif_msg_link(qdev)) + 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"); - + } } else { /* Remote error detected */ - if (test_bit(QL_LINK_MASTER,&qdev->flags)) { - if (netif_msg_link(qdev)) + 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; } } ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK); - return 0; +out: + return rc; } 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 (netif_msg_link(qdev)) + if (test_bit(QL_RESET_ACTIVE, &qdev->flags)) { + if (netif_msg_link(qdev)) { printk(KERN_INFO PFX "%s: Reset in progress, skip processing link " "state.\n", qdev->ndev->name); + } + /* FIXME: return with spinlock held. */ return; } 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 */ case LS_DOWN: - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_DEBUG PFX "%s: port_link_state = LS_DOWN.\n", qdev->ndev->name); + } if (curr_link_state == LS_UP) { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_DEBUG PFX "%s: curr_link_state = LS_UP.\n", qdev->ndev->name); + } if (ql_is_auto_neg_complete(qdev)) ql_finish_auto_neg(qdev); @@ -1423,14 +1311,15 @@ static void ql_link_state_machine(struct * back up */ if ((curr_link_state == LS_DOWN) || ql_link_down_detect(qdev)) { - if (netif_msg_link(qdev)) + if (netif_msg_link(qdev)) { printk(KERN_INFO PFX "%s: Link is down.\n", qdev->ndev->name); + } qdev->port_link_state = LS_DOWN; } break; } - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + spin_unlock_irqrestore(&qdev->hw_lock, flags); } /* @@ -1439,9 +1328,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); } /* @@ -1451,7 +1340,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 { @@ -1468,91 +1357,104 @@ static void ql_init_scan_mode(struct ql3 */ static int ql_mii_setup(struct ql3_adapter *qdev) { - u32 reg; - struct ql3xxx_port_registers __iomem *port_regs = - qdev->mem_map_registers; + u32 bits = (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index * 2)) << 7; + u32 __iomem *ctrl = &qdev->ioaddr->macMIIMgmtControlReg; + int rc; - if(ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * - 2) << 7)) - return -1; + rc = ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, bits); + if (rc < 0) + goto out; if (qdev->device_id == QL3032_DEVICE_ID) - ql_write_page0_reg(qdev, - &port_regs->macMIIMgmtControlReg, 0x0f00000); + ql_write_page0_reg(qdev, ctrl, 0x0f00000); /* Divide 125MHz clock by 28 to meet PHY timing requirements */ - reg = MAC_MII_CONTROL_CLK_SEL_DIV28; - - ql_write_page0_reg(qdev, &port_regs->macMIIMgmtControlReg, - reg | ((MAC_MII_CONTROL_CLK_SEL_MASK) << 16)); + ql_write_page0_reg(qdev, ctrl, MAC_MII_CONTROL_CLK_SEL_DIV28 | + (MAC_MII_CONTROL_CLK_SEL_MASK << 16)); ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK); - return 0; +out: + return rc; } static u32 ql_supported_modes(struct ql3_adapter *qdev) { 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_Autoneg | SUPPORTED_TP | + SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | + SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | + SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full; } return supported; } +// FIXME: the caller does not check the returned value. static int ql_get_auto_cfg_status(struct ql3_adapter *qdev) { + u32 bits = (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index * 2)) << 7; + 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)) - return 0; + int rc; + + spin_lock_irqsave(&qdev->hw_lock, flags); + + rc = ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, bits); + if (rc < 0) { + status = 0; + goto out_unlock; + } status = ql_is_auto_cfg(qdev); ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); +out_unlock: + spin_unlock_irqrestore(&qdev->hw_lock, flags); return status; } +// FIXME: the caller does not check the returned value. static u32 ql_get_speed(struct ql3_adapter *qdev) { + u32 bits = (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index * 2)) << 7; + 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)) - return 0; + int rc; + + spin_lock_irqsave(&qdev->hw_lock, flags); + rc = ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, bits); + if (rc < 0) { + status = 0; + goto out_unlock; + } status = ql_get_link_speed(qdev); ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); +out_unlock: + spin_unlock_irqrestore(&qdev->hw_lock, flags); return status; } +// FIXME: the caller does not check the returned value. static int ql_get_full_dup(struct ql3_adapter *qdev) { + u32 bits = (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index * 2)) << 7; + 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)) - return 0; + int rc; + + spin_lock_irqsave(&qdev->hw_lock, flags); + rc = ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, bits); + if (rc < 0) { + status = 0; + goto out_unlock; + } status = ql_is_link_full_dup(qdev); ql_sem_unlock(qdev, QL_PHY_GIO_SEM_MASK); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); +out_unlock: + spin_unlock_irqrestore(&qdev->hw_lock, flags); return status; } @@ -1564,7 +1466,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; @@ -1581,6 +1483,7 @@ static void ql_get_drvinfo(struct net_de struct ethtool_drvinfo *drvinfo) { struct ql3_adapter *qdev = netdev_priv(ndev); + strncpy(drvinfo->driver, ql3xxx_driver_name, 32); strncpy(drvinfo->version, ql3xxx_driver_version, 32); strncpy(drvinfo->fw_version, "N/A", 32); @@ -1594,12 +1497,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; } @@ -1614,42 +1519,39 @@ static const struct ethtool_ops ql3xxx_e static int ql_populate_free_queue(struct ql3_adapter *qdev) { - struct ql_rcv_buf_cb *lrg_buf_cb = qdev->lrg_buf_free_head; - u64 map; + struct ql_rcv_buf_cb *rx_cb; - while (lrg_buf_cb) { - if (!lrg_buf_cb->skb) { - lrg_buf_cb->skb = dev_alloc_skb(qdev->lrg_buffer_len); - if (unlikely(!lrg_buf_cb->skb)) { - printk(KERN_DEBUG PFX - "%s: Failed dev_alloc_skb().\n", - qdev->ndev->name); - break; - } else { - /* - * We save some space to copy the ethhdr from - * first buffer - */ - skb_reserve(lrg_buf_cb->skb, QL_HEADER_SPACE); - map = pci_map_single(qdev->pdev, - lrg_buf_cb->skb->data, - qdev->lrg_buffer_len - - QL_HEADER_SPACE, - PCI_DMA_FROMDEVICE); - lrg_buf_cb->buf_phy_addr_low = - cpu_to_le32(LS_64BITS(map)); - lrg_buf_cb->buf_phy_addr_high = - cpu_to_le32(MS_64BITS(map)); - pci_unmap_addr_set(lrg_buf_cb, mapaddr, map); - pci_unmap_len_set(lrg_buf_cb, maplen, - qdev->lrg_buffer_len - - QL_HEADER_SPACE); - --qdev->lrg_buf_skb_check; - if (!qdev->lrg_buf_skb_check) - return 1; - } + for (rx_cb = qdev->lrg_buf_free_head; rx_cb; rx_cb = rx_cb->next) { + u64 map; + + if (rx_cb->skb) + continue; + + rx_cb->skb = dev_alloc_skb(qdev->lrg_buffer_len); + if (unlikely(!rx_cb->skb)) { + printk(KERN_DEBUG PFX "%s: Failed dev_alloc_skb().\n", + qdev->ndev->name); + break; } - lrg_buf_cb = lrg_buf_cb->next; + /* + * We save some space to copy the ethhdr from + * first buffer + */ + skb_reserve(rx_cb->skb, QL_HEADER_SPACE); + map = pci_map_single(qdev->pdev, rx_cb->skb->data, + qdev->lrg_buffer_len - QL_HEADER_SPACE, + PCI_DMA_FROMDEVICE); + + rx_cb->buf_phy_addr_low = cpu_to_le32(LS_64BITS(map)); + rx_cb->buf_phy_addr_high = cpu_to_le32(MS_64BITS(map)); + + pci_unmap_addr_set(rx_cb, mapaddr, map); + pci_unmap_len_set(rx_cb, maplen, + qdev->lrg_buffer_len - QL_HEADER_SPACE); + + --qdev->lrg_buf_skb_check; + if (!qdev->lrg_buf_skb_check) + return 1; } return 0; } @@ -1659,13 +1561,12 @@ static int ql_populate_free_queue(struct */ static void ql_update_lrg_bufq_prod_index(struct ql3_adapter *qdev) { + u32 __iomem *idx = &qdev->ioaddr->CommonRegs.rxLargeQProducerIndex; 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)) @@ -1673,8 +1574,9 @@ static void ql_update_lrg_bufq_prod_inde 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)) { + unsigned int i; for (i = 0; i < 8; i++) { lrg_buf_cb = @@ -1701,34 +1603,23 @@ static void ql_update_lrg_bufq_prod_inde qdev->lrg_buf_next_free = lrg_buf_q_ele; - ql_write_common_reg(qdev, - &port_regs->CommonRegs. - rxLargeQProducerIndex, - qdev->lrg_buf_q_producer_index); + ql_write_common_reg(qdev, idx, qdev->lrg_buf_q_producer_index); } } static void ql_process_mac_tx_intr(struct ql3_adapter *qdev, struct ob_mac_iocb_rsp *mac_rsp) { - struct ql_tx_buf_cb *tx_cb; - int i; + struct ql_tx_buf_cb *tx_cb = &qdev->tx_buf[mac_rsp->transaction_id]; + unsigned int i; - tx_cb = &qdev->tx_buf[mac_rsp->transaction_id]; - pci_unmap_single(qdev->pdev, - pci_unmap_addr(&tx_cb->map[0], mapaddr), - pci_unmap_len(&tx_cb->map[0], maplen), - PCI_DMA_TODEVICE); - tx_cb->seg_count--; - if (tx_cb->seg_count) { - for (i = 1; i < tx_cb->seg_count; i++) { - pci_unmap_page(qdev->pdev, - pci_unmap_addr(&tx_cb->map[i], - mapaddr), - pci_unmap_len(&tx_cb->map[i], maplen), - PCI_DMA_TODEVICE); - } + for (i = 0; !i || (i < tx_cb->seg_count); i++) { + pci_unmap_page(qdev->pdev, + pci_unmap_addr(tx_cb->map + i, mapaddr), + pci_unmap_len(tx_cb->map + i, maplen), + PCI_DMA_TODEVICE); } + tx_cb->seg_count--; qdev->stats.tx_packets++; qdev->stats.tx_bytes += tx_cb->skb->len; dev_kfree_skb_irq(tx_cb->skb); @@ -1910,16 +1801,16 @@ 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_common_registers __iomem *regs = + &qdev->ioaddr->CommonRegs; struct net_device *ndev = qdev->ndev; - unsigned long hw_flags; + unsigned long flags; /* While there are entries in the completion queue. */ while ((cpu_to_le32(*(qdev->prsp_producer_index)) != qdev->rsp_consumer_index) && (*rx_cleaned < work_to_do)) { + struct net_rsp_iocb *net_rsp = qdev->rsp_current; - net_rsp = qdev->rsp_current; switch (net_rsp->opcode) { case OPCODE_OB_MAC_IOCB_FN0: @@ -1946,8 +1837,7 @@ static int ql_tx_rx_clean(struct ql3_ada { 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); @@ -1970,7 +1860,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); @@ -1984,21 +1874,18 @@ static int ql_tx_rx_clean(struct ql3_ada qdev->small_buf_release_cnt -= 8; } - ql_write_common_reg(qdev, - &port_regs->CommonRegs. - rxSmallQProducerIndex, + ql_write_common_reg(qdev, ®s->rxSmallQProducerIndex, qdev->small_buf_q_producer_index); } - ql_write_common_reg(qdev, - &port_regs->CommonRegs.rspQConsumerIndex, + ql_write_common_reg(qdev, ®s->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) && + if (unlikely(netif_queue_stopped(ndev))) { + if (netif_queue_stopped(ndev) && (atomic_read(&qdev->tx_count) > (NUM_REQ_Q_ENTRIES / 4))) - netif_wake_queue(qdev->ndev); + netif_wake_queue(ndev); } return *tx_cleaned + *rx_cleaned; @@ -2028,48 +1915,45 @@ 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; + u32 __iomem *ctl = &qdev->ioaddr->CommonRegs.ispControlStatus; + unsigned int handled = 1; u32 value; - int handled = 1; - u32 var; - - port_regs = qdev->mem_map_registers; - value = - ql_read_common_reg_l(qdev, &port_regs->CommonRegs.ispControlStatus); + value = ql_read_common_reg_l(qdev, ctl); if (value & (ISP_CONTROL_FE | ISP_CONTROL_RI)) { spin_lock(&qdev->adapter_lock); + netif_stop_queue(qdev->ndev); 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); + u32 __iomem *reg = &qdev->ioaddr->PortFatalErrStatus; + u32 var = ql_read_page0_reg_l(qdev, reg); + 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); } queue_delayed_work(qdev->workqueue, &qdev->reset_work, 0); + spin_unlock(&qdev->adapter_lock); } else if (value & ISP_IMR_DISABLE_CMPL_INT) { ql_disable_interrupts(qdev); @@ -2122,12 +2006,11 @@ static int ql_get_seg_count(unsigned sho static void ql_hw_csum_setup(struct sk_buff *skb, struct ob_mac_iocb_req *mac_iocb_ptr) { - struct ethhdr *eth; + struct ethhdr *eth = (struct ethhdr *) skb->data; + struct iphdr *ip = NULL; u8 offset = ETH_HLEN; - eth = (struct ethhdr *)(skb->data); - if (eth->h_proto == __constant_htons(ETH_P_IP)) { ip = (struct iphdr *)&skb->data[ETH_HLEN]; } else if (eth->h_proto == htons(ETH_P_8021Q) && @@ -2163,62 +2046,65 @@ static void ql_hw_csum_setup(struct sk_b */ 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 ql_tx_buf_cb *tx_cb; - u32 tot_len = skb->len; - struct oal *oal; - struct oal_entry *oal_entry; - int len; + struct ql3_adapter *qdev = netdev_priv(ndev); + u32 __iomem *idx = &qdev->ioaddr->CommonRegs.reqQProducerIndex; + int frag_cnt = (int)skb_shinfo(skb)->nr_frags; struct ob_mac_iocb_req *mac_iocb_ptr; + struct oal_entry *oal_entry; + struct ql_tx_buf_cb *tx_cb; + unsigned int len; u64 map; - int seg_cnt, seg = 0; - int frag_cnt = (int)skb_shinfo(skb)->nr_frags; if (unlikely(atomic_read(&qdev->tx_count) < 2)) { if (!netif_queue_stopped(ndev)) netif_stop_queue(ndev); return NETDEV_TX_BUSY; } - tx_cb = &qdev->tx_buf[qdev->req_producer_index] ; - seg_cnt = tx_cb->seg_count = ql_get_seg_count((skb_shinfo(skb)->nr_frags)); - if(seg_cnt == -1) { + + tx_cb = &qdev->tx_buf[qdev->req_producer_index]; + tx_cb->seg_count = ql_get_seg_count((skb_shinfo(skb)->nr_frags)); + if (tx_cb->seg_count == -1) { printk(KERN_ERR PFX"%s: invalid segment count!\n",__func__); return NETDEV_TX_OK; } + 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; - mac_iocb_ptr->data_len = cpu_to_le16((u16) tot_len); + mac_iocb_ptr->data_len = cpu_to_le16((u16) skb->len); tx_cb->skb = skb; if (skb->ip_summed == CHECKSUM_PARTIAL) ql_hw_csum_setup(skb, mac_iocb_ptr); + len = skb_headlen(skb); map = pci_map_single(qdev->pdev, skb->data, len, PCI_DMA_TODEVICE); oal_entry = (struct oal_entry *)&mac_iocb_ptr->buf_addr0_low; oal_entry->dma_lo = cpu_to_le32(LS_64BITS(map)); oal_entry->dma_hi = cpu_to_le32(MS_64BITS(map)); oal_entry->len = cpu_to_le32(len); - pci_unmap_addr_set(&tx_cb->map[seg], mapaddr, map); - pci_unmap_len_set(&tx_cb->map[seg], maplen, len); - seg++; - - if (!skb_shinfo(skb)->nr_frags) { - /* Terminate the last segment. */ - oal_entry->len = - cpu_to_le32(le32_to_cpu(oal_entry->len) | OAL_LAST_ENTRY); - } else { - int i; - oal = tx_cb->oal; - for (i=0; imap, mapaddr, map); + pci_unmap_len_set(tx_cb->map, maplen, len); + + if (frag_cnt) { + const int seg_cnt = tx_cb->seg_count; + struct oal *oal = tx_cb->oal; + unsigned int seg; + unsigned int i; + + for (i = 0, seg = 1; i < frag_cnt; i++, seg++) { skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; oal_entry++; - if ((seg == 2 && seg_cnt > 3) || /* Check for continuation */ - (seg == 7 && seg_cnt > 8) || /* requirements. It's strange */ - (seg == 12 && seg_cnt > 13) || /* but necessary. */ + /* + * Check for continuation requirements. It's strange + * but necessary. + */ + if ((seg == 2 && seg_cnt > 3) || + (seg == 7 && seg_cnt > 8) || + (seg == 12 && seg_cnt > 13) || (seg == 17 && seg_cnt > 18)) { /* Continuation entry points to outbound address list. */ map = pci_map_single(qdev->pdev, oal, @@ -2238,10 +2124,9 @@ static int ql3xxx_send(struct sk_buff *s seg++; } - map = - pci_map_page(qdev->pdev, frag->page, - frag->page_offset, frag->size, - PCI_DMA_TODEVICE); + map = pci_map_page(qdev->pdev, frag->page, + frag->page_offset, frag->size, + PCI_DMA_TODEVICE); oal_entry->dma_lo = cpu_to_le32(LS_64BITS(map)); oal_entry->dma_hi = cpu_to_le32(MS_64BITS(map)); oal_entry->len = cpu_to_le32(frag->size); @@ -2249,23 +2134,23 @@ static int ql3xxx_send(struct sk_buff *s pci_unmap_len_set(&tx_cb->map[seg], maplen, frag->size); } - /* Terminate the last segment. */ - oal_entry->len = - cpu_to_le32(le32_to_cpu(oal_entry->len) | OAL_LAST_ENTRY); } + + /* Terminate the last segment */ + len = le32_to_cpu(oal_entry->len) | OAL_LAST_ENTRY; + oal_entry->len = cpu_to_le32(len); wmb(); qdev->req_producer_index++; 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, idx, qdev->req_producer_index); ndev->trans_start = jiffies; - if (netif_msg_tx_queued(qdev)) + if (netif_msg_tx_queued(qdev)) { printk(KERN_DEBUG PFX "%s: tx queued, slot %d, len %d\n", ndev->name, qdev->req_producer_index, skb->len); + } atomic_dec(&qdev->tx_count); return NETDEV_TX_OK; @@ -2306,14 +2191,14 @@ 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; @@ -2331,7 +2216,7 @@ static void ql_free_net_req_rsp_queues(s 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) @@ -2382,15 +2267,14 @@ 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; } @@ -2408,13 +2292,13 @@ static void ql_free_buffer_queues(struct 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) { - int i; struct bufq_addr_element *small_buf_q_entry; + unsigned int i; /* Currently we allocate on one of memory and use it for smallbuffers */ qdev->small_buf_total_size = @@ -2427,8 +2311,7 @@ static int ql_alloc_small_buffers(struct &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; } @@ -2450,15 +2333,14 @@ 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) { @@ -2473,8 +2355,8 @@ static void ql_free_small_buffers(struct static void ql_free_large_buffers(struct ql3_adapter *qdev) { - int i = 0; struct ql_rcv_buf_cb *lrg_buf_cb; + unsigned int i; for (i = 0; i < NUM_LARGE_BUFFERS; i++) { lrg_buf_cb = &qdev->lrg_buf[i]; @@ -2493,9 +2375,9 @@ static void ql_free_large_buffers(struct static void ql_init_large_buffers(struct ql3_adapter *qdev) { - int i; - struct ql_rcv_buf_cb *lrg_buf_cb; struct bufq_addr_element *buf_addr_ele = qdev->lrg_buf_q_virt_addr; + struct ql_rcv_buf_cb *lrg_buf_cb; + unsigned int i; for (i = 0; i < NUM_LARGE_BUFFERS; i++) { lrg_buf_cb = &qdev->lrg_buf[i]; @@ -2509,12 +2391,13 @@ static void ql_init_large_buffers(struct static int ql_alloc_large_buffers(struct ql3_adapter *qdev) { - int i; - struct ql_rcv_buf_cb *lrg_buf_cb; - struct sk_buff *skb; - u64 map; + unsigned int i; for (i = 0; i < NUM_LARGE_BUFFERS; i++) { + struct ql_rcv_buf_cb *lrg_buf_cb = &qdev->lrg_buf[i]; + struct sk_buff *skb; + u64 map; + skb = dev_alloc_skb(qdev->lrg_buffer_len); if (unlikely(!skb)) { /* Better luck next round */ @@ -2526,8 +2409,6 @@ static int ql_alloc_large_buffers(struct 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; lrg_buf_cb->skb = skb; @@ -2556,11 +2437,11 @@ static int ql_alloc_large_buffers(struct static void ql_free_send_free_list(struct ql3_adapter *qdev) { - struct ql_tx_buf_cb *tx_cb; - int i; + unsigned int i; - tx_cb = &qdev->tx_buf[0]; for (i = 0; i < NUM_REQ_Q_ENTRIES; i++) { + struct ql_tx_buf_cb *tx_cb = &qdev->tx_buf[i]; + if (tx_cb->oal) { kfree(tx_cb->oal); tx_cb->oal = NULL; @@ -2571,18 +2452,15 @@ static void ql_free_send_free_list(struc static int ql_create_send_free_list(struct ql3_adapter *qdev) { - struct ql_tx_buf_cb *tx_cb; - int i; - struct ob_mac_iocb_req *req_q_curr = - qdev->req_q_virt_addr; + struct ob_mac_iocb_req *req_q_curr = qdev->req_q_virt_addr; + unsigned int i; /* Create free list of transmit buffers */ for (i = 0; i < NUM_REQ_Q_ENTRIES; i++) { + struct ql_tx_buf_cb *tx_cb = &qdev->tx_buf[i]; - tx_cb = &qdev->tx_buf[i]; tx_cb->skb = NULL; - tx_cb->queue_entry = req_q_curr; - req_q_curr++; + tx_cb->queue_entry = req_q_curr++; tx_cb->oal = kmalloc(512, GFP_KERNEL); if (tx_cb->oal == NULL) return -1; @@ -2597,9 +2475,8 @@ static int ql_alloc_mem_resources(struct else if (qdev->ndev->mtu == JUMBO_MTU_SIZE) { qdev->lrg_buffer_len = JUMBO_MTU_SIZE; } else { - printk(KERN_ERR PFX - "%s: Invalid mtu size. Only 1500 and 9000 are accepted.\n", - qdev->ndev->name); + printk(KERN_ERR PFX "%s: Invalid mtu size." + " Only 1500 and 9000 are accepted.\n", qdev->ndev->name); return -ENOMEM; } qdev->lrg_buffer_len += VLAN_ETH_HLEN + VLAN_ID_LEN + QL_HEADER_SPACE; @@ -2635,15 +2512,13 @@ static int ql_alloc_mem_resources(struct } 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; } @@ -2675,8 +2550,7 @@ err_small_buffers: err_buffer_queues: ql_free_net_req_rsp_queues(qdev); err_req_rsp: - pci_free_consistent(qdev->pdev, - PAGE_SIZE, + pci_free_consistent(qdev->pdev, PAGE_SIZE, qdev->shadow_reg_virt_addr, qdev->shadow_reg_phy_addr); @@ -2691,8 +2565,7 @@ 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, + pci_free_consistent(qdev->pdev, PAGE_SIZE, qdev->shadow_reg_virt_addr, qdev->shadow_reg_phy_addr); qdev->shadow_reg_virt_addr = NULL; @@ -2701,13 +2574,14 @@ static void ql_free_mem_resources(struct static int ql_init_misc_registers(struct ql3_adapter *qdev) { + u32 bits = (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index * 2)) << 4; struct ql3xxx_local_ram_registers __iomem *local_ram = - (void __iomem *)qdev->mem_map_registers; + (void __iomem *)qdev->ioaddr; + int rc; - if(ql_sem_spinlock(qdev, QL_DDR_RAM_SEM_MASK, - (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) * - 2) << 4)) - return -1; + rc = ql_sem_spinlock(qdev, QL_DDR_RAM_SEM_MASK, bits); + if (rc < 0) + goto out; ql_write_page2_reg(qdev, &local_ram->bufletSize, qdev->nvram_data.bufletSize); @@ -2754,37 +2628,41 @@ static int ql_init_misc_registers(struct &local_ram->maxDrbCount, qdev->nvram_data.drbTableSize); ql_sem_unlock(qdev, QL_DDR_RAM_SEM_MASK); - return 0; +out: + return rc; } +// FIXME: ugly 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; + struct ql3xxx_common_registers __iomem *regs = &port_regs->CommonRegs; + unsigned int mac_index = qdev->mac_index; u32 delay = 10; int status = 0; - 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))); + ql_write_common_reg(qdev, ®s->serialPortInterfaceReg, + (ISP_SERIAL_PORT_IF_WE << 16) | + ISP_SERIAL_PORT_IF_WE); 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))); + ql_write_common_reg(qdev, ®s->serialPortInterfaceReg, + (ISP_SERIAL_PORT_IF_SDE << 16) | + ISP_SERIAL_PORT_IF_SDE); /* Request Queue Registers */ *((u32 *) (qdev->preq_consumer_index)) = 0; - atomic_set(&qdev->tx_count,NUM_REQ_Q_ENTRIES); + atomic_set(&qdev->tx_count, NUM_REQ_Q_ENTRIES); qdev->req_producer_index = 0; ql_write_page1_reg(qdev, @@ -2866,13 +2744,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, ®s->rxSmallQProducerIndex, qdev->small_buf_q_producer_index); - ql_write_common_reg(qdev, - &port_regs->CommonRegs. - rxLargeQProducerIndex, + ql_write_common_reg(qdev, ®s->rxLargeQProducerIndex, qdev->lrg_buf_q_producer_index); /* @@ -2884,7 +2758,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; } @@ -2903,27 +2777,27 @@ 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)) { - status = -1; + status = ql_sem_spinlock(qdev, QL_FLASH_SEM_MASK, + (QL_RESOURCE_BITS_BASE_CODE | + (qdev->mac_index * 2) << 13)); + if (status < 0) goto out; - } + +#define INTERNAL_CHIP_SD_WE (INTERNAL_CHIP_SD | INTERNAL_CHIP_WE) + 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_WE << 16) | + INTERNAL_CHIP_SD_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)) { - status = -1; + status = ql_sem_spinlock(qdev, QL_PHY_GIO_SEM_MASK, + (QL_RESOURCE_BITS_BASE_CODE | + (qdev->mac_index * 2) << 13)); + if (status < 0) goto out; - } ql_init_scan_mode(qdev); ql_get_phy_owner(qdev); @@ -2932,42 +2806,40 @@ static int ql_adapter_initialize(struct /* Program lower 32 bits of the MAC address */ ql_write_page0_reg(qdev, &port_regs->macAddrIndirectPtrReg, - (MAC_ADDR_INDIRECT_PTR_REG_RP_MASK << 16)); + 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) | (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) | + ((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); @@ -2985,17 +2857,15 @@ static int ql_adapter_initialize(struct /* Enable Ethernet Function */ if (qdev->device_id == QL3032_DEVICE_ID) { - value = - (QL3032_PORT_CONTROL_EF | QL3032_PORT_CONTROL_KIE | - QL3032_PORT_CONTROL_EIv6 | QL3032_PORT_CONTROL_EIv4); + value = QL3032_PORT_CONTROL_EF | QL3032_PORT_CONTROL_KIE | + QL3032_PORT_CONTROL_EIv6 | QL3032_PORT_CONTROL_EIv4; ql_write_page0_reg(qdev, &port_regs->functionControl, - ((value << 16) | value)); + (value << 16) | value); } else { - 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); } @@ -3008,7 +2878,7 @@ out: */ static int ql_adapter_reset(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; + u32 __iomem *ctl = &qdev->ioaddr->CommonRegs.ispControlStatus; int status = 0; u16 value; int max_wait_time; @@ -3019,12 +2889,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, ctl, (ISP_CONTROL_SR << 16) | ISP_CONTROL_SR); /* Wait 3 seconds for reset to complete. */ printk(KERN_DEBUG PFX @@ -3034,9 +2901,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, ctl); if ((value & ISP_CONTROL_SR) == 0) break; @@ -3047,37 +2912,27 @@ static int ql_adapter_reset(struct ql3_a * Also, make sure that the Network Reset Interrupt bit has been * cleared after the soft reset has taken place. */ - value = - ql_read_common_reg(qdev, &port_regs->CommonRegs.ispControlStatus); + value = ql_read_common_reg(qdev, ctl); 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, ctl, + (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, ctl, + (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, ctl); + if ((value & ISP_CONTROL_FSR) == 0) break; - } ssleep(1); } while ((--max_wait_time)); } @@ -3091,13 +2946,13 @@ 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 __iomem *ctl = &port_regs->CommonRegs.ispControlStatus; u32 value, port_status; u8 func_number; /* Get the function number */ - value = - ql_read_common_reg_l(qdev, &port_regs->CommonRegs.ispControlStatus); + value = ql_read_common_reg_l(qdev, ctl); func_number = (u8) ((value >> 4) & OPCODE_FUNC_ID_MASK); port_status = ql_read_page0_reg(qdev, &port_regs->portStatus); switch (value & ISP_CONTROL_FN_MASK) { @@ -3109,9 +2964,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: @@ -3122,9 +2977,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: @@ -3132,7 +2987,7 @@ static void ql_set_mac_info(struct ql3_a default: printk(KERN_DEBUG PFX "%s: Invalid function number, ispControlStatus = 0x%x\n", - qdev->ndev->name,value); + qdev->ndev->name, value); break; } qdev->numPorts = qdev->nvram_data.numPorts; @@ -3140,37 +2995,34 @@ 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 - "\n%s Adapter %d RevisionID %d found %s on PCI slot %d.\n", - DRV_NAME, qdev->index, qdev->chip_rev_id, + "\n%s: revision id %d. %s on PCI slot %d. %s interface.\n", + ndev->name, qdev->chip_rev_id, (qdev->device_id == QL3032_DEVICE_ID) ? "QLA3032" : "QLA3022", - qdev->pci_slot); - printk(KERN_INFO PFX - "%s Interface.\n", - test_bit(QL_LINK_OPTICAL,&qdev->flags) ? "OPTICAL" : "COPPER"); + qdev->pci_slot, + test_bit(QL_LINK_OPTICAL, &qdev->flags) ? "OPTICAL" : "COPPER"); /* * Print PCI bus width/type. */ - 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 "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)) + if (netif_msg_probe(qdev)) { printk(KERN_INFO PFX "%s: MAC address %02x:%02x:%02x:%02x:%02x:%02x\n", ndev->name, ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2], ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]); + } } static int ql_adapter_down(struct ql3_adapter *qdev, int do_reset) @@ -3181,17 +3033,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); } @@ -3200,25 +3052,25 @@ static int ql_adapter_down(struct ql3_ad netif_poll_disable(ndev); if (do_reset) { - int soft_reset; - unsigned long hw_flags; + unsigned long 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))) { + if (ql_adapter_reset(qdev)) { printk(KERN_ERR PFX - "%s: ql_adapter_reset(%d) FAILED!\n", - ndev->name, qdev->index); + "%s: ql_adapter_reset() FAILED!\n", + ndev->name); } printk(KERN_ERR PFX - "%s: Releaseing driver lock via chip reset.\n",ndev->name); + "%s: Releaseing driver lock via chip reset.\n", ndev->name); } else { printk(KERN_ERR PFX "%s: Could not acquire driver lock to do " "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; @@ -3229,7 +3081,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 @@ -3246,42 +3098,44 @@ 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))) { + err = ql_wait_for_drvr_lock(qdev); + if (err) { + err = ql_adapter_initialize(qdev); + if (err < 0) { printk(KERN_ERR PFX "%s: Unable to initialize adapter.\n", ndev->name); goto err_init; } - printk(KERN_ERR PFX - "%s: Releaseing driver lock.\n",ndev->name); + printk(KERN_ERR PFX "%s: Releaseing driver lock.\n", + ndev->name); ql_sem_unlock(qdev, QL_DRVR_SEM_MASK); } else { - printk(KERN_ERR PFX - "%s: Could not aquire driver lock.\n", + printk(KERN_ERR PFX "%s: Could not aquire driver lock.\n", ndev->name); 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); @@ -3294,11 +3148,10 @@ err_init: err_lock: free_irq(qdev->pdev->irq, ndev); err_irq: - if (qdev->msi && test_bit(QL_MSI_ENABLED,&qdev->flags)) { - printk(KERN_INFO PFX - "%s: calling pci_disable_msi().\n", + 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; @@ -3306,10 +3159,9 @@ err_irq: static int ql_cycle_adapter(struct ql3_adapter *qdev, int reset) { - 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); + 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); dev_close(qdev->ndev); return -1; } @@ -3324,28 +3176,31 @@ 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); + ql_adapter_down(qdev, QL_DO_RESET); return 0; } static int ql3xxx_open(struct net_device *ndev) { struct ql3_adapter *qdev = netdev_priv(ndev); - return (ql_adapter_up(qdev)); + + 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; } static int ql3xxx_change_mtu(struct net_device *ndev, int new_mtu) { struct ql3_adapter *qdev = netdev_priv(ndev); + printk(KERN_ERR PFX "%s: new mtu size = %d.\n", ndev->name, new_mtu); if (new_mtu != NORMAL_MTU_SIZE && new_mtu != JUMBO_MTU_SIZE) { printk(KERN_ERR PFX @@ -3361,7 +3216,7 @@ static int ql3xxx_change_mtu(struct net_ } ndev->mtu = new_mtu; - return ql_cycle_adapter(qdev,QL_DO_RESET); + return ql_cycle_adapter(qdev, QL_DO_RESET); } static void ql3xxx_set_multicast_list(struct net_device *ndev) @@ -3374,11 +3229,11 @@ static void ql3xxx_set_multicast_list(st 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); + u32 __iomem *indirect = &qdev->ioaddr->macAddrIndirectPtrReg; + u32 __iomem *mac_addr = &qdev->ioaddr->macAddrDataReg; struct sockaddr *addr = p; - unsigned long hw_flags; + unsigned long flags; if (netif_running(ndev)) return -EBUSY; @@ -3388,28 +3243,32 @@ 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])); + ql_write_page0_reg(qdev, indirect, + MAC_ADDR_INDIRECT_PTR_REG_RP_MASK << 16); + ql_write_page0_reg(qdev, mac_addr, + (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); + ql_write_page0_reg(qdev, indirect, + (MAC_ADDR_INDIRECT_PTR_REG_RP_MASK << 16) | 1); + ql_write_page0_reg(qdev, mac_addr, + (ndev->dev_addr[0] << 8) | + ndev->dev_addr[1]); + + 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); /* @@ -3427,101 +3286,87 @@ static void ql_reset_work(struct work_st { struct ql3_adapter *qdev = container_of(work, struct ql3_adapter, reset_work.work); - struct net_device *ndev = qdev->ndev; + u32 __iomem *reg = &qdev->ioaddr->CommonRegs.ispControlStatus; + u32 cmd = (ISP_CONTROL_RI << 16) | ISP_CONTROL_RI; + char *name = qdev->ndev->name; + 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); + if (!test_bit(QL_RESET_PER_SCSI | QL_RESET_START, &qdev->flags)) + return; - /* - * Loop through the active list and return the skb. - */ - for (i = 0; i < NUM_REQ_Q_ENTRIES; i++) { - int j; - tx_cb = &qdev->tx_buf[i]; - if (tx_cb->skb) { - printk(KERN_DEBUG PFX - "%s: Freeing lost SKB.\n", - qdev->ndev->name); - pci_unmap_single(qdev->pdev, - pci_unmap_addr(&tx_cb->map[0], mapaddr), - pci_unmap_len(&tx_cb->map[0], maplen), - PCI_DMA_TODEVICE); - for(j=1;jseg_count;j++) { - pci_unmap_page(qdev->pdev, - pci_unmap_addr(&tx_cb->map[j],mapaddr), - pci_unmap_len(&tx_cb->map[j],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]; + unsigned int j; - 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", name); - ssleep(1); - } while (--max_wait_time); - spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); + for (j = 0; !j || (j < tx_cb->seg_count); j++) { + pci_unmap_page(qdev->pdev, + pci_unmap_addr(&tx_cb->map[j], mapaddr), + pci_unmap_len(&tx_cb->map[j], maplen), + PCI_DMA_TODEVICE); + } + + dev_kfree_skb(tx_cb->skb); + tx_cb->skb = NULL; + } - if (value & ISP_CONTROL_SR) { + printk(KERN_ERR PFX "%s: Clearing NRI after reset.\n", name); - /* - * 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; + spin_lock_irqsave(&qdev->hw_lock, flags); + + ql_write_common_reg(qdev, reg, cmd); + /* + * Wait the for Soft Reset to Complete. + */ + for (i = 0; i < 10; i++) { + value = ql_read_common_reg(qdev, reg); + if (!(value & ISP_CONTROL_SR)) { + printk(KERN_DEBUG PFX "%s: reset completed.\n", name); + break; } - 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); + if (value & ISP_CONTROL_RI) { + printk(KERN_DEBUG PFX + "%s: clearing NRI after reset.\n", name); + ql_write_common_reg(qdev, reg, cmd); + } + + // FIXME: sleeping with spinlock held, yeah ! + 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", name); + printk(KERN_ERR PFX "%s: Do a reset.\n", name); + + clear_bit(QL_RESET_PER_SCSI, &qdev->flags); + clear_bit(QL_RESET_START, &qdev->flags); + + ql_cycle_adapter(qdev, QL_DO_RESET); + } else { + 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); } } @@ -3535,12 +3380,11 @@ static void ql_tx_timeout_work(struct wo static void ql_get_board_info(struct ql3_adapter *qdev) { - struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; u32 value; - value = ql_read_page0_reg_l(qdev, &port_regs->portStatus); + value = ql_read_page0_reg_l(qdev, &qdev->ioaddr->portStatus); - qdev->chip_rev_id = ((value & PORT_STATUS_REV_ID_MASK) >> 12); + qdev->chip_rev_id = (value & PORT_STATUS_REV_ID_MASK) >> 12; if (value & PORT_STATUS_64) qdev->pci_width = 64; else @@ -3556,7 +3400,7 @@ static void ql3xxx_timer(unsigned long p { struct ql3_adapter *qdev = (struct ql3_adapter *)ptr; - if (test_bit(QL_RESET_ACTIVE,&qdev->flags)) { + if (test_bit(QL_RESET_ACTIVE, &qdev->flags)) { printk(KERN_DEBUG PFX "%s: Reset in progress.\n", qdev->ndev->name); @@ -3573,23 +3417,23 @@ end: static int __devinit ql3xxx_probe(struct pci_dev *pdev, const struct pci_device_id *pci_entry) { - struct net_device *ndev = NULL; - struct ql3_adapter *qdev = NULL; - static int cards_found = 0; + static int ql_version_printed = 0; + struct ql3_adapter *qdev; + struct net_device *ndev; int pci_using_dac, err; err = pci_enable_device(pdev); if (err) { printk(KERN_ERR PFX "%s cannot enable PCI device\n", pci_name(pdev)); - goto err_out; + goto out; } err = pci_request_regions(pdev, DRV_NAME); - if (err) { + if (err < 0) { printk(KERN_ERR PFX "%s cannot obtain PCI resources\n", pci_name(pdev)); - goto err_out_disable_pdev; + goto err_out_disable_pdev_0; } pci_set_master(pdev); @@ -3597,20 +3441,22 @@ static int __devinit ql3xxx_probe(struct if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) { pci_using_dac = 1; err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK); - } else if (!(err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) { + } else { pci_using_dac = 0; - err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); + err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); + if (!err) + err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); } - if (err) { + if (err < 0) { printk(KERN_ERR PFX "%s no usable DMA configuration\n", pci_name(pdev)); - goto err_out_free_regions; + goto err_out_free_regions_1; } ndev = alloc_etherdev(sizeof(struct ql3_adapter)); if (!ndev) - goto err_out_free_regions; + goto err_out_free_regions_1; SET_MODULE_OWNER(ndev); SET_NETDEV_DEV(ndev, &pdev->dev); @@ -3618,7 +3464,6 @@ static int __devinit ql3xxx_probe(struct pci_set_drvdata(pdev, ndev); qdev = netdev_priv(ndev); - qdev->index = cards_found; qdev->ndev = ndev; qdev->pdev = pdev; qdev->device_id = pci_entry->device; @@ -3631,15 +3476,14 @@ static int __devinit ql3xxx_probe(struct if (pci_using_dac) ndev->features |= NETIF_F_HIGHDMA; if (qdev->device_id == QL3032_DEVICE_ID) - ndev->features |= (NETIF_F_HW_CSUM | NETIF_F_SG); + ndev->features |= NETIF_F_HW_CSUM | NETIF_F_SG; - 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; + goto err_out_free_ndev_2; } spin_lock_init(&qdev->adapter_lock); @@ -3647,15 +3491,15 @@ static int __devinit ql3xxx_probe(struct /* Set driver entry points */ ndev->open = ql3xxx_open; - ndev->hard_start_xmit = ql3xxx_send; ndev->stop = ql3xxx_close; ndev->get_stats = ql3xxx_get_stats; ndev->change_mtu = ql3xxx_change_mtu; - ndev->set_multicast_list = ql3xxx_set_multicast_list; - SET_ETHTOOL_OPS(ndev, &ql3xxx_ethtool_ops); - ndev->set_mac_address = ql3xxx_set_mac_address; ndev->tx_timeout = ql3xxx_tx_timeout; ndev->watchdog_timeo = 5 * HZ; + ndev->hard_start_xmit = ql3xxx_send; + ndev->set_mac_address = ql3xxx_set_mac_address; + ndev->set_multicast_list = ql3xxx_set_multicast_list; + SET_ETHTOOL_OPS(ndev, &ql3xxx_ethtool_ops); ndev->poll = &ql_poll; ndev->weight = 64; @@ -3663,23 +3507,20 @@ static int __devinit ql3xxx_probe(struct ndev->irq = pdev->irq; /* make sure the EEPROM is good */ - if (ql_get_nvram_params(qdev)) { + err = ql_get_nvram_params(qdev); + if (err < 0) { printk(KERN_ALERT PFX - "ql3xxx_probe: Adapter #%d, Invalid NVRAM parameters.\n", - qdev->index); - goto err_out_iounmap; + "ql3xxx_probe: %s, invalid NVRAM parameters.\n", + pci_name(pdev)); + goto err_out_iounmap_3; } ql_set_mac_info(qdev); /* Validate and set parameters */ - if (qdev->mac_index) { - memcpy(ndev->dev_addr, &qdev->nvram_data.funcCfg_fn2.macAddress, - ETH_ALEN); - } else { - memcpy(ndev->dev_addr, &qdev->nvram_data.funcCfg_fn0.macAddress, - ETH_ALEN); - } + memcpy(ndev->dev_addr, qdev->mac_index ? + &qdev->nvram_data.funcCfg_fn2.macAddress : + &qdev->nvram_data.funcCfg_fn0.macAddress, ETH_ALEN); memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len); ndev->tx_queue_len = NUM_REQ_Q_ENTRIES; @@ -3694,15 +3535,14 @@ 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) { + if (err < 0) { printk(KERN_ERR PFX "%s: cannot register net device\n", pci_name(pdev)); - goto err_out_iounmap; + goto err_out_iounmap_3; } /* we're going to reset, so assume we have no link for now */ @@ -3719,27 +3559,25 @@ static int __devinit ql3xxx_probe(struct qdev->adapter_timer.expires = jiffies + HZ * 2; /* two second delay */ qdev->adapter_timer.data = (unsigned long)qdev; - if(!cards_found) { + if (!ql_version_printed) { 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); +out: + return err; - cards_found++; - return 0; - -err_out_iounmap: - iounmap(qdev->mem_map_registers); -err_out_free_ndev: +err_out_iounmap_3: + iounmap(qdev->ioaddr); +err_out_free_ndev_2: + pci_set_drvdata(pdev, NULL); free_netdev(ndev); -err_out_free_regions: +err_out_free_regions_1: pci_release_regions(pdev); -err_out_disable_pdev: +err_out_disable_pdev_0: pci_disable_device(pdev); - pci_set_drvdata(pdev, NULL); -err_out: - return err; + goto out; } static void __devexit ql3xxx_remove(struct pci_dev *pdev) @@ -3748,7 +3586,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); @@ -3759,18 +3596,17 @@ 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); } static struct pci_driver ql3xxx_driver = { - - .name = DRV_NAME, - .id_table = ql3xxx_pci_tbl, - .probe = ql3xxx_probe, - .remove = __devexit_p(ql3xxx_remove), + .name = DRV_NAME, + .id_table = ql3xxx_pci_tbl, + .probe = ql3xxx_probe, + .remove = __devexit_p(ql3xxx_remove), }; static int __init ql3xxx_init_module(void) diff --git a/drivers/net/qla3xxx.h b/drivers/net/qla3xxx.h old mode 100755 new mode 100644 index b2d76ea..ee2629b --- a/drivers/net/qla3xxx.h +++ b/drivers/net/qla3xxx.h @@ -1153,15 +1153,13 @@ struct ql3_adapter { u8 pci_width; u8 pci_x; u32 msi; - int index; struct timer_list adapter_timer; /* timer used for various functions */ spinlock_t adapter_lock; 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;