* [PATCH v3 1/5] hisi_acc_vfio_pci: Fixes error return code issue
2022-09-26 9:33 [PATCH v3 0/5] Fix some bugs and clean code issues Longfang Liu
@ 2022-09-26 9:33 ` Longfang Liu
2022-09-26 9:33 ` [PATCH v3 2/5] hisi_acc_vfio_pci: Fix device data address combination problem Longfang Liu
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Longfang Liu @ 2022-09-26 9:33 UTC (permalink / raw)
To: alex.williamson, jgg, shameerali.kolothum.thodi
Cc: cohuck, linux-kernel, linuxarm, liulongfang
During the process of compatibility and matching of live migration
device information, if the isolation status of the two devices is
inconsistent, the live migration needs to be exited.
The current driver does not return the error code correctly and
needs to be fixed.
Reviewed-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Longfang Liu <liulongfang@huawei.com>
---
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
index 47174e2b61bd..4ef9761ef467 100644
--- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
+++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
@@ -397,7 +397,7 @@ static int vf_qm_check_match(struct hisi_acc_vf_core_device *hisi_acc_vdev,
if (vf_data->que_iso_cfg != que_iso_state) {
dev_err(dev, "failed to match isolation state\n");
- return ret;
+ return -EINVAL;
}
ret = qm_write_regs(vf_qm, QM_VF_STATE, &vf_data->vf_qm_state, 1);
--
2.33.0
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v3 2/5] hisi_acc_vfio_pci: Fix device data address combination problem
2022-09-26 9:33 [PATCH v3 0/5] Fix some bugs and clean code issues Longfang Liu
2022-09-26 9:33 ` [PATCH v3 1/5] hisi_acc_vfio_pci: Fixes error return code issue Longfang Liu
@ 2022-09-26 9:33 ` Longfang Liu
2022-09-26 9:33 ` [PATCH v3 3/5] hisi_acc_vfio_pci: Remove useless function parameter Longfang Liu
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Longfang Liu @ 2022-09-26 9:33 UTC (permalink / raw)
To: alex.williamson, jgg, shameerali.kolothum.thodi
Cc: cohuck, linux-kernel, linuxarm, liulongfang
The queue address of the accelerator device should be combined into
a dma address in a way of combining the low and high bits.
The previous combination is wrong and needs to be modified.
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Longfang Liu <liulongfang@huawei.com>
---
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
index 4ef9761ef467..fbe72ce173de 100644
--- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
+++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
@@ -520,12 +520,12 @@ static int vf_qm_state_save(struct hisi_acc_vf_core_device *hisi_acc_vdev,
return -EINVAL;
/* Every reg is 32 bit, the dma address is 64 bit. */
- vf_data->eqe_dma = vf_data->qm_eqc_dw[2];
+ vf_data->eqe_dma = vf_data->qm_eqc_dw[1];
vf_data->eqe_dma <<= QM_XQC_ADDR_OFFSET;
- vf_data->eqe_dma |= vf_data->qm_eqc_dw[1];
- vf_data->aeqe_dma = vf_data->qm_aeqc_dw[2];
+ vf_data->eqe_dma |= vf_data->qm_eqc_dw[0];
+ vf_data->aeqe_dma = vf_data->qm_aeqc_dw[1];
vf_data->aeqe_dma <<= QM_XQC_ADDR_OFFSET;
- vf_data->aeqe_dma |= vf_data->qm_aeqc_dw[1];
+ vf_data->aeqe_dma |= vf_data->qm_aeqc_dw[0];
/* Through SQC_BT/CQC_BT to get sqc and cqc address */
ret = qm_get_sqc(vf_qm, &vf_data->sqc_dma);
--
2.33.0
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v3 3/5] hisi_acc_vfio_pci: Remove useless function parameter
2022-09-26 9:33 [PATCH v3 0/5] Fix some bugs and clean code issues Longfang Liu
2022-09-26 9:33 ` [PATCH v3 1/5] hisi_acc_vfio_pci: Fixes error return code issue Longfang Liu
2022-09-26 9:33 ` [PATCH v3 2/5] hisi_acc_vfio_pci: Fix device data address combination problem Longfang Liu
@ 2022-09-26 9:33 ` Longfang Liu
2022-09-26 9:33 ` [PATCH v3 4/5] hisi_acc_vfio_pci: Remove useless macro definitions Longfang Liu
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Longfang Liu @ 2022-09-26 9:33 UTC (permalink / raw)
To: alex.williamson, jgg, shameerali.kolothum.thodi
Cc: cohuck, linux-kernel, linuxarm, liulongfang
Remove unused function parameters for vf_qm_fun_reset() and
ensure the device is enabled before the reset operation
is performed.
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Longfang Liu <liulongfang@huawei.com>
---
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
index fbe72ce173de..c07ed7b0ccf1 100644
--- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
+++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
@@ -337,8 +337,7 @@ static int vf_qm_cache_wb(struct hisi_qm *qm)
return 0;
}
-static void vf_qm_fun_reset(struct hisi_acc_vf_core_device *hisi_acc_vdev,
- struct hisi_qm *qm)
+static void vf_qm_fun_reset(struct hisi_qm *qm)
{
int i;
@@ -662,7 +661,10 @@ static void hisi_acc_vf_start_device(struct hisi_acc_vf_core_device *hisi_acc_vd
if (hisi_acc_vdev->vf_qm_state != QM_READY)
return;
- vf_qm_fun_reset(hisi_acc_vdev, vf_qm);
+ /* Make sure the device is enabled */
+ qm_dev_cmd_init(vf_qm);
+
+ vf_qm_fun_reset(vf_qm);
}
static int hisi_acc_vf_load_state(struct hisi_acc_vf_core_device *hisi_acc_vdev)
--
2.33.0
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v3 4/5] hisi_acc_vfio_pci: Remove useless macro definitions
2022-09-26 9:33 [PATCH v3 0/5] Fix some bugs and clean code issues Longfang Liu
` (2 preceding siblings ...)
2022-09-26 9:33 ` [PATCH v3 3/5] hisi_acc_vfio_pci: Remove useless function parameter Longfang Liu
@ 2022-09-26 9:33 ` Longfang Liu
2022-09-26 9:33 ` [PATCH v3 5/5] hisi_acc_vfio_pci: Update some log and comment formats Longfang Liu
2022-09-27 20:06 ` [PATCH v3 0/5] Fix some bugs and clean code issues Alex Williamson
5 siblings, 0 replies; 9+ messages in thread
From: Longfang Liu @ 2022-09-26 9:33 UTC (permalink / raw)
To: alex.williamson, jgg, shameerali.kolothum.thodi
Cc: cohuck, linux-kernel, linuxarm, liulongfang
The QM_QUE_ISO_CFG macro definition is no longer used
and needs to be deleted from the current driver.
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Longfang Liu <liulongfang@huawei.com>
---
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h
index 5494f4983bbe..8e4bf21deae1 100644
--- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h
+++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h
@@ -16,7 +16,6 @@
#define SEC_CORE_INT_STATUS 0x301008
#define HPRE_HAC_INT_STATUS 0x301800
#define HZIP_CORE_INT_STATUS 0x3010AC
-#define QM_QUE_ISO_CFG 0x301154
#define QM_VFT_CFG_RDY 0x10006c
#define QM_VFT_CFG_OP_WR 0x100058
--
2.33.0
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v3 5/5] hisi_acc_vfio_pci: Update some log and comment formats
2022-09-26 9:33 [PATCH v3 0/5] Fix some bugs and clean code issues Longfang Liu
` (3 preceding siblings ...)
2022-09-26 9:33 ` [PATCH v3 4/5] hisi_acc_vfio_pci: Remove useless macro definitions Longfang Liu
@ 2022-09-26 9:33 ` Longfang Liu
2022-09-27 20:06 ` [PATCH v3 0/5] Fix some bugs and clean code issues Alex Williamson
5 siblings, 0 replies; 9+ messages in thread
From: Longfang Liu @ 2022-09-26 9:33 UTC (permalink / raw)
To: alex.williamson, jgg, shameerali.kolothum.thodi
Cc: cohuck, linux-kernel, linuxarm, liulongfang
1. Modify some annotation information formats to keep the
entire driver annotation format consistent.
2. Modify some log description formats to be consistent with
the format of the entire driver log.
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Longfang Liu <liulongfang@huawei.com>
---
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 18 +++++++++---------
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
index c07ed7b0ccf1..39eeca18a0f7 100644
--- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
+++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
@@ -16,7 +16,7 @@
#include "hisi_acc_vfio_pci.h"
-/* return 0 on VM acc device ready, -ETIMEDOUT hardware timeout */
+/* Return 0 on VM acc device ready, -ETIMEDOUT hardware timeout */
static int qm_wait_dev_not_ready(struct hisi_qm *qm)
{
u32 val;
@@ -189,7 +189,7 @@ static int qm_set_regs(struct hisi_qm *qm, struct acc_vf_data *vf_data)
struct device *dev = &qm->pdev->dev;
int ret;
- /* check VF state */
+ /* Check VF state */
if (unlikely(hisi_qm_wait_mb_ready(qm))) {
dev_err(&qm->pdev->dev, "QM device is not ready to write\n");
return -EBUSY;
@@ -373,7 +373,7 @@ static int vf_qm_check_match(struct hisi_acc_vf_core_device *hisi_acc_vdev,
return -EINVAL;
}
- /* vf qp num check */
+ /* VF qp num check */
ret = qm_get_vft(vf_qm, &vf_qm->qp_base);
if (ret <= 0) {
dev_err(dev, "failed to get vft qp nums\n");
@@ -387,7 +387,7 @@ static int vf_qm_check_match(struct hisi_acc_vf_core_device *hisi_acc_vdev,
vf_qm->qp_num = ret;
- /* vf isolation state check */
+ /* VF isolation state check */
ret = qm_read_regs(pf_qm, QM_QUE_ISO_CFG_V, &que_iso_state, 1);
if (ret) {
dev_err(dev, "failed to read QM_QUE_ISO_CFG_V\n");
@@ -418,10 +418,10 @@ static int vf_qm_get_match_data(struct hisi_acc_vf_core_device *hisi_acc_vdev,
int ret;
vf_data->acc_magic = ACC_DEV_MAGIC;
- /* save device id */
+ /* Save device id */
vf_data->dev_id = hisi_acc_vdev->vf_dev->device;
- /* vf qp num save from PF */
+ /* VF qp num save from PF */
ret = pf_qm_get_qp_num(pf_qm, vf_id, &vf_data->qp_base);
if (ret <= 0) {
dev_err(dev, "failed to get vft qp nums!\n");
@@ -465,19 +465,19 @@ static int vf_qm_load_data(struct hisi_acc_vf_core_device *hisi_acc_vdev,
ret = qm_set_regs(qm, vf_data);
if (ret) {
- dev_err(dev, "Set VF regs failed\n");
+ dev_err(dev, "set VF regs failed\n");
return ret;
}
ret = hisi_qm_mb(qm, QM_MB_CMD_SQC_BT, qm->sqc_dma, 0, 0);
if (ret) {
- dev_err(dev, "Set sqc failed\n");
+ dev_err(dev, "set sqc failed\n");
return ret;
}
ret = hisi_qm_mb(qm, QM_MB_CMD_CQC_BT, qm->cqc_dma, 0, 0);
if (ret) {
- dev_err(dev, "Set cqc failed\n");
+ dev_err(dev, "set cqc failed\n");
return ret;
}
diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h
index 8e4bf21deae1..67343325b320 100644
--- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h
+++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h
@@ -79,7 +79,7 @@ struct acc_vf_data {
/* QM reserved 5 regs */
u32 qm_rsv_regs[5];
u32 padding;
- /* qm memory init information */
+ /* QM memory init information */
u64 eqe_dma;
u64 aeqe_dma;
u64 sqc_dma;
@@ -98,7 +98,7 @@ struct hisi_acc_vf_migration_file {
struct hisi_acc_vf_core_device {
struct vfio_pci_core_device core_device;
u8 deferred_reset:1;
- /* for migration state */
+ /* For migration state */
struct mutex state_mutex;
enum vfio_device_mig_state mig_state;
struct pci_dev *pf_dev;
@@ -107,7 +107,7 @@ struct hisi_acc_vf_core_device {
struct hisi_qm vf_qm;
u32 vf_qm_state;
int vf_id;
- /* for reset handler */
+ /* For reset handler */
spinlock_t reset_lock;
struct hisi_acc_vf_migration_file *resuming_migf;
struct hisi_acc_vf_migration_file *saving_migf;
--
2.33.0
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v3 0/5] Fix some bugs and clean code issues
2022-09-26 9:33 [PATCH v3 0/5] Fix some bugs and clean code issues Longfang Liu
` (4 preceding siblings ...)
2022-09-26 9:33 ` [PATCH v3 5/5] hisi_acc_vfio_pci: Update some log and comment formats Longfang Liu
@ 2022-09-27 20:06 ` Alex Williamson
5 siblings, 0 replies; 9+ messages in thread
From: Alex Williamson @ 2022-09-27 20:06 UTC (permalink / raw)
To: Longfang Liu
Cc: jgg, shameerali.kolothum.thodi, cohuck, linux-kernel, linuxarm
On Mon, 26 Sep 2022 17:33:27 +0800
Longfang Liu <liulongfang@huawei.com> wrote:
> Modify two code bugs inside the driver, update the format of the
> driver's log and comments, and delete an unused macro definition.
>
> Changes in v3:
> - Remake patchset based on vfio/next branch.
> - Add new reviewer.
>
> Changes in v2:
> - Remove a wrong patch.
> - Remove some unnecessary changes.
>
> Longfang Liu (5):
> hisi_acc_vfio_pci: Fixes error return code issue
> hisi_acc_vfio_pci: Fix device data address combination problem
> hisi_acc_vfio_pci: Remove useless function parameter
> hisi_acc_vfio_pci: Remove useless macro definitions
> hisi_acc_vfio_pci: Update some log and comment formats
>
> .../vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 36 ++++++++++---------
> .../vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 7 ++--
> 2 files changed, 22 insertions(+), 21 deletions(-)
>
Applied to vfio next branch for v6.1. Thanks,
Alex
^ permalink raw reply [flat|nested] 9+ messages in thread