* [PATCH 01/10] crypto: qat: Cleanup - remove unnecessary return codes
2014-07-25 22:55 [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1 Tadeusz Struk
@ 2014-07-25 22:55 ` Tadeusz Struk
2014-07-25 22:55 ` [PATCH 02/10] crypto: qat: Cleanup - checkpatch blank lines Tadeusz Struk
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Tadeusz Struk @ 2014-07-25 22:55 UTC (permalink / raw)
To: herbert
Cc: tadeusz.struk, davem, bruce.w.allan, bo.cui, pingchao.yang,
qat-linux, linux-crypto
Remove unnecessary return code variables and change function types
accordingly.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
---
drivers/crypto/qat/qat_common/qat_uclo.c | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/drivers/crypto/qat/qat_common/qat_uclo.c b/drivers/crypto/qat/qat_common/qat_uclo.c
index dd4e0d3..f22b488 100644
--- a/drivers/crypto/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/qat/qat_common/qat_uclo.c
@@ -1088,14 +1088,13 @@ static void qat_uclo_fill_uwords(struct icp_qat_uclo_objhandle *obj_handle,
*uword = fill;
}
-static int qat_uclo_wr_uimage_raw_page(struct icp_qat_fw_loader_handle *handle,
- struct icp_qat_uclo_encap_page
- *encap_page, unsigned int ae)
+static void qat_uclo_wr_uimage_raw_page(struct icp_qat_fw_loader_handle *handle,
+ struct icp_qat_uclo_encap_page
+ *encap_page, unsigned int ae)
{
unsigned int uw_physical_addr, uw_relative_addr, i, words_num, cpylen;
struct icp_qat_uclo_objhandle *obj_handle = handle->obj_handle;
uint64_t fill_pat;
- int status = 0;
/* load the page starting at appropriate ustore address */
/* get fill-pattern from an image -- they are all the same */
@@ -1126,18 +1125,15 @@ static int qat_uclo_wr_uimage_raw_page(struct icp_qat_fw_loader_handle *handle,
uw_relative_addr += cpylen;
words_num -= cpylen;
}
- return status;
}
-static int
-qat_uclo_wr_uimage_pages(struct icp_qat_fw_loader_handle *handle,
- struct icp_qat_uof_image *image)
+static void qat_uclo_wr_uimage_pages(struct icp_qat_fw_loader_handle *handle,
+ struct icp_qat_uof_image *image)
{
struct icp_qat_uclo_objhandle *obj_handle = handle->obj_handle;
unsigned int ctx_mask, s;
struct icp_qat_uclo_page *page;
unsigned char ae;
- int retval = 0;
int ctx;
if (ICP_QAT_CTX_MODE(image->ae_mode) == ICP_QAT_UCLO_MAX_CTX)
@@ -1160,8 +1156,7 @@ qat_uclo_wr_uimage_pages(struct icp_qat_fw_loader_handle *handle,
page = obj_handle->ae_data[ae].ae_slices[s].page;
if (!page->encap_page->def_page)
continue;
- if (qat_uclo_wr_uimage_raw_page(handle, page->encap_page, ae))
- return -EINVAL;
+ qat_uclo_wr_uimage_raw_page(handle, page->encap_page, ae);
page = obj_handle->ae_data[ae].ae_slices[s].page;
for (ctx = 0; ctx < ICP_QAT_UCLO_MAX_CTX; ctx++)
@@ -1172,7 +1167,6 @@ qat_uclo_wr_uimage_pages(struct icp_qat_fw_loader_handle *handle,
qat_hal_set_pc(handle, (unsigned char)ae, image->ctx_assigned,
image->entry_address);
}
- return retval;
}
int qat_uclo_wr_all_uimage(struct icp_qat_fw_loader_handle *handle)
@@ -1187,9 +1181,8 @@ int qat_uclo_wr_all_uimage(struct icp_qat_fw_loader_handle *handle)
return -EINVAL;
if (qat_uclo_init_ustore(handle, &(obj_handle->ae_uimage[i])))
return -EINVAL;
- if (qat_uclo_wr_uimage_pages(handle,
- obj_handle->ae_uimage[i].img_ptr))
- return -EINVAL;
+ qat_uclo_wr_uimage_pages(handle,
+ obj_handle->ae_uimage[i].img_ptr);
}
return 0;
}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 02/10] crypto: qat: Cleanup - checkpatch blank lines
2014-07-25 22:55 [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1 Tadeusz Struk
2014-07-25 22:55 ` [PATCH 01/10] crypto: qat: Cleanup - remove unnecessary return codes Tadeusz Struk
@ 2014-07-25 22:55 ` Tadeusz Struk
2014-07-25 22:55 ` [PATCH 03/10] crypto: qat: Cleanup - remove unneeded header Tadeusz Struk
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Tadeusz Struk @ 2014-07-25 22:55 UTC (permalink / raw)
To: herbert
Cc: tadeusz.struk, davem, bruce.w.allan, bo.cui, pingchao.yang,
qat-linux, linux-crypto
Fix new checkpatch hits:
CHECK:LINE_SPACING: Please use a blank line after
function/struct/union/enum declarations
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
---
.../crypto/qat/qat_common/adf_transport_internal.h | 3 +++
drivers/crypto/qat/qat_common/icp_qat_fw_la.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/drivers/crypto/qat/qat_common/adf_transport_internal.h b/drivers/crypto/qat/qat_common/adf_transport_internal.h
index 4eb8969..f854bac 100644
--- a/drivers/crypto/qat/qat_common/adf_transport_internal.h
+++ b/drivers/crypto/qat/qat_common/adf_transport_internal.h
@@ -104,12 +104,15 @@ static inline int adf_bank_debugfs_add(struct adf_etr_bank_data *bank)
{
return 0;
}
+
#define adf_bank_debugfs_rm(bank) do {} while (0)
+
static inline int adf_ring_debugfs_add(struct adf_etr_ring_data *ring,
const char *name)
{
return 0;
}
+
#define adf_ring_debugfs_rm(ring) do {} while (0)
#endif
#endif
diff --git a/drivers/crypto/qat/qat_common/icp_qat_fw_la.h b/drivers/crypto/qat/qat_common/icp_qat_fw_la.h
index d1d4802..c8d2669 100644
--- a/drivers/crypto/qat/qat_common/icp_qat_fw_la.h
+++ b/drivers/crypto/qat/qat_common/icp_qat_fw_la.h
@@ -358,6 +358,7 @@ struct icp_qat_fw_la_resp {
uint64_t opaque_data;
uint32_t resrvd[ICP_QAT_FW_NUM_LONGWORDS_4];
};
+
#define ICP_QAT_FW_CIPHER_NEXT_ID_GET(cd_ctrl_hdr_t) \
((((cd_ctrl_hdr_t)->next_curr_id_cipher) & \
ICP_QAT_FW_COMN_NEXT_ID_MASK) >> (ICP_QAT_FW_COMN_NEXT_ID_BITPOS))
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 03/10] crypto: qat: Cleanup - remove unneeded header
2014-07-25 22:55 [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1 Tadeusz Struk
2014-07-25 22:55 ` [PATCH 01/10] crypto: qat: Cleanup - remove unnecessary return codes Tadeusz Struk
2014-07-25 22:55 ` [PATCH 02/10] crypto: qat: Cleanup - checkpatch blank lines Tadeusz Struk
@ 2014-07-25 22:55 ` Tadeusz Struk
2014-07-25 22:55 ` [PATCH 04/10] crypto: qat: Cleanup - remove unnecessary parentheses Tadeusz Struk
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Tadeusz Struk @ 2014-07-25 22:55 UTC (permalink / raw)
To: herbert
Cc: tadeusz.struk, davem, bruce.w.allan, bo.cui, pingchao.yang,
qat-linux, linux-crypto
Remove include of a no longer necessary header file.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
---
drivers/crypto/qat/qat_common/adf_cfg.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/crypto/qat/qat_common/adf_cfg.c b/drivers/crypto/qat/qat_common/adf_cfg.c
index 4279076..aba7f1d 100644
--- a/drivers/crypto/qat/qat_common/adf_cfg.c
+++ b/drivers/crypto/qat/qat_common/adf_cfg.c
@@ -49,7 +49,6 @@
#include <linux/list.h>
#include <linux/seq_file.h>
#include "adf_accel_devices.h"
-#include "adf_common_drv.h"
#include "adf_cfg.h"
static DEFINE_MUTEX(qat_cfg_read_lock);
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 04/10] crypto: qat: Cleanup - remove unnecessary parentheses
2014-07-25 22:55 [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1 Tadeusz Struk
` (2 preceding siblings ...)
2014-07-25 22:55 ` [PATCH 03/10] crypto: qat: Cleanup - remove unneeded header Tadeusz Struk
@ 2014-07-25 22:55 ` Tadeusz Struk
2014-07-25 22:55 ` [PATCH 05/10] crypto: qat: Cleanup - use min_t macro Tadeusz Struk
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Tadeusz Struk @ 2014-07-25 22:55 UTC (permalink / raw)
To: herbert
Cc: tadeusz.struk, davem, bruce.w.allan, bo.cui, pingchao.yang,
qat-linux, linux-crypto
Resolve new strict checkpatch hits
CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around ...
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
---
drivers/crypto/qat/qat_common/icp_qat_hw.h | 6 ++-
drivers/crypto/qat/qat_common/qat_algs.c | 2 +
drivers/crypto/qat/qat_common/qat_uclo.c | 54 ++++++++++++++--------------
3 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/drivers/crypto/qat/qat_common/icp_qat_hw.h b/drivers/crypto/qat/qat_common/icp_qat_hw.h
index cc7ec40..5031f8c 100644
--- a/drivers/crypto/qat/qat_common/icp_qat_hw.h
+++ b/drivers/crypto/qat/qat_common/icp_qat_hw.h
@@ -120,14 +120,14 @@ struct icp_qat_hw_auth_config {
#define QAT_AUTH_ALGO_SHA3_BITPOS 22
#define QAT_AUTH_ALGO_SHA3_MASK 0x3
#define ICP_QAT_HW_AUTH_CONFIG_BUILD(mode, algo, cmp_len) \
- ((((mode) & QAT_AUTH_MODE_MASK) << QAT_AUTH_MODE_BITPOS) | \
- (((algo) & QAT_AUTH_ALGO_MASK) << QAT_AUTH_ALGO_BITPOS) | \
+ (((mode & QAT_AUTH_MODE_MASK) << QAT_AUTH_MODE_BITPOS) | \
+ ((algo & QAT_AUTH_ALGO_MASK) << QAT_AUTH_ALGO_BITPOS) | \
(((algo >> 4) & QAT_AUTH_ALGO_SHA3_MASK) << \
QAT_AUTH_ALGO_SHA3_BITPOS) | \
(((((algo == ICP_QAT_HW_AUTH_ALGO_SHA3_256) || \
(algo == ICP_QAT_HW_AUTH_ALGO_SHA3_512)) ? 1 : 0) \
& QAT_AUTH_SHA3_PADDING_MASK) << QAT_AUTH_SHA3_PADDING_BITPOS) | \
- (((cmp_len) & QAT_AUTH_CMP_MASK) << QAT_AUTH_CMP_BITPOS))
+ ((cmp_len & QAT_AUTH_CMP_MASK) << QAT_AUTH_CMP_BITPOS))
struct icp_qat_hw_auth_counter {
__be32 counter;
diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c
index 946686f..59df488 100644
--- a/drivers/crypto/qat/qat_common/qat_algs.c
+++ b/drivers/crypto/qat/qat_common/qat_algs.c
@@ -759,7 +759,7 @@ void qat_alg_callback(void *resp)
qat_alg_free_bufl(inst, qat_req);
if (unlikely(qat_res != ICP_QAT_FW_COMN_STATUS_FLAG_OK))
res = -EBADMSG;
- areq->base.complete(&(areq->base), res);
+ areq->base.complete(&areq->base, res);
}
static int qat_alg_dec(struct aead_request *areq)
diff --git a/drivers/crypto/qat/qat_common/qat_uclo.c b/drivers/crypto/qat/qat_common/qat_uclo.c
index f22b488..17a9954f 100644
--- a/drivers/crypto/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/qat/qat_common/qat_uclo.c
@@ -79,11 +79,11 @@ static int qat_uclo_init_ae_data(struct icp_qat_uclo_objhandle *obj_handle,
} else {
ae_slice->ctx_mask_assigned = 0;
}
- ae_slice->regions = kzalloc(sizeof(*(ae_slice->regions)), GFP_KERNEL);
- if (!(ae_slice->regions))
+ ae_slice->regions = kzalloc(sizeof(*ae_slice->regions), GFP_KERNEL);
+ if (!ae_slice->regions)
return -ENOMEM;
- ae_slice->page = kzalloc(sizeof(*(ae_slice->page)), GFP_KERNEL);
- if (!(ae_slice->page))
+ ae_slice->page = kzalloc(sizeof(*ae_slice->page), GFP_KERNEL);
+ if (!ae_slice->page)
goto out_err;
page = ae_slice->page;
page->encap_page = encap_image->page;
@@ -248,7 +248,7 @@ static int qat_uclo_fetch_initmem_ae(struct icp_qat_fw_loader_handle *handle,
pr_err("QAT: Memory scope for init_mem error\n");
return -EINVAL;
}
- str = qat_uclo_get_string(&(obj_handle->str_table), init_mem->sym_name);
+ str = qat_uclo_get_string(&obj_handle->str_table, init_mem->sym_name);
if (!str) {
pr_err("QAT: AE name assigned in uof init table is NULL\n");
return -EINVAL;
@@ -257,7 +257,7 @@ static int qat_uclo_fetch_initmem_ae(struct icp_qat_fw_loader_handle *handle,
pr_err("QAT: Parse num for AE number failed\n");
return -EINVAL;
}
- if (!test_bit(*ae, (unsigned long *)&(handle->hal_handle->ae_mask))) {
+ if (!test_bit(*ae, (unsigned long *)&handle->hal_handle->ae_mask)) {
pr_err("QAT: ae %d to be init is fused off\n", *ae);
return -EINVAL;
}
@@ -332,7 +332,7 @@ static int qat_uclo_init_lmem_seg(struct icp_qat_fw_loader_handle *handle,
ICP_QAT_UCLO_MAX_LMEM_REG, &ae))
return -EINVAL;
if (qat_uclo_create_batch_init_list(handle, init_mem, ae,
- &(obj_handle->lm_init_tab[ae])))
+ &obj_handle->lm_init_tab[ae]))
return -EINVAL;
return 0;
}
@@ -347,7 +347,7 @@ static int qat_uclo_init_umem_seg(struct icp_qat_fw_loader_handle *handle,
if (qat_uclo_fetch_initmem_ae(handle, init_mem, ustore_size, &ae))
return -EINVAL;
if (qat_uclo_create_batch_init_list(handle, init_mem, ae,
- &(obj_handle->umem_init_tab[ae])))
+ &obj_handle->umem_init_tab[ae]))
return -EINVAL;
/* set the highest ustore address referenced */
uaddr = (init_mem->addr + init_mem->num_in_bytes) >> 0x2;
@@ -425,7 +425,7 @@ static int qat_uclo_init_ustore(struct icp_qat_fw_loader_handle *handle,
page = image->page;
for (ae = 0; ae <= handle->hal_handle->ae_max_num; ae++) {
- if (!test_bit(ae, (unsigned long *)&(uof_image->ae_assigned)))
+ if (!test_bit(ae, (unsigned long *)&uof_image->ae_assigned))
continue;
ustore_size = obj_handle->ae_data[ae].eff_ustore_size;
patt_pos = page->beg_addr_p + page->micro_words_num;
@@ -486,8 +486,8 @@ static void *qat_uclo_find_chunk(struct icp_qat_uof_objhdr *obj_hdr,
for (i = 0; i < obj_hdr->num_chunks; i++) {
if ((cur < (void *)&chunk_hdr[i]) &&
- !(strncmp(chunk_hdr[i].chunk_id, chunk_id,
- ICP_QAT_UOF_OBJID_LEN))) {
+ !strncmp(chunk_hdr[i].chunk_id, chunk_id,
+ ICP_QAT_UOF_OBJID_LEN)) {
return &chunk_hdr[i];
}
}
@@ -532,8 +532,8 @@ qat_uclo_map_chunk(char *buf, struct icp_qat_uof_filehdr *file_hdr,
file_chunk = (struct icp_qat_uof_filechunkhdr *)
(buf + sizeof(struct icp_qat_uof_filehdr));
for (i = 0; i < file_hdr->num_chunks; i++) {
- if (!(strncmp(file_chunk->chunk_id, chunk_id,
- ICP_QAT_UOF_OBJID_LEN))) {
+ if (!strncmp(file_chunk->chunk_id, chunk_id,
+ ICP_QAT_UOF_OBJID_LEN)) {
chunk = buf + file_chunk->offset;
if (file_chunk->checksum != qat_uclo_calc_str_checksum(
(char *)chunk, file_chunk->size))
@@ -692,12 +692,12 @@ static int qat_uclo_map_ae(struct icp_qat_fw_loader_handle *handle, int max_ae)
struct icp_qat_uclo_objhandle *obj_handle = handle->obj_handle;
for (ae = 0; ae <= max_ae; ae++) {
- if (!test_bit(ae, (unsigned long *)
- &(handle->hal_handle->ae_mask)))
+ if (!test_bit(ae,
+ (unsigned long *)&handle->hal_handle->ae_mask))
continue;
for (i = 0; i < obj_handle->uimage_num; i++) {
if (!test_bit(ae, (unsigned long *)
- &(obj_handle->ae_uimage[i].img_ptr->ae_assigned)))
+ &obj_handle->ae_uimage[i].img_ptr->ae_assigned))
continue;
mflag = 1;
if (qat_uclo_init_ae_data(obj_handle, ae, i))
@@ -898,12 +898,12 @@ static int qat_uclo_set_ae_mode(struct icp_qat_fw_loader_handle *handle)
for (ae = 0; ae <= handle->hal_handle->ae_max_num; ae++) {
if (!test_bit(ae,
- (unsigned long *)&(handle->hal_handle->ae_mask)))
+ (unsigned long *)&handle->hal_handle->ae_mask))
continue;
- ae_data = &(obj_handle->ae_data[ae]);
+ ae_data = &obj_handle->ae_data[ae];
for (s = 0; s < ae_data->slice_num && s < ICP_QAT_UCLO_MAX_CTX;
s++) {
- if (!(obj_handle->ae_data[ae].ae_slices[s].encap_image))
+ if (!obj_handle->ae_data[ae].ae_slices[s].encap_image)
continue;
uof_image = ae_data->ae_slices[s].encap_image->img_ptr;
if (qat_hal_set_ae_ctx_mode(handle, ae,
@@ -968,9 +968,9 @@ static int qat_uclo_parse_uof_obj(struct icp_qat_fw_loader_handle *handle)
return -EINVAL;
}
obj_handle->ustore_phy_size = ICP_QAT_UCLO_MAX_USTORE;
- if (!(obj_handle->obj_hdr->file_buff) ||
- !(qat_uclo_map_str_table(obj_handle->obj_hdr, ICP_QAT_UOF_STRT,
- &(obj_handle->str_table)))) {
+ if (!obj_handle->obj_hdr->file_buff ||
+ !qat_uclo_map_str_table(obj_handle->obj_hdr, ICP_QAT_UOF_STRT,
+ &obj_handle->str_table)) {
pr_err("QAT: uof doesn't have effective images\n");
goto out_err;
}
@@ -984,8 +984,8 @@ static int qat_uclo_parse_uof_obj(struct icp_qat_fw_loader_handle *handle)
goto out_check_uof_aemask_err;
}
qat_uclo_init_uword_num(handle);
- qat_uclo_map_initmem_table(&(obj_handle->encap_uof_obj),
- &(obj_handle->init_mem_tab));
+ qat_uclo_map_initmem_table(&obj_handle->encap_uof_obj,
+ &obj_handle->init_mem_tab);
if (qat_uclo_set_ae_mode(handle))
goto out_check_uof_aemask_err;
return 0;
@@ -1143,7 +1143,7 @@ static void qat_uclo_wr_uimage_pages(struct icp_qat_fw_loader_handle *handle,
/* load the default page and set assigned CTX PC
* to the entrypoint address */
for (ae = 0; ae <= handle->hal_handle->ae_max_num; ae++) {
- if (!test_bit(ae, (unsigned long *)&(image->ae_assigned)))
+ if (!test_bit(ae, (unsigned long *)&image->ae_assigned))
continue;
/* find the slice to which this image is assigned */
for (s = 0; s < obj_handle->ae_data[ae].slice_num; s++) {
@@ -1177,9 +1177,9 @@ int qat_uclo_wr_all_uimage(struct icp_qat_fw_loader_handle *handle)
if (qat_uclo_init_globals(handle))
return -EINVAL;
for (i = 0; i < obj_handle->uimage_num; i++) {
- if (!(obj_handle->ae_uimage[i].img_ptr))
+ if (!obj_handle->ae_uimage[i].img_ptr)
return -EINVAL;
- if (qat_uclo_init_ustore(handle, &(obj_handle->ae_uimage[i])))
+ if (qat_uclo_init_ustore(handle, &obj_handle->ae_uimage[i]))
return -EINVAL;
qat_uclo_wr_uimage_pages(handle,
obj_handle->ae_uimage[i].img_ptr);
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 05/10] crypto: qat: Cleanup - use min_t macro
2014-07-25 22:55 [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1 Tadeusz Struk
` (3 preceding siblings ...)
2014-07-25 22:55 ` [PATCH 04/10] crypto: qat: Cleanup - remove unnecessary parentheses Tadeusz Struk
@ 2014-07-25 22:55 ` Tadeusz Struk
2014-07-25 22:55 ` [PATCH 06/10] crypto: qat: Cleanup - change slice->regions to slice->region Tadeusz Struk
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Tadeusz Struk @ 2014-07-25 22:55 UTC (permalink / raw)
To: herbert
Cc: tadeusz.struk, davem, bruce.w.allan, bo.cui, pingchao.yang,
qat-linux, linux-crypto
prefer min_t() macro over two open-coded logical tests
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
---
drivers/crypto/qat/qat_common/qat_uclo.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/qat/qat_common/qat_uclo.c b/drivers/crypto/qat/qat_common/qat_uclo.c
index 17a9954f..b1a16eb 100644
--- a/drivers/crypto/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/qat/qat_common/qat_uclo.c
@@ -901,8 +901,8 @@ static int qat_uclo_set_ae_mode(struct icp_qat_fw_loader_handle *handle)
(unsigned long *)&handle->hal_handle->ae_mask))
continue;
ae_data = &obj_handle->ae_data[ae];
- for (s = 0; s < ae_data->slice_num && s < ICP_QAT_UCLO_MAX_CTX;
- s++) {
+ for (s = 0; s < min_t(unsigned int, ae_data->slice_num,
+ ICP_QAT_UCLO_MAX_CTX); s++) {
if (!obj_handle->ae_data[ae].ae_slices[s].encap_image)
continue;
uof_image = ae_data->ae_slices[s].encap_image->img_ptr;
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 06/10] crypto: qat: Cleanup - change slice->regions to slice->region
2014-07-25 22:55 [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1 Tadeusz Struk
` (4 preceding siblings ...)
2014-07-25 22:55 ` [PATCH 05/10] crypto: qat: Cleanup - use min_t macro Tadeusz Struk
@ 2014-07-25 22:55 ` Tadeusz Struk
2014-07-25 22:55 ` [PATCH 07/10] crypto: qat: Cleanup - change ae_num to ae_id Tadeusz Struk
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Tadeusz Struk @ 2014-07-25 22:55 UTC (permalink / raw)
To: herbert
Cc: tadeusz.struk, davem, bruce.w.allan, bo.cui, pingchao.yang,
qat-linux, linux-crypto
Change ptr name slice->regions to slice->region to reflect the same
in the page struct.
Signed-off-by: Pingchao Yang <pingchao.yang@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
---
drivers/crypto/qat/qat_common/icp_qat_uclo.h | 2 +-
drivers/crypto/qat/qat_common/qat_uclo.c | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/crypto/qat/qat_common/icp_qat_uclo.h b/drivers/crypto/qat/qat_common/icp_qat_uclo.h
index 120fbce..2132a8c 100644
--- a/drivers/crypto/qat/qat_common/icp_qat_uclo.h
+++ b/drivers/crypto/qat/qat_common/icp_qat_uclo.h
@@ -124,7 +124,7 @@ struct icp_qat_uclo_region {
};
struct icp_qat_uclo_aeslice {
- struct icp_qat_uclo_region *regions;
+ struct icp_qat_uclo_region *region;
struct icp_qat_uclo_page *page;
struct icp_qat_uclo_page *cur_page[ICP_QAT_UCLO_MAX_CTX];
struct icp_qat_uclo_encapme *encap_image;
diff --git a/drivers/crypto/qat/qat_common/qat_uclo.c b/drivers/crypto/qat/qat_common/qat_uclo.c
index b1a16eb..557fa60 100644
--- a/drivers/crypto/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/qat/qat_common/qat_uclo.c
@@ -79,37 +79,37 @@ static int qat_uclo_init_ae_data(struct icp_qat_uclo_objhandle *obj_handle,
} else {
ae_slice->ctx_mask_assigned = 0;
}
- ae_slice->regions = kzalloc(sizeof(*ae_slice->regions), GFP_KERNEL);
- if (!ae_slice->regions)
+ ae_slice->region = kzalloc(sizeof(*ae_slice->region), GFP_KERNEL);
+ if (!ae_slice->region)
return -ENOMEM;
ae_slice->page = kzalloc(sizeof(*ae_slice->page), GFP_KERNEL);
if (!ae_slice->page)
goto out_err;
page = ae_slice->page;
page->encap_page = encap_image->page;
- ae_slice->page->region = ae_slice->regions;
+ ae_slice->page->region = ae_slice->region;
ae_data->slice_num++;
return 0;
out_err:
- kfree(ae_slice->regions);
- ae_slice->regions = NULL;
+ kfree(ae_slice->region);
+ ae_slice->region = NULL;
return -ENOMEM;
}
static int qat_uclo_free_ae_data(struct icp_qat_uclo_aedata *ae_data)
{
- unsigned int ss = 0;
+ unsigned int i;
if (!ae_data) {
pr_err("QAT: bad argument, ae_data is NULL\n ");
return -EINVAL;
}
- for (ss = 0; ss < ae_data->slice_num; ss++) {
- kfree(ae_data->ae_slices[ss].regions);
- ae_data->ae_slices[ss].regions = NULL;
- kfree(ae_data->ae_slices[ss].page);
- ae_data->ae_slices[ss].page = NULL;
+ for (i = 0; i < ae_data->slice_num; i++) {
+ kfree(ae_data->ae_slices[i].region);
+ ae_data->ae_slices[i].region = NULL;
+ kfree(ae_data->ae_slices[i].page);
+ ae_data->ae_slices[i].page = NULL;
}
return 0;
}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 07/10] crypto: qat: Cleanup - change ae_num to ae_id
2014-07-25 22:55 [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1 Tadeusz Struk
` (5 preceding siblings ...)
2014-07-25 22:55 ` [PATCH 06/10] crypto: qat: Cleanup - change slice->regions to slice->region Tadeusz Struk
@ 2014-07-25 22:55 ` Tadeusz Struk
2014-07-25 22:55 ` [PATCH 08/10] crypto: qat: Cleanup - Updated print outputs Tadeusz Struk
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Tadeusz Struk @ 2014-07-25 22:55 UTC (permalink / raw)
To: herbert
Cc: tadeusz.struk, davem, bruce.w.allan, bo.cui, pingchao.yang,
qat-linux, linux-crypto
Change the logic how acceleration engines are indexed to make it
easier to read. Aslo some return code values updates to better reflect
what failed.
Signed-off-by: Pingchao Yang <pingchao.yang@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
---
drivers/crypto/qat/qat_common/qat_hal.c | 26 ++++++------
drivers/crypto/qat/qat_common/qat_uclo.c | 67 ++++++++++++++----------------
2 files changed, 45 insertions(+), 48 deletions(-)
diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c
index 28da876..da9626b 100644
--- a/drivers/crypto/qat/qat_common/qat_hal.c
+++ b/drivers/crypto/qat/qat_common/qat_hal.c
@@ -424,7 +424,7 @@ static void qat_hal_reset_timestamp(struct icp_qat_fw_loader_handle *handle)
SET_GLB_CSR(handle, MISC_CONTROL, misc_ctl &
(~MC_TIMESTAMP_ENABLE));
- for (ae = 0; ae <= handle->hal_handle->ae_max_num; ae++) {
+ for (ae = 0; ae < handle->hal_handle->ae_max_num; ae++) {
if (!(handle->hal_handle->ae_mask & (1 << ae)))
continue;
qat_hal_wr_ae_csr(handle, ae, TIMESTAMP_LOW, 0);
@@ -492,7 +492,7 @@ int qat_hal_clr_reset(struct icp_qat_fw_loader_handle *handle)
goto out_err;
/* Set undefined power-up/reset states to reasonable default values */
- for (ae = 0; ae <= handle->hal_handle->ae_max_num; ae++) {
+ for (ae = 0; ae < handle->hal_handle->ae_max_num; ae++) {
if (!(handle->hal_handle->ae_mask & (1 << ae)))
continue;
qat_hal_wr_ae_csr(handle, ae, CTX_ENABLES,
@@ -608,7 +608,7 @@ static int qat_hal_clear_gpr(struct icp_qat_fw_loader_handle *handle)
unsigned int savctx = 0;
int ret = 0;
- for (ae = 0; ae <= handle->hal_handle->ae_max_num; ae++) {
+ for (ae = 0; ae < handle->hal_handle->ae_max_num; ae++) {
if (!(handle->hal_handle->ae_mask & (1 << ae)))
continue;
for (reg = 0; reg < ICP_QAT_UCLO_MAX_GPR_REG; reg++) {
@@ -637,7 +637,7 @@ static int qat_hal_clear_gpr(struct icp_qat_fw_loader_handle *handle)
qat_hal_wr_ae_csr(handle, ae, CTX_SIG_EVENTS_ACTIVE, 0);
qat_hal_enable_ctx(handle, ae, ctx_mask);
}
- for (ae = 0; ae <= handle->hal_handle->ae_max_num; ae++) {
+ for (ae = 0; ae < handle->hal_handle->ae_max_num; ae++) {
if (!(handle->hal_handle->ae_mask & (1 << ae)))
continue;
/* wait for AE to finish */
@@ -674,17 +674,16 @@ static int qat_hal_clear_gpr(struct icp_qat_fw_loader_handle *handle)
#define ICP_DH895XCC_PMISC_BAR 1
int qat_hal_init(struct adf_accel_dev *accel_dev)
{
- unsigned char ae = 0;
- unsigned int csr_val = 0;
- unsigned int max_en_ae_num = 0;
- struct icp_qat_fw_loader_handle *handle = NULL;
+ unsigned char ae;
+ unsigned int max_en_ae_id = 0;
+ struct icp_qat_fw_loader_handle *handle;
struct adf_accel_pci *pci_info = &accel_dev->accel_pci_dev;
struct adf_hw_device_data *hw_data = accel_dev->hw_device;
struct adf_bar *bar = &pci_info->pci_bars[ADF_DH895XCC_PMISC_BAR];
handle = kzalloc(sizeof(*handle), GFP_KERNEL);
if (!handle)
- goto out_handle;
+ return -ENOMEM;
handle->hal_cap_g_ctl_csr_addr_v = bar->virt_addr +
ICP_DH895XCC_CAP_OFFSET;
@@ -713,9 +712,9 @@ int qat_hal_init(struct adf_accel_dev *accel_dev)
handle->hal_handle->max_ustore;
handle->hal_handle->aes[ae].live_ctx_mask =
ICP_QAT_UCLO_AE_ALL_CTX;
- max_en_ae_num = ae;
+ max_en_ae_id = ae;
}
- handle->hal_handle->ae_max_num = max_en_ae_num;
+ handle->hal_handle->ae_max_num = max_en_ae_id + 1;
/* take all AEs out of reset */
if (qat_hal_clr_reset(handle)) {
pr_err("QAT: qat_hal_clr_reset error\n");
@@ -724,7 +723,9 @@ int qat_hal_init(struct adf_accel_dev *accel_dev)
if (qat_hal_clear_gpr(handle))
goto out_err;
/* Set SIGNATURE_ENABLE[0] to 0x1 in order to enable ALU_OUT csr */
- for (ae = 0; ae <= handle->hal_handle->ae_max_num; ae++) {
+ for (ae = 0; ae < handle->hal_handle->ae_max_num; ae++) {
+ unsigned int csr_val = 0;
+
if (!(hw_data->ae_mask & (1 << ae)))
continue;
qat_hal_rd_ae_csr(handle, ae, SIGNATURE_ENABLE, &csr_val);
@@ -738,7 +739,6 @@ out_err:
kfree(handle->hal_handle);
out_hal_handle:
kfree(handle);
-out_handle:
return -EFAULT;
}
diff --git a/drivers/crypto/qat/qat_common/qat_uclo.c b/drivers/crypto/qat/qat_common/qat_uclo.c
index 557fa60..ebd5da0 100644
--- a/drivers/crypto/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/qat/qat_common/qat_uclo.c
@@ -214,11 +214,10 @@ qat_uclo_cleanup_batch_init_list(struct icp_qat_fw_loader_handle *handle,
static int qat_uclo_parse_num(char *str, unsigned int *num)
{
- char buf[16];
+ char buf[16] = {0};
unsigned long ae = 0;
int i;
- memset(buf, '\0', 16);
strncpy(buf, str, 15);
for (i = 0; i < 16; i++) {
if (!isdigit(buf[i])) {
@@ -418,13 +417,13 @@ static int qat_uclo_init_ustore(struct icp_qat_fw_loader_handle *handle,
fill_data = kcalloc(ICP_QAT_UCLO_MAX_USTORE, sizeof(uint64_t),
GFP_KERNEL);
if (!fill_data)
- return -EFAULT;
+ return -ENOMEM;
for (i = 0; i < ICP_QAT_UCLO_MAX_USTORE; i++)
memcpy(&fill_data[i], &uof_image->fill_pattern,
sizeof(uint64_t));
page = image->page;
- for (ae = 0; ae <= handle->hal_handle->ae_max_num; ae++) {
+ for (ae = 0; ae < handle->hal_handle->ae_max_num; ae++) {
if (!test_bit(ae, (unsigned long *)&uof_image->ae_assigned))
continue;
ustore_size = obj_handle->ae_data[ae].eff_ustore_size;
@@ -442,11 +441,9 @@ static int qat_uclo_init_ustore(struct icp_qat_fw_loader_handle *handle,
static int qat_uclo_init_memory(struct icp_qat_fw_loader_handle *handle)
{
- unsigned int i;
- int status = 0;
+ int i, ae;
struct icp_qat_uclo_objhandle *obj_handle = handle->obj_handle;
struct icp_qat_uof_initmem *initmem = obj_handle->init_mem_tab.init_mem;
- int ae;
for (i = 0; i < obj_handle->init_mem_tab.entry_num; i++) {
if (initmem->num_in_bytes) {
@@ -473,7 +470,7 @@ static int qat_uclo_init_memory(struct icp_qat_fw_loader_handle *handle)
&obj_handle->
umem_init_tab[ae]);
}
- return status;
+ return 0;
}
static void *qat_uclo_find_chunk(struct icp_qat_uof_objhdr *obj_hdr,
@@ -526,7 +523,7 @@ qat_uclo_map_chunk(char *buf, struct icp_qat_uof_filehdr *file_hdr,
{
struct icp_qat_uof_filechunkhdr *file_chunk;
struct icp_qat_uclo_objhdr *obj_hdr;
- void *chunk;
+ char *chunk;
int i;
file_chunk = (struct icp_qat_uof_filechunkhdr *)
@@ -536,7 +533,7 @@ qat_uclo_map_chunk(char *buf, struct icp_qat_uof_filehdr *file_hdr,
ICP_QAT_UOF_OBJID_LEN)) {
chunk = buf + file_chunk->offset;
if (file_chunk->checksum != qat_uclo_calc_str_checksum(
- (char *)chunk, file_chunk->size))
+ chunk, file_chunk->size))
break;
obj_hdr = kzalloc(sizeof(*obj_hdr), GFP_KERNEL);
if (!obj_hdr)
@@ -595,7 +592,7 @@ qat_uclo_check_image_compat(struct icp_qat_uof_encap_obj *encap_uof_obj,
return 0;
}
-static void qat_uclo_map_image_pages(struct icp_qat_uof_encap_obj
+static void qat_uclo_map_image_page(struct icp_qat_uof_encap_obj
*encap_uof_obj,
struct icp_qat_uof_image *img,
struct icp_qat_uclo_encap_page *page)
@@ -631,7 +628,7 @@ static int qat_uclo_map_uimage(struct icp_qat_uclo_objhandle *obj_handle,
struct icp_qat_uclo_encapme *ae_uimage,
int max_image)
{
- int a = 0, i;
+ int i, j;
struct icp_qat_uof_chunkhdr *chunk_hdr = NULL;
struct icp_qat_uof_image *image;
struct icp_qat_uof_objtable *ae_regtab;
@@ -640,7 +637,7 @@ static int qat_uclo_map_uimage(struct icp_qat_uclo_objhandle *obj_handle,
struct icp_qat_uof_encap_obj *encap_uof_obj =
&obj_handle->encap_uof_obj;
- for (a = 0; a < max_image; a++) {
+ for (j = 0; j < max_image; j++) {
chunk_hdr = qat_uclo_find_chunk(encap_uof_obj->obj_hdr,
ICP_QAT_UOF_IMAG, chunk_hdr);
if (!chunk_hdr)
@@ -650,37 +647,37 @@ static int qat_uclo_map_uimage(struct icp_qat_uclo_objhandle *obj_handle,
ae_regtab = (struct icp_qat_uof_objtable *)
(image->reg_tab_offset +
obj_handle->obj_hdr->file_buff);
- ae_uimage[a].ae_reg_num = ae_regtab->entry_num;
- ae_uimage[a].ae_reg = (struct icp_qat_uof_ae_reg *)
+ ae_uimage[j].ae_reg_num = ae_regtab->entry_num;
+ ae_uimage[j].ae_reg = (struct icp_qat_uof_ae_reg *)
(((char *)ae_regtab) +
sizeof(struct icp_qat_uof_objtable));
init_reg_sym_tab = (struct icp_qat_uof_objtable *)
(image->init_reg_sym_tab +
obj_handle->obj_hdr->file_buff);
- ae_uimage[a].init_regsym_num = init_reg_sym_tab->entry_num;
- ae_uimage[a].init_regsym = (struct icp_qat_uof_init_regsym *)
+ ae_uimage[j].init_regsym_num = init_reg_sym_tab->entry_num;
+ ae_uimage[j].init_regsym = (struct icp_qat_uof_init_regsym *)
(((char *)init_reg_sym_tab) +
sizeof(struct icp_qat_uof_objtable));
sbreak_tab = (struct icp_qat_uof_objtable *)
(image->sbreak_tab + obj_handle->obj_hdr->file_buff);
- ae_uimage[a].sbreak_num = sbreak_tab->entry_num;
- ae_uimage[a].sbreak = (struct icp_qat_uof_sbreak *)
+ ae_uimage[j].sbreak_num = sbreak_tab->entry_num;
+ ae_uimage[j].sbreak = (struct icp_qat_uof_sbreak *)
(((char *)sbreak_tab) +
sizeof(struct icp_qat_uof_objtable));
- ae_uimage[a].img_ptr = image;
+ ae_uimage[j].img_ptr = image;
if (qat_uclo_check_image_compat(encap_uof_obj, image))
goto out_err;
- ae_uimage[a].page =
+ ae_uimage[j].page =
kzalloc(sizeof(struct icp_qat_uclo_encap_page),
GFP_KERNEL);
- if (!ae_uimage[a].page)
+ if (!ae_uimage[j].page)
goto out_err;
- qat_uclo_map_image_pages(encap_uof_obj, image,
- ae_uimage[a].page);
+ qat_uclo_map_image_page(encap_uof_obj, image,
+ ae_uimage[j].page);
}
- return a;
+ return j;
out_err:
- for (i = 0; i < a; i++)
+ for (i = 0; i < j; i++)
kfree(ae_uimage[i].page);
return 0;
}
@@ -875,7 +872,7 @@ static int qat_uclo_init_globals(struct icp_qat_fw_loader_handle *handle)
return -EINVAL;
}
}
- for (ae = 0; ae <= handle->hal_handle->ae_max_num; ae++) {
+ for (ae = 0; ae < handle->hal_handle->ae_max_num; ae++) {
for (s = 0; s < obj_handle->ae_data[ae].slice_num; s++) {
if (!obj_handle->ae_data[ae].ae_slices[s].encap_image)
continue;
@@ -896,7 +893,7 @@ static int qat_uclo_set_ae_mode(struct icp_qat_fw_loader_handle *handle)
struct icp_qat_uclo_aedata *ae_data;
struct icp_qat_uclo_objhandle *obj_handle = handle->obj_handle;
- for (ae = 0; ae <= handle->hal_handle->ae_max_num; ae++) {
+ for (ae = 0; ae < handle->hal_handle->ae_max_num; ae++) {
if (!test_bit(ae,
(unsigned long *)&handle->hal_handle->ae_mask))
continue;
@@ -1041,7 +1038,7 @@ out_objbuf_err:
void qat_uclo_del_uof_obj(struct icp_qat_fw_loader_handle *handle)
{
struct icp_qat_uclo_objhandle *obj_handle = handle->obj_handle;
- int a;
+ unsigned int a;
if (!obj_handle)
return;
@@ -1050,7 +1047,7 @@ void qat_uclo_del_uof_obj(struct icp_qat_fw_loader_handle *handle)
for (a = 0; a < obj_handle->uimage_num; a++)
kfree(obj_handle->ae_uimage[a].page);
- for (a = 0; a <= (int)handle->hal_handle->ae_max_num; a++)
+ for (a = 0; a < handle->hal_handle->ae_max_num; a++)
qat_uclo_free_ae_data(&obj_handle->ae_data[a]);
kfree(obj_handle->obj_hdr);
@@ -1127,8 +1124,8 @@ static void qat_uclo_wr_uimage_raw_page(struct icp_qat_fw_loader_handle *handle,
}
}
-static void qat_uclo_wr_uimage_pages(struct icp_qat_fw_loader_handle *handle,
- struct icp_qat_uof_image *image)
+static void qat_uclo_wr_uimage_page(struct icp_qat_fw_loader_handle *handle,
+ struct icp_qat_uof_image *image)
{
struct icp_qat_uclo_objhandle *obj_handle = handle->obj_handle;
unsigned int ctx_mask, s;
@@ -1142,7 +1139,7 @@ static void qat_uclo_wr_uimage_pages(struct icp_qat_fw_loader_handle *handle,
ctx_mask = 0x55;
/* load the default page and set assigned CTX PC
* to the entrypoint address */
- for (ae = 0; ae <= handle->hal_handle->ae_max_num; ae++) {
+ for (ae = 0; ae < handle->hal_handle->ae_max_num; ae++) {
if (!test_bit(ae, (unsigned long *)&image->ae_assigned))
continue;
/* find the slice to which this image is assigned */
@@ -1181,8 +1178,8 @@ int qat_uclo_wr_all_uimage(struct icp_qat_fw_loader_handle *handle)
return -EINVAL;
if (qat_uclo_init_ustore(handle, &obj_handle->ae_uimage[i]))
return -EINVAL;
- qat_uclo_wr_uimage_pages(handle,
- obj_handle->ae_uimage[i].img_ptr);
+ qat_uclo_wr_uimage_page(handle,
+ obj_handle->ae_uimage[i].img_ptr);
}
return 0;
}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 08/10] crypto: qat: Cleanup - Updated print outputs
2014-07-25 22:55 [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1 Tadeusz Struk
` (6 preceding siblings ...)
2014-07-25 22:55 ` [PATCH 07/10] crypto: qat: Cleanup - change ae_num to ae_id Tadeusz Struk
@ 2014-07-25 22:55 ` Tadeusz Struk
2014-07-25 22:55 ` [PATCH 09/10] crypto: qat: Cleanup - Use hweight for bit counting Tadeusz Struk
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Tadeusz Struk @ 2014-07-25 22:55 UTC (permalink / raw)
To: herbert
Cc: tadeusz.struk, davem, bruce.w.allan, bo.cui, pingchao.yang,
qat-linux, linux-crypto
Updated pr_err output to make it more consistent.
Signed-off-by: Pingchao Yang <pingchao.yang@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
---
drivers/crypto/qat/qat_common/adf_accel_engine.c | 4 ++--
drivers/crypto/qat/qat_common/adf_init.c | 2 +-
drivers/crypto/qat/qat_common/qat_hal.c | 3 +--
drivers/crypto/qat/qat_common/qat_uclo.c | 18 +++++++++---------
4 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/drivers/crypto/qat/qat_common/adf_accel_engine.c b/drivers/crypto/qat/qat_common/adf_accel_engine.c
index 25801fe..c77453b 100644
--- a/drivers/crypto/qat/qat_common/adf_accel_engine.c
+++ b/drivers/crypto/qat/qat_common/adf_accel_engine.c
@@ -67,11 +67,11 @@ int adf_ae_fw_load(struct adf_accel_dev *accel_dev)
uof_size = loader_data->uof_fw->size;
uof_addr = (void *)loader_data->uof_fw->data;
if (qat_uclo_map_uof_obj(loader_data->fw_loader, uof_addr, uof_size)) {
- pr_err("QAT: Failed to map uof\n");
+ pr_err("QAT: Failed to map UOF\n");
goto out_err;
}
if (qat_uclo_wr_all_uimage(loader_data->fw_loader)) {
- pr_err("QAT: Failed to map uof\n");
+ pr_err("QAT: Failed to map UOF\n");
goto out_err;
}
return 0;
diff --git a/drivers/crypto/qat/qat_common/adf_init.c b/drivers/crypto/qat/qat_common/adf_init.c
index 5c3d6f1..5c0e47a 100644
--- a/drivers/crypto/qat/qat_common/adf_init.c
+++ b/drivers/crypto/qat/qat_common/adf_init.c
@@ -136,7 +136,7 @@ int adf_dev_start(struct adf_accel_dev *accel_dev)
set_bit(ADF_STATUS_AE_INITIALISED, &accel_dev->status);
if (adf_ae_fw_load(accel_dev)) {
- pr_err("Failed to load acceleration FW\n");
+ pr_err("QAT: Failed to load acceleration FW\n");
adf_ae_fw_release(accel_dev);
return -EFAULT;
}
diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c
index da9626b..8d686a2 100644
--- a/drivers/crypto/qat/qat_common/qat_hal.c
+++ b/drivers/crypto/qat/qat_common/qat_hal.c
@@ -849,8 +849,7 @@ static int qat_hal_exec_micro_inst(struct icp_qat_fw_loader_handle *handle,
unsigned int ctxarb_ctl, ctx_enables;
if ((inst_num > handle->hal_handle->max_ustore) || !micro_inst) {
- pr_err("QAT: invalid instructs inst_num=%d, micro_inst=0x%p\n ",
- inst_num, micro_inst);
+ pr_err("QAT: invalid instruction num %d\n", inst_num);
return -EINVAL;
}
/* save current context */
diff --git a/drivers/crypto/qat/qat_common/qat_uclo.c b/drivers/crypto/qat/qat_common/qat_uclo.c
index ebd5da0..2580091 100644
--- a/drivers/crypto/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/qat/qat_common/qat_uclo.c
@@ -132,7 +132,7 @@ static int qat_uclo_check_format(struct icp_qat_uof_filehdr *hdr)
return -EINVAL;
}
if (min != ICP_QAT_UOF_MINVER || maj != ICP_QAT_UOF_MAJVER) {
- pr_err("QAT: bad uof version, major 0x%x, minor 0x%x\n",
+ pr_err("QAT: bad UOF version, major 0x%x, minor 0x%x\n",
maj, min);
return -EINVAL;
}
@@ -249,7 +249,7 @@ static int qat_uclo_fetch_initmem_ae(struct icp_qat_fw_loader_handle *handle,
}
str = qat_uclo_get_string(&obj_handle->str_table, init_mem->sym_name);
if (!str) {
- pr_err("QAT: AE name assigned in uof init table is NULL\n");
+ pr_err("QAT: AE name assigned in UOF init table is NULL\n");
return -EINVAL;
}
if (qat_uclo_parse_num(str, ae)) {
@@ -751,14 +751,14 @@ static int qat_uclo_check_uof_compat(struct icp_qat_uclo_objhandle *obj_handle)
unsigned int maj_ver, prod_type = obj_handle->prod_type;
if (!(prod_type & obj_handle->encap_uof_obj.obj_hdr->cpu_type)) {
- pr_err("QAT: uof type 0x%x not match with cur platform 0x%x\n",
+ pr_err("QAT: UOF type 0x%x not match with cur platform 0x%x\n",
obj_handle->encap_uof_obj.obj_hdr->cpu_type, prod_type);
return -EINVAL;
}
maj_ver = obj_handle->prod_rev & 0xff;
if ((obj_handle->encap_uof_obj.obj_hdr->max_cpu_ver < maj_ver) ||
(obj_handle->encap_uof_obj.obj_hdr->min_cpu_ver > maj_ver)) {
- pr_err("QAT: uof majVer 0x%x out of range\n", maj_ver);
+ pr_err("QAT: UOF majVer 0x%x out of range\n", maj_ver);
return -EINVAL;
}
return 0;
@@ -868,7 +868,7 @@ static int qat_uclo_init_globals(struct icp_qat_fw_loader_handle *handle)
return 0;
if (obj_handle->init_mem_tab.entry_num) {
if (qat_uclo_init_memory(handle)) {
- pr_err("QAT: initalize memory failed\n");
+ pr_err("QAT: initialize memory failed\n");
return -EINVAL;
}
}
@@ -917,13 +917,13 @@ static int qat_uclo_set_ae_mode(struct icp_qat_fw_loader_handle *handle)
if (qat_hal_set_ae_lm_mode(handle, ae, ICP_LMEM0,
(char)ICP_QAT_LOC_MEM0_MODE
(uof_image->ae_mode))) {
- pr_err("QAT: qat_hal_set_ae_lm_mode error\n ");
+ pr_err("QAT: qat_hal_set_ae_lm_mode LMEM0 error\n");
return -EFAULT;
}
if (qat_hal_set_ae_lm_mode(handle, ae, ICP_LMEM1,
(char)ICP_QAT_LOC_MEM1_MODE
(uof_image->ae_mode))) {
- pr_err("QAT: qat_hal_set_ae_lm_mode error\n ");
+ pr_err("QAT: qat_hal_set_ae_lm_mode LMEM1 error\n");
return -EFAULT;
}
}
@@ -961,14 +961,14 @@ static int qat_uclo_parse_uof_obj(struct icp_qat_fw_loader_handle *handle)
obj_handle->prod_rev = PID_MAJOR_REV |
(PID_MINOR_REV & handle->hal_handle->revision_id);
if (qat_uclo_check_uof_compat(obj_handle)) {
- pr_err("QAT: uof incompatible\n");
+ pr_err("QAT: UOF incompatible\n");
return -EINVAL;
}
obj_handle->ustore_phy_size = ICP_QAT_UCLO_MAX_USTORE;
if (!obj_handle->obj_hdr->file_buff ||
!qat_uclo_map_str_table(obj_handle->obj_hdr, ICP_QAT_UOF_STRT,
&obj_handle->str_table)) {
- pr_err("QAT: uof doesn't have effective images\n");
+ pr_err("QAT: UOF doesn't have effective images\n");
goto out_err;
}
obj_handle->uimage_num =
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 09/10] crypto: qat: Cleanup - Use hweight for bit counting
2014-07-25 22:55 [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1 Tadeusz Struk
` (7 preceding siblings ...)
2014-07-25 22:55 ` [PATCH 08/10] crypto: qat: Cleanup - Updated print outputs Tadeusz Struk
@ 2014-07-25 22:55 ` Tadeusz Struk
2014-07-25 22:56 ` [PATCH 10/10] crypto: qat: Fixed SKU1 dev issue Tadeusz Struk
2014-08-01 14:39 ` [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1 Herbert Xu
10 siblings, 0 replies; 12+ messages in thread
From: Tadeusz Struk @ 2014-07-25 22:55 UTC (permalink / raw)
To: herbert
Cc: tadeusz.struk, davem, bruce.w.allan, bo.cui, pingchao.yang,
qat-linux, linux-crypto
Use predefined hweight32 function instead of writing a new one.
Signed-off-by: Pingchao Yang <pingchao.yang@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
---
drivers/crypto/qat/qat_common/qat_hal.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c
index 8d686a2..9b8a315 100644
--- a/drivers/crypto/qat/qat_common/qat_hal.c
+++ b/drivers/crypto/qat/qat_common/qat_hal.c
@@ -795,17 +795,6 @@ static void qat_hal_get_uwords(struct icp_qat_fw_loader_handle *handle,
qat_hal_wr_ae_csr(handle, ae, USTORE_ADDRESS, ustore_addr);
}
-static int qat_hal_count_bits(unsigned int word)
-{
- int n = 0;
-
- while (word) {
- n++;
- word &= word - 1;
- }
- return n;
-}
-
void qat_hal_wr_umem(struct icp_qat_fw_loader_handle *handle,
unsigned char ae, unsigned int uaddr,
unsigned int words_num, unsigned int *data)
@@ -822,9 +811,9 @@ void qat_hal_wr_umem(struct icp_qat_fw_loader_handle *handle,
((data[i] & 0xff00) << 2) |
(0x3 << 8) | (data[i] & 0xff);
uwrd_hi = (0xf << 4) | ((data[i] & 0xf0000000) >> 28);
- uwrd_hi |= (qat_hal_count_bits(data[i] & 0xffff) & 0x1) << 8;
+ uwrd_hi |= (hweight32(data[i] & 0xffff) & 0x1) << 8;
tmp = ((data[i] >> 0x10) & 0xffff);
- uwrd_hi |= (qat_hal_count_bits(tmp) & 0x1) << 9;
+ uwrd_hi |= (hweight32(tmp) & 0x1) << 9;
qat_hal_wr_ae_csr(handle, ae, USTORE_DATA_LOWER, uwrd_lo);
qat_hal_wr_ae_csr(handle, ae, USTORE_DATA_UPPER, uwrd_hi);
}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 10/10] crypto: qat: Fixed SKU1 dev issue
2014-07-25 22:55 [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1 Tadeusz Struk
` (8 preceding siblings ...)
2014-07-25 22:55 ` [PATCH 09/10] crypto: qat: Cleanup - Use hweight for bit counting Tadeusz Struk
@ 2014-07-25 22:56 ` Tadeusz Struk
2014-08-01 14:39 ` [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1 Herbert Xu
10 siblings, 0 replies; 12+ messages in thread
From: Tadeusz Struk @ 2014-07-25 22:56 UTC (permalink / raw)
To: herbert
Cc: tadeusz.struk, davem, bruce.w.allan, bo.cui, pingchao.yang,
qat-linux, linux-crypto
Fix for issue with SKU1 device.
SKU1 device has 8 micro engines as opposed to 12 in other SKUs
so it was not possible to start the non-existing micro engines.
Signed-off-by: Bo Cui <bo.cui@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
---
drivers/crypto/qat/qat_common/qat_uclo.c | 6 +-----
.../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/crypto/qat/qat_common/qat_uclo.c b/drivers/crypto/qat/qat_common/qat_uclo.c
index 2580091..1e27f9f 100644
--- a/drivers/crypto/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/qat/qat_common/qat_uclo.c
@@ -256,10 +256,6 @@ static int qat_uclo_fetch_initmem_ae(struct icp_qat_fw_loader_handle *handle,
pr_err("QAT: Parse num for AE number failed\n");
return -EINVAL;
}
- if (!test_bit(*ae, (unsigned long *)&handle->hal_handle->ae_mask)) {
- pr_err("QAT: ae %d to be init is fused off\n", *ae);
- return -EINVAL;
- }
if (*ae >= ICP_QAT_UCLO_MAX_AE) {
pr_err("QAT: ae %d out of range\n", *ae);
return -EINVAL;
@@ -456,7 +452,7 @@ static int qat_uclo_init_memory(struct icp_qat_fw_loader_handle *handle)
(sizeof(struct icp_qat_uof_memvar_attr) *
initmem->val_attr_num));
}
- for (ae = 0; ae < ICP_QAT_UCLO_MAX_AE; ae++) {
+ for (ae = 0; ae < handle->hal_handle->ae_max_num; ae++) {
if (qat_hal_batch_wr_lm(handle, ae,
obj_handle->lm_init_tab[ae])) {
pr_err("QAT: fail to batch init lmem for AE %d\n", ae);
diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h
index c5ce236..b707f29 100644
--- a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h
+++ b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h
@@ -59,7 +59,7 @@
#define ADF_DH895XCC_FUSECTL_SKU_4 0x3
#define ADF_DH895XCC_MAX_ACCELERATORS 6
#define ADF_DH895XCC_MAX_ACCELENGINES 12
-#define ADF_DH895XCC_ACCELERATORS_REG_OFFSET 18
+#define ADF_DH895XCC_ACCELERATORS_REG_OFFSET 13
#define ADF_DH895XCC_ACCELERATORS_MASK 0x3F
#define ADF_DH895XCC_ACCELENGINES_MASK 0xFFF
#define ADF_DH895XCC_LEGFUSE_OFFSET 0x4C
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1
2014-07-25 22:55 [PATCH 00/10] crypto: qat: Checkpatch and other cleanups plus SKU1 Tadeusz Struk
` (9 preceding siblings ...)
2014-07-25 22:56 ` [PATCH 10/10] crypto: qat: Fixed SKU1 dev issue Tadeusz Struk
@ 2014-08-01 14:39 ` Herbert Xu
10 siblings, 0 replies; 12+ messages in thread
From: Herbert Xu @ 2014-08-01 14:39 UTC (permalink / raw)
To: Tadeusz Struk
Cc: davem, bruce.w.allan, bo.cui, pingchao.yang, qat-linux,
linux-crypto
On Fri, Jul 25, 2014 at 03:55:03PM -0700, Tadeusz Struk wrote:
> issue.
>
> Hi,
> Minor cleanups for the qat driver.
> The last patch fixes SKU1 device startup issue.
> Rest of the patches clean up new checkpatch issues plus some minor
> and cosmetic updates.
All applied.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 12+ messages in thread