aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorAllan, Bruce W <bruce.w.allan@intel.com>2015-03-19 19:03:44 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2015-03-23 07:06:49 -0400
commit665503049bada5198aa53b9d618069f0f8fe191f (patch)
treeb3329d0877bdddee41d6038cd6a19df4a5943f47 /drivers/crypto
parent92dd5be55996730e8bf776f758c3d4764ed9f349 (diff)
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: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/qat/qat_common/adf_accel_engine.c21
-rw-r--r--drivers/crypto/qat/qat_common/adf_aer.c19
-rw-r--r--drivers/crypto/qat/qat_common/adf_cfg.c5
-rw-r--r--drivers/crypto/qat/qat_common/adf_ctl_drv.c38
-rw-r--r--drivers/crypto/qat/qat_common/adf_dev_mgr.c3
-rw-r--r--drivers/crypto/qat/qat_common/adf_init.c83
-rw-r--r--drivers/crypto/qat/qat_common/adf_transport.c31
-rw-r--r--drivers/crypto/qat/qat_common/qat_crypto.c5
-rw-r--r--drivers/crypto/qat/qat_common/qat_hal.c2
-rw-r--r--drivers/crypto/qat/qat_dh895xcc/adf_admin.c3
-rw-r--r--drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c3
-rw-r--r--drivers/crypto/qat/qat_dh895xcc/adf_isr.c15
12 files changed, 137 insertions, 91 deletions
diff --git a/drivers/crypto/qat/qat_common/adf_accel_engine.c b/drivers/crypto/qat/qat_common/adf_accel_engine.c
index c77453b900a3..97e8ea5d928c 100644
--- a/drivers/crypto/qat/qat_common/adf_accel_engine.c
+++ b/drivers/crypto/qat/qat_common/adf_accel_engine.c
@@ -60,18 +60,19 @@ int adf_ae_fw_load(struct adf_accel_dev *accel_dev)
60 60
61 if (request_firmware(&loader_data->uof_fw, hw_device->fw_name, 61 if (request_firmware(&loader_data->uof_fw, hw_device->fw_name,
62 &accel_dev->accel_pci_dev.pci_dev->dev)) { 62 &accel_dev->accel_pci_dev.pci_dev->dev)) {
63 pr_err("QAT: Failed to load firmware %s\n", hw_device->fw_name); 63 dev_err(&GET_DEV(accel_dev), "Failed to load firmware %s\n",
64 hw_device->fw_name);
64 return -EFAULT; 65 return -EFAULT;
65 } 66 }
66 67
67 uof_size = loader_data->uof_fw->size; 68 uof_size = loader_data->uof_fw->size;
68 uof_addr = (void *)loader_data->uof_fw->data; 69 uof_addr = (void *)loader_data->uof_fw->data;
69 if (qat_uclo_map_uof_obj(loader_data->fw_loader, uof_addr, uof_size)) { 70 if (qat_uclo_map_uof_obj(loader_data->fw_loader, uof_addr, uof_size)) {
70 pr_err("QAT: Failed to map UOF\n"); 71 dev_err(&GET_DEV(accel_dev), "Failed to map UOF\n");
71 goto out_err; 72 goto out_err;
72 } 73 }
73 if (qat_uclo_wr_all_uimage(loader_data->fw_loader)) { 74 if (qat_uclo_wr_all_uimage(loader_data->fw_loader)) {
74 pr_err("QAT: Failed to map UOF\n"); 75 dev_err(&GET_DEV(accel_dev), "Failed to map UOF\n");
75 goto out_err; 76 goto out_err;
76 } 77 }
77 return 0; 78 return 0;
@@ -104,8 +105,9 @@ int adf_ae_start(struct adf_accel_dev *accel_dev)
104 ae_ctr++; 105 ae_ctr++;
105 } 106 }
106 } 107 }
107 pr_info("QAT: qat_dev%d started %d acceleration engines\n", 108 dev_info(&GET_DEV(accel_dev),
108 accel_dev->accel_id, ae_ctr); 109 "qat_dev%d started %d acceleration engines\n",
110 accel_dev->accel_id, ae_ctr);
109 return 0; 111 return 0;
110} 112}
111 113
@@ -121,8 +123,9 @@ int adf_ae_stop(struct adf_accel_dev *accel_dev)
121 ae_ctr++; 123 ae_ctr++;
122 } 124 }
123 } 125 }
124 pr_info("QAT: qat_dev%d stopped %d acceleration engines\n", 126 dev_info(&GET_DEV(accel_dev),
125 accel_dev->accel_id, ae_ctr); 127 "qat_dev%d stopped %d acceleration engines\n",
128 accel_dev->accel_id, ae_ctr);
126 return 0; 129 return 0;
127} 130}
128 131
@@ -147,12 +150,12 @@ int adf_ae_init(struct adf_accel_dev *accel_dev)
147 150
148 accel_dev->fw_loader = loader_data; 151 accel_dev->fw_loader = loader_data;
149 if (qat_hal_init(accel_dev)) { 152 if (qat_hal_init(accel_dev)) {
150 pr_err("QAT: Failed to init the AEs\n"); 153 dev_err(&GET_DEV(accel_dev), "Failed to init the AEs\n");
151 kfree(loader_data); 154 kfree(loader_data);
152 return -EFAULT; 155 return -EFAULT;
153 } 156 }
154 if (adf_ae_reset(accel_dev, 0)) { 157 if (adf_ae_reset(accel_dev, 0)) {
155 pr_err("QAT: Failed to reset the AEs\n"); 158 dev_err(&GET_DEV(accel_dev), "Failed to reset the AEs\n");
156 qat_hal_deinit(loader_data->fw_loader); 159 qat_hal_deinit(loader_data->fw_loader);
157 kfree(loader_data); 160 kfree(loader_data);
158 return -EFAULT; 161 return -EFAULT;
diff --git a/drivers/crypto/qat/qat_common/adf_aer.c b/drivers/crypto/qat/qat_common/adf_aer.c
index fa1fef824de2..82e23b821f71 100644
--- a/drivers/crypto/qat/qat_common/adf_aer.c
+++ b/drivers/crypto/qat/qat_common/adf_aer.c
@@ -60,14 +60,14 @@ static pci_ers_result_t adf_error_detected(struct pci_dev *pdev,
60{ 60{
61 struct adf_accel_dev *accel_dev = adf_devmgr_pci_to_accel_dev(pdev); 61 struct adf_accel_dev *accel_dev = adf_devmgr_pci_to_accel_dev(pdev);
62 62
63 pr_info("QAT: Acceleration driver hardware error detected.\n"); 63 dev_info(&pdev->dev, "Acceleration driver hardware error detected.\n");
64 if (!accel_dev) { 64 if (!accel_dev) {
65 pr_err("QAT: Can't find acceleration device\n"); 65 dev_err(&pdev->dev, "Can't find acceleration device\n");
66 return PCI_ERS_RESULT_DISCONNECT; 66 return PCI_ERS_RESULT_DISCONNECT;
67 } 67 }
68 68
69 if (state == pci_channel_io_perm_failure) { 69 if (state == pci_channel_io_perm_failure) {
70 pr_err("QAT: Can't recover from device error\n"); 70 dev_err(&pdev->dev, "Can't recover from device error\n");
71 return PCI_ERS_RESULT_DISCONNECT; 71 return PCI_ERS_RESULT_DISCONNECT;
72 } 72 }
73 73
@@ -88,10 +88,12 @@ static void adf_dev_restore(struct adf_accel_dev *accel_dev)
88 struct pci_dev *parent = pdev->bus->self; 88 struct pci_dev *parent = pdev->bus->self;
89 uint16_t bridge_ctl = 0; 89 uint16_t bridge_ctl = 0;
90 90
91 pr_info("QAT: Resetting device qat_dev%d\n", accel_dev->accel_id); 91 dev_info(&GET_DEV(accel_dev), "Resetting device qat_dev%d\n",
92 accel_dev->accel_id);
92 93
93 if (!pci_wait_for_pending_transaction(pdev)) 94 if (!pci_wait_for_pending_transaction(pdev))
94 pr_info("QAT: Transaction still in progress. Proceeding\n"); 95 dev_info(&GET_DEV(accel_dev),
96 "Transaction still in progress. Proceeding\n");
95 97
96 pci_read_config_word(parent, PCI_BRIDGE_CONTROL, &bridge_ctl); 98 pci_read_config_word(parent, PCI_BRIDGE_CONTROL, &bridge_ctl);
97 bridge_ctl |= PCI_BRIDGE_CTL_BUS_RESET; 99 bridge_ctl |= PCI_BRIDGE_CTL_BUS_RESET;
@@ -158,7 +160,8 @@ static int adf_dev_aer_schedule_reset(struct adf_accel_dev *accel_dev,
158 unsigned long timeout = wait_for_completion_timeout( 160 unsigned long timeout = wait_for_completion_timeout(
159 &reset_data->compl, wait_jiffies); 161 &reset_data->compl, wait_jiffies);
160 if (!timeout) { 162 if (!timeout) {
161 pr_err("QAT: Reset device timeout expired\n"); 163 dev_err(&GET_DEV(accel_dev),
164 "Reset device timeout expired\n");
162 ret = -EFAULT; 165 ret = -EFAULT;
163 } 166 }
164 kfree(reset_data); 167 kfree(reset_data);
@@ -184,8 +187,8 @@ static pci_ers_result_t adf_slot_reset(struct pci_dev *pdev)
184 187
185static void adf_resume(struct pci_dev *pdev) 188static void adf_resume(struct pci_dev *pdev)
186{ 189{
187 pr_info("QAT: Acceleration driver reset completed\n"); 190 dev_info(&pdev->dev, "Acceleration driver reset completed\n");
188 pr_info("QAT: Device is up and runnig\n"); 191 dev_info(&pdev->dev, "Device is up and runnig\n");
189} 192}
190 193
191static struct pci_error_handlers adf_err_handler = { 194static struct pci_error_handlers adf_err_handler = {
diff --git a/drivers/crypto/qat/qat_common/adf_cfg.c b/drivers/crypto/qat/qat_common/adf_cfg.c
index de16da9070a5..ab65bc274561 100644
--- a/drivers/crypto/qat/qat_common/adf_cfg.c
+++ b/drivers/crypto/qat/qat_common/adf_cfg.c
@@ -142,7 +142,8 @@ int adf_cfg_dev_add(struct adf_accel_dev *accel_dev)
142 dev_cfg_data, 142 dev_cfg_data,
143 &qat_dev_cfg_fops); 143 &qat_dev_cfg_fops);
144 if (!dev_cfg_data->debug) { 144 if (!dev_cfg_data->debug) {
145 pr_err("QAT: Failed to create qat cfg debugfs entry.\n"); 145 dev_err(&GET_DEV(accel_dev),
146 "Failed to create qat cfg debugfs entry.\n");
146 kfree(dev_cfg_data); 147 kfree(dev_cfg_data);
147 accel_dev->cfg = NULL; 148 accel_dev->cfg = NULL;
148 return -EFAULT; 149 return -EFAULT;
@@ -305,7 +306,7 @@ int adf_cfg_add_key_value_param(struct adf_accel_dev *accel_dev,
305 snprintf(key_val->val, ADF_CFG_MAX_VAL_LEN_IN_BYTES, 306 snprintf(key_val->val, ADF_CFG_MAX_VAL_LEN_IN_BYTES,
306 "0x%lx", (unsigned long)val); 307 "0x%lx", (unsigned long)val);
307 } else { 308 } else {
308 pr_err("QAT: Unknown type given.\n"); 309 dev_err(&GET_DEV(accel_dev), "Unknown type given.\n");
309 kfree(key_val); 310 kfree(key_val);
310 return -1; 311 return -1;
311 } 312 }
diff --git a/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
index 74207a6f0516..731538aada65 100644
--- a/drivers/crypto/qat/qat_common/adf_ctl_drv.c
+++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
@@ -159,14 +159,16 @@ static int adf_add_key_value_data(struct adf_accel_dev *accel_dev,
159 if (adf_cfg_add_key_value_param(accel_dev, section, 159 if (adf_cfg_add_key_value_param(accel_dev, section,
160 key_val->key, (void *)val, 160 key_val->key, (void *)val,
161 key_val->type)) { 161 key_val->type)) {
162 pr_err("QAT: failed to add keyvalue.\n"); 162 dev_err(&GET_DEV(accel_dev),
163 "failed to add hex keyvalue.\n");
163 return -EFAULT; 164 return -EFAULT;
164 } 165 }
165 } else { 166 } else {
166 if (adf_cfg_add_key_value_param(accel_dev, section, 167 if (adf_cfg_add_key_value_param(accel_dev, section,
167 key_val->key, key_val->val, 168 key_val->key, key_val->val,
168 key_val->type)) { 169 key_val->type)) {
169 pr_err("QAT: failed to add keyvalue.\n"); 170 dev_err(&GET_DEV(accel_dev),
171 "failed to add keyvalue.\n");
170 return -EFAULT; 172 return -EFAULT;
171 } 173 }
172 } 174 }
@@ -185,12 +187,14 @@ static int adf_copy_key_value_data(struct adf_accel_dev *accel_dev,
185 while (section_head) { 187 while (section_head) {
186 if (copy_from_user(&section, (void __user *)section_head, 188 if (copy_from_user(&section, (void __user *)section_head,
187 sizeof(*section_head))) { 189 sizeof(*section_head))) {
188 pr_err("QAT: failed to copy section info\n"); 190 dev_err(&GET_DEV(accel_dev),
191 "failed to copy section info\n");
189 goto out_err; 192 goto out_err;
190 } 193 }
191 194
192 if (adf_cfg_section_add(accel_dev, section.name)) { 195 if (adf_cfg_section_add(accel_dev, section.name)) {
193 pr_err("QAT: failed to add section.\n"); 196 dev_err(&GET_DEV(accel_dev),
197 "failed to add section.\n");
194 goto out_err; 198 goto out_err;
195 } 199 }
196 200
@@ -199,7 +203,8 @@ static int adf_copy_key_value_data(struct adf_accel_dev *accel_dev,
199 while (params_head) { 203 while (params_head) {
200 if (copy_from_user(&key_val, (void __user *)params_head, 204 if (copy_from_user(&key_val, (void __user *)params_head,
201 sizeof(key_val))) { 205 sizeof(key_val))) {
202 pr_err("QAT: Failed to copy keyvalue.\n"); 206 dev_err(&GET_DEV(accel_dev),
207 "Failed to copy keyvalue.\n");
203 goto out_err; 208 goto out_err;
204 } 209 }
205 if (adf_add_key_value_data(accel_dev, section.name, 210 if (adf_add_key_value_data(accel_dev, section.name,
@@ -258,8 +263,9 @@ static int adf_ctl_is_device_in_use(int id)
258 263
259 if (id == dev->accel_id || id == ADF_CFG_ALL_DEVICES) { 264 if (id == dev->accel_id || id == ADF_CFG_ALL_DEVICES) {
260 if (adf_devmgr_in_reset(dev) || adf_dev_in_use(dev)) { 265 if (adf_devmgr_in_reset(dev) || adf_dev_in_use(dev)) {
261 pr_info("QAT: device qat_dev%d is busy\n", 266 dev_info(&GET_DEV(dev),
262 dev->accel_id); 267 "device qat_dev%d is busy\n",
268 dev->accel_id);
263 return -EBUSY; 269 return -EBUSY;
264 } 270 }
265 } 271 }
@@ -280,7 +286,8 @@ static int adf_ctl_stop_devices(uint32_t id)
280 continue; 286 continue;
281 287
282 if (adf_dev_stop(accel_dev)) { 288 if (adf_dev_stop(accel_dev)) {
283 pr_err("QAT: Failed to stop qat_dev%d\n", id); 289 dev_err(&GET_DEV(accel_dev),
290 "Failed to stop qat_dev%d\n", id);
284 ret = -EFAULT; 291 ret = -EFAULT;
285 } else { 292 } else {
286 adf_dev_shutdown(accel_dev); 293 adf_dev_shutdown(accel_dev);
@@ -343,17 +350,20 @@ static int adf_ctl_ioctl_dev_start(struct file *fp, unsigned int cmd,
343 } 350 }
344 351
345 if (!adf_dev_started(accel_dev)) { 352 if (!adf_dev_started(accel_dev)) {
346 pr_info("QAT: Starting acceleration device qat_dev%d.\n", 353 dev_info(&GET_DEV(accel_dev),
347 ctl_data->device_id); 354 "Starting acceleration device qat_dev%d.\n",
355 ctl_data->device_id);
348 ret = adf_dev_init(accel_dev); 356 ret = adf_dev_init(accel_dev);
349 if (!ret) 357 if (!ret)
350 ret = adf_dev_start(accel_dev); 358 ret = adf_dev_start(accel_dev);
351 } else { 359 } else {
352 pr_info("QAT: Acceleration device qat_dev%d already started.\n", 360 dev_info(&GET_DEV(accel_dev),
353 ctl_data->device_id); 361 "Acceleration device qat_dev%d already started.\n",
362 ctl_data->device_id);
354 } 363 }
355 if (ret) { 364 if (ret) {
356 pr_err("QAT: Failed to start qat_dev%d\n", ctl_data->device_id); 365 dev_err(&GET_DEV(accel_dev), "Failed to start qat_dev%d\n",
366 ctl_data->device_id);
357 adf_dev_stop(accel_dev); 367 adf_dev_stop(accel_dev);
358 adf_dev_shutdown(accel_dev); 368 adf_dev_shutdown(accel_dev);
359 } 369 }
@@ -408,7 +418,7 @@ static int adf_ctl_ioctl_get_status(struct file *fp, unsigned int cmd,
408 418
409 if (copy_to_user((void __user *)arg, &dev_info, 419 if (copy_to_user((void __user *)arg, &dev_info,
410 sizeof(struct adf_dev_status_info))) { 420 sizeof(struct adf_dev_status_info))) {
411 pr_err("QAT: failed to copy status.\n"); 421 dev_err(&GET_DEV(accel_dev), "failed to copy status.\n");
412 return -EFAULT; 422 return -EFAULT;
413 } 423 }
414 return 0; 424 return 0;
diff --git a/drivers/crypto/qat/qat_common/adf_dev_mgr.c b/drivers/crypto/qat/qat_common/adf_dev_mgr.c
index 4a0a829d4500..3f0ff9e7d840 100644
--- a/drivers/crypto/qat/qat_common/adf_dev_mgr.c
+++ b/drivers/crypto/qat/qat_common/adf_dev_mgr.c
@@ -67,7 +67,8 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev)
67 struct list_head *itr; 67 struct list_head *itr;
68 68
69 if (num_devices == ADF_MAX_DEVICES) { 69 if (num_devices == ADF_MAX_DEVICES) {
70 pr_err("QAT: Only support up to %d devices\n", ADF_MAX_DEVICES); 70 dev_err(&GET_DEV(accel_dev), "Only support up to %d devices\n",
71 ADF_MAX_DEVICES);
71 return -EFAULT; 72 return -EFAULT;
72 } 73 }
73 74
diff --git a/drivers/crypto/qat/qat_common/adf_init.c b/drivers/crypto/qat/qat_common/adf_init.c
index 8f0ca498ab87..da5793b34841 100644
--- a/drivers/crypto/qat/qat_common/adf_init.c
+++ b/drivers/crypto/qat/qat_common/adf_init.c
@@ -124,12 +124,12 @@ int adf_dev_init(struct adf_accel_dev *accel_dev)
124 124
125 if (!hw_data) { 125 if (!hw_data) {
126 dev_err(&GET_DEV(accel_dev), 126 dev_err(&GET_DEV(accel_dev),
127 "QAT: Failed to init device - hw_data not set\n"); 127 "Failed to init device - hw_data not set\n");
128 return -EFAULT; 128 return -EFAULT;
129 } 129 }
130 130
131 if (!test_bit(ADF_STATUS_CONFIGURED, &accel_dev->status)) { 131 if (!test_bit(ADF_STATUS_CONFIGURED, &accel_dev->status)) {
132 pr_info("QAT: Device not configured\n"); 132 dev_err(&GET_DEV(accel_dev), "Device not configured\n");
133 return -EFAULT; 133 return -EFAULT;
134 } 134 }
135 135
@@ -151,20 +151,22 @@ int adf_dev_init(struct adf_accel_dev *accel_dev)
151 hw_data->enable_ints(accel_dev); 151 hw_data->enable_ints(accel_dev);
152 152
153 if (adf_ae_init(accel_dev)) { 153 if (adf_ae_init(accel_dev)) {
154 pr_err("QAT: Failed to initialise Acceleration Engine\n"); 154 dev_err(&GET_DEV(accel_dev),
155 "Failed to initialise Acceleration Engine\n");
155 return -EFAULT; 156 return -EFAULT;
156 } 157 }
157 set_bit(ADF_STATUS_AE_INITIALISED, &accel_dev->status); 158 set_bit(ADF_STATUS_AE_INITIALISED, &accel_dev->status);
158 159
159 if (adf_ae_fw_load(accel_dev)) { 160 if (adf_ae_fw_load(accel_dev)) {
160 pr_err("QAT: Failed to load acceleration FW\n"); 161 dev_err(&GET_DEV(accel_dev),
162 "Failed to load acceleration FW\n");
161 adf_ae_fw_release(accel_dev); 163 adf_ae_fw_release(accel_dev);
162 return -EFAULT; 164 return -EFAULT;
163 } 165 }
164 set_bit(ADF_STATUS_AE_UCODE_LOADED, &accel_dev->status); 166 set_bit(ADF_STATUS_AE_UCODE_LOADED, &accel_dev->status);
165 167
166 if (hw_data->alloc_irq(accel_dev)) { 168 if (hw_data->alloc_irq(accel_dev)) {
167 pr_err("QAT: Failed to allocate interrupts\n"); 169 dev_err(&GET_DEV(accel_dev), "Failed to allocate interrupts\n");
168 return -EFAULT; 170 return -EFAULT;
169 } 171 }
170 set_bit(ADF_STATUS_IRQ_ALLOCATED, &accel_dev->status); 172 set_bit(ADF_STATUS_IRQ_ALLOCATED, &accel_dev->status);
@@ -179,8 +181,9 @@ int adf_dev_init(struct adf_accel_dev *accel_dev)
179 if (!service->admin) 181 if (!service->admin)
180 continue; 182 continue;
181 if (service->event_hld(accel_dev, ADF_EVENT_INIT)) { 183 if (service->event_hld(accel_dev, ADF_EVENT_INIT)) {
182 pr_err("QAT: Failed to initialise service %s\n", 184 dev_err(&GET_DEV(accel_dev),
183 service->name); 185 "Failed to initialise service %s\n",
186 service->name);
184 return -EFAULT; 187 return -EFAULT;
185 } 188 }
186 set_bit(accel_dev->accel_id, &service->init_status); 189 set_bit(accel_dev->accel_id, &service->init_status);
@@ -190,8 +193,9 @@ int adf_dev_init(struct adf_accel_dev *accel_dev)
190 if (service->admin) 193 if (service->admin)
191 continue; 194 continue;
192 if (service->event_hld(accel_dev, ADF_EVENT_INIT)) { 195 if (service->event_hld(accel_dev, ADF_EVENT_INIT)) {
193 pr_err("QAT: Failed to initialise service %s\n", 196 dev_err(&GET_DEV(accel_dev),
194 service->name); 197 "Failed to initialise service %s\n",
198 service->name);
195 return -EFAULT; 199 return -EFAULT;
196 } 200 }
197 set_bit(accel_dev->accel_id, &service->init_status); 201 set_bit(accel_dev->accel_id, &service->init_status);
@@ -221,7 +225,7 @@ int adf_dev_start(struct adf_accel_dev *accel_dev)
221 set_bit(ADF_STATUS_STARTING, &accel_dev->status); 225 set_bit(ADF_STATUS_STARTING, &accel_dev->status);
222 226
223 if (adf_ae_start(accel_dev)) { 227 if (adf_ae_start(accel_dev)) {
224 pr_err("QAT: AE Start Failed\n"); 228 dev_err(&GET_DEV(accel_dev), "AE Start Failed\n");
225 return -EFAULT; 229 return -EFAULT;
226 } 230 }
227 set_bit(ADF_STATUS_AE_STARTED, &accel_dev->status); 231 set_bit(ADF_STATUS_AE_STARTED, &accel_dev->status);
@@ -231,8 +235,9 @@ int adf_dev_start(struct adf_accel_dev *accel_dev)
231 if (!service->admin) 235 if (!service->admin)
232 continue; 236 continue;
233 if (service->event_hld(accel_dev, ADF_EVENT_START)) { 237 if (service->event_hld(accel_dev, ADF_EVENT_START)) {
234 pr_err("QAT: Failed to start service %s\n", 238 dev_err(&GET_DEV(accel_dev),
235 service->name); 239 "Failed to start service %s\n",
240 service->name);
236 return -EFAULT; 241 return -EFAULT;
237 } 242 }
238 set_bit(accel_dev->accel_id, &service->start_status); 243 set_bit(accel_dev->accel_id, &service->start_status);
@@ -242,8 +247,9 @@ int adf_dev_start(struct adf_accel_dev *accel_dev)
242 if (service->admin) 247 if (service->admin)
243 continue; 248 continue;
244 if (service->event_hld(accel_dev, ADF_EVENT_START)) { 249 if (service->event_hld(accel_dev, ADF_EVENT_START)) {
245 pr_err("QAT: Failed to start service %s\n", 250 dev_err(&GET_DEV(accel_dev),
246 service->name); 251 "Failed to start service %s\n",
252 service->name);
247 return -EFAULT; 253 return -EFAULT;
248 } 254 }
249 set_bit(accel_dev->accel_id, &service->start_status); 255 set_bit(accel_dev->accel_id, &service->start_status);
@@ -253,7 +259,8 @@ int adf_dev_start(struct adf_accel_dev *accel_dev)
253 set_bit(ADF_STATUS_STARTED, &accel_dev->status); 259 set_bit(ADF_STATUS_STARTED, &accel_dev->status);
254 260
255 if (qat_algs_register()) { 261 if (qat_algs_register()) {
256 pr_err("QAT: Failed to register crypto algs\n"); 262 dev_err(&GET_DEV(accel_dev),
263 "Failed to register crypto algs\n");
257 set_bit(ADF_STATUS_STARTING, &accel_dev->status); 264 set_bit(ADF_STATUS_STARTING, &accel_dev->status);
258 clear_bit(ADF_STATUS_STARTED, &accel_dev->status); 265 clear_bit(ADF_STATUS_STARTED, &accel_dev->status);
259 return -EFAULT; 266 return -EFAULT;
@@ -287,7 +294,8 @@ int adf_dev_stop(struct adf_accel_dev *accel_dev)
287 clear_bit(ADF_STATUS_STARTED, &accel_dev->status); 294 clear_bit(ADF_STATUS_STARTED, &accel_dev->status);
288 295
289 if (qat_algs_unregister()) 296 if (qat_algs_unregister())
290 pr_err("QAT: Failed to unregister crypto algs\n"); 297 dev_err(&GET_DEV(accel_dev),
298 "Failed to unregister crypto algs\n");
291 299
292 list_for_each(list_itr, &service_table) { 300 list_for_each(list_itr, &service_table) {
293 service = list_entry(list_itr, struct service_hndl, list); 301 service = list_entry(list_itr, struct service_hndl, list);
@@ -310,8 +318,9 @@ int adf_dev_stop(struct adf_accel_dev *accel_dev)
310 if (!test_bit(accel_dev->accel_id, &service->start_status)) 318 if (!test_bit(accel_dev->accel_id, &service->start_status))
311 continue; 319 continue;
312 if (service->event_hld(accel_dev, ADF_EVENT_STOP)) 320 if (service->event_hld(accel_dev, ADF_EVENT_STOP))
313 pr_err("QAT: Failed to shutdown service %s\n", 321 dev_err(&GET_DEV(accel_dev),
314 service->name); 322 "Failed to shutdown service %s\n",
323 service->name);
315 else 324 else
316 clear_bit(accel_dev->accel_id, &service->start_status); 325 clear_bit(accel_dev->accel_id, &service->start_status);
317 } 326 }
@@ -321,7 +330,7 @@ int adf_dev_stop(struct adf_accel_dev *accel_dev)
321 330
322 if (test_bit(ADF_STATUS_AE_STARTED, &accel_dev->status)) { 331 if (test_bit(ADF_STATUS_AE_STARTED, &accel_dev->status)) {
323 if (adf_ae_stop(accel_dev)) 332 if (adf_ae_stop(accel_dev))
324 pr_err("QAT: failed to stop AE\n"); 333 dev_err(&GET_DEV(accel_dev), "failed to stop AE\n");
325 else 334 else
326 clear_bit(ADF_STATUS_AE_STARTED, &accel_dev->status); 335 clear_bit(ADF_STATUS_AE_STARTED, &accel_dev->status);
327 } 336 }
@@ -351,7 +360,8 @@ void adf_dev_shutdown(struct adf_accel_dev *accel_dev)
351 360
352 if (test_bit(ADF_STATUS_AE_UCODE_LOADED, &accel_dev->status)) { 361 if (test_bit(ADF_STATUS_AE_UCODE_LOADED, &accel_dev->status)) {
353 if (adf_ae_fw_release(accel_dev)) 362 if (adf_ae_fw_release(accel_dev))
354 pr_err("QAT: Failed to release the ucode\n"); 363 dev_err(&GET_DEV(accel_dev),
364 "Failed to release the ucode\n");
355 else 365 else
356 clear_bit(ADF_STATUS_AE_UCODE_LOADED, 366 clear_bit(ADF_STATUS_AE_UCODE_LOADED,
357 &accel_dev->status); 367 &accel_dev->status);
@@ -359,7 +369,8 @@ void adf_dev_shutdown(struct adf_accel_dev *accel_dev)
359 369
360 if (test_bit(ADF_STATUS_AE_INITIALISED, &accel_dev->status)) { 370 if (test_bit(ADF_STATUS_AE_INITIALISED, &accel_dev->status)) {
361 if (adf_ae_shutdown(accel_dev)) 371 if (adf_ae_shutdown(accel_dev))
362 pr_err("QAT: Failed to shutdown Accel Engine\n"); 372 dev_err(&GET_DEV(accel_dev),
373 "Failed to shutdown Accel Engine\n");
363 else 374 else
364 clear_bit(ADF_STATUS_AE_INITIALISED, 375 clear_bit(ADF_STATUS_AE_INITIALISED,
365 &accel_dev->status); 376 &accel_dev->status);
@@ -372,8 +383,9 @@ void adf_dev_shutdown(struct adf_accel_dev *accel_dev)
372 if (!test_bit(accel_dev->accel_id, &service->init_status)) 383 if (!test_bit(accel_dev->accel_id, &service->init_status))
373 continue; 384 continue;
374 if (service->event_hld(accel_dev, ADF_EVENT_SHUTDOWN)) 385 if (service->event_hld(accel_dev, ADF_EVENT_SHUTDOWN))
375 pr_err("QAT: Failed to shutdown service %s\n", 386 dev_err(&GET_DEV(accel_dev),
376 service->name); 387 "Failed to shutdown service %s\n",
388 service->name);
377 else 389 else
378 clear_bit(accel_dev->accel_id, &service->init_status); 390 clear_bit(accel_dev->accel_id, &service->init_status);
379 } 391 }
@@ -384,8 +396,9 @@ void adf_dev_shutdown(struct adf_accel_dev *accel_dev)
384 if (!test_bit(accel_dev->accel_id, &service->init_status)) 396 if (!test_bit(accel_dev->accel_id, &service->init_status))
385 continue; 397 continue;
386 if (service->event_hld(accel_dev, ADF_EVENT_SHUTDOWN)) 398 if (service->event_hld(accel_dev, ADF_EVENT_SHUTDOWN))
387 pr_err("QAT: Failed to shutdown service %s\n", 399 dev_err(&GET_DEV(accel_dev),
388 service->name); 400 "Failed to shutdown service %s\n",
401 service->name);
389 else 402 else
390 clear_bit(accel_dev->accel_id, &service->init_status); 403 clear_bit(accel_dev->accel_id, &service->init_status);
391 } 404 }
@@ -419,16 +432,18 @@ int adf_dev_restarting_notify(struct adf_accel_dev *accel_dev)
419 if (service->admin) 432 if (service->admin)
420 continue; 433 continue;
421 if (service->event_hld(accel_dev, ADF_EVENT_RESTARTING)) 434 if (service->event_hld(accel_dev, ADF_EVENT_RESTARTING))
422 pr_err("QAT: Failed to restart service %s.\n", 435 dev_err(&GET_DEV(accel_dev),
423 service->name); 436 "Failed to restart service %s.\n",
437 service->name);
424 } 438 }
425 list_for_each(list_itr, &service_table) { 439 list_for_each(list_itr, &service_table) {
426 service = list_entry(list_itr, struct service_hndl, list); 440 service = list_entry(list_itr, struct service_hndl, list);
427 if (!service->admin) 441 if (!service->admin)
428 continue; 442 continue;
429 if (service->event_hld(accel_dev, ADF_EVENT_RESTARTING)) 443 if (service->event_hld(accel_dev, ADF_EVENT_RESTARTING))
430 pr_err("QAT: Failed to restart service %s.\n", 444 dev_err(&GET_DEV(accel_dev),
431 service->name); 445 "Failed to restart service %s.\n",
446 service->name);
432 } 447 }
433 return 0; 448 return 0;
434} 449}
@@ -443,16 +458,18 @@ int adf_dev_restarted_notify(struct adf_accel_dev *accel_dev)
443 if (service->admin) 458 if (service->admin)
444 continue; 459 continue;
445 if (service->event_hld(accel_dev, ADF_EVENT_RESTARTED)) 460 if (service->event_hld(accel_dev, ADF_EVENT_RESTARTED))
446 pr_err("QAT: Failed to restart service %s.\n", 461 dev_err(&GET_DEV(accel_dev),
447 service->name); 462 "Failed to restart service %s.\n",
463 service->name);
448 } 464 }
449 list_for_each(list_itr, &service_table) { 465 list_for_each(list_itr, &service_table) {
450 service = list_entry(list_itr, struct service_hndl, list); 466 service = list_entry(list_itr, struct service_hndl, list);
451 if (!service->admin) 467 if (!service->admin)
452 continue; 468 continue;
453 if (service->event_hld(accel_dev, ADF_EVENT_RESTARTED)) 469 if (service->event_hld(accel_dev, ADF_EVENT_RESTARTED))
454 pr_err("QAT: Failed to restart service %s.\n", 470 dev_err(&GET_DEV(accel_dev),
455 service->name); 471 "Failed to restart service %s.\n",
472 service->name);
456 } 473 }
457 return 0; 474 return 0;
458} 475}
diff --git a/drivers/crypto/qat/qat_common/adf_transport.c b/drivers/crypto/qat/qat_common/adf_transport.c
index 7dd54aaee9fa..ccec327489da 100644
--- a/drivers/crypto/qat/qat_common/adf_transport.c
+++ b/drivers/crypto/qat/qat_common/adf_transport.c
@@ -195,7 +195,7 @@ static int adf_init_ring(struct adf_etr_ring_data *ring)
195 memset(ring->base_addr, 0x7F, ring_size_bytes); 195 memset(ring->base_addr, 0x7F, ring_size_bytes);
196 /* The base_addr has to be aligned to the size of the buffer */ 196 /* The base_addr has to be aligned to the size of the buffer */
197 if (adf_check_ring_alignment(ring->dma_addr, ring_size_bytes)) { 197 if (adf_check_ring_alignment(ring->dma_addr, ring_size_bytes)) {
198 pr_err("QAT: Ring address not aligned\n"); 198 dev_err(&GET_DEV(accel_dev), "Ring address not aligned\n");
199 dma_free_coherent(&GET_DEV(accel_dev), ring_size_bytes, 199 dma_free_coherent(&GET_DEV(accel_dev), ring_size_bytes,
200 ring->base_addr, ring->dma_addr); 200 ring->base_addr, ring->dma_addr);
201 return -EFAULT; 201 return -EFAULT;
@@ -242,32 +242,33 @@ int adf_create_ring(struct adf_accel_dev *accel_dev, const char *section,
242 int ret; 242 int ret;
243 243
244 if (bank_num >= GET_MAX_BANKS(accel_dev)) { 244 if (bank_num >= GET_MAX_BANKS(accel_dev)) {
245 pr_err("QAT: Invalid bank number\n"); 245 dev_err(&GET_DEV(accel_dev), "Invalid bank number\n");
246 return -EFAULT; 246 return -EFAULT;
247 } 247 }
248 if (msg_size > ADF_MSG_SIZE_TO_BYTES(ADF_MAX_MSG_SIZE)) { 248 if (msg_size > ADF_MSG_SIZE_TO_BYTES(ADF_MAX_MSG_SIZE)) {
249 pr_err("QAT: Invalid msg size\n"); 249 dev_err(&GET_DEV(accel_dev), "Invalid msg size\n");
250 return -EFAULT; 250 return -EFAULT;
251 } 251 }
252 if (ADF_MAX_INFLIGHTS(adf_verify_ring_size(msg_size, num_msgs), 252 if (ADF_MAX_INFLIGHTS(adf_verify_ring_size(msg_size, num_msgs),
253 ADF_BYTES_TO_MSG_SIZE(msg_size)) < 2) { 253 ADF_BYTES_TO_MSG_SIZE(msg_size)) < 2) {
254 pr_err("QAT: Invalid ring size for given msg size\n"); 254 dev_err(&GET_DEV(accel_dev),
255 "Invalid ring size for given msg size\n");
255 return -EFAULT; 256 return -EFAULT;
256 } 257 }
257 if (adf_cfg_get_param_value(accel_dev, section, ring_name, val)) { 258 if (adf_cfg_get_param_value(accel_dev, section, ring_name, val)) {
258 pr_err("QAT: Section %s, no such entry : %s\n", 259 dev_err(&GET_DEV(accel_dev), "Section %s, no such entry : %s\n",
259 section, ring_name); 260 section, ring_name);
260 return -EFAULT; 261 return -EFAULT;
261 } 262 }
262 if (kstrtouint(val, 10, &ring_num)) { 263 if (kstrtouint(val, 10, &ring_num)) {
263 pr_err("QAT: Can't get ring number\n"); 264 dev_err(&GET_DEV(accel_dev), "Can't get ring number\n");
264 return -EFAULT; 265 return -EFAULT;
265 } 266 }
266 267
267 bank = &transport_data->banks[bank_num]; 268 bank = &transport_data->banks[bank_num];
268 if (adf_reserve_ring(bank, ring_num)) { 269 if (adf_reserve_ring(bank, ring_num)) {
269 pr_err("QAT: Ring %d, %s already exists.\n", 270 dev_err(&GET_DEV(accel_dev), "Ring %d, %s already exists.\n",
270 ring_num, ring_name); 271 ring_num, ring_name);
271 return -EFAULT; 272 return -EFAULT;
272 } 273 }
273 ring = &bank->rings[ring_num]; 274 ring = &bank->rings[ring_num];
@@ -287,7 +288,8 @@ int adf_create_ring(struct adf_accel_dev *accel_dev, const char *section,
287 accel_dev->hw_device->hw_arb_ring_enable(ring); 288 accel_dev->hw_device->hw_arb_ring_enable(ring);
288 289
289 if (adf_ring_debugfs_add(ring, ring_name)) { 290 if (adf_ring_debugfs_add(ring, ring_name)) {
290 pr_err("QAT: Couldn't add ring debugfs entry\n"); 291 dev_err(&GET_DEV(accel_dev),
292 "Couldn't add ring debugfs entry\n");
291 ret = -EFAULT; 293 ret = -EFAULT;
292 goto err; 294 goto err;
293 } 295 }
@@ -428,7 +430,8 @@ static int adf_init_bank(struct adf_accel_dev *accel_dev,
428 goto err; 430 goto err;
429 } else { 431 } else {
430 if (i < hw_data->tx_rx_gap) { 432 if (i < hw_data->tx_rx_gap) {
431 pr_err("QAT: Invalid tx rings mask config\n"); 433 dev_err(&GET_DEV(accel_dev),
434 "Invalid tx rings mask config\n");
432 goto err; 435 goto err;
433 } 436 }
434 tx_ring = &bank->rings[i - hw_data->tx_rx_gap]; 437 tx_ring = &bank->rings[i - hw_data->tx_rx_gap];
@@ -436,7 +439,8 @@ static int adf_init_bank(struct adf_accel_dev *accel_dev,
436 } 439 }
437 } 440 }
438 if (adf_bank_debugfs_add(bank)) { 441 if (adf_bank_debugfs_add(bank)) {
439 pr_err("QAT: Failed to add bank debugfs entry\n"); 442 dev_err(&GET_DEV(accel_dev),
443 "Failed to add bank debugfs entry\n");
440 goto err; 444 goto err;
441 } 445 }
442 446
@@ -492,7 +496,8 @@ int adf_init_etr_data(struct adf_accel_dev *accel_dev)
492 etr_data->debug = debugfs_create_dir("transport", 496 etr_data->debug = debugfs_create_dir("transport",
493 accel_dev->debugfs_dir); 497 accel_dev->debugfs_dir);
494 if (!etr_data->debug) { 498 if (!etr_data->debug) {
495 pr_err("QAT: Unable to create transport debugfs entry\n"); 499 dev_err(&GET_DEV(accel_dev),
500 "Unable to create transport debugfs entry\n");
496 ret = -ENOENT; 501 ret = -ENOENT;
497 goto err_bank_debug; 502 goto err_bank_debug;
498 } 503 }
diff --git a/drivers/crypto/qat/qat_common/qat_crypto.c b/drivers/crypto/qat/qat_common/qat_crypto.c
index 828f2a686aab..f064a9fba011 100644
--- a/drivers/crypto/qat/qat_common/qat_crypto.c
+++ b/drivers/crypto/qat/qat_common/qat_crypto.c
@@ -116,7 +116,7 @@ struct qat_crypto_instance *qat_crypto_get_instance_node(int node)
116 accel_dev = NULL; 116 accel_dev = NULL;
117 } 117 }
118 if (!accel_dev) { 118 if (!accel_dev) {
119 pr_err("QAT: Could not find device on node %d\n", node); 119 pr_err("QAT: Could not find a device on node %d\n", node);
120 accel_dev = adf_devmgr_get_first(); 120 accel_dev = adf_devmgr_get_first();
121 } 121 }
122 if (!accel_dev || !adf_dev_started(accel_dev)) 122 if (!accel_dev || !adf_dev_started(accel_dev))
@@ -137,7 +137,8 @@ struct qat_crypto_instance *qat_crypto_get_instance_node(int node)
137 if (atomic_add_return(1, &inst_best->refctr) == 1) { 137 if (atomic_add_return(1, &inst_best->refctr) == 1) {
138 if (adf_dev_get(accel_dev)) { 138 if (adf_dev_get(accel_dev)) {
139 atomic_dec(&inst_best->refctr); 139 atomic_dec(&inst_best->refctr);
140 pr_err("QAT: Could increment dev refctr\n"); 140 dev_err(&GET_DEV(accel_dev),
141 "Could not increment dev refctr\n");
141 return NULL; 142 return NULL;
142 } 143 }
143 } 144 }
diff --git a/drivers/crypto/qat/qat_common/qat_hal.c b/drivers/crypto/qat/qat_common/qat_hal.c
index b818c19713bf..8a02d5127390 100644
--- a/drivers/crypto/qat/qat_common/qat_hal.c
+++ b/drivers/crypto/qat/qat_common/qat_hal.c
@@ -718,7 +718,7 @@ int qat_hal_init(struct adf_accel_dev *accel_dev)
718 handle->hal_handle->ae_max_num = max_en_ae_id + 1; 718 handle->hal_handle->ae_max_num = max_en_ae_id + 1;
719 /* take all AEs out of reset */ 719 /* take all AEs out of reset */
720 if (qat_hal_clr_reset(handle)) { 720 if (qat_hal_clr_reset(handle)) {
721 pr_err("QAT: qat_hal_clr_reset error\n"); 721 dev_err(&GET_DEV(accel_dev), "qat_hal_clr_reset error\n");
722 goto out_err; 722 goto out_err;
723 } 723 }
724 if (qat_hal_clear_gpr(handle)) 724 if (qat_hal_clear_gpr(handle))
diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_admin.c b/drivers/crypto/qat/qat_dh895xcc/adf_admin.c
index 53c491b59f07..e4666065c399 100644
--- a/drivers/crypto/qat/qat_dh895xcc/adf_admin.c
+++ b/drivers/crypto/qat/qat_dh895xcc/adf_admin.c
@@ -93,7 +93,8 @@ int adf_put_admin_msg_sync(struct adf_accel_dev *accel_dev,
93 memcpy(out, admin->virt_addr + offset + 93 memcpy(out, admin->virt_addr + offset +
94 ADF_ADMINMSG_LEN, ADF_ADMINMSG_LEN); 94 ADF_ADMINMSG_LEN, ADF_ADMINMSG_LEN);
95 else 95 else
96 pr_err("QAT: Failed to send admin msg to accelerator\n"); 96 dev_err(&GET_DEV(accel_dev),
97 "Failed to send admin msg to accelerator\n");
97 98
98 mutex_unlock(&admin->lock); 99 mutex_unlock(&admin->lock);
99 return received ? 0 : -EFAULT; 100 return received ? 0 : -EFAULT;
diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
index 6a735d5c0e37..b1386922d7a2 100644
--- a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
+++ b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
@@ -150,7 +150,8 @@ void adf_get_arbiter_mapping(struct adf_accel_dev *accel_dev,
150 *arb_map_config = thrd_to_arb_map_sku6; 150 *arb_map_config = thrd_to_arb_map_sku6;
151 break; 151 break;
152 default: 152 default:
153 pr_err("QAT: The configuration doesn't match any SKU"); 153 dev_err(&GET_DEV(accel_dev),
154 "The configuration doesn't match any SKU");
154 *arb_map_config = NULL; 155 *arb_map_config = NULL;
155 } 156 }
156} 157}
diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_isr.c b/drivers/crypto/qat/qat_dh895xcc/adf_isr.c
index fe8f89697ad8..0d03c109c2d3 100644
--- a/drivers/crypto/qat/qat_dh895xcc/adf_isr.c
+++ b/drivers/crypto/qat/qat_dh895xcc/adf_isr.c
@@ -73,7 +73,7 @@ static int adf_enable_msix(struct adf_accel_dev *accel_dev)
73 if (pci_enable_msix_exact(pci_dev_info->pci_dev, 73 if (pci_enable_msix_exact(pci_dev_info->pci_dev,
74 pci_dev_info->msix_entries.entries, 74 pci_dev_info->msix_entries.entries,
75 msix_num_entries)) { 75 msix_num_entries)) {
76 pr_err("QAT: Failed to enable MSIX IRQ\n"); 76 dev_err(&GET_DEV(accel_dev), "Failed to enable MSIX IRQ\n");
77 return -EFAULT; 77 return -EFAULT;
78 } 78 }
79 return 0; 79 return 0;
@@ -97,7 +97,8 @@ static irqreturn_t adf_msix_isr_ae(int irq, void *dev_ptr)
97{ 97{
98 struct adf_accel_dev *accel_dev = dev_ptr; 98 struct adf_accel_dev *accel_dev = dev_ptr;
99 99
100 pr_info("QAT: qat_dev%d spurious AE interrupt\n", accel_dev->accel_id); 100 dev_info(&GET_DEV(accel_dev), "qat_dev%d spurious AE interrupt\n",
101 accel_dev->accel_id);
101 return IRQ_HANDLED; 102 return IRQ_HANDLED;
102} 103}
103 104
@@ -121,8 +122,9 @@ static int adf_request_irqs(struct adf_accel_dev *accel_dev)
121 ret = request_irq(msixe[i].vector, 122 ret = request_irq(msixe[i].vector,
122 adf_msix_isr_bundle, 0, name, bank); 123 adf_msix_isr_bundle, 0, name, bank);
123 if (ret) { 124 if (ret) {
124 pr_err("QAT: failed to enable irq %d for %s\n", 125 dev_err(&GET_DEV(accel_dev),
125 msixe[i].vector, name); 126 "failed to enable irq %d for %s\n",
127 msixe[i].vector, name);
126 return ret; 128 return ret;
127 } 129 }
128 130
@@ -136,8 +138,9 @@ static int adf_request_irqs(struct adf_accel_dev *accel_dev)
136 "qat%d-ae-cluster", accel_dev->accel_id); 138 "qat%d-ae-cluster", accel_dev->accel_id);
137 ret = request_irq(msixe[i].vector, adf_msix_isr_ae, 0, name, accel_dev); 139 ret = request_irq(msixe[i].vector, adf_msix_isr_ae, 0, name, accel_dev);
138 if (ret) { 140 if (ret) {
139 pr_err("QAT: failed to enable irq %d, for %s\n", 141 dev_err(&GET_DEV(accel_dev),
140 msixe[i].vector, name); 142 "failed to enable irq %d, for %s\n",
143 msixe[i].vector, name);
141 return ret; 144 return ret;
142 } 145 }
143 return ret; 146 return ret;
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-01 22:43:22 -0500