qla3xxx: Remove NETIF_F_LLTX from driver features.
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/3 qla3xxx: Add delay to NVRAM register access.
Some platforms showed issues when no delay was used. This code only runs during the probe.
Signed-off-by Ron Mercer <[email protected]>
--- drivers/net/qla3xxx.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-)
drivers/net/qla3xxx.c +23 -14
@@ -210,6 +210,15 @@ static void ql_write_common_reg(struct qreturn ; } +static void ql_write_nvram_reg (struct ql3_adapter *qdev, +u32 __iomem *reg,u32 value) +{ +writel (value, reg); +readl (reg); +udelay (1 ); +return ; +} +static void ql_write_page0_reg (struct ql3_adapter *qdev,u32 __iomem *reg,u32 value) {
@@ -338,9 +347,9 @@ static void fm93c56a_select(struct ql3_a qdev->mem_map_registers; qdev->eeprom_cmd_data =AUBURN_EEPROM_CS_1 ; -ql_write_common_reg (qdev, &port_regs->CommonRegs.serialPortInterfaceReg, +ql_write_nvram_reg (qdev, &port_regs->CommonRegs.serialPortInterfaceReg,ISP_NVRAM_MASK | qdev->eeprom_cmd_data); -ql_write_common_reg (qdev, &port_regs->CommonRegs.serialPortInterfaceReg, +ql_write_nvram_reg (qdev, &port_regs->CommonRegs.serialPortInterfaceReg, ((ISP_NVRAM_MASK <<16 ) | qdev->eeprom_cmd_data)); }
@@ -357,14 +366,14 @@ static void fm93c56a_cmd(struct ql3_adap qdev->mem_map_registers;/* Clock in a zero, then do the start bit */ -ql_write_common_reg (qdev, &port_regs->CommonRegs.serialPortInterfaceReg, +ql_write_nvram_reg (qdev, &port_regs->CommonRegs.serialPortInterfaceReg,ISP_NVRAM_MASK | qdev->eeprom_cmd_data |AUBURN_EEPROM_DO_1 ); -ql_write_common_reg (qdev, &port_regs->CommonRegs.serialPortInterfaceReg, +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_common_reg (qdev, &port_regs->CommonRegs.serialPortInterfaceReg, +ql_write_nvram_reg (qdev, &port_regs->CommonRegs.serialPortInterfaceReg,ISP_NVRAM_MASK | qdev-> eeprom_cmd_data |AUBURN_EEPROM_DO_1 |AUBURN_EEPROM_CLK_FALL );
@@ -380,20 +389,20 @@ static void fm93c56a_cmd(struct ql3_adap* If the bit changed, then change the DO state to * match */ -ql_write_common_reg (qdev, +ql_write_nvram_reg (qdev, &port_regs->CommonRegs. serialPortInterfaceReg,ISP_NVRAM_MASK | qdev-> eeprom_cmd_data | dataBit); previousBit = dataBit; } -ql_write_common_reg (qdev, +ql_write_nvram_reg (qdev, &port_regs->CommonRegs. serialPortInterfaceReg,ISP_NVRAM_MASK | qdev-> eeprom_cmd_data | dataBit |AUBURN_EEPROM_CLK_RISE ); -ql_write_common_reg (qdev, +ql_write_nvram_reg (qdev, &port_regs->CommonRegs. serialPortInterfaceReg, ISP_NVRAM_MASK | qdev->
@@ -414,20 +423,20 @@ static void fm93c56a_cmd(struct ql3_adap* If the bit changed, then change the DO state to * match */ -ql_write_common_reg (qdev, +ql_write_nvram_reg (qdev, &port_regs->CommonRegs. serialPortInterfaceReg,ISP_NVRAM_MASK | qdev-> eeprom_cmd_data | dataBit); previousBit = dataBit; } -ql_write_common_reg (qdev, +ql_write_nvram_reg (qdev, &port_regs->CommonRegs. serialPortInterfaceReg,ISP_NVRAM_MASK | qdev-> eeprom_cmd_data | dataBit |AUBURN_EEPROM_CLK_RISE ); -ql_write_common_reg (qdev, +ql_write_nvram_reg (qdev, &port_regs->CommonRegs. serialPortInterfaceReg, ISP_NVRAM_MASK | qdev->
@@ -445,7 +454,7 @@ static void fm93c56a_deselect(struct ql3struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; qdev->eeprom_cmd_data =AUBURN_EEPROM_CS_0 ; -ql_write_common_reg (qdev, &port_regs->CommonRegs.serialPortInterfaceReg, +ql_write_nvram_reg (qdev, &port_regs->CommonRegs.serialPortInterfaceReg,ISP_NVRAM_MASK | qdev->eeprom_cmd_data); }
@@ -463,12 +472,12 @@ static void fm93c56a_datain(struct ql3_a/* Read the data bits */ /* The first bit is a dummy. Clock right over it. */ for (i =0 ; i < dataBits; i++) { -ql_write_common_reg (qdev, +ql_write_nvram_reg (qdev, &port_regs->CommonRegs. serialPortInterfaceReg,ISP_NVRAM_MASK | qdev->eeprom_cmd_data |AUBURN_EEPROM_CLK_RISE ); - ql_write_common_reg(qdev, + ql_write_nvram_reg(qdev, &port_regs->CommonRegs. serialPortInterfaceReg, ISP_NVRAM_MASK | qdev->eeprom_cmd_data |
Signature · 1 line
1.4.2.rc2-dirty
PATCH 2/3 qla3xxx: Remove NETIF_F_LLTX from driver features.
In reply to a message not in the archiveThe TX locking was removed some time ago but this flag was overlooked.
Signed-off-by Ron Mercer <[email protected]>
--- drivers/net/qla3xxx.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/qla3xxx.c +0 -1
@@ -3630,7 +3630,6 @@ static int __devinit ql3xxx_probe(struct qdev->msg_enable =netif_msg_init (debug, default_msg); - ndev->features |=NETIF_F_LLTX ;if (pci_using_dac) ndev->features |=NETIF_F_HIGHDMA ;if (qdev->device_id ==QL3032_DEVICE_ID )
Signature · 1 line
1.4.2.rc2-dirty
PATCH 3/3 qla3xxx: Fixed rx checksum warning.
In reply to a message not in the archiveSigned-off-by Ron Mercer <[email protected]>
--- drivers/net/qla3xxx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/qla3xxx.c +1 -1
@@ -1879,7 +1879,7 @@ static void ql_process_macip_rx_intr(strmemcpy (skb_push (skb2, size), skb1->data +VLAN_ID_LEN , size); skb2->ip_summed =CHECKSUM_NONE ; }else { - skb2->ip_summed =CHECKSUM_COMPLETE ; + skb2->ip_summed =CHECKSUM_UNNECESSARY ;if (ib_ip_rsp_ptr->checksum &IB_IP_IOCB_RSP_3032_ICE ) { skb2->ip_summed =CHECKSUM_NONE ; printk(KERN_ERR
Signature · 1 line
1.4.2.rc2-dirty