diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 10:33:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 10:33:17 -0500 |
commit | 3ff1562ea48cddaa5ac1adcb8892227389a4c96c (patch) | |
tree | 927f885b02579402859f339db707a0a76470aa51 /drivers/net/cxgb3/cxgb3_main.c | |
parent | 88b68033b99b16b42e734ab56a4ed6bc1d53516a (diff) | |
parent | fe8875e5a41a36ef26072cf05731df5493ade0e1 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (48 commits)
IB/srp: Clean up error path in srp_create_target_ib()
IB/srp: Split send and recieve CQs to reduce number of interrupts
RDMA/nes: Add support for KR device id 0x0110
IB/uverbs: Use anon_inodes instead of private infinibandeventfs
IB/core: Fix and clean up ib_ud_header_init()
RDMA/cxgb3: Mark RDMA device with CXIO_ERROR_FATAL when removing
RDMA/cxgb3: Don't allocate the SW queue for user mode CQs
RDMA/cxgb3: Increase the max CQ depth
RDMA/cxgb3: Doorbell overflow avoidance and recovery
IB/core: Pack struct ib_device a little tighter
IB/ucm: Clean whitespace errors
IB/ucm: Increase maximum devices supported
IB/ucm: Use stack variable 'base' in ib_ucm_add_one
IB/ucm: Use stack variable 'devnum' in ib_ucm_add_one
IB/umad: Clean whitespace
IB/umad: Increase maximum devices supported
IB/umad: Use stack variable 'base' in ib_umad_init_port
IB/umad: Use stack variable 'devnum' in ib_umad_init_port
IB/umad: Remove port_table[]
IB/umad: Convert *cdev to cdev in struct ib_umad_port
...
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
-rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 57 |
1 files changed, 56 insertions, 1 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 6fd968abb073..3e453e1d97e7 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <linux/firmware.h> | 45 | #include <linux/firmware.h> |
46 | #include <linux/log2.h> | 46 | #include <linux/log2.h> |
47 | #include <linux/stringify.h> | 47 | #include <linux/stringify.h> |
48 | #include <linux/sched.h> | ||
48 | #include <asm/uaccess.h> | 49 | #include <asm/uaccess.h> |
49 | 50 | ||
50 | #include "common.h" | 51 | #include "common.h" |
@@ -140,7 +141,7 @@ MODULE_PARM_DESC(ofld_disable, "whether to enable offload at init time or not"); | |||
140 | * will block keventd as it needs the rtnl lock, and we'll deadlock waiting | 141 | * will block keventd as it needs the rtnl lock, and we'll deadlock waiting |
141 | * for our work to complete. Get our own work queue to solve this. | 142 | * for our work to complete. Get our own work queue to solve this. |
142 | */ | 143 | */ |
143 | static struct workqueue_struct *cxgb3_wq; | 144 | struct workqueue_struct *cxgb3_wq; |
144 | 145 | ||
145 | /** | 146 | /** |
146 | * link_report - show link status and link speed/duplex | 147 | * link_report - show link status and link speed/duplex |
@@ -586,6 +587,19 @@ static void setup_rss(struct adapter *adap) | |||
586 | V_RRCPLCPUSIZE(6) | F_HASHTOEPLITZ, cpus, rspq_map); | 587 | V_RRCPLCPUSIZE(6) | F_HASHTOEPLITZ, cpus, rspq_map); |
587 | } | 588 | } |
588 | 589 | ||
590 | static void ring_dbs(struct adapter *adap) | ||
591 | { | ||
592 | int i, j; | ||
593 | |||
594 | for (i = 0; i < SGE_QSETS; i++) { | ||
595 | struct sge_qset *qs = &adap->sge.qs[i]; | ||
596 | |||
597 | if (qs->adap) | ||
598 | for (j = 0; j < SGE_TXQ_PER_SET; j++) | ||
599 | t3_write_reg(adap, A_SG_KDOORBELL, F_SELEGRCNTX | V_EGRCNTX(qs->txq[j].cntxt_id)); | ||
600 | } | ||
601 | } | ||
602 | |||
589 | static void init_napi(struct adapter *adap) | 603 | static void init_napi(struct adapter *adap) |
590 | { | 604 | { |
591 | int i; | 605 | int i; |
@@ -2750,6 +2764,42 @@ static void t3_adap_check_task(struct work_struct *work) | |||
2750 | spin_unlock_irq(&adapter->work_lock); | 2764 | spin_unlock_irq(&adapter->work_lock); |
2751 | } | 2765 | } |
2752 | 2766 | ||
2767 | static void db_full_task(struct work_struct *work) | ||
2768 | { | ||
2769 | struct adapter *adapter = container_of(work, struct adapter, | ||
2770 | db_full_task); | ||
2771 | |||
2772 | cxgb3_event_notify(&adapter->tdev, OFFLOAD_DB_FULL, 0); | ||
2773 | } | ||
2774 | |||
2775 | static void db_empty_task(struct work_struct *work) | ||
2776 | { | ||
2777 | struct adapter *adapter = container_of(work, struct adapter, | ||
2778 | db_empty_task); | ||
2779 | |||
2780 | cxgb3_event_notify(&adapter->tdev, OFFLOAD_DB_EMPTY, 0); | ||
2781 | } | ||
2782 | |||
2783 | static void db_drop_task(struct work_struct *work) | ||
2784 | { | ||
2785 | struct adapter *adapter = container_of(work, struct adapter, | ||
2786 | db_drop_task); | ||
2787 | unsigned long delay = 1000; | ||
2788 | unsigned short r; | ||
2789 | |||
2790 | cxgb3_event_notify(&adapter->tdev, OFFLOAD_DB_DROP, 0); | ||
2791 | |||
2792 | /* | ||
2793 | * Sleep a while before ringing the driver qset dbs. | ||
2794 | * The delay is between 1000-2023 usecs. | ||
2795 | */ | ||
2796 | get_random_bytes(&r, 2); | ||
2797 | delay += r & 1023; | ||
2798 | set_current_state(TASK_UNINTERRUPTIBLE); | ||
2799 | schedule_timeout(usecs_to_jiffies(delay)); | ||
2800 | ring_dbs(adapter); | ||
2801 | } | ||
2802 | |||
2753 | /* | 2803 | /* |
2754 | * Processes external (PHY) interrupts in process context. | 2804 | * Processes external (PHY) interrupts in process context. |
2755 | */ | 2805 | */ |
@@ -3218,6 +3268,11 @@ static int __devinit init_one(struct pci_dev *pdev, | |||
3218 | INIT_LIST_HEAD(&adapter->adapter_list); | 3268 | INIT_LIST_HEAD(&adapter->adapter_list); |
3219 | INIT_WORK(&adapter->ext_intr_handler_task, ext_intr_task); | 3269 | INIT_WORK(&adapter->ext_intr_handler_task, ext_intr_task); |
3220 | INIT_WORK(&adapter->fatal_error_handler_task, fatal_error_task); | 3270 | INIT_WORK(&adapter->fatal_error_handler_task, fatal_error_task); |
3271 | |||
3272 | INIT_WORK(&adapter->db_full_task, db_full_task); | ||
3273 | INIT_WORK(&adapter->db_empty_task, db_empty_task); | ||
3274 | INIT_WORK(&adapter->db_drop_task, db_drop_task); | ||
3275 | |||
3221 | INIT_DELAYED_WORK(&adapter->adap_check_task, t3_adap_check_task); | 3276 | INIT_DELAYED_WORK(&adapter->adap_check_task, t3_adap_check_task); |
3222 | 3277 | ||
3223 | for (i = 0; i < ai->nports0 + ai->nports1; ++i) { | 3278 | for (i = 0; i < ai->nports0 + ai->nports1; ++i) { |