cxgb3: start qset timers when setup succeeded
Subsystems (2)
PATCH 1/5 cxgb3: start qset timers when setup succeeded
From: Divy Le Ray <[email protected]>
Start queue set reclaim timers after the queue sets have been allocated successfully.
---
drivers/net/cxgb3/adapter.h | 1 + drivers/net/cxgb3/cxgb3_main.c | 3 ++- drivers/net/cxgb3/sge.c | 24 +++++++++++++++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-)
drivers/net/cxgb3/adapter.h +1 -0
@@ -291,6 +291,7 @@ 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); +void t3_start_sge_timers (struct adapter *adap);void t3_stop_sge_timers (struct adapter *adap);void t3_free_sge_resources (struct adapter *adap);void t3_sge_err_intr_handler (struct adapter *adapter);
drivers/net/cxgb3/cxgb3_main.c +2 -1
@@ -602,7 +602,6 @@ static int setup_sge_qsets(struct adapter *adap) &adap->params.sge.qset[qset_idx], ntxq, dev, netdev_get_tx_queue(dev, j));if (err) { -t3_stop_sge_timers (adap);t3_free_sge_resources (adap);return err; }
@@ -1046,6 +1045,8 @@ static int cxgb_up(struct adapter *adap)setup_rss (adap);if (!(adap->flags &NAPI_INIT ))init_napi (adap); + +t3_start_sge_timers (adap); adap->flags |=FULL_INIT_DONE ; }
drivers/net/cxgb3/sge.c +21 -3
@@ -3044,9 +3044,6 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports,t3_write_reg (adapter,A_SG_GTS ,V_RSPQ (q->rspq.cntxt_id) |V_NEWTIMER (q->rspq.holdoff_tmr)); -mod_timer (&q->tx_reclaim_timer, jiffies +TX_RECLAIM_PERIOD ); -mod_timer (&q->rx_reclaim_timer, jiffies +RX_RECLAIM_PERIOD ); -return 0 ; err_unlock:
@@ -3057,6 +3054,27 @@ err: }/** +* t3_start_sge_timers - start SGE timer call backs +* @adap: the adapter +* +* Starts each SGE queue set's timer call back +*/ +void t3_start_sge_timers (struct adapter *adap) +{ +int i; + +for (i =0 ; i <SGE_QSETS ; ++i) { +struct sge_qset *q = &adap->sge.qs[i]; + +if (q->tx_reclaim_timer.function) +mod_timer (&q->tx_reclaim_timer, jiffies +TX_RECLAIM_PERIOD ); + +if (q->rx_reclaim_timer.function) +mod_timer (&q->rx_reclaim_timer, jiffies +RX_RECLAIM_PERIOD ); + } +} + +/** * t3_stop_sge_timers - stop SGE timer call backs * @adap: the adapter *
PATCH 2/5 cxgb3: sge setup fixes
From: Divy Le Ray <[email protected]>
Enable timestamps, update delayed ack threshold for iSCSI/iWARP traffic Remove the len flag in Tx requests. It might corrupt offload trace packets. Update SGE context setup to avoid potential H/W misprogrammation.
---
drivers/net/cxgb3/sge.c | 2 +- drivers/net/cxgb3/t3_hw.c | 45 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 39 insertions(+), 8 deletions(-)
drivers/net/cxgb3/sge.c +1 -1
@@ -1089,7 +1089,7 @@ static void write_tx_pkt_wr(struct adapter *adap, struct sk_buff *skb,struct tx_desc *d = &q->desc[pidx];struct cpl_tx_pkt *cpl = (struct cpl_tx_pkt *)d; - cpl->len =htonl (skb->len |0x80000000 ); + cpl->len =htonl (skb->len); cntrl =V_TXPKT_INTF (pi->port_id);if (vlan_tx_tag_present (skb) && pi->vlan_grp)
drivers/net/cxgb3/t3_hw.c +38 -7
71 lines not on this page · raw message
PATCH 3/5 cxgb3: use resource_size_t for mmio declarations
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
Use resource_size_t to declare mmio start and len variables. Print PEX error register after EEH resumed.
---
drivers/net/cxgb3/cxgb3_main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
drivers/net/cxgb3/cxgb3_main.c +4 -1
@@ -2871,6 +2871,9 @@ static void t3_io_resume(struct pci_dev *pdev) {struct adapter *adapter =pci_get_drvdata (pdev); +CH_ALERT (adapter,"adapter recovering, PEX ERR 0x%x\n" , +t3_read_reg (adapter,A_PCIE_PEX_ERR )); +t3_resume_ports (adapter); }
@@ -3003,7 +3006,7 @@ static int __devinit init_one(struct pci_dev *pdev,static int version_printed;int i, err, pci_using_dac =0 ; -unsigned long mmio_start, mmio_len; +resource_size_t mmio_start, mmio_len;const struct adapter_info *ai;struct adapter *adapter =NULL ;struct port_info *pi;
PATCH 4/5 cxgb3: differentiate portx and Tx channels
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
Separate ports from H/W Tx channels.
---
drivers/net/cxgb3/common.h | 4 +++- drivers/net/cxgb3/cxgb3_main.c | 4 ++-- drivers/net/cxgb3/t3_hw.c | 35 +++++++++++++++++++---------------- 3 files changed, 24 insertions(+), 19 deletions(-)
drivers/net/cxgb3/common.h +3 -1
@@ -191,7 +191,8 @@ struct mdio_ops { };struct adapter_info { -unsigned char nports;/* # of ports */ +unsigned char nports0;/* # of ports on channel 0 */ +unsigned char nports1;/* # of ports on channel 1 */ unsigned char phy_base_addr;/* MDIO PHY base address */ unsigned int gpio_out;/* GPIO output settings */ unsigned char gpio_intr[MAX_NPORTS ];/* GPIO PHY IRQ pins */
@@ -422,6 +423,7 @@ struct adapter_params {unsigned short b_wnd[NCCTRL_WIN ];unsigned int nports;/* # of ethernet ports */ +unsigned int chan_map;/* bitmap of in-use Tx channels */ unsigned int stats_update_period;/* MAC stats accumulation period */ unsigned int linkpoll_period;/* link poll period in 0.1s */ unsigned int rev;/* chip revision */
drivers/net/cxgb3/cxgb3_main.c +2 -2
@@ -3086,7 +3086,7 @@ static int __devinit init_one(struct pci_dev *pdev,INIT_WORK (&adapter->fatal_error_handler_task, fatal_error_task);INIT_DELAYED_WORK (&adapter->adap_check_task, t3_adap_check_task); -for (i =0 ; i < ai->nports; ++i) { +for (i =0 ; i < ai->nports0 + ai->nports1; ++i) {struct net_device *netdev; netdev =alloc_etherdev_mq (sizeof (struct port_info ),SGE_QSETS );
@@ -3176,7 +3176,7 @@ static int __devinit init_one(struct pci_dev *pdev, out_free_dev:iounmap (adapter->regs); -for (i = ai->nports -1 ; i >=0 ; --i) +for (i = ai->nports0 + ai->nports1 -1 ; i >=0 ; --i)if (adapter->port[i])free_netdev (adapter->port[i]);
drivers/net/cxgb3/t3_hw.c +19 -16
@@ -493,20 +493,20 @@ int t3_phy_lasi_intr_handler(struct cphy *phy) }static const struct adapter_info t3_adap_info[] = { - {2 ,0 , + {1 ,1 ,0 ,F_GPIO2_OEN |F_GPIO4_OEN |F_GPIO2_OUT_VAL |F_GPIO4_OUT_VAL , {S_GPIO3 ,S_GPIO5 },0 , &mi1_mdio_ops,"Chelsio PE9000" }, - {2 ,0 , + {1 ,1 ,0 ,F_GPIO2_OEN |F_GPIO4_OEN |F_GPIO2_OUT_VAL |F_GPIO4_OUT_VAL , {S_GPIO3 ,S_GPIO5 },0 , &mi1_mdio_ops,"Chelsio T302" }, - {1 ,0 , + {1 ,0 ,0 ,F_GPIO1_OEN |F_GPIO6_OEN |F_GPIO7_OEN |F_GPIO10_OEN |F_GPIO11_OEN |F_GPIO1_OUT_VAL |F_GPIO6_OUT_VAL |F_GPIO10_OUT_VAL , {0 }, SUPPORTED_10000baseT_Full |SUPPORTED_AUI , &mi1_mdio_ext_ops,"Chelsio T310" }, - {2 ,0 , + {1 ,1 ,0 ,F_GPIO1_OEN |F_GPIO2_OEN |F_GPIO4_OEN |F_GPIO5_OEN |F_GPIO6_OEN |F_GPIO7_OEN |F_GPIO10_OEN |F_GPIO11_OEN |F_GPIO1_OUT_VAL |F_GPIO5_OUT_VAL |F_GPIO6_OUT_VAL |F_GPIO10_OUT_VAL ,
@@ -514,7 +514,7 @@ static const struct adapter_info t3_adap_info[] = { &mi1_mdio_ext_ops, "Chelsio T320"}, {}, {}, - {1 ,0 , + {1 ,0 ,0 ,F_GPIO1_OEN |F_GPIO2_OEN |F_GPIO4_OEN |F_GPIO6_OEN |F_GPIO7_OEN |F_GPIO10_OEN |F_GPIO1_OUT_VAL |F_GPIO6_OUT_VAL |F_GPIO10_OUT_VAL , { S_GPIO9 }, SUPPORTED_10000baseT_Full | SUPPORTED_AUI,
@@ -3227,20 +3227,22 @@ int t3_mps_set_active_ports(struct adapter *adap, unsigned int port_mask) }/* -* Perform the bits of HW initialization that are dependent on the number -* of available ports. +* Perform the bits of HW initialization that are dependent on the Tx +* channels being used. */ -static void init_hw_for_avail_ports (struct adapter *adap,int nports) +static void chan_init_hw (struct adapter *adap,unsigned int chan_map) {int i; -if (nports ==1 ) { +if (chan_map !=3 ) {/* one channel */ t3_set_reg_field (adap,A_ULPRX_CTL ,F_ROUND_ROBIN ,0 );t3_set_reg_field (adap,A_ULPTX_CONFIG ,F_CFG_RR_ARB ,0 ); -t3_write_reg (adap,A_MPS_CFG ,F_TPRXPORTEN |F_TPTXPORT0EN | -F_PORT0ACTIVE |F_ENFORCEPKT ); -t3_write_reg (adap,A_PM1_TX_CFG ,0xffffffff ); - }else { +t3_write_reg (adap,A_MPS_CFG ,F_TPRXPORTEN |F_ENFORCEPKT | + (chan_map ==1 ?F_TPTXPORT0EN |F_PORT0ACTIVE : +F_TPTXPORT1EN |F_PORT1ACTIVE )); +t3_write_reg (adap,A_PM1_TX_CFG , + chan_map ==1 ?0xffffffff :0 ); + }else {/* two channels */ t3_set_reg_field (adap,A_ULPRX_CTL ,0 ,F_ROUND_ROBIN );t3_set_reg_field (adap,A_ULPTX_CONFIG ,0 ,F_CFG_RR_ARB ); t3_write_reg(adap, A_ULPTX_DMA_WEIGHT,
@@ -3548,7 +3550,7 @@ int t3_init_hw(struct adapter *adapter, u32 fw_params)t3_write_reg (adapter,A_PM1_RX_CFG ,0xffffffff );t3_write_reg (adapter,A_PM1_RX_MODE ,0 );t3_write_reg (adapter,A_PM1_TX_MODE ,0 ); -init_hw_for_avail_ports (adapter, adapter->params.nports); +chan_init_hw (adapter, adapter->params.chan_map);t3_sge_init (adapter, &adapter->params.sge);t3_write_reg (adapter,A_T3DBG_GPIO_ACT_LOW ,calc_gpio_intr (adapter));
@@ -3785,7 +3787,8 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,get_pci_mode (adapter, &adapter->params.pci); adapter->params.info = ai; - adapter->params.nports = ai->nports; + adapter->params.nports = ai->nports0 + ai->nports1; + adapter->params.chan_map = !!ai->nports0 | (!!ai->nports1 <<1 ); adapter->params.rev =t3_read_reg (adapter,A_PL_REV );/* * We used to only run the "adapter check task" once a second if
@@ -3816,7 +3819,7 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,mc7_prep (adapter, &adapter->pmtx,MC7_PMTX_BASE_ADDR ,"PMTX" );mc7_prep (adapter, &adapter->cm,MC7_CM_BASE_ADDR ,"CM" ); - p->nchan = ai->nports; + p->nchan = adapter->params.chan_map ==3 ?2 :1 ; p->pmrx_size =t3_mc7_size (&adapter->pmrx); p->pmtx_size =t3_mc7_size (&adapter->pmtx); p->cm_size =t3_mc7_size (&adapter->cm);
PATCH 5/5 cxgb3: map entire Rx page, feed map+offset to Rx ring.
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
DMA mapping can be expensive in the presence of iommus.
Reduce the Rx iommu activity by mapping an entire page, and provide the H/W the mapped address + offset of the current page chunk.
Reserve bits at the end of the page to track mapping references, so the page can be unmapped.
---
drivers/net/cxgb3/adapter.h | 3 + drivers/net/cxgb3/sge.c | 138 ++++++++++++++++++++++++++++++++----------- 2 files changed, 106 insertions(+), 35 deletions(-)
drivers/net/cxgb3/adapter.h +3 -0
@@ -85,6 +85,8 @@ struct fl_pg_chunk {struct page *page;void *va;unsigned int offset; +u64 *p_cnt; +DECLARE_PCI_UNMAP_ADDR (mapping); };struct rx_desc ;
@@ -101,6 +103,7 @@ struct sge_fl { /* SGE per free-buffer list state */struct fl_pg_chunk pg_chunk;/* page chunk cache */ unsigned int use_pages;/* whether FL uses pages or sk_buffs */ unsigned int order;/* order of page allocations */ +unsigned int alloc_size;/* size of allocated buffer */ struct rx_desc *desc;/* address of HW Rx descriptor ring */ struct rx_sw_desc *sdesc;/* address of SW Rx descriptor ring */ dma_addr_t phys_addr;/* physical address of HW ring start */
drivers/net/cxgb3/sge.c +103 -35
284 lines not on this page · raw message
From: Divy Le Ray <[email protected]>
Date: Thu, 26 Mar 2009 19:39:09 -0700
Quoted 6 lines
From: Divy Le Ray <[email protected]>
Start queue set reclaim timers after the queue sets have been allocated successfully.
Signed-off-by Divy Le Ray <[email protected]>
Applied.
Re: [PATCH 2.6.30 2/5] cxgb3: sge setup fixes
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
Date: Thu, 26 Mar 2009 19:39:14 -0700
Quoted 7 lines
From: Divy Le Ray <[email protected]>
Enable timestamps, update delayed ack threshold for iSCSI/iWARP traffic Remove the len flag in Tx requests. It might corrupt offload trace packets. Update SGE context setup to avoid potential H/W misprogrammation.
Signed-off-by Divy Le Ray <[email protected]>
Applied.
Re: [PATCH 2.6.30 3/5] cxgb3: use resource_size_t for mmio declarations
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
Date: Thu, 26 Mar 2009 19:39:19 -0700
Quoted 6 lines
From: Divy Le Ray <[email protected]>
Use
resource_size_tto declare mmio start and len variables. Print PEX error register after EEH resumed.Signed-off-by Divy Le Ray <[email protected]>
Applied.
Re: [PATCH 2.6.30 4/5] cxgb3: differentiate portx and Tx channels
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
Date: Thu, 26 Mar 2009 19:39:24 -0700
Quoted 5 lines
From: Divy Le Ray <[email protected]>
Separate ports from H/W Tx channels.
Signed-off-by Divy Le Ray <[email protected]>
Applied.
Re: [PATCH 2.6.30 5/5] cxgb3: map entire Rx page, feed map+offset to Rx ring.
In reply to Divy Le RayFrom: Divy Le Ray <[email protected]>
Date: Thu, 26 Mar 2009 19:39:29 -0700
Quoted 9 lines
From: Divy Le Ray <[email protected]>
DMA mapping can be expensive in the presence of iommus.
Reduce the Rx iommu activity by mapping an entire page, and provide the H/W the mapped address + offset of the current page chunk.
Reserve bits at the end of the page to track mapping references, so the page can be unmapped.Signed-off-by Divy Le Ray <[email protected]>
Applied.