Merge branch 'ferseiti-master'

include/libcard.h

@@ -227,7 +227,7 @@ static inline void genwqe_ddcb_cmd_init(struct genwqe_ddcb_cmd *cmd)
  * And the usable data starts after the ATS area which is used to
  * describe the SCB itself.
  *
- * Our first implemenation is limited such that we need to align the
+ * Our first implementation is limited such that we need to align the
  * memory for the SCB to a 4KiB boundary.
  */
 void *genwqe_card_alloc_scb(card_handle_t card, size_t size);

include/libzHW.h

@@ -111,7 +111,7 @@ extern "C" {
  * not large enough the DDCB will be repeated with the SAVE_DICT flag
  * enabled, such that compression/decompression can properly
  * continue. It might help to reduce hardware time especially for many
- * independend small transfers. E.g. 64KiB data will will cause an
+ * independent small transfers. E.g. 64KiB data will cause an
  * osolete 32KiB dictionary transfer with zEDC/zEDCv2 bitstreams.
  *
  * For large files the effect is not noticeable.
@@ -229,7 +229,7 @@ typedef struct zedc_stream_s {
 	int		flush;
 	int		data_type;	/**< best guess dtype: ascii/binary*/
 
-	/* stream data mangement */
+	/* stream data management */
 	const uint8_t	*next_in;	/**< next input byte */
 	unsigned int	avail_in;	/**< # of bytes available at next_in */
 	unsigned long	total_in;	/**< total nb of inp read so far */
@@ -244,7 +244,7 @@ typedef struct zedc_stream_s {
 	/*
 	 * PRIVATE AREA
 	 *
-	 * The definitions below are not intendet for normal use. We
+	 * The definitions below are not intended for normal use. We
 	 * have them at the moment here, because we liked to dump some
 	 * internals for problem determination and where too lazy to
 	 * hide them and add access functions. When moving towards a

lib/Makefile

@@ -22,7 +22,7 @@ libversion = $(VERSION)
 CFLAGS += -fPIC -fno-strict-aliasing
 LDLIBS += -lpthread -ldl -lrt
 
-### Accelerated libz implemenation (Accelerated Data Compression/ADC)
+### Accelerated libz implementation (Accelerated Data Compression/ADC)
 libname=libzADC
 projA = $(libname).a \
 	$(libname).so \
@@ -149,7 +149,7 @@ $(libname).so.$(libversion): __$(libname).o
 	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(libname).so.$(MAJOR_VERS) \
 		 -Wl,--version-script=libzADC.map -o $@ $^ $(LDLIBS)
 
-# Produce z_ prefixed verson of software zlib. We need this when we
+# Produce z_ prefixed version of software zlib. We need this when we
 # want to include libz statially instead of using dlopen/dlsym to use
 # it.
 #

lib/ddcb_capi.c

@@ -250,7 +250,7 @@ static inline void cmd_2_ddcb(ddcb_t *pddcb, struct ddcb_cmd *cmd,
 	pddcb->n.ats_64 = __cpu_to_be64(cmd->ats);
 	memcpy(&pddcb->n.asiv[0], &cmd->asiv[0], DDCB_ASIV_LENGTH_ATS);
 	pddcb->icrc_hsi_shi_32 = __cpu_to_be32(0x00000000); /* for crc */
-	/* Write seqnum into reserverd area, check for this seqnum is done in ddcb_2_cmd() */
+	/* Write seqnum into reserved area, check for this seqnum is done in ddcb_2_cmd() */
 	pddcb->rsvd_0e = __cpu_to_be16(seqnum);
 
 	/* DDCB completion irq */

lib/deflate.c

@@ -772,15 +772,15 @@ int zedc_deflate(zedc_streamp strm, int flush)
 		    (strm->avail_out >= __be32_to_cpu(asv->outp_returned)))
 			break;
 
-		/* What a pitty, need to repeat to get back dictionary */
+		/* What a pity, need to repeat to get back dictionary */
 		if ((strm->flags & ZEDC_FLG_SKIP_LAST_DICT) &&
 		    (((flush == ZEDC_FINISH) || (flush == ZEDC_FULL_FLUSH)) &&
 		     (strm->avail_out >= strm->avail_in))) {
 			cmd->cmdopts |= DDCB_OPT_DEFL_SAVE_DICT;
 			asiv->out_dict = out_dict;
 			asiv->out_dict_len = out_dict_len;
 
-			pr_warn("[%s] What a pitty, optimization did "
+			pr_warn("[%s] What a pity, optimization did "
 				"not work\n"
 				"  (RETC=%03x ATTN=%04x PROGR=%x)\n",
 				__func__, cmd->retc, cmd->attn, cmd->progress);

lib/hardware.c

@@ -176,7 +176,7 @@ static void __free(void *ptr)
  *
  * zEDC was better here than zEDCv2. zEDCv2 requires
  * us to increase the factor to 15/8, which wastes
- * some memory in most cases. What a pitty.
+ * some memory in most cases. What a pity.
  */
 uLong h_deflateBound(z_streamp strm __attribute__((unused)), uLong sourceLen)
 {
@@ -594,7 +594,7 @@ int h_deflate(z_streamp strm, int flush)
 
 		/* Give out what is already there */
 		h_flush_obuf(strm);
-		if (strm->avail_out == 0)	/* need more ouput space */
+		if (strm->avail_out == 0)	/* need more output space */
 			return Z_OK;
 		/*
 		 * Here we start the hardware to do the compression
@@ -649,7 +649,7 @@ int h_deflate(z_streamp strm, int flush)
 
 		/* Give out what is already there */
 		h_flush_obuf(strm);
-		if (strm->avail_out == 0)	/* need more ouput space */
+		if (strm->avail_out == 0)	/* need more output space */
 			return Z_OK;
 
 		ibuf_bytes = s->ibuf - s->ibuf_base;  /* accumulated input */
@@ -967,7 +967,7 @@ static inline int __inflate(z_streamp strm, struct hw_state *s, int flush)
  * FIXME Circumvention for hardware deficiency
  *
  * Our hardware does not continue processing input bytes, once it has
- * no ouput bytes anymore. This causes our hardware missing the FEOB
+ * no output bytes anymore. This causes our hardware missing the FEOB
  * information which can be in empty blocks which follow the regular
  * data. Software would return Z_STREAM_END in those cases and not
  * Z_OK, which is expected by some applications e.g. the MongoDB zlib

lib/inflate.c

@@ -1181,15 +1181,15 @@ int zedc_inflate(zedc_streamp strm, int flush)
 		if (asv->infl_stat & INFL_STAT_FINAL_EOB)
 			break;
 
-		/* What a pitty, we guessed wrong and need to
+		/* What a pity, we guessed wrong and need to
 		   repeat. We did not see the last byte in the last
 		   block yet! */
 		if ((strm->flags & ZEDC_FLG_SKIP_LAST_DICT) &&
 		    (flush == ZEDC_FINISH)) {
 			cmd->cmdopts |= DDCB_OPT_INFL_SAVE_DICT;
 			asiv->out_dict = out_dict;
 			asiv->out_dict_len = out_dict_len;
-			pr_warn("[%s] What a pitty, we guessed wrong "
+			pr_warn("[%s] What a pity, we guessed wrong "
 				"and need to repeat\n", __func__);
 		}
 	}

lib/libcard.c

@@ -557,7 +557,7 @@ static void __node_delete(struct card_dev_t *node, void **head)
 		node->next->prev = NULL;
 		*head = (void*)node->next;
 	} else {
-		/* someting in the middle, root_node stays */
+		/* something in the middle, root_node stays */
 		node->prev->next = node->next;
 		node->next->prev = node->prev;
 	}
@@ -836,7 +836,7 @@ static void *__inotify_thread(void *data)
 /*
  * Function: __inotify_create()
  *	This functions creates the inotify event handler thread
- *	only for multible mode
+ *	only for multiple mode
  */
 static void __inotify_create(struct lib_data_t *ld)
 {
@@ -1569,7 +1569,7 @@ void *genwqe_card_alloc_scb(card_handle_t card, size_t size)
  *                         at offset offs.
  *
  * Each 4-bit in the ATS array corresponds to 8 bytes in the scb. The
- * 1st ATS bits describe the ATS array itself and must therfore be
+ * 1st ATS bits describe the ATS array itself and must therefore be
  * plain data read-only: ATS_TYPE_DATA. The remaining bits can
  * identify plan data read-only or rw, sgl version 1 or sgl version 2,
  * or even a scb read-only or rw itself. Recursion avoidance when

lib/wrapper.h

@@ -18,7 +18,7 @@
 #define __WRAPPER_H__
 
 /*
- * Switching between software and hardware implemenation of zlib. The
+ * Switching between software and hardware implementation of zlib. The
  * hardware implementation is not implementing the full set of
  * interfaces but enough to do commonly used functionality for
  * compression and decompression.

misc/basic_hardware_tests.sh

@@ -61,7 +61,7 @@ else
     fi
     if ! kill -0 $OTHERPID &>/dev/null; then
         # lock is stale, remove it and restart
-        echo "Removing stale lock of nonexistant PID ${OTHERPID}" >&2
+        echo "Removing stale lock of nonexistent PID ${OTHERPID}" >&2
         rm -rf "${LOCKDIR}"
         exit ${ENO_LOCKFAIL}
     else

tools/force_cpu.c

@@ -12,7 +12,7 @@
 
 #include "force_cpu.h"
 
-/* FIXME Fake this for old RHEL verions e.g. RHEL5.6 */
+/* FIXME Fake this for old RHEL versions e.g. RHEL5.6 */
 #ifndef CPU_ALLOC
 #define	  CPU_ALLOC(cpus)		      ({ void *ptr = NULL; ptr; })
 #define	  CPU_ALLOC_SIZE(cpus)		      ({ int val = 0; val; })

tools/genwqe_csv2vpd.c

@@ -47,7 +47,7 @@ typedef enum { FALSE = 0, TRUE = 1 } BOOL;
  */
 static char input_fn[MAX_LINE];
 static char output_fn[MAX_LINE];
-static BOOL verbose_flag = FALSE; /** TRUE if verbse messages output */
+static BOOL verbose_flag = FALSE; /** TRUE if verbose messages output */
 static BOOL add_crc = FALSE;
 
 typedef enum _SOS_ENDIANNESS {

tools/genwqe_find_card

@@ -97,7 +97,7 @@ function detect_genwqe_cards() {
 }
 
 case ${accel} in
-	# Set one or the other, but not not miss to set the accelerator
+	# Set one or the other, but not miss to set the accelerator
 	"UNKNOWN")
 	usage
 	exit 1

tools/genwqe_gzip.c

@@ -52,7 +52,7 @@
 
 #define SET_BINARY_MODE(file)
 
-/* FIXME Fake this for old RHEL verions e.g. RHEL5.6 */
+/* FIXME Fake this for old RHEL versions e.g. RHEL5.6 */
 #ifndef CPU_ALLOC
 #define	  CPU_ALLOC(cpus)		      ({ void *ptr = NULL; ptr; })
 #define	  CPU_ALLOC_SIZE(cpus)		      ({ int val = 0; val; })

tools/genwqe_loadtree.c

@@ -15,7 +15,7 @@
  */
 
 /*
- * Load a Text file file as a new tree into the Capi Card
+ * Load a Text file as a new tree into the Capi Card
  */
 
 #include <stdio.h>

tools/genwqe_mt_perf

@@ -25,7 +25,7 @@
 # are needed to saturate the hardware.
 #
 # The buffersize test shows the influence of buffering and small buffers
-# on throughput. Hardware implemenation will normally work best with large
+# on throughput. Hardware implementation will normally work best with large
 # buffers.
 #
 

tools/genwqe_parallel_echo

@@ -17,9 +17,9 @@
 #
 
 #
-# This testcase proceses significant interrupt stress. Run that for a day
+# This testcase processes significant interrupt stress. Run that for a day
 # and you will know if your device driver and software can surive sudden
-# abborts while running a lot of interrrupt stress.
+# abborts while running a lot of interrupt stress.
 #
 # Start N echos and kill them after a couple of seconds.
 #

tools/genwqe_peek.c

@@ -61,7 +61,7 @@ static void usage(const char *prog)
 	       "    Reg 0x0008 CAPI Card Version Reg 2 (RO)\n"
 	       "    Reg 0x0080 CAPI Card Free Run Timer in 4 nsec (RO)\n"
 	       "    Reg 0x0180 Queue Work Time in 4 nsec (RO)\n"
-	       "    Reg 0x1000 ... 0x1028  6 Fir Regsiters (RW)\n"
+	       "    Reg 0x1000 ... 0x1028  6 Fir Registers (RW)\n"
 	       "\n"
 	       "   Only CAPI (debugging):\n"
 	       "     genwqe_peek -ACAPI -C0 --psl-bar=2 --width=64 0x150\n"

tools/genwqe_tools.h

@@ -32,7 +32,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <sysexits.h>		/* standart application exit codes */
+#include <sysexits.h>		/* standard application exit codes */
 
 #define GENWQE_TOOL_VERS_STRING	"3.0.25"
 
@@ -139,7 +139,7 @@ extern int verbose_flag;
 			fprintf(stdout, fmt, ## __VA_ARGS__);	\
 	} while (0)
 
-/* FIXME Fake this for old RHEL verions e.g. RHEL5.6 */
+/* FIXME Fake this for old RHEL versions e.g. RHEL5.6 */
 #ifndef CLOCK_MONOTONIC_RAW
 #define   clock_gettime(clk_id, tp) ({ int val = 0; val; })
 #endif

tools/genwqe_update.c

@@ -327,7 +327,7 @@ int main(int argc, char *argv[])
 
 	genwqe_card_lib_debug(verbose_flag);
 
-	/* simulation is not suppored with this tool */
+	/* simulation is not supported with this tool */
 	env = getenv("GENWQE_SIM");
 	if ((env) && (atoi(env) > 0)) {
 		pr_err("driver / HW simulation active !\n");

tools/genwqe_vpd_common.c

@@ -86,7 +86,7 @@ static uint8_t a2h(char c)
 }
 
 /**
- * Converts BIN to CSV file file
+ * Converts BIN to CSV file
  *
  *  op:     Output File Pointer
  *  fs:     Size of input data in buffer

tools/genwqe_vpdupdate.c

@@ -51,10 +51,10 @@ static void usage(const char *prog)
 		"  -V, --version      print version\n"
 		"  -C, --card=CARDNO\n"
 		"  -f, --file=VPD.BIN\n"
-		"  -d, --dump	      use multible d to increase dump info\n"
+		"  -d, --dump	      use multiple d to increase dump info\n"
 		"  -u, --update	      set this flag for update VPD\n"
 		"  -s, --show	      set this flag to display VPD from a card\n"
-		"  -v, --verbose      verbose level, use multible v's to increase\n"
+		"  -v, --verbose      verbose level, use multiple v's to increase\n"
 		"\n"
 		"This utility updates the Genwqes FLASH with new VPD\n"
 		"information from a *.bin file. Do not disconnect the card from power\n"
@@ -233,7 +233,7 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 
-	/* simulation is not suppored with this tool */
+	/* simulation is not supported with this tool */
 	env = getenv("GENWQE_SIM");
 	if ((env) && (atoi(env) > 0)) {
 		pr_err("driver / HW simulation active !\n");

tools/zlib_mt_perf.c

@@ -20,7 +20,7 @@
 
 /*
  * Mount debugfs on old RHEL systems:
- *   sudo mount -t debugfs debugfs /sys/kernel/debug
+ *   sudo mount -t debugfs /sys/kernel/debug
  *
  * Repro hardware multithreaded problem with:
  *   export ZLIB_DEFLATE_IMPL=1
@@ -71,7 +71,7 @@
 #  define SET_BINARY_MODE(file)
 #endif
 
-/* FIXME Fake this for old RHEL verions e.g. RHEL5.6 */
+/* FIXME Fake this for old RHEL versions e.g. RHEL5.6 */
 #ifndef CPU_ALLOC
 #define	  CPU_ALLOC(cpus)		      ({ void *ptr = NULL; ptr; })
 #define	  CPU_ALLOC_SIZE(cpus)		      ({ int val = 0; val; })
@@ -83,7 +83,7 @@
 #define	  sched_setaffinity(x, size, cpusetp) ({ int val = 0; val; })
 #endif
 
-/* FIXME Fake this for old RHEL verions e.g. RHEL5.6 */
+/* FIXME Fake this for old RHEL versions e.g. RHEL5.6 */
 #ifndef CLOCK_MONOTONIC_RAW
 #define   clock_gettime(clk_id, tp) ({ int val = 0; val; })
 #endif