| Message ID | 20221119095003.10802-1-qianweili@huawei.com |
|---|---|
| State | Accepted |
| Commit | 5f9c97a0e6dc873f662528ae591f2bd500eb5940 |
| Headers | show |
| Series | crypto: hisilicon/qm - add device status check when start fails | expand |
On Sat, Nov 19, 2022 at 05:50:03PM +0800, Weili Qian wrote: > In function 'hisi_qm_resume', if the device fails to be started, > directly returning error code will cause the device to be unavailable. > However, the failure may be caused by device error, which will be > reported to the driver, and driver can reset and restart device. > Therefore, check device status instead of returning error code > directly. Returns 0 if device error has occurred, otherwise returns > error code. > > Signed-off-by: Weili Qian <qianweili@huawei.com> > --- > drivers/crypto/hisilicon/qm.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) Patch applied. Thanks.
diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index 9072bee7336f..007ac7a69ce7 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -5468,8 +5468,14 @@ int hisi_qm_resume(struct device *dev) } ret = hisi_qm_start(qm); - if (ret) - pci_err(pdev, "failed to start qm(%d)\n", ret); + if (ret) { + if (qm_check_dev_error(qm)) { + pci_info(pdev, "failed to start qm due to device error, device will be reset!\n"); + return 0; + } + + pci_err(pdev, "failed to start qm(%d)!\n", ret); + } return ret; }
In function 'hisi_qm_resume', if the device fails to be started, directly returning error code will cause the device to be unavailable. However, the failure may be caused by device error, which will be reported to the driver, and driver can reset and restart device. Therefore, check device status instead of returning error code directly. Returns 0 if device error has occurred, otherwise returns error code. Signed-off-by: Weili Qian <qianweili@huawei.com> --- drivers/crypto/hisilicon/qm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)