cxgb3: ring rx door bell less frequently
Subsystems (2)
PATCH 1/10 cxgb3: ring rx door bell less frequently
From: Divy Le Ray <[email protected]>
Ring free lists door bell less frequently,
specifically every quarter of the active FL
size.
---
drivers/net/cxgb3/adapter.h | 1 + drivers/net/cxgb3/sge.c | 32 ++++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-)
drivers/net/cxgb3/adapter.h +1 -0
@@ -91,6 +91,7 @@ struct rx_sw_desc;struct sge_fl {/* SGE per free-buffer list state */ unsigned int buf_size;/* size of each Rx buffer */ unsigned int credits;/* # of available Rx buffers */ +unsigned int pend_cred;/* new buffers since last FL DB ring */ unsigned int size;/* capacity of free list */ unsigned int cidx;/* consumer index */ unsigned int pidx;/* producer index */
drivers/net/cxgb3/sge.c +24 -8
@@ -63,6 +63,10 @@#define SGE_RX_DROP_THRES 16/* +* Max number of Rx buffers we replenish at a time. +*/ +#define MAX_RX_REFILL 16U +/* * Period of the Tx buffer reclaim timer. This timer does not need to run * frequently as Tx buffers are usually reclaimed by new Tx packets. */
@@ -423,6 +427,14 @@ static int alloc_pg_chunk(struct sge_fl *q, struct rx_sw_desc *sd, gfp_t gfp,return 0 ; } +static inline void ring_fl_db (struct adapter *adap,struct sge_fl *q) +{ +if (q->pend_cred >= q->credits /4 ) { + q->pend_cred =0 ; +t3_write_reg (adap,A_SG_KDOORBELL ,V_EGRCNTX (q->cntxt_id)); + } +} +/** * refill_fl - refill an SGE free-buffer list * @adapter: the adapter
@@ -478,19 +490,19 @@ nomem: q->alloc_failed++; sd = q->sdesc; d = q->desc; } - q->credits++; count++; } -wmb (); -if (likely (count)) -t3_write_reg (adap,A_SG_KDOORBELL ,V_EGRCNTX (q->cntxt_id)); + + q->credits += count; + q->pend_cred += count; +ring_fl_db (adap, q);return count; }static inline void __refill_fl (struct adapter *adap,struct sge_fl *fl) { -refill_fl (adap, fl,min (16U , fl->size - fl->credits), +refill_fl (adap, fl,min (MAX_RX_REFILL , fl->size - fl->credits),GFP_ATOMIC | __GFP_COMP); }
@@ -515,13 +527,15 @@ static void recycle_rx_buf(struct adapter *adap, struct sge_fl *q,wmb (); to->len_gen =cpu_to_be32 (V_FLD_GEN1 (q->gen)); to->gen2 =cpu_to_be32 (V_FLD_GEN2 (q->gen)); - q->credits++;if (++q->pidx == q->size) { q->pidx =0 ; q->gen ^=1 ; } -t3_write_reg (adap,A_SG_KDOORBELL ,V_EGRCNTX (q->cntxt_id)); + + q->credits++; + q->pend_cred++; +ring_fl_db (adap, q); }/**
@@ -732,7 +746,9 @@ recycle:return skb; } -if (unlikely (fl->credits < drop_thres)) +if (unlikely (fl->credits < drop_thres) && +refill_fl (adap, fl,min (MAX_RX_REFILL , fl->size - fl->credits -1 ), +GFP_ATOMIC | __GFP_COMP) ==0 ) goto recycle; use_orig_buf:
PATCH 2/10 cxgb3: release page ref on mapping error
From: Divy Le Ray <[email protected]>
Release page chunk reference in case we fail to map it.
---
drivers/net/cxgb3/sge.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-)
drivers/net/cxgb3/sge.c +14 -12
@@ -338,6 +338,18 @@ static inline int should_restart_tx(const struct sge_txq *q)return q->in_use - r < (q->size >>1 ); } +static void clear_rx_desc (const struct sge_fl *q,struct rx_sw_desc *d) +{ +if (q->use_pages) { +if (d->pg_chunk.page) +put_page (d->pg_chunk.page); + d->pg_chunk.page =NULL ; + }else { +kfree_skb (d->skb); + d->skb =NULL ; + } +} +/** * free_rx_bufs - free the Rx buffers on an SGE free list * @pdev: the PCI device associated with the adapter
@@ -355,14 +367,7 @@ static void free_rx_bufs(struct pci_dev *pdev, struct sge_fl *q)pci_unmap_single (pdev,pci_unmap_addr (d, dma_addr), q->buf_size,PCI_DMA_FROMDEVICE ); -if (q->use_pages) { -if (d->pg_chunk.page) -put_page (d->pg_chunk.page); - d->pg_chunk.page =NULL ; - }else { -kfree_skb (d->skb); - d->skb =NULL ; - } +clear_rx_desc (q, d);if (++cidx == q->size) cidx =0 ; }
@@ -475,10 +480,7 @@ nomem: q->alloc_failed++; err =add_one_rx_buf (buf_start, q->buf_size, d, sd, q->gen, adap->pdev);if (unlikely (err)) { -if (!q->use_pages) { -kfree_skb (sd->skb); - sd->skb =NULL ; - } +clear_rx_desc (q, sd);break ; }
PATCH 3/10 cxgb3: fix skb truesize in jumbo mode
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
Update skb truesize correctly for the 2nd buffer from a Jumbo frame
---
drivers/net/cxgb3/sge.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/cxgb3/sge.c +2 -1
@@ -830,14 +830,15 @@ recycle: len - SGE_RX_PULL_LEN); newskb->len = len; newskb->data_len = len -SGE_RX_PULL_LEN ; + newskb->truesize += newskb->data_len; }else {skb_fill_page_desc (newskb,skb_shinfo (newskb)->nr_frags, sd->pg_chunk.page, sd->pg_chunk.offset, len); newskb->len += len; newskb->data_len += len; + newskb->truesize += len; } - newskb->truesize += newskb->data_len; fl->credits--;/*
PATCH 4/10 cxgb3: prefetch buffer access in GRO mode
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
Elmininate a cache miss when accessing the CPL header within the first aggregated buffer.
---
drivers/net/cxgb3/sge.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/net/cxgb3/sge.c +3 -0
@@ -2029,6 +2029,8 @@ static void lro_add_page(struct adapter *adap, struct sge_qset *qs,pci_unmap_single (adap->pdev,pci_unmap_addr (sd, dma_addr), fl->buf_size,PCI_DMA_FROMDEVICE ); +prefetch (&qs->lro_frag_tbl); + rx_frag += nr_frags; rx_frag->page = sd->pg_chunk.page; rx_frag->page_offset = sd->pg_chunk.offset + offset;
@@ -2997,6 +2999,7 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports, V_NEWTIMER(q->rspq.holdoff_tmr));mod_timer (&q->tx_reclaim_timer, jiffies +TX_RECLAIM_PERIOD ); +return 0 ; err_unlock:
PATCH 5/10 cxgb3: separate TX and RX reclaim handlers
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
Separate TX and RX reclaim handlers
Don't disable interrupts in RX reclaim handler.
---
drivers/net/cxgb3/adapter.h | 1 drivers/net/cxgb3/sge.c | 128 ++++++++++++++++++++++++++++++------------- 2 files changed, 89 insertions(+), 40 deletions(-)
drivers/net/cxgb3/adapter.h +1 -0
@@ -197,6 +197,7 @@ struct sge_qset { /* an SGE queue set */struct netdev_queue *tx_q;/* associated netdev TX queue */ unsigned long txq_stopped;/* which Tx queues are stopped */ struct timer_list tx_reclaim_timer;/* reclaims TX buffers */ +struct timer_list rx_reclaim_timer;/* reclaims RX buffers */ unsigned long port_stats[SGE_PSTAT_MAX ]; }____cacheline_aligned ;
drivers/net/cxgb3/sge.c +88 -40
231 lines not on this page · raw message
PATCH 6/10 cxgb3: disable high freq non-data interrupts
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
Under RX pressure, The HW might generate a high load of interrupts to signal mac fifo or free lists overflow.
Disable the interrupts, and poll the relevant status bits to maintain stats.
---
drivers/net/cxgb3/cxgb3_main.c | 50 ++++++++++++++++++++++++++++++++++++++++ drivers/net/cxgb3/regs.h | 8 ++++++ drivers/net/cxgb3/sge.c | 3 ++ drivers/net/cxgb3/t3_hw.c | 30 +++++++++++++++++++++--- 4 files changed, 86 insertions(+), 5 deletions(-)
drivers/net/cxgb3/cxgb3_main.c +50 -0
@@ -2471,6 +2471,8 @@ static void t3_adap_check_task(struct work_struct *work) struct adapter *adapter = container_of(work, struct adapter, adap_check_task.work);const struct adapter_params *p = &adapter->params; +int port; +unsigned int v, status, reset; adapter->check_task_cnt++;
@@ -2489,6 +2491,54 @@ static void t3_adap_check_task(struct work_struct *work)if (p->rev ==T3_REV_B2 )check_t3b2_mac (adapter); +/* +* Scan the XGMAC's to check for various conditions which we want to +* monitor in a periodic polling manner rather than via an interrupt +* condition. This is used for conditions which would otherwise flood +* the system with interrupts and we only really need to know that the +* conditions are "happening" ... For each condition we count the +* detection of the condition and reset it for the next polling loop. +*/ +for_each_port (adapter, port) { +struct cmac *mac = &adap2pinfo (adapter, port)->mac; +u32 cause; + + cause =t3_read_reg (adapter,A_XGM_INT_CAUSE + mac->offset); + reset =0 ; +if (cause &F_RXFIFO_OVERFLOW ) { + mac->stats.rx_fifo_ovfl++; + reset |=F_RXFIFO_OVERFLOW ; + } + +t3_write_reg (adapter,A_XGM_INT_CAUSE + mac->offset, reset); + } + +/* +* We do the same as above for FL_EMPTY interrupts. +*/ + status =t3_read_reg (adapter,A_SG_INT_CAUSE ); + reset =0 ; + +if (status &F_FLEMPTY ) { +struct sge_qset *qs = &adapter->sge.qs[0 ]; +int i =0 ; + + reset |=F_FLEMPTY ; + + v = (t3_read_reg (adapter,A_SG_RSPQ_FL_STATUS ) >>S_FL0EMPTY ) & +0xffff ; + +while (v) { + qs->fl[i].empty += (v &1 ); +if (i) + qs++; + i ^=1 ; + v >>=1 ; + } + } + +t3_write_reg (adapter,A_SG_INT_CAUSE , reset); +/* Schedule the next check update if any port is active. */ spin_lock_irq (&adapter->work_lock);if (adapter->open_device_map &PORT_MASK )
drivers/net/cxgb3/regs.h +8 -0
@@ -170,6 +170,10 @@#define S_RSPQ0DISABLED 8 +#define S_FL0EMPTY 16 +#define V_FL0EMPTY (x) ((x) << S_FL0EMPTY) +#define F_FL0EMPTY V_FL0EMPTY(1U) +#define A_SG_EGR_RCQ_DRB_THRSH 0x54#define S_HIRCQDRBTHRSH 16
@@ -258,6 +262,10 @@#define V_RSPQCREDITOVERFOW (x) ((x) << S_RSPQCREDITOVERFOW)#define F_RSPQCREDITOVERFOW V_RSPQCREDITOVERFOW(1U) +#define S_FLEMPTY 1 +#define V_FLEMPTY (x) ((x) << S_FLEMPTY) +#define F_FLEMPTY V_FLEMPTY(1U) +#define A_SG_INT_ENABLE 0x60#define A_SG_CMDQ_CREDIT_TH 0x64
drivers/net/cxgb3/sge.c +2 -1
@@ -2725,7 +2725,8 @@ irq_handler_t t3_intr_handler(struct adapter *adap, int polling)*/ void t3_sge_err_intr_handler (struct adapter *adapter) { -unsigned int v, status =t3_read_reg (adapter,A_SG_INT_CAUSE ); +unsigned int v, status =t3_read_reg (adapter,A_SG_INT_CAUSE ) & + ~F_FLEMPTY ;if (status &SGE_PARERR ) CH_ALERT(adapter, "SGE parity error (0x%x)\n",
drivers/net/cxgb3/t3_hw.c +26 -4
@@ -1323,7 +1323,7 @@ static int t3_handle_intr_status(struct adapter *adapter, unsigned int reg,#define MC7_INTR_MASK (F_AE | F_UE | F_CE | V_PE(M_PE))#define XGM_INTR_MASK (V_TXFIFO_PRTY_ERR(M_TXFIFO_PRTY_ERR) | \ V_RXFIFO_PRTY_ERR(M_RXFIFO_PRTY_ERR) | \ - F_TXFIFO_UNDERRUN | F_RXFIFO_OVERFLOW) + F_TXFIFO_UNDERRUN)#define PCIX_INTR_MASK (F_MSTDETPARERR | F_SIGTARABT | F_RCVTARABT | \ F_RCVMSTABT | F_SIGSYSERR | F_DETPARERR | \ F_SPLCMPDIS | F_UNXSPLCMP | F_RCVSPLCMPERR | \
@@ -1695,7 +1695,14 @@ static void mc7_intr_handler(struct mc7 *mc7)static int mac_intr_handler (struct adapter *adap,unsigned int idx) {struct cmac *mac = &adap2pinfo (adap, idx)->mac; -u32 cause =t3_read_reg (adap,A_XGM_INT_CAUSE + mac->offset); +/* +* We mask out interrupt causes for which we're not taking interrupts. +* This allows us to use polling logic to monitor some of the other +* conditions when taking interrupts would impose too much load on the +* system. +*/ +u32 cause =t3_read_reg (adap,A_XGM_INT_CAUSE + mac->offset) & + ~F_RXFIFO_OVERFLOW ;if (cause &V_TXFIFO_PRTY_ERR (M_TXFIFO_PRTY_ERR )) { mac->stats.tx_fifo_parity_err++;
@@ -3617,7 +3624,15 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai, adapter->params.info = ai; adapter->params.nports = ai->nports; adapter->params.rev =t3_read_reg (adapter,A_PL_REV ); - adapter->params.linkpoll_period =0 ; +/* +* We used to only run the "adapter check task" once a second if +* we had PHYs which didn't support interrupts (we would check +* their link status once a second). Now we check other conditions +* in that routine which could potentially impose a very high +* interrupt load on the system. As such, we now always scan the +* adapter state once a second ... +*/ + adapter->params.linkpoll_period =10 ; adapter->params.stats_update_period =is_10G (adapter) ?MAC_STATS_ACCUM_SECS : (MAC_STATS_ACCUM_SECS *10 ); adapter->params.pci.vpd_cap_addr =
@@ -3707,7 +3722,14 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai, ETH_ALEN);init_link_config (&p->link_config, p->phy.caps); p->phy.ops->power_down (&p->phy,1 ); -if (!(p->phy.caps &SUPPORTED_IRQ )) + +/* +* If the PHY doesn't support interrupts for link status +* changes, schedule a scan of the adapter links at least +* once a second. +*/ +if (!(p->phy.caps &SUPPORTED_IRQ ) && + adapter->params.linkpoll_period >10 ) adapter->params.linkpoll_period =10 ; }
PATCH 7/10 cxgb3: Update Rev3 mac workaround
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
Update the heurstics workaround unlocking a hung mac:
- reduce Tx mac toggling by enabling Tx drain before resetting the mac
- Take Tx (lack of) activity in account only
- Update the monitoring counter range to 64 bits
---
drivers/net/cxgb3/xgmac.c | 72 +++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 39 deletions(-)
drivers/net/cxgb3/xgmac.c +33 -39
@@ -150,7 +150,8 @@ int t3_mac_reset(struct cmac *mac)static int t3b2_mac_reset (struct cmac *mac) {struct adapter *adap = mac->adapter; -unsigned int oft = mac->offset; +unsigned int oft = mac->offset, store; +int idx =macidx (mac);u32 val;if (!macidx (mac))
@@ -158,14 +159,28 @@ static int t3b2_mac_reset(struct cmac *mac)else t3_set_reg_field (adap,A_MPS_CFG ,F_PORT1ACTIVE ,0 ); +/* Stop NIC traffic to reduce the number of TXTOGGLES */ +t3_set_reg_field (adap,A_MPS_CFG ,F_ENFORCEPKT ,0 ); +/* Ensure TX drains */ +t3_set_reg_field (adap,A_XGM_TX_CFG + oft,F_TXPAUSEEN ,0 ); +t3_write_reg (adap,A_XGM_RESET_CTRL + oft,F_MAC_RESET_ );t3_read_reg (adap,A_XGM_RESET_CTRL + oft);/* flush */ +/* Store A_TP_TX_DROP_CFG_CH0 */ +t3_write_reg (adap,A_TP_PIO_ADDR ,A_TP_TX_DROP_CFG_CH0 + idx); + store =t3_read_reg (adap,A_TP_TX_DROP_CFG_CH0 + idx); +msleep (10 ); +/* Change DROP_CFG to 0xc0000011 */ +t3_write_reg (adap,A_TP_PIO_ADDR ,A_TP_TX_DROP_CFG_CH0 + idx); +t3_write_reg (adap,A_TP_PIO_DATA ,0xc0000011 ); +/* Check for xgm Rx fifo empty */ +/* Increased loop count to 1000 from 5 cover 1G and 100Mbps case */ if (t3_wait_op_done (adap,A_XGM_RX_MAX_PKT_SIZE_ERR_CNT + oft, -0x80000000 ,1 ,5 ,2 )) { +0x80000000 ,1 ,1000 ,2 )) {CH_ERR (adap,"MAC %d Rx fifo drain failed\n" ,macidx (mac));return -1 ;
@@ -191,11 +206,18 @@ static int t3b2_mac_reset(struct cmac *mac)F_DISPAUSEFRAMES |F_EN1536BFRAMES | F_RMFCS | F_ENJUMBO | F_ENHASHMCAST); -if (!macidx (mac)) +/* Restore the DROP_CFG */ +t3_write_reg (adap,A_TP_PIO_ADDR ,A_TP_TX_DROP_CFG_CH0 + idx); +t3_write_reg (adap,A_TP_PIO_DATA , store); + +if (!idx)t3_set_reg_field (adap,A_MPS_CFG ,0 ,F_PORT0ACTIVE );else t3_set_reg_field (adap,A_MPS_CFG ,0 ,F_PORT1ACTIVE ); +/* re-enable nic traffic */ +t3_set_reg_field (adap,A_MPS_CFG ,F_ENFORCEPKT ,1 ); +return 0 ; }
@@ -332,15 +354,6 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)return -EINVAL ;t3_write_reg (adap,A_XGM_RX_MAX_PKT_SIZE + mac->offset, mtu); -/* -* Adjust the PAUSE frame watermarks. We always set the LWM, and the -* HWM only if flow-control is enabled. -*/ - hwm = max_t(unsigned int, MAC_RXFIFO_SIZE - 3 * mtu, -MAC_RXFIFO_SIZE *38 /100 ); - hwm =min (hwm,MAC_RXFIFO_SIZE -8192 ); - lwm =min (3 * (int )mtu,MAC_RXFIFO_SIZE /4 ); -if (adap->params.rev >=T3_REV_B2 && (t3_read_reg (adap,A_XGM_RX_CTRL + mac->offset) &F_RXEN )) {disable_exact_filters (mac);
@@ -452,9 +465,12 @@ int t3_mac_enable(struct cmac *mac, int which)if (which &MAC_DIRECTION_TX ) {t3_write_reg (adap,A_TP_PIO_ADDR ,A_TP_TX_DROP_CFG_CH0 + idx); -t3_write_reg (adap,A_TP_PIO_DATA ,0xc0ede401 ); +t3_write_reg (adap,A_TP_PIO_DATA , + adap->params.rev ==T3_REV_C ? +0xc4ffff01 :0xc0ede401 );t3_write_reg (adap,A_TP_PIO_ADDR ,A_TP_TX_DROP_MODE ); -t3_set_reg_field (adap,A_TP_PIO_DATA ,1 << idx,1 << idx); +t3_set_reg_field (adap,A_TP_PIO_DATA ,1 << idx, + adap->params.rev ==T3_REV_C ?0 :1 << idx);t3_write_reg (adap,A_XGM_TX_CTRL + oft,F_TXEN );
@@ -510,15 +526,12 @@ int t3b2_mac_watchdog_task(struct cmac *mac)struct adapter *adap = mac->adapter;struct mac_stats *s = &mac->stats;unsigned int tx_tcnt, tx_xcnt; -unsigned int tx_mcnt = s->tx_frames; -unsigned int rx_mcnt = s->rx_frames; -unsigned int rx_xcnt; +u64 tx_mcnt = s->tx_frames;int status; status =0 ; tx_xcnt =1 ;/* By default tx_xcnt is making progress */ tx_tcnt = mac->tx_tcnt;/* If tx_mcnt is progressing ignore tx_tcnt */ - rx_xcnt =1 ;/* By default rx_xcnt is making progress */ if (tx_mcnt == mac->tx_mcnt && mac->rx_pause == s->rx_pause) { tx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap, A_XGM_TX_SPI4_SOP_EOP_CNT +
@@ -529,11 +542,11 @@ int t3b2_mac_watchdog_task(struct cmac *mac) tx_tcnt = (G_TXDROPCNTCH0RCVD (t3_read_reg (adap,A_TP_PIO_DATA ))); }else { - goto rxcheck; + goto out; } }else { mac->toggle_cnt =0 ; - goto rxcheck; + goto out; }if ((tx_tcnt != mac->tx_tcnt) && (mac->tx_xcnt ==0 )) {
@@ -546,23 +559,6 @@ int t3b2_mac_watchdog_task(struct cmac *mac) } }else { mac->toggle_cnt =0 ; - goto rxcheck; - } - -rxcheck: -if (rx_mcnt != mac->rx_mcnt) { - rx_xcnt = (G_TXSPI4SOPCNT (t3_read_reg (adap, -A_XGM_RX_SPI4_SOP_EOP_CNT + - mac->offset))) + - (s->rx_fifo_ovfl - - mac->rx_ocnt); - mac->rx_ocnt = s->rx_fifo_ovfl; - }else - goto out; - -if (mac->rx_mcnt != s->rx_frames && rx_xcnt ==0 && - mac->rx_xcnt ==0 ) { - status =2 ; goto out; }
@@ -570,8 +566,6 @@ out: mac->tx_tcnt = tx_tcnt; mac->tx_xcnt = tx_xcnt; mac->tx_mcnt = s->tx_frames; - mac->rx_xcnt = rx_xcnt; - mac->rx_mcnt = s->rx_frames; mac->rx_pause = s->rx_pause;if (status ==1 ) {t3_write_reg (adap,A_XGM_TX_CTRL + mac->offset,0 );
PATCH 8/10 cxgb3: detect mac link faults.
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
The driver currently ignores the local or remote link faults raised at the mac layer. This patch fixes it.
Our mac however only advertizes link events, so wait for the phy to stabilize the link, then enable mac link events interrupts.
---
drivers/net/cxgb3/adapter.h | 5 + drivers/net/cxgb3/common.h | 6 ++ drivers/net/cxgb3/cxgb3_main.c | 123 ++++++++++++++++++++++++++++++++++++- drivers/net/cxgb3/regs.h | 13 ++++ drivers/net/cxgb3/t3_hw.c | 134 ++++++++++++++++++++++++++++++++++++++++ drivers/net/cxgb3/xgmac.c | 13 ++-- 6 files changed, 285 insertions(+), 9 deletions(-)
drivers/net/cxgb3/adapter.h +5 -0
@@ -68,6 +68,8 @@ struct port_info {struct net_device_stats netstats;int activity;__be32 iscsi_ipv4addr; + +int link_fault;/* link fault was detected */ };enum {/* adapter flags */
@@ -241,6 +243,7 @@ struct adapter {struct delayed_work adap_check_task;struct work_struct ext_intr_handler_task;struct work_struct fatal_error_handler_task; +struct work_struct link_fault_handler_task;struct dentry *debugfs_root;
@@ -283,6 +286,8 @@ void t3_os_ext_intr_handler(struct adapter *adapter);void t3_os_link_changed (struct adapter *adapter,int port_id,int link_status,int speed,int duplex,int fc);void t3_os_phymod_changed (struct adapter *adap,int port_id); +void t3_os_link_fault (struct adapter *adapter,int port_id,int state); +void t3_os_link_fault_handler (struct adapter *adapter,int port_id);void t3_sge_start (struct adapter *adap);void t3_sge_stop (struct adapter *adap);
drivers/net/cxgb3/common.h +6 -0
@@ -280,6 +280,7 @@ struct mac_stats {unsigned long num_toggled;/* # times toggled TxEn due to stuck TX */ unsigned long num_resets;/* # times reset due to stuck TX */ +unsigned long link_faults;/* # detected link faults */ };struct tp_mib_stats {
@@ -701,6 +702,8 @@ int t3_phy_lasi_intr_handler(struct cphy *phy);void t3_intr_enable (struct adapter *adapter);void t3_intr_disable (struct adapter *adapter);void t3_intr_clear (struct adapter *adapter); +void t3_xgm_intr_enable (struct adapter *adapter,int idx); +void t3_xgm_intr_disable (struct adapter *adapter,int idx);void t3_port_intr_enable (struct adapter *adapter,int idx);void t3_port_intr_disable (struct adapter *adapter,int idx);void t3_port_intr_clear (struct adapter *adapter,int idx);
@@ -708,6 +711,7 @@ int t3_slow_intr_handler(struct adapter *adapter);int t3_phy_intr_handler (struct adapter *adapter);void t3_link_changed (struct adapter *adapter,int port_id); +void t3_link_fault (struct adapter *adapter,int port_id);int t3_link_start (struct cphy *phy,struct cmac *mac,struct link_config *lc);const struct adapter_info *t3_get_adapter_info (unsigned int board_id);int t3_seeprom_read (struct adapter *adapter,u32 addr,__le32 *data);
@@ -744,6 +748,8 @@ int t3_mc7_bd_read(struct mc7 *mc7, unsigned int start, unsigned int n,int t3_mac_reset (struct cmac *mac);void t3b_pcs_reset (struct cmac *mac); +void t3_mac_disable_exact_filters (struct cmac *mac); +void t3_mac_enable_exact_filters (struct cmac *mac);int t3_mac_enable (struct cmac *mac,int which);int t3_mac_disable (struct cmac *mac,int which);int t3_mac_set_mtu (struct cmac *mac,unsigned int mtu);
drivers/net/cxgb3/cxgb3_main.c +120 -3
190 lines not on this page · raw message
drivers/net/cxgb3/regs.h +13 -0
@@ -2215,6 +2215,15 @@#define A_XGM_RX_EXACT_MATCH_LOW_8 0x854 +#define A_XGM_INT_STATUS 0x86c + +#define S_LINKFAULTCHANGE 9 +#define V_LINKFAULTCHANGE (x) ((x) << S_LINKFAULTCHANGE) +#define F_LINKFAULTCHANGE V_LINKFAULTCHANGE(1U) + +#define A_XGM_XGM_INT_ENABLE 0x874 +#define A_XGM_XGM_INT_DISABLE 0x878 +#define A_XGM_STAT_CTRL 0x880#define S_CLRSTATS 2
@@ -2413,6 +2422,10 @@#define V_XAUIPCSALIGNCHANGE (x) ((x) << S_XAUIPCSALIGNCHANGE)#define F_XAUIPCSALIGNCHANGE V_XAUIPCSALIGNCHANGE(1U) +#define S_XGM_INT 0 +#define V_XGM_INT (x) ((x) << S_XGM_INT) +#define F_XGM_INT V_XGM_INT(1U) +#define A_XGM_INT_CAUSE 0x8d8#define A_XGM_XAUI_ACT_CTRL 0x8dc
drivers/net/cxgb3/t3_hw.c +133 -1
181 lines not on this page · raw message
drivers/net/cxgb3/xgmac.c +8 -5
@@ -218,6 +218,9 @@ static int t3b2_mac_reset(struct cmac *mac)/* re-enable nic traffic */ t3_set_reg_field (adap,A_MPS_CFG ,F_ENFORCEPKT ,1 ); +/* Set: re-enable NIC traffic */ +t3_set_reg_field (adap,A_MPS_CFG ,F_ENFORCEPKT ,1 ); +return 0 ; }
@@ -258,7 +261,7 @@ int t3_mac_set_num_ucast(struct cmac *mac, int n)return 0 ; } -static void disable_exact_filters (struct cmac *mac) +void t3_mac_disable_exact_filters (struct cmac *mac) {unsigned int i, reg = mac->offset +A_XGM_RX_EXACT_MATCH_LOW_1 ;
@@ -269,7 +272,7 @@ static void disable_exact_filters(struct cmac *mac)t3_read_reg (mac->adapter,A_XGM_RX_EXACT_MATCH_LOW_1 );/* flush */ } -static void enable_exact_filters (struct cmac *mac) +void t3_mac_enable_exact_filters (struct cmac *mac) {unsigned int i, reg = mac->offset +A_XGM_RX_EXACT_MATCH_HIGH_1 ;
@@ -356,7 +359,7 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)if (adap->params.rev >=T3_REV_B2 && (t3_read_reg (adap,A_XGM_RX_CTRL + mac->offset) &F_RXEN )) { -disable_exact_filters (mac); +t3_mac_disable_exact_filters (mac); v =t3_read_reg (adap,A_XGM_RX_CFG + mac->offset);t3_set_reg_field (adap,A_XGM_RX_CFG + mac->offset,F_ENHASHMCAST |F_COPYALLFRAMES ,F_DISBCAST );
@@ -368,14 +371,14 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)if (t3_wait_op_done (adap, reg + mac->offset,F_RXFIFO_EMPTY ,1 ,20 ,5 )) {t3_write_reg (adap,A_XGM_RX_CFG + mac->offset, v); -enable_exact_filters (mac); +t3_mac_enable_exact_filters (mac);return -EIO ; }t3_set_reg_field (adap,A_XGM_RX_MAX_PKT_SIZE + mac->offset,V_RXMAXPKTSIZE (M_RXMAXPKTSIZE ),V_RXMAXPKTSIZE (mtu));t3_write_reg (adap,A_XGM_RX_CFG + mac->offset, v); -enable_exact_filters (mac); +t3_mac_enable_exact_filters (mac); }else t3_set_reg_field(adap, A_XGM_RX_MAX_PKT_SIZE + mac->offset, V_RXMAXPKTSIZE(M_RXMAXPKTSIZE),
PATCH 9/10 cxgb3: update FW
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
Update FW to 7.1
---
drivers/net/cxgb3/version.h | 2 firmware/Makefile | 2 firmware/WHENCE | 2 firmware/cxgb3/t3fw-7.0.0.bin.ihex | 1881 ------------------------------------ firmware/cxgb3/t3fw-7.1.0.bin.ihex | 1885 ++++++++++++++++++++++++++++++++++++ 5 files changed, 1888 insertions(+), 1884 deletions(-)
drivers/net/cxgb3/version.h +1 -1
@@ -39,6 +39,6 @@/* Firmware version */ #define FW_VERSION_MAJOR 7 -#define FW_VERSION_MINOR 0 +#define FW_VERSION_MINOR 1#define FW_VERSION_MICRO 0#endif /* __CHELSIO_VERSION_H */
firmware/Makefile +1 -1
@@ -35,7 +35,7 @@ fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \ cxgb3/t3c_psram-1.1.0.bin \ - cxgb3/t3fw-7.0.0.bin + cxgb3/t3fw-7.1.0.bin fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ e100/d102e_ucode.bin
firmware/WHENCE +1 -1
@@ -368,7 +368,7 @@ Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter File: cxgb3/t3b_psram-1.1.0.bin.ihex File: cxgb3/t3c_psram-1.1.0.bin.ihex -file: cxgb3/t3fw-7.0.0.bin.ihex +file: cxgb3/t3fw-7.1.0.bin.ihex License: GPLv2 or OpenIB.org BSD license, no source visible
firmware/cxgb3/t3fw-7.0.0.bin.ihex deleted +0 -1881
1,881 lines not on this page · raw message
firmware/cxgb3/t3fw-7.1.0.bin.ihex new file +1885 -0
1,096 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
PATCH 10/10 cxgb3: update driver version
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
update driver version to 1.1.1-ko
---
drivers/net/cxgb3/version.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/cxgb3/version.h +1 -1
@@ -35,7 +35,7 @@#define DRV_DESC "Chelsio T3 Network Driver"#define DRV_NAME "cxgb3"/* Driver version */ -#define DRV_VERSION "1.1.1-ko" +#define DRV_VERSION "1.1.2-ko"/* Firmware version */ #define FW_VERSION_MAJOR 7