Skip to content

Commit bf94e31

Browse files
committed
Merge: crypto: qat: Update QAT drivers up thru v6.12-rc1
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5345 ``` JIRA: https://issues.redhat.com/browse/RHEL-52749 Upstream Status: 15 commits are merged into the linux.git 4 commits are from herbert/crypto-2.6.git Bring in the latest QAT drivers bugfixes and improvements. All the commits apply cleanly, no conflicts, no changes vs the upstream. Signed-off-by: Vladis Dronov <vdronov@redhat.com> ``` Approved-by: Phil Auld <pauld@redhat.com> Approved-by: Štěpán Horáček <shoracek@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Herbert Xu <zxu@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>
2 parents 6db828e + 538c626 commit bf94e31

32 files changed

+251
-177
lines changed

Documentation/ABI/testing/sysfs-driver-qat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ Description:
143143
This attribute is only available for qat_4xxx devices.
144144

145145
What: /sys/bus/pci/devices/<BDF>/qat/auto_reset
146-
Date: March 2024
147-
KernelVersion: 6.8
146+
Date: May 2024
147+
KernelVersion: 6.9
148148
Contact: qat-linux@intel.com
149149
Description: (RW) Reports the current state of the autoreset feature
150150
for a QAT device

drivers/crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ static const char *uof_get_name(struct adf_accel_dev *accel_dev, u32 obj_num,
375375
else
376376
id = -EINVAL;
377377

378-
if (id < 0 || id > num_objs)
378+
if (id < 0 || id >= num_objs)
379379
return NULL;
380380

381381
return fw_objs[id];

drivers/crypto/intel/qat/qat_420xx/adf_drv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
163163
return ret;
164164

165165
out_err_dev_stop:
166-
adf_dev_down(accel_dev, false);
166+
adf_dev_down(accel_dev);
167167
out_err:
168168
adf_cleanup_accel(accel_dev);
169169
return ret;
@@ -177,7 +177,7 @@ static void adf_remove(struct pci_dev *pdev)
177177
pr_err("QAT: Driver removal failed\n");
178178
return;
179179
}
180-
adf_dev_down(accel_dev, false);
180+
adf_dev_down(accel_dev);
181181
adf_cleanup_accel(accel_dev);
182182
}
183183

drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ static const char *uof_get_name(struct adf_accel_dev *accel_dev, u32 obj_num,
334334
else
335335
id = -EINVAL;
336336

337-
if (id < 0 || id > num_objs)
337+
if (id < 0 || id >= num_objs)
338338
return NULL;
339339

340340
return fw_objs[id];

drivers/crypto/intel/qat/qat_4xxx/adf_drv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
165165
return ret;
166166

167167
out_err_dev_stop:
168-
adf_dev_down(accel_dev, false);
168+
adf_dev_down(accel_dev);
169169
out_err:
170170
adf_cleanup_accel(accel_dev);
171171
return ret;
@@ -179,7 +179,7 @@ static void adf_remove(struct pci_dev *pdev)
179179
pr_err("QAT: Driver removal failed\n");
180180
return;
181181
}
182-
adf_dev_down(accel_dev, false);
182+
adf_dev_down(accel_dev);
183183
adf_cleanup_accel(accel_dev);
184184
}
185185

drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
202202
return ret;
203203

204204
out_err_dev_stop:
205-
adf_dev_down(accel_dev, false);
205+
adf_dev_down(accel_dev);
206206
out_err_free_reg:
207207
pci_release_regions(accel_pci_dev->pci_dev);
208208
out_err_disable:
@@ -221,7 +221,7 @@ static void adf_remove(struct pci_dev *pdev)
221221
pr_err("QAT: Driver removal failed\n");
222222
return;
223223
}
224-
adf_dev_down(accel_dev, false);
224+
adf_dev_down(accel_dev);
225225
adf_cleanup_accel(accel_dev);
226226
adf_cleanup_pci_dev(accel_dev);
227227
kfree(accel_dev);

drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
176176
return ret;
177177

178178
out_err_dev_stop:
179-
adf_dev_down(accel_dev, false);
179+
adf_dev_down(accel_dev);
180180
out_err_free_reg:
181181
pci_release_regions(accel_pci_dev->pci_dev);
182182
out_err_disable:
@@ -196,7 +196,7 @@ static void adf_remove(struct pci_dev *pdev)
196196
return;
197197
}
198198
adf_flush_vf_wq(accel_dev);
199-
adf_dev_down(accel_dev, false);
199+
adf_dev_down(accel_dev);
200200
adf_cleanup_accel(accel_dev);
201201
adf_cleanup_pci_dev(accel_dev);
202202
kfree(accel_dev);

drivers/crypto/intel/qat/qat_c62x/adf_drv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
202202
return ret;
203203

204204
out_err_dev_stop:
205-
adf_dev_down(accel_dev, false);
205+
adf_dev_down(accel_dev);
206206
out_err_free_reg:
207207
pci_release_regions(accel_pci_dev->pci_dev);
208208
out_err_disable:
@@ -221,7 +221,7 @@ static void adf_remove(struct pci_dev *pdev)
221221
pr_err("QAT: Driver removal failed\n");
222222
return;
223223
}
224-
adf_dev_down(accel_dev, false);
224+
adf_dev_down(accel_dev);
225225
adf_cleanup_accel(accel_dev);
226226
adf_cleanup_pci_dev(accel_dev);
227227
kfree(accel_dev);

drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
176176
return ret;
177177

178178
out_err_dev_stop:
179-
adf_dev_down(accel_dev, false);
179+
adf_dev_down(accel_dev);
180180
out_err_free_reg:
181181
pci_release_regions(accel_pci_dev->pci_dev);
182182
out_err_disable:
@@ -196,7 +196,7 @@ static void adf_remove(struct pci_dev *pdev)
196196
return;
197197
}
198198
adf_flush_vf_wq(accel_dev);
199-
adf_dev_down(accel_dev, false);
199+
adf_dev_down(accel_dev);
200200
adf_cleanup_accel(accel_dev);
201201
adf_cleanup_pci_dev(accel_dev);
202202
kfree(accel_dev);

drivers/crypto/intel/qat/qat_common/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ intel_qat-objs := adf_cfg.o \
3939
adf_sysfs_rl.o \
4040
qat_uclo.o \
4141
qat_hal.o \
42-
qat_bl.o
42+
qat_bl.o \
43+
qat_mig_dev.o
4344

4445
intel_qat-$(CONFIG_DEBUG_FS) += adf_transport_debug.o \
4546
adf_fw_counters.o \
@@ -56,6 +57,6 @@ intel_qat-$(CONFIG_DEBUG_FS) += adf_transport_debug.o \
5657
intel_qat-$(CONFIG_PCI_IOV) += adf_sriov.o adf_vf_isr.o adf_pfvf_utils.o \
5758
adf_pfvf_pf_msg.o adf_pfvf_pf_proto.o \
5859
adf_pfvf_vf_msg.o adf_pfvf_vf_proto.o \
59-
adf_gen2_pfvf.o adf_gen4_pfvf.o qat_mig_dev.o
60+
adf_gen2_pfvf.o adf_gen4_pfvf.o
6061

6162
intel_qat-$(CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION) += adf_heartbeat_inject.o

0 commit comments

Comments
 (0)