qlge: Clean up and non-functional changes.
Subsystems (2)
cover qlge: Clean up and non-functional changes.
Hi Dave,
These 5 patches are mostly non-logical changes. They are preparatory to adding more support for firmware events and adding the new device ID.
0001--net-next-qlge-Add-defines-for-firmware-support.patch 0002--net-next-qlge-Clean-up-firmware-reset-path.patch 0003--net-next-qlge-Move-firmware-event-handler.patch 0004--net-next-qlge-Prepare-to-add-new-device.patch 0005--net-next-qlge-Reduce-debug-print-output.patch
Thanks,
Ron Mercer
PATCH 1/5 qlge: Add defines for firmware support.
--- drivers/net/qlge/qlge.h | 97 +++++++++++++++++++++++++------------- drivers/net/qlge/qlge_ethtool.c | 3 +- 2 files changed, 66 insertions(+), 34 deletions(-)
drivers/net/qlge/qlge.h +64 -33
@@ -164,7 +164,7 @@ enum {CSR_RP = (1 <<10 ),CSR_CMD_PARM_SHIFT =22 ,CSR_CMD_NOP =0x00000000 , -CSR_CMD_SET_RST =0x1000000 , +CSR_CMD_SET_RST =0x10000000 ,CSR_CMD_CLR_RST =0x20000000 ,CSR_CMD_SET_PAUSE =0x30000000 , CSR_CMD_CLR_PAUSE = 0x40000000,
@@ -424,7 +424,7 @@ enum {RX_SYMBOL_ERR =0x00000370 ,RX_MAC_ERR =0x00000378 ,RX_CTL_PKTS =0x00000380 , -RX_PAUSE_PKTS =0x00000384 , +RX_PAUSE_PKTS =0x00000388 ,RX_64_PKTS =0x00000390 ,RX_65_TO_127_PKTS =0x00000398 , RX_128_255_PKTS = 0x000003a0,
@@ -733,6 +733,11 @@ enum {AEN_LINK_DOWN =0x00008012 ,AEN_IDC_CMPLT =0x00008100 ,AEN_IDC_REQ =0x00008101 , +AEN_IDC_EXT =0x00008102 , +AEN_DCBX_CHG =0x00008110 , +AEN_AEN_LOST =0x00008120 , +AEN_AEN_SFP_IN =0x00008130 , +AEN_AEN_SFP_OUT =0x00008131 ,AEN_FW_INIT_DONE =0x00008400 , AEN_FW_INIT_FAIL = 0x00008401,
@@ -742,40 +747,48 @@ enum {MB_CMD_MB_TEST =0x00000006 ,MB_CMD_CSUM_TEST =0x00000007 ,/* Verify Checksum */ MB_CMD_ABOUT_FW =0x00000008 , +MB_CMD_COPY_RISC_RAM =0x0000000a ,MB_CMD_LOAD_RISC_RAM =0x0000000b ,MB_CMD_DUMP_RISC_RAM =0x0000000c ,MB_CMD_WRITE_RAM =0x0000000d , +MB_CMD_INIT_RISC_RAM =0x0000000e ,MB_CMD_READ_RAM =0x0000000f ,MB_CMD_STOP_FW =0x00000014 ,MB_CMD_MAKE_SYS_ERR =0x0000002a , +MB_CMD_WRITE_SFP =0x00000030 , +MB_CMD_READ_SFP =0x00000031 ,MB_CMD_INIT_FW =0x00000060 , -MB_CMD_GET_INIT_CB =0x00000061 , +MB_CMD_GET_IFCB =0x00000061 ,MB_CMD_GET_FW_STATE =0x00000069 ,MB_CMD_IDC_REQ =0x00000100 ,/* Inter-Driver Communication */ MB_CMD_IDC_ACK =0x00000101 ,/* Inter-Driver Communication */ MB_CMD_SET_WOL_MODE =0x00000110 ,/* Wake On Lan */ -MB_WOL_DISABLE =0x00000000 , -MB_WOL_MAGIC_PKT =0x00000001 , -MB_WOL_FLTR =0x00000002 , -MB_WOL_UCAST =0x00000004 , -MB_WOL_MCAST =0x00000008 , -MB_WOL_BCAST =0x00000010 , -MB_WOL_LINK_UP =0x00000020 , -MB_WOL_LINK_DOWN =0x00000040 , +MB_WOL_DISABLE =0 , +MB_WOL_MAGIC_PKT = (1 <<1 ), +MB_WOL_FLTR = (1 <<2 ), +MB_WOL_UCAST = (1 <<3 ), +MB_WOL_MCAST = (1 <<4 ), +MB_WOL_BCAST = (1 <<5 ), +MB_WOL_LINK_UP = (1 <<6 ), +MB_WOL_LINK_DOWN = (1 <<7 ),MB_CMD_SET_WOL_FLTR =0x00000111 ,/* Wake On Lan Filter */ -MB_CMD_CLEAR_WOL_FLTR =0x00000112 ,/* Wake On Lan Filter */ +MB_CMD_CLEAR_WOL_FLTR =0x00000112 ,/* Wake On Lan Filter */ MB_CMD_SET_WOL_MAGIC =0x00000113 ,/* Wake On Lan Magic Packet */ -MB_CMD_CLEAR_WOL_MAGIC =0x00000114 ,/* Wake On Lan Magic Packet */ +MB_CMD_CLEAR_WOL_MAGIC =0x00000114 ,/* Wake On Lan Magic Packet */ +MB_CMD_SET_WOL_IMMED =0x00000115 ,MB_CMD_PORT_RESET =0x00000120 ,MB_CMD_SET_PORT_CFG =0x00000122 ,MB_CMD_GET_PORT_CFG =0x00000123 , -MB_CMD_SET_ASIC_VOLTS =0x00000130 , -MB_CMD_GET_SNS_DATA =0x00000131 ,/* Temp and Volt Sense data. */ +MB_CMD_GET_LINK_STS =0x00000124 ,/* Mailbox Command Status. */ MB_CMD_STS_GOOD =0x00004000 ,/* Success. */ MB_CMD_STS_INTRMDT =0x00001000 ,/* Intermediate Complete. */ - MB_CMD_STS_ERR = 0x00004005, /* Error. */ +MB_CMD_STS_INVLD_CMD =0x00004001 ,/* Invalid. */ +MB_CMD_STS_XFC_ERR =0x00004002 ,/* Interface Error. */ +MB_CMD_STS_CSUM_ERR =0x00004003 ,/* Csum Error. */ +MB_CMD_STS_ERR =0x00004005 ,/* System Error. */ + MB_CMD_STS_PARAM_ERR = 0x00004006, /* Parameter Error. */ }; struct mbox_params {
@@ -967,6 +980,7 @@ struct ib_mac_iocb_rsp {__le16 vlan_id;/* 12 bits */ #define IB_MAC_IOCB_RSP_C 0x1000/* VLAN CFI bit */ #define IB_MAC_IOCB_RSP_COS_SHIFT 12/* class of service value */ +#define IB_MAC_IOCB_RSP_VLAN_MASK 0x0ffff__le16 reserved1;__le32 reserved2[6 ];
@@ -1032,6 +1046,7 @@ struct wqicb {#define Q_LEN_CPP_16 0x0001#define Q_LEN_CPP_32 0x0002#define Q_LEN_CPP_64 0x0003 +#define Q_LEN_CPP_512 0x0006__le16 flags;#define Q_PRI_SHIFT 1#define Q_FLAGS_LC 0x1000
@@ -1313,27 +1328,43 @@ enum {QL_DMA64 = (1 <<5 ),QL_PROMISCUOUS = (1 <<6 ),QL_ALLMULTI = (1 <<7 ), +QL_PORT_CFG = (1 <<8 ), + QL_CAM_RT_SET = (1 << 9), };/* link_status bit definitions */ enum { -LOOPBACK_MASK =0x00000700 , -LOOPBACK_PCS =0x00000100 , -LOOPBACK_HSS =0x00000200 , -LOOPBACK_EXT =0x00000300 , -PAUSE_MASK =0x000000c0 , -PAUSE_STD =0x00000040 , -PAUSE_PRI =0x00000080 , -SPEED_MASK =0x00000038 , - SPEED_100Mb =0x00000000 , - SPEED_1Gb =0x00000008 , - SPEED_10Gb =0x00000010 , -LINK_TYPE_MASK =0x00000007 , -LINK_TYPE_XFI =0x00000001 , -LINK_TYPE_XAUI =0x00000002 , -LINK_TYPE_XFI_BP =0x00000003 , -LINK_TYPE_XAUI_BP =0x00000004 , -LINK_TYPE_10GBASET =0x00000005 , +STS_LOOPBACK_MASK =0x00000700 , +STS_LOOPBACK_PCS =0x00000100 , +STS_LOOPBACK_HSS =0x00000200 , +STS_LOOPBACK_EXT =0x00000300 , +STS_PAUSE_MASK =0x000000c0 , +STS_PAUSE_STD =0x00000040 , +STS_PAUSE_PRI =0x00000080 , +STS_SPEED_MASK =0x00000038 , + STS_SPEED_100Mb =0x00000000 , + STS_SPEED_1Gb =0x00000008 , + STS_SPEED_10Gb =0x00000010 , +STS_LINK_TYPE_MASK =0x00000007 , +STS_LINK_TYPE_XFI =0x00000001 , +STS_LINK_TYPE_XAUI =0x00000002 , +STS_LINK_TYPE_XFI_BP =0x00000003 , +STS_LINK_TYPE_XAUI_BP =0x00000004 , +STS_LINK_TYPE_10GBASET =0x00000005 , +}; + +/* link_config bit definitions */ +enum { +CFG_JUMBO_FRAME_SIZE =0x00010000 , +CFG_PAUSE_MASK =0x00000060 , +CFG_PAUSE_STD =0x00000020 , +CFG_PAUSE_PRI =0x00000040 , +CFG_DCBX =0x00000010 , +CFG_LOOPBACK_MASK =0x00000007 , +CFG_LOOPBACK_PCS =0x00000002 , +CFG_LOOPBACK_HSS =0x00000004 , +CFG_LOOPBACK_EXT =0x00000006 , +CFG_DEFAULT_MAX_FRAME_SIZE =0x00002580 , };/*
drivers/net/qlge/qlge_ethtool.c +2 -1
@@ -271,7 +271,8 @@ static int ql_get_settings(struct net_device *ndev, ecmd->advertising = ADVERTISED_10000baseT_Full; ecmd->autoneg =AUTONEG_ENABLE ; ecmd->transceiver =XCVR_EXTERNAL ; -if ((qdev->link_status &LINK_TYPE_MASK ) ==LINK_TYPE_10GBASET ) { +if ((qdev->link_status &STS_LINK_TYPE_MASK ) == +STS_LINK_TYPE_10GBASET ) { ecmd->supported |= (SUPPORTED_TP | SUPPORTED_Autoneg); ecmd->advertising |= (ADVERTISED_TP | ADVERTISED_Autoneg); ecmd->port =PORT_TP ;
Signature · 1 line
1.6.0.2
PATCH 2/5 qlge: Clean up firmware reset path.
In reply to Ron MercerAdd function for performing the reset rather than in-line. This function may later be called by a core dump process.
--- drivers/net/qlge/qlge_mpi.c | 36 +++++++++++++++++++++++++++++------- 1 files changed, 29 insertions(+), 7 deletions(-)
drivers/net/qlge/qlge_mpi.c +29 -7
@@ -1,6 +1,6 @@#include "qlge.h" -static int ql_read_mbox_reg (struct ql_adapter *qdev,u32 reg,u32 *data) +int ql_read_mpi_reg (struct ql_adapter *qdev,u32 reg,u32 *data) {int status;/* wait for reg to come ready */
@@ -19,6 +19,32 @@ exit:return status; } +int ql_write_mpi_reg (struct ql_adapter *qdev,u32 reg,u32 data) +{ +int status =0 ; +/* wait for reg to come ready */ + status =ql_wait_reg_rdy (qdev,PROC_ADDR ,PROC_ADDR_RDY ,PROC_ADDR_ERR ); +if (status) + goto exit; +/* write the data to the data reg */ +ql_write32 (qdev,PROC_DATA , data); +/* trigger the write */ +ql_write32 (qdev,PROC_ADDR , reg); +/* wait for reg to come ready */ + status =ql_wait_reg_rdy (qdev,PROC_ADDR ,PROC_ADDR_RDY ,PROC_ADDR_ERR ); +if (status) + goto exit; +exit: +return status; +} + +int ql_soft_reset_mpi_risc (struct ql_adapter *qdev) +{ +int status; + status =ql_write_mpi_reg (qdev,0x00001010 ,1 ); +return status; +} +static int ql_get_mb_sts (struct ql_adapter *qdev,struct mbox_params *mbcp) {int i, status;
@@ -28,7 +54,7 @@ static int ql_get_mb_sts(struct ql_adapter *qdev, struct mbox_params *mbcp)return -EBUSY ;for (i =0 ; i < mbcp->out_count; i++) { status = -ql_read_mbox_reg (qdev, qdev->mailbox_out + i, +ql_read_mpi_reg (qdev, qdev->mailbox_out + i, &mbcp->mbox_out[i]);if (status) {QPRINTK (qdev,DRV ,ERR ,"Failed mailbox read.\n" );
@@ -142,9 +168,5 @@ void ql_mpi_reset_work(struct work_struct *work) {struct ql_adapter *qdev = container_of(work, struct ql_adapter, mpi_reset_work.work); -QPRINTK (qdev,DRV ,ERR , -"Enter, qdev = %p..\n" , qdev); -ql_write32 (qdev,CSR ,CSR_CMD_SET_RST ); -msleep (50 ); -ql_write32 (qdev,CSR ,CSR_CMD_CLR_RST ); +ql_soft_reset_mpi_risc (qdev); }
Signature · 1 line
1.6.0.2
PATCH 4/5 qlge: Prepare to add new device.
In reply to Ron MercerThis organizes a few calls into a function table to enable adding new devices.
--- drivers/net/qlge/qlge.h | 17 +++++++-- drivers/net/qlge/qlge_main.c | 80 +++++++++++++++++++++++++++++++++-------- 2 files changed, 78 insertions(+), 19 deletions(-)
drivers/net/qlge/qlge.h +14 -3
@@ -28,7 +28,7 @@ } while (0)#define QLGE_VENDOR_ID 0x1077 -#define QLGE_DEVICE_ID 0x8012 +#define QLGE_DEVICE_ID_8012 0x8012#define MAX_CPUS 8#define MAX_TX_RINGS MAX_CPUS
@@ -798,7 +798,7 @@ struct mbox_params {int out_count; }; -struct flash_params { +struct flash_params_8012 {u8 dev_id_str[4 ];__le16 size;__le16 csum;
@@ -808,6 +808,9 @@ struct flash_params {__le16 res; }; +union flash_params { +struct flash_params_8012 flash_params_8012; +};/* * doorbell space for the rx ring context
@@ -1367,6 +1370,12 @@ enum { CFG_DEFAULT_MAX_FRAME_SIZE = 0x00002580, }; +struct nic_operations { + +int (*get_flash) (struct ql_adapter *); +int (*port_initialize) (struct ql_adapter *); +}; +/* * The main Adapter structure definition. * This structure has all fields relevant to the hardware.
@@ -1444,7 +1453,7 @@ struct ql_adapter {u32 port_init;u32 link_status; -struct flash_params flash; +union flash_params flash;struct net_device_stats stats;struct workqueue_struct *q_workqueue;
@@ -1452,6 +1461,8 @@ struct ql_adapter {struct delayed_work asic_reset_work;struct delayed_work mpi_reset_work;struct delayed_work mpi_work; +struct nic_operations *nic_ops; +u16 device_id; };/*
drivers/net/qlge/qlge_main.c +64 -16
160 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 5/5 qlge: Reduce debug print output.
In reply to Ron MercerGet rid of some noise that is for debug only.
--- drivers/net/qlge/qlge_main.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
drivers/net/qlge/qlge_main.c +12 -12
@@ -58,8 +58,8 @@ static const u32 default_msg =NETIF_MSG_IFUP |NETIF_MSG_RX_ERR |NETIF_MSG_TX_ERR | -NETIF_MSG_TX_QUEUED | -NETIF_MSG_INTR |NETIF_MSG_TX_DONE |NETIF_MSG_RX_STATUS | +/* NETIF_MSG_TX_QUEUED | */ +/* NETIF_MSG_INTR | NETIF_MSG_TX_DONE | NETIF_MSG_RX_STATUS | */ /* NETIF_MSG_PKTDATA | */ NETIF_MSG_HW |NETIF_MSG_WOL |0 ;
@@ -327,7 +327,7 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type, (addr[2 ] <<24 ) | (addr[3 ] <<16 ) | (addr[4 ] <<8 ) | (addr[5 ]); - QPRINTK(qdev, IFUP, INFO, + QPRINTK(qdev, IFUP, DEBUG, "Adding %s address %pM" " at index %d in the CAM.\n", ((type ==
@@ -2552,7 +2552,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)QPRINTK (qdev,IFUP ,DEBUG ,"Invalid rx_ring->type = %d.\n" , rx_ring->type); } -QPRINTK (qdev,IFUP ,INFO ,"Initializing rx work queue.\n" ); +QPRINTK (qdev,IFUP ,DEBUG ,"Initializing rx work queue.\n" ); err =ql_write_cfg (qdev, cqicb,sizeof (struct cqicb ),CFG_LCQ , rx_ring->cq_id);if (err) {
@@ -2605,7 +2605,7 @@ static int ql_start_tx_ring(struct ql_adapter *qdev, struct tx_ring *tx_ring)QPRINTK (qdev,IFUP ,ERR ,"Failed to load tx_ring.\n" );return err; } -QPRINTK (qdev,IFUP ,INFO ,"Successfully loaded WQICB.\n" ); +QPRINTK (qdev,IFUP ,DEBUG ,"Successfully loaded WQICB.\n" );return err; }
@@ -2647,7 +2647,7 @@ static void ql_enable_msix(struct ql_adapter *qdev) (qdev->pdev, qdev->msi_x_entry, qdev->rx_ring_count)) {set_bit (QL_MSIX_ENABLED , &qdev->flags); qdev->intr_count = qdev->rx_ring_count; -QPRINTK (qdev,IFUP ,INFO , +QPRINTK (qdev,IFUP ,DEBUG ,"MSI-X Enabled, got %d vectors.\n" , qdev->intr_count);return ;
@@ -2774,11 +2774,11 @@ static void ql_free_irq(struct ql_adapter *qdev)if (test_bit (QL_MSIX_ENABLED , &qdev->flags)) {free_irq (qdev->msi_x_entry[i].vector, &qdev->rx_ring[i]); -QPRINTK (qdev,IFDOWN ,ERR , +QPRINTK (qdev,IFDOWN ,DEBUG ,"freeing msix interrupt %d.\n" , i); }else {free_irq (qdev->pdev->irq, &qdev->rx_ring[0 ]); -QPRINTK (qdev,IFDOWN ,ERR , +QPRINTK (qdev,IFDOWN ,DEBUG ,"freeing msi interrupt %d.\n" , i); } }
@@ -2809,7 +2809,7 @@ static int ql_request_irq(struct ql_adapter *qdev) i); goto err_irq; }else { - QPRINTK(qdev, IFUP, INFO, + QPRINTK(qdev, IFUP, DEBUG, "Hooked intr %d, queue type %s%s%s, with name %s.\n", i, qdev->rx_ring[i].type ==
@@ -2884,14 +2884,14 @@ static int ql_start_rss(struct ql_adapter *qdev)get_random_bytes ((void *)&ricb->ipv6_hash_key[0 ],40 );get_random_bytes ((void *)&ricb->ipv4_hash_key[0 ],16 ); -QPRINTK (qdev,IFUP ,INFO ,"Initializing RSS.\n" ); +QPRINTK (qdev,IFUP ,DEBUG ,"Initializing RSS.\n" ); status =ql_write_cfg (qdev, ricb,sizeof (ricb),CFG_LR ,0 );if (status) {QPRINTK (qdev,IFUP ,ERR ,"Failed to load RICB.\n" );return status; } -QPRINTK (qdev,IFUP ,INFO ,"Successfully loaded RICB.\n" ); +QPRINTK (qdev,IFUP ,DEBUG ,"Successfully loaded RICB.\n" );return status; }
@@ -3053,7 +3053,7 @@ static int ql_adapter_initialize(struct ql_adapter *qdev)/* Start NAPI for the RSS queues. */ for (i = qdev->rss_ring_first_cq_id; i < qdev->rx_ring_count; i++) { -QPRINTK (qdev,IFUP ,INFO ,"Enabling NAPI for rx_ring[%d].\n" , +QPRINTK (qdev,IFUP ,DEBUG ,"Enabling NAPI for rx_ring[%d].\n" , i);napi_enable (&qdev->rx_ring[i].napi); }
Signature · 1 line
1.6.0.2
PATCH 3/5 qlge: Move firmware event handler.
In reply to Ron MercerThis is not a logical change but rather a move of the inbound firmware event handler into it's own function as it will later be called by the outbound path.
The addition of the mutex is to create exclusive access to the mailbox commands between inbound and outbound handling.
--- drivers/net/qlge/qlge.h | 1 + drivers/net/qlge/qlge_main.c | 1 + drivers/net/qlge/qlge_mpi.c | 88 ++++++++++++++++++++++++++++------------- 3 files changed, 62 insertions(+), 28 deletions(-)
drivers/net/qlge/qlge.h +1 -0
@@ -1407,6 +1407,7 @@ struct ql_adapter {u32 mailbox_in;u32 mailbox_out; +struct mutex mpi_mutex;int tx_ring_size;int rx_ring_size;
drivers/net/qlge/qlge_main.c +1 -0
@@ -3659,6 +3659,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev,INIT_DELAYED_WORK (&qdev->asic_reset_work, ql_asic_reset_work);INIT_DELAYED_WORK (&qdev->mpi_reset_work, ql_mpi_reset_work);INIT_DELAYED_WORK (&qdev->mpi_work, ql_mpi_work); +mutex_init (&qdev->mpi_mutex);if (!cards_found) {dev_info (&pdev->dev,"%s\n" ,DRV_STRING );
drivers/net/qlge/qlge_mpi.c +60 -28
103 lines not on this page · raw message
Signature · 1 line
1.6.0.2
David Miller
maintainerFrom: Ron Mercer <[email protected]>
Date: Thu, 26 Feb 2009 12:07:46 -0800
Quoted 8 lines
These 5 patches are mostly non-logical changes. They are preparatory to adding more support for firmware events and adding the new device ID.
0001--net-next-qlge-Add-defines-for-firmware-support.patch 0002--net-next-qlge-Clean-up-firmware-reset-path.patch 0003--net-next-qlge-Move-firmware-event-handler.patch 0004--net-next-qlge-Prepare-to-add-new-device.patch 0005--net-next-qlge-Reduce-debug-print-output.patch
All applied to net-next-2.6, thanks Ron.