aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/octeon
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/octeon')
-rw-r--r--drivers/staging/octeon/cvmx-cmd-queue.h16
-rw-r--r--drivers/staging/octeon/cvmx-pko.c2
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/octeon/cvmx-cmd-queue.h b/drivers/staging/octeon/cvmx-cmd-queue.h
index f0cb20ffa39..59d22142229 100644
--- a/drivers/staging/octeon/cvmx-cmd-queue.h
+++ b/drivers/staging/octeon/cvmx-cmd-queue.h
@@ -110,7 +110,7 @@ typedef enum {
110} cvmx_cmd_queue_id_t; 110} cvmx_cmd_queue_id_t;
111 111
112/** 112/**
113 * Command write operations can fail if the comamnd queue needs 113 * Command write operations can fail if the command queue needs
114 * a new buffer and the associated FPA pool is empty. It can also 114 * a new buffer and the associated FPA pool is empty. It can also
115 * fail if the number of queued command words reaches the maximum 115 * fail if the number of queued command words reaches the maximum
116 * set at initialization. 116 * set at initialization.
@@ -136,12 +136,12 @@ typedef struct {
136 uint64_t unused2:6; 136 uint64_t unused2:6;
137 /* FPA buffer size in 64bit words minus 1 */ 137 /* FPA buffer size in 64bit words minus 1 */
138 uint64_t pool_size_m1:13; 138 uint64_t pool_size_m1:13;
139 /* Number of comamnds already used in buffer */ 139 /* Number of commands already used in buffer */
140 uint64_t index:13; 140 uint64_t index:13;
141} __cvmx_cmd_queue_state_t; 141} __cvmx_cmd_queue_state_t;
142 142
143/** 143/**
144 * This structure contains the global state of all comamnd queues. 144 * This structure contains the global state of all command queues.
145 * It is stored in a bootmem named block and shared by all 145 * It is stored in a bootmem named block and shared by all
146 * applications running on Octeon. Tickets are stored in a differnet 146 * applications running on Octeon. Tickets are stored in a differnet
147 * cahce line that queue information to reduce the contention on the 147 * cahce line that queue information to reduce the contention on the
@@ -308,7 +308,7 @@ static inline __cvmx_cmd_queue_state_t
308 308
309/** 309/**
310 * Write an arbitrary number of command words to a command queue. 310 * Write an arbitrary number of command words to a command queue.
311 * This is a generic function; the fixed number of comamnd word 311 * This is a generic function; the fixed number of command word
312 * functions yield higher performance. 312 * functions yield higher performance.
313 * 313 *
314 * @queue_id: Hardware command queue to write to 314 * @queue_id: Hardware command queue to write to
@@ -317,7 +317,7 @@ static inline __cvmx_cmd_queue_state_t
317 * updates. If you don't use this locking you must ensure 317 * updates. If you don't use this locking you must ensure
318 * exclusivity some other way. Locking is strongly recommended. 318 * exclusivity some other way. Locking is strongly recommended.
319 * @cmd_count: Number of command words to write 319 * @cmd_count: Number of command words to write
320 * @cmds: Array of comamnds to write 320 * @cmds: Array of commands to write
321 * 321 *
322 * Returns CVMX_CMD_QUEUE_SUCCESS or a failure code 322 * Returns CVMX_CMD_QUEUE_SUCCESS or a failure code
323 */ 323 */
@@ -363,7 +363,7 @@ static inline cvmx_cmd_queue_result_t cvmx_cmd_queue_write(cvmx_cmd_queue_id_t
363 uint64_t *ptr; 363 uint64_t *ptr;
364 int count; 364 int count;
365 /* 365 /*
366 * We need a new comamnd buffer. Fail if there isn't 366 * We need a new command buffer. Fail if there isn't
367 * one available. 367 * one available.
368 */ 368 */
369 uint64_t *new_buffer = 369 uint64_t *new_buffer =
@@ -466,7 +466,7 @@ static inline cvmx_cmd_queue_result_t cvmx_cmd_queue_write2(cvmx_cmd_queue_id_t
466 */ 466 */
467 int count = qptr->pool_size_m1 - qptr->index; 467 int count = qptr->pool_size_m1 - qptr->index;
468 /* 468 /*
469 * We need a new comamnd buffer. Fail if there isn't 469 * We need a new command buffer. Fail if there isn't
470 * one available. 470 * one available.
471 */ 471 */
472 uint64_t *new_buffer = 472 uint64_t *new_buffer =
@@ -568,7 +568,7 @@ static inline cvmx_cmd_queue_result_t cvmx_cmd_queue_write3(cvmx_cmd_queue_id_t
568 */ 568 */
569 int count = qptr->pool_size_m1 - qptr->index; 569 int count = qptr->pool_size_m1 - qptr->index;
570 /* 570 /*
571 * We need a new comamnd buffer. Fail if there isn't 571 * We need a new command buffer. Fail if there isn't
572 * one available 572 * one available
573 */ 573 */
574 uint64_t *new_buffer = 574 uint64_t *new_buffer =
diff --git a/drivers/staging/octeon/cvmx-pko.c b/drivers/staging/octeon/cvmx-pko.c
index 00db91529b1..50a2c9bd5a5 100644
--- a/drivers/staging/octeon/cvmx-pko.c
+++ b/drivers/staging/octeon/cvmx-pko.c
@@ -54,7 +54,7 @@ void cvmx_pko_initialize_global(void)
54 /* 54 /*
55 * Set the size of the PKO command buffers to an odd number of 55 * Set the size of the PKO command buffers to an odd number of
56 * 64bit words. This allows the normal two word send to stay 56 * 64bit words. This allows the normal two word send to stay
57 * aligned and never span a comamnd word buffer. 57 * aligned and never span a command word buffer.
58 */ 58 */
59 config.u64 = 0; 59 config.u64 = 0;
60 config.s.pool = CVMX_FPA_OUTPUT_BUFFER_POOL; 60 config.s.pool = CVMX_FPA_OUTPUT_BUFFER_POOL;