summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorJoshua M. Clulow <jmc@joyent.com>2016-03-22 23:11:49 +0000
committerJoshua M. Clulow <jmc@joyent.com>2016-07-06 16:25:40 +0000
commit793500cce26f3ba61081ecc29c8189632cb905f3 (patch)
tree1fed74a4fe516347a6e015812084a899ce3324b1 /usr/src
parentde7cef95df6131899a95e41becb59586640ceb0a (diff)
downloadillumos-joyent-793500cce26f3ba61081ecc29c8189632cb905f3.tar.gz
XXX stop completing commands in the periodic function
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/io/cpqary3/cpqary3.c5
-rw-r--r--usr/src/uts/common/io/cpqary3/cpqary3_ciss.c11
2 files changed, 2 insertions, 14 deletions
diff --git a/usr/src/uts/common/io/cpqary3/cpqary3.c b/usr/src/uts/common/io/cpqary3/cpqary3.c
index 42e13113f1..e2c96e88d3 100644
--- a/usr/src/uts/common/io/cpqary3/cpqary3.c
+++ b/usr/src/uts/common/io/cpqary3/cpqary3.c
@@ -268,11 +268,10 @@ cpqary3_attach(dev_info_t *dip, ddi_attach_cmd_t attach_cmd)
cpqary3_intr_set(cpq, B_TRUE);
/*
- * Register a periodic function to be called every 15 seconds.
- * XXX (1 second at the moment)
+ * Register a periodic function to be called every 5 seconds.
*/
cpq->cpq_periodic = ddi_periodic_add(cpqary3_periodic, cpq,
- 1 * NANOSEC, DDI_IPL_0);
+ 5 * NANOSEC, DDI_IPL_0);
cpq->cpq_init_level |= CPQARY3_INITLEVEL_PERIODIC;
/*
diff --git a/usr/src/uts/common/io/cpqary3/cpqary3_ciss.c b/usr/src/uts/common/io/cpqary3/cpqary3_ciss.c
index d05f70092c..c80f349d47 100644
--- a/usr/src/uts/common/io/cpqary3/cpqary3_ciss.c
+++ b/usr/src/uts/common/io/cpqary3/cpqary3_ciss.c
@@ -149,12 +149,6 @@ cpqary3_periodic(void *arg)
cpqary3_lockup_check(cpq);
/*
- * Run the retrieval routine, in case the controller has become
- * stuck or we have somehow missed an interrupt.
- */
- (void) cpqary3_retrieve(cpq);
-
- /*
* Check inflight commands to see if they have timed out.
*/
for (cpcm = avl_first(&cpq->cpq_inflight); cpcm != NULL;
@@ -202,11 +196,6 @@ cpqary3_periodic(void *arg)
}
/*
- * Process the completion queue.
- */
- (void) cpqary3_process_finishq(cpq);
-
- /*
* Process the abort queue.
*/
(void) cpqary3_process_abortq(cpq);