Commit 0a8f5989 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Herbert Xu

crypto: marvell/octeontx - Add missing '\n' in log messages

Message logged by 'dev_xxx()' or 'pr_xxx()' should end with a '\n'.

While at it, I've introduced a few pr_cont that looked logical to me.

Fixes: 10b4f094 ("crypto: marvell - add the Virtual Function driver for CPT")
Fixes: d9110b0b ("crypto: marvell - add support for OCTEON TX CPT engine")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6603523b
...@@ -79,13 +79,13 @@ static int otx_cpt_device_init(struct otx_cpt_device *cpt) ...@@ -79,13 +79,13 @@ static int otx_cpt_device_init(struct otx_cpt_device *cpt)
/* Check BIST status */ /* Check BIST status */
bist = (u64)otx_cpt_check_bist_status(cpt); bist = (u64)otx_cpt_check_bist_status(cpt);
if (bist) { if (bist) {
dev_err(dev, "RAM BIST failed with code 0x%llx", bist); dev_err(dev, "RAM BIST failed with code 0x%llx\n", bist);
return -ENODEV; return -ENODEV;
} }
bist = otx_cpt_check_exe_bist_status(cpt); bist = otx_cpt_check_exe_bist_status(cpt);
if (bist) { if (bist) {
dev_err(dev, "Engine BIST failed with code 0x%llx", bist); dev_err(dev, "Engine BIST failed with code 0x%llx\n", bist);
return -ENODEV; return -ENODEV;
} }
......
...@@ -63,11 +63,11 @@ static void dump_mbox_msg(struct otx_cpt_mbox *mbox_msg, int vf_id) ...@@ -63,11 +63,11 @@ static void dump_mbox_msg(struct otx_cpt_mbox *mbox_msg, int vf_id)
hex_dump_to_buffer(mbox_msg, sizeof(struct otx_cpt_mbox), 16, 8, hex_dump_to_buffer(mbox_msg, sizeof(struct otx_cpt_mbox), 16, 8,
raw_data_str, OTX_CPT_MAX_MBOX_DATA_STR_SIZE, false); raw_data_str, OTX_CPT_MAX_MBOX_DATA_STR_SIZE, false);
if (vf_id >= 0) if (vf_id >= 0)
pr_debug("MBOX opcode %s received from VF%d raw_data %s", pr_debug("MBOX opcode %s received from VF%d raw_data %s\n",
get_mbox_opcode_str(mbox_msg->msg), vf_id, get_mbox_opcode_str(mbox_msg->msg), vf_id,
raw_data_str); raw_data_str);
else else
pr_debug("MBOX opcode %s received from PF raw_data %s", pr_debug("MBOX opcode %s received from PF raw_data %s\n",
get_mbox_opcode_str(mbox_msg->msg), raw_data_str); get_mbox_opcode_str(mbox_msg->msg), raw_data_str);
} }
...@@ -140,20 +140,20 @@ static int otx_cpt_bind_vq_to_grp(struct otx_cpt_device *cpt, u8 q, u8 grp) ...@@ -140,20 +140,20 @@ static int otx_cpt_bind_vq_to_grp(struct otx_cpt_device *cpt, u8 q, u8 grp)
struct otx_cpt_ucode *ucode; struct otx_cpt_ucode *ucode;
if (q >= cpt->max_vfs) { if (q >= cpt->max_vfs) {
dev_err(dev, "Requested queue %d is > than maximum avail %d", dev_err(dev, "Requested queue %d is > than maximum avail %d\n",
q, cpt->max_vfs); q, cpt->max_vfs);
return -EINVAL; return -EINVAL;
} }
if (grp >= OTX_CPT_MAX_ENGINE_GROUPS) { if (grp >= OTX_CPT_MAX_ENGINE_GROUPS) {
dev_err(dev, "Requested group %d is > than maximum avail %d", dev_err(dev, "Requested group %d is > than maximum avail %d\n",
grp, OTX_CPT_MAX_ENGINE_GROUPS); grp, OTX_CPT_MAX_ENGINE_GROUPS);
return -EINVAL; return -EINVAL;
} }
eng_grp = &cpt->eng_grps.grp[grp]; eng_grp = &cpt->eng_grps.grp[grp];
if (!eng_grp->is_enabled) { if (!eng_grp->is_enabled) {
dev_err(dev, "Requested engine group %d is disabled", grp); dev_err(dev, "Requested engine group %d is disabled\n", grp);
return -EINVAL; return -EINVAL;
} }
...@@ -212,7 +212,7 @@ static void otx_cpt_handle_mbox_intr(struct otx_cpt_device *cpt, int vf) ...@@ -212,7 +212,7 @@ static void otx_cpt_handle_mbox_intr(struct otx_cpt_device *cpt, int vf)
vftype = otx_cpt_bind_vq_to_grp(cpt, vf, (u8)mbx.data); vftype = otx_cpt_bind_vq_to_grp(cpt, vf, (u8)mbx.data);
if ((vftype != OTX_CPT_AE_TYPES) && if ((vftype != OTX_CPT_AE_TYPES) &&
(vftype != OTX_CPT_SE_TYPES)) { (vftype != OTX_CPT_SE_TYPES)) {
dev_err(dev, "VF%d binding to eng group %llu failed", dev_err(dev, "VF%d binding to eng group %llu failed\n",
vf, mbx.data); vf, mbx.data);
otx_cptpf_mbox_send_nack(cpt, vf, &mbx); otx_cptpf_mbox_send_nack(cpt, vf, &mbx);
} else { } else {
......
...@@ -1660,7 +1660,7 @@ int otx_cpt_crypto_init(struct pci_dev *pdev, struct module *mod, ...@@ -1660,7 +1660,7 @@ int otx_cpt_crypto_init(struct pci_dev *pdev, struct module *mod,
case OTX_CPT_SE_TYPES: case OTX_CPT_SE_TYPES:
count = atomic_read(&se_devices.count); count = atomic_read(&se_devices.count);
if (count >= CPT_MAX_VF_NUM) { if (count >= CPT_MAX_VF_NUM) {
dev_err(&pdev->dev, "No space to add a new device"); dev_err(&pdev->dev, "No space to add a new device\n");
ret = -ENOSPC; ret = -ENOSPC;
goto err; goto err;
} }
...@@ -1687,7 +1687,7 @@ int otx_cpt_crypto_init(struct pci_dev *pdev, struct module *mod, ...@@ -1687,7 +1687,7 @@ int otx_cpt_crypto_init(struct pci_dev *pdev, struct module *mod,
case OTX_CPT_AE_TYPES: case OTX_CPT_AE_TYPES:
count = atomic_read(&ae_devices.count); count = atomic_read(&ae_devices.count);
if (count >= CPT_MAX_VF_NUM) { if (count >= CPT_MAX_VF_NUM) {
dev_err(&pdev->dev, "No space to a add new device"); dev_err(&pdev->dev, "No space to a add new device\n");
ret = -ENOSPC; ret = -ENOSPC;
goto err; goto err;
} }
...@@ -1728,7 +1728,7 @@ void otx_cpt_crypto_exit(struct pci_dev *pdev, struct module *mod, ...@@ -1728,7 +1728,7 @@ void otx_cpt_crypto_exit(struct pci_dev *pdev, struct module *mod,
} }
if (!dev_found) { if (!dev_found) {
dev_err(&pdev->dev, "%s device not found", __func__); dev_err(&pdev->dev, "%s device not found\n", __func__);
goto exit; goto exit;
} }
......
...@@ -584,7 +584,7 @@ static irqreturn_t cptvf_done_intr_handler(int __always_unused irq, ...@@ -584,7 +584,7 @@ static irqreturn_t cptvf_done_intr_handler(int __always_unused irq,
cptvf_write_vq_done_ack(cptvf, intr); cptvf_write_vq_done_ack(cptvf, intr);
wqe = get_cptvf_vq_wqe(cptvf, 0); wqe = get_cptvf_vq_wqe(cptvf, 0);
if (unlikely(!wqe)) { if (unlikely(!wqe)) {
dev_err(&pdev->dev, "No work to schedule for VF (%d)", dev_err(&pdev->dev, "No work to schedule for VF (%d)\n",
cptvf->vfid); cptvf->vfid);
return IRQ_NONE; return IRQ_NONE;
} }
...@@ -602,7 +602,7 @@ static void cptvf_set_irq_affinity(struct otx_cptvf *cptvf, int vec) ...@@ -602,7 +602,7 @@ static void cptvf_set_irq_affinity(struct otx_cptvf *cptvf, int vec)
if (!zalloc_cpumask_var(&cptvf->affinity_mask[vec], if (!zalloc_cpumask_var(&cptvf->affinity_mask[vec],
GFP_KERNEL)) { GFP_KERNEL)) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Allocation failed for affinity_mask for VF %d", "Allocation failed for affinity_mask for VF %d\n",
cptvf->vfid); cptvf->vfid);
return; return;
} }
...@@ -691,7 +691,7 @@ static ssize_t vf_engine_group_store(struct device *dev, ...@@ -691,7 +691,7 @@ static ssize_t vf_engine_group_store(struct device *dev,
return -EINVAL; return -EINVAL;
if (val >= OTX_CPT_MAX_ENGINE_GROUPS) { if (val >= OTX_CPT_MAX_ENGINE_GROUPS) {
dev_err(dev, "Engine group >= than max available groups %d", dev_err(dev, "Engine group >= than max available groups %d\n",
OTX_CPT_MAX_ENGINE_GROUPS); OTX_CPT_MAX_ENGINE_GROUPS);
return -EINVAL; return -EINVAL;
} }
...@@ -837,7 +837,7 @@ static int otx_cptvf_probe(struct pci_dev *pdev, ...@@ -837,7 +837,7 @@ static int otx_cptvf_probe(struct pci_dev *pdev,
cptvf_misc_intr_handler, 0, "CPT VF misc intr", cptvf_misc_intr_handler, 0, "CPT VF misc intr",
cptvf); cptvf);
if (err) { if (err) {
dev_err(dev, "Failed to request misc irq"); dev_err(dev, "Failed to request misc irq\n");
goto free_vectors; goto free_vectors;
} }
...@@ -854,7 +854,7 @@ static int otx_cptvf_probe(struct pci_dev *pdev, ...@@ -854,7 +854,7 @@ static int otx_cptvf_probe(struct pci_dev *pdev,
cptvf->cqinfo.qchunksize = OTX_CPT_CMD_QCHUNK_SIZE; cptvf->cqinfo.qchunksize = OTX_CPT_CMD_QCHUNK_SIZE;
err = cptvf_sw_init(cptvf, OTX_CPT_CMD_QLEN, OTX_CPT_NUM_QS_PER_VF); err = cptvf_sw_init(cptvf, OTX_CPT_CMD_QLEN, OTX_CPT_NUM_QS_PER_VF);
if (err) { if (err) {
dev_err(dev, "cptvf_sw_init() failed"); dev_err(dev, "cptvf_sw_init() failed\n");
goto free_misc_irq; goto free_misc_irq;
} }
/* Convey VQ LEN to PF */ /* Convey VQ LEN to PF */
...@@ -946,7 +946,7 @@ static void otx_cptvf_remove(struct pci_dev *pdev) ...@@ -946,7 +946,7 @@ static void otx_cptvf_remove(struct pci_dev *pdev)
/* Convey DOWN to PF */ /* Convey DOWN to PF */
if (otx_cptvf_send_vf_down(cptvf)) { if (otx_cptvf_send_vf_down(cptvf)) {
dev_err(&pdev->dev, "PF not responding to DOWN msg"); dev_err(&pdev->dev, "PF not responding to DOWN msg\n");
} else { } else {
sysfs_remove_group(&pdev->dev.kobj, &otx_cptvf_sysfs_group); sysfs_remove_group(&pdev->dev.kobj, &otx_cptvf_sysfs_group);
otx_cpt_crypto_exit(pdev, THIS_MODULE, cptvf->vftype); otx_cpt_crypto_exit(pdev, THIS_MODULE, cptvf->vftype);
......
...@@ -314,7 +314,7 @@ static int process_request(struct pci_dev *pdev, struct otx_cpt_req_info *req, ...@@ -314,7 +314,7 @@ static int process_request(struct pci_dev *pdev, struct otx_cpt_req_info *req,
GFP_ATOMIC; GFP_ATOMIC;
ret = setup_sgio_list(pdev, &info, req, gfp); ret = setup_sgio_list(pdev, &info, req, gfp);
if (unlikely(ret)) { if (unlikely(ret)) {
dev_err(&pdev->dev, "Setting up SG list failed"); dev_err(&pdev->dev, "Setting up SG list failed\n");
goto request_cleanup; goto request_cleanup;
} }
cpt_req->dlen = info->dlen; cpt_req->dlen = info->dlen;
...@@ -410,17 +410,17 @@ int otx_cpt_do_request(struct pci_dev *pdev, struct otx_cpt_req_info *req, ...@@ -410,17 +410,17 @@ int otx_cpt_do_request(struct pci_dev *pdev, struct otx_cpt_req_info *req,
struct otx_cptvf *cptvf = pci_get_drvdata(pdev); struct otx_cptvf *cptvf = pci_get_drvdata(pdev);
if (!otx_cpt_device_ready(cptvf)) { if (!otx_cpt_device_ready(cptvf)) {
dev_err(&pdev->dev, "CPT Device is not ready"); dev_err(&pdev->dev, "CPT Device is not ready\n");
return -ENODEV; return -ENODEV;
} }
if ((cptvf->vftype == OTX_CPT_SE_TYPES) && (!req->ctrl.s.se_req)) { if ((cptvf->vftype == OTX_CPT_SE_TYPES) && (!req->ctrl.s.se_req)) {
dev_err(&pdev->dev, "CPTVF-%d of SE TYPE got AE request", dev_err(&pdev->dev, "CPTVF-%d of SE TYPE got AE request\n",
cptvf->vfid); cptvf->vfid);
return -EINVAL; return -EINVAL;
} else if ((cptvf->vftype == OTX_CPT_AE_TYPES) && } else if ((cptvf->vftype == OTX_CPT_AE_TYPES) &&
(req->ctrl.s.se_req)) { (req->ctrl.s.se_req)) {
dev_err(&pdev->dev, "CPTVF-%d of AE TYPE got SE request", dev_err(&pdev->dev, "CPTVF-%d of AE TYPE got SE request\n",
cptvf->vfid); cptvf->vfid);
return -EINVAL; return -EINVAL;
} }
...@@ -461,7 +461,7 @@ static int cpt_process_ccode(struct pci_dev *pdev, ...@@ -461,7 +461,7 @@ static int cpt_process_ccode(struct pci_dev *pdev,
/* check for timeout */ /* check for timeout */
if (time_after_eq(jiffies, cpt_info->time_in + if (time_after_eq(jiffies, cpt_info->time_in +
OTX_CPT_COMMAND_TIMEOUT * HZ)) OTX_CPT_COMMAND_TIMEOUT * HZ))
dev_warn(&pdev->dev, "Request timed out 0x%p", req); dev_warn(&pdev->dev, "Request timed out 0x%p\n", req);
else if (cpt_info->extra_time < OTX_CPT_TIME_IN_RESET_COUNT) { else if (cpt_info->extra_time < OTX_CPT_TIME_IN_RESET_COUNT) {
cpt_info->time_in = jiffies; cpt_info->time_in = jiffies;
cpt_info->extra_time++; cpt_info->extra_time++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment