Commit 66550304 authored by Allan, Bruce W's avatar Allan, Bruce W Committed by Herbert Xu
Browse files

crypto: qat - make error and info log messages more descriptive 



Convert pr_info() and pr_err() log messages to dev_info() and dev_err(),
respectively, where able.  This adds the module name and PCI B:D:F to
indicate which QAT device generated the log message.  The "QAT:" is removed
from these log messages as that is now unnecessary.  A few of these log
messages have additional spelling/contextual fixes.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 92dd5be5

drivers/crypto/qat/qat_common/adf_accel_engine.c

+12 −9
Original line number Diff line number Diff line
@@ -60,18 +60,19 @@ int adf_ae_fw_load(struct adf_accel_dev *accel_dev) 


	if (request_firmware(&loader_data->uof_fw, hw_device->fw_name,

			     &accel_dev->accel_pci_dev.pci_dev->dev)) {

		pr_err("QAT: Failed to load firmware %s\n", hw_device->fw_name);

		dev_err(&GET_DEV(accel_dev), "Failed to load firmware %s\n",

			hw_device->fw_name);

		return -EFAULT;

	}



	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");

		dev_err(&GET_DEV(accel_dev), "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");

		dev_err(&GET_DEV(accel_dev), "Failed to map UOF\n");

		goto out_err;

	}

	return 0;
@@ -104,7 +105,8 @@ int adf_ae_start(struct adf_accel_dev *accel_dev) 
			ae_ctr++;

		}

	}

	pr_info("QAT: qat_dev%d started %d acceleration engines\n",

	dev_info(&GET_DEV(accel_dev),

		 "qat_dev%d started %d acceleration engines\n",

		 accel_dev->accel_id, ae_ctr);

	return 0;

}
@@ -121,7 +123,8 @@ int adf_ae_stop(struct adf_accel_dev *accel_dev) 
			ae_ctr++;

		}

	}

	pr_info("QAT: qat_dev%d stopped %d acceleration engines\n",

	dev_info(&GET_DEV(accel_dev),

		 "qat_dev%d stopped %d acceleration engines\n",

		 accel_dev->accel_id, ae_ctr);

	return 0;

}
@@ -147,12 +150,12 @@ int adf_ae_init(struct adf_accel_dev *accel_dev) 


	accel_dev->fw_loader = loader_data;

	if (qat_hal_init(accel_dev)) {

		pr_err("QAT: Failed to init the AEs\n");

		dev_err(&GET_DEV(accel_dev), "Failed to init the AEs\n");

		kfree(loader_data);

		return -EFAULT;

	}

	if (adf_ae_reset(accel_dev, 0)) {

		pr_err("QAT: Failed to reset the AEs\n");

		dev_err(&GET_DEV(accel_dev), "Failed to reset the AEs\n");

		qat_hal_deinit(loader_data->fw_loader);

		kfree(loader_data);

		return -EFAULT;

drivers/crypto/qat/qat_common/adf_aer.c

+11 −8
Original line number Diff line number Diff line
@@ -60,14 +60,14 @@ static pci_ers_result_t adf_error_detected(struct pci_dev *pdev, 
{

	struct adf_accel_dev *accel_dev = adf_devmgr_pci_to_accel_dev(pdev);



	pr_info("QAT: Acceleration driver hardware error detected.\n");

	dev_info(&pdev->dev, "Acceleration driver hardware error detected.\n");

	if (!accel_dev) {

		pr_err("QAT: Can't find acceleration device\n");

		dev_err(&pdev->dev, "Can't find acceleration device\n");

		return PCI_ERS_RESULT_DISCONNECT;

	}



	if (state == pci_channel_io_perm_failure) {

		pr_err("QAT: Can't recover from device error\n");

		dev_err(&pdev->dev, "Can't recover from device error\n");

		return PCI_ERS_RESULT_DISCONNECT;

	}
@@ -88,10 +88,12 @@ static void adf_dev_restore(struct adf_accel_dev *accel_dev) 
	struct pci_dev *parent = pdev->bus->self;

	uint16_t bridge_ctl = 0;



	pr_info("QAT: Resetting device qat_dev%d\n", accel_dev->accel_id);

	dev_info(&GET_DEV(accel_dev), "Resetting device qat_dev%d\n",

		 accel_dev->accel_id);



	if (!pci_wait_for_pending_transaction(pdev))

		pr_info("QAT: Transaction still in progress. Proceeding\n");

		dev_info(&GET_DEV(accel_dev),

			 "Transaction still in progress. Proceeding\n");



	pci_read_config_word(parent, PCI_BRIDGE_CONTROL, &bridge_ctl);

	bridge_ctl |= PCI_BRIDGE_CTL_BUS_RESET;
@@ -158,7 +160,8 @@ static int adf_dev_aer_schedule_reset(struct adf_accel_dev *accel_dev, 
		unsigned long timeout = wait_for_completion_timeout(

				   &reset_data->compl, wait_jiffies);

		if (!timeout) {

			pr_err("QAT: Reset device timeout expired\n");

			dev_err(&GET_DEV(accel_dev),

				"Reset device timeout expired\n");

			ret = -EFAULT;

		}

		kfree(reset_data);
@@ -184,8 +187,8 @@ static pci_ers_result_t adf_slot_reset(struct pci_dev *pdev) 


static void adf_resume(struct pci_dev *pdev)

{

	pr_info("QAT: Acceleration driver reset completed\n");

	pr_info("QAT: Device is up and runnig\n");

	dev_info(&pdev->dev, "Acceleration driver reset completed\n");

	dev_info(&pdev->dev, "Device is up and runnig\n");

}



static struct pci_error_handlers adf_err_handler = {

drivers/crypto/qat/qat_common/adf_cfg.c

+3 −2
Original line number Diff line number Diff line
@@ -142,7 +142,8 @@ int adf_cfg_dev_add(struct adf_accel_dev *accel_dev) 
						  dev_cfg_data,

						  &qat_dev_cfg_fops);

	if (!dev_cfg_data->debug) {

		pr_err("QAT: Failed to create qat cfg debugfs entry.\n");

		dev_err(&GET_DEV(accel_dev),

			"Failed to create qat cfg debugfs entry.\n");

		kfree(dev_cfg_data);

		accel_dev->cfg = NULL;

		return -EFAULT;
@@ -305,7 +306,7 @@ int adf_cfg_add_key_value_param(struct adf_accel_dev *accel_dev, 
		snprintf(key_val->val, ADF_CFG_MAX_VAL_LEN_IN_BYTES,

			 "0x%lx", (unsigned long)val);

	} else {

		pr_err("QAT: Unknown type given.\n");

		dev_err(&GET_DEV(accel_dev), "Unknown type given.\n");

		kfree(key_val);

		return -1;

	}

drivers/crypto/qat/qat_common/adf_ctl_drv.c

+24 −14
Original line number Diff line number Diff line
@@ -159,14 +159,16 @@ static int adf_add_key_value_data(struct adf_accel_dev *accel_dev, 
		if (adf_cfg_add_key_value_param(accel_dev, section,

						key_val->key, (void *)val,

						key_val->type)) {

			pr_err("QAT: failed to add keyvalue.\n");

			dev_err(&GET_DEV(accel_dev),

				"failed to add hex keyvalue.\n");

			return -EFAULT;

		}

	} else {

		if (adf_cfg_add_key_value_param(accel_dev, section,

						key_val->key, key_val->val,

						key_val->type)) {

			pr_err("QAT: failed to add keyvalue.\n");

			dev_err(&GET_DEV(accel_dev),

				"failed to add keyvalue.\n");

			return -EFAULT;

		}

	}
@@ -185,12 +187,14 @@ static int adf_copy_key_value_data(struct adf_accel_dev *accel_dev, 
	while (section_head) {

		if (copy_from_user(&section, (void __user *)section_head,

				   sizeof(*section_head))) {

			pr_err("QAT: failed to copy section info\n");

			dev_err(&GET_DEV(accel_dev),

				"failed to copy section info\n");

			goto out_err;

		}



		if (adf_cfg_section_add(accel_dev, section.name)) {

			pr_err("QAT: failed to add section.\n");

			dev_err(&GET_DEV(accel_dev),

				"failed to add section.\n");

			goto out_err;

		}
@@ -199,7 +203,8 @@ static int adf_copy_key_value_data(struct adf_accel_dev *accel_dev, 
		while (params_head) {

			if (copy_from_user(&key_val, (void __user *)params_head,

					   sizeof(key_val))) {

				pr_err("QAT: Failed to copy keyvalue.\n");

				dev_err(&GET_DEV(accel_dev),

					"Failed to copy keyvalue.\n");

				goto out_err;

			}

			if (adf_add_key_value_data(accel_dev, section.name,
@@ -258,7 +263,8 @@ static int adf_ctl_is_device_in_use(int id) 


		if (id == dev->accel_id || id == ADF_CFG_ALL_DEVICES) {

			if (adf_devmgr_in_reset(dev) || adf_dev_in_use(dev)) {

				pr_info("QAT: device qat_dev%d is busy\n",

				dev_info(&GET_DEV(dev),

					 "device qat_dev%d is busy\n",

					 dev->accel_id);

				return -EBUSY;

			}
@@ -280,7 +286,8 @@ static int adf_ctl_stop_devices(uint32_t id) 
				continue;



			if (adf_dev_stop(accel_dev)) {

				pr_err("QAT: Failed to stop qat_dev%d\n", id);

				dev_err(&GET_DEV(accel_dev),

					"Failed to stop qat_dev%d\n", id);

				ret = -EFAULT;

			} else {

				adf_dev_shutdown(accel_dev);
@@ -343,17 +350,20 @@ static int adf_ctl_ioctl_dev_start(struct file *fp, unsigned int cmd, 
	}



	if (!adf_dev_started(accel_dev)) {

		pr_info("QAT: Starting acceleration device qat_dev%d.\n",

		dev_info(&GET_DEV(accel_dev),

			 "Starting acceleration device qat_dev%d.\n",

			 ctl_data->device_id);

		ret = adf_dev_init(accel_dev);

		if (!ret)

			ret = adf_dev_start(accel_dev);

	} else {

		pr_info("QAT: Acceleration device qat_dev%d already started.\n",

		dev_info(&GET_DEV(accel_dev),

			 "Acceleration device qat_dev%d already started.\n",

			 ctl_data->device_id);

	}

	if (ret) {

		pr_err("QAT: Failed to start qat_dev%d\n", ctl_data->device_id);

		dev_err(&GET_DEV(accel_dev), "Failed to start qat_dev%d\n",

			ctl_data->device_id);

		adf_dev_stop(accel_dev);

		adf_dev_shutdown(accel_dev);

	}
@@ -408,7 +418,7 @@ static int adf_ctl_ioctl_get_status(struct file *fp, unsigned int cmd, 


	if (copy_to_user((void __user *)arg, &dev_info,

			 sizeof(struct adf_dev_status_info))) {

		pr_err("QAT: failed to copy status.\n");

		dev_err(&GET_DEV(accel_dev), "failed to copy status.\n");

		return -EFAULT;

	}

	return 0;

drivers/crypto/qat/qat_common/adf_dev_mgr.c

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev) 
	struct list_head *itr;



	if (num_devices == ADF_MAX_DEVICES) {

		pr_err("QAT: Only support up to %d devices\n", ADF_MAX_DEVICES);

		dev_err(&GET_DEV(accel_dev), "Only support up to %d devices\n",

			ADF_MAX_DEVICES);

		return -EFAULT;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE