On 2024/5/4 0:25, Alex Williamson wrote:
> On Thu, 25 Apr 2024 21:23:20 +0800
> Longfang Liu <liulongfang@xxxxxxxxxx> wrote:
>
>> During the live migration process.
>
> This is not a complete sentence.
>
>> It needs to obtain various status
>> data of drivers and devices.
>
> What's "It" describing here?
>
>> In order to facilitate calling it in the
>> debugfs function.
>
> Also not a complete sentence.
>
>> For all operations that read data from device registers,
>> the driver creates a subfunction.
>
> There's only one sub-function.
>
>> Also fixed the location of address data.
>
> I think this is addressed in the previous patch now? Thanks,
>
OK, I'll update the descriptions again.
> Alex
>
Thanks,
Longfang.
>> Signed-off-by: Longfang Liu <liulongfang@xxxxxxxxxx>
>> ---
>> .../vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 54 +++++++++++--------
>> 1 file changed, 33 insertions(+), 21 deletions(-)
>>
>> diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
>> index 0c7e31076ff4..bf358ba94b5d 100644
>> --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
>> +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
>> @@ -486,31 +486,11 @@ static int vf_qm_load_data(struct hisi_acc_vf_core_device *hisi_acc_vdev,
>> return 0;
>> }
>>
>> -static int vf_qm_state_save(struct hisi_acc_vf_core_device *hisi_acc_vdev,
>> - struct hisi_acc_vf_migration_file *migf)
>> +static int vf_qm_read_data(struct hisi_qm *vf_qm, struct acc_vf_data *vf_data)
>> {
>> - struct acc_vf_data *vf_data = &migf->vf_data;
>> - struct hisi_qm *vf_qm = &hisi_acc_vdev->vf_qm;
>> struct device *dev = &vf_qm->pdev->dev;
>> int ret;
>>
>> - if (unlikely(qm_wait_dev_not_ready(vf_qm))) {
>> - /* Update state and return with match data */
>> - vf_data->vf_qm_state = QM_NOT_READY;
>> - hisi_acc_vdev->vf_qm_state = vf_data->vf_qm_state;
>> - migf->total_length = QM_MATCH_SIZE;
>> - return 0;
>> - }
>> -
>> - vf_data->vf_qm_state = QM_READY;
>> - hisi_acc_vdev->vf_qm_state = vf_data->vf_qm_state;
>> -
>> - ret = vf_qm_cache_wb(vf_qm);
>> - if (ret) {
>> - dev_err(dev, "failed to writeback QM Cache!\n");
>> - return ret;
>> - }
>> -
>> ret = qm_get_regs(vf_qm, vf_data);
>> if (ret)
>> return -EINVAL;
>> @@ -536,6 +516,38 @@ static int vf_qm_state_save(struct hisi_acc_vf_core_device *hisi_acc_vdev,
>> return -EINVAL;
>> }
>>
>> + return 0;
>> +}
>> +
>> +static int vf_qm_state_save(struct hisi_acc_vf_core_device *hisi_acc_vdev,
>> + struct hisi_acc_vf_migration_file *migf)
>> +{
>> + struct acc_vf_data *vf_data = &migf->vf_data;
>> + struct hisi_qm *vf_qm = &hisi_acc_vdev->vf_qm;
>> + struct device *dev = &vf_qm->pdev->dev;
>> + int ret;
>> +
>> + if (unlikely(qm_wait_dev_not_ready(vf_qm))) {
>> + /* Update state and return with match data */
>> + vf_data->vf_qm_state = QM_NOT_READY;
>> + hisi_acc_vdev->vf_qm_state = vf_data->vf_qm_state;
>> + migf->total_length = QM_MATCH_SIZE;
>> + return 0;
>> + }
>> +
>> + vf_data->vf_qm_state = QM_READY;
>> + hisi_acc_vdev->vf_qm_state = vf_data->vf_qm_state;
>> +
>> + ret = vf_qm_cache_wb(vf_qm);
>> + if (ret) {
>> + dev_err(dev, "failed to writeback QM Cache!\n");
>> + return ret;
>> + }
>> +
>> + ret = vf_qm_read_data(vf_qm, vf_data);
>> + if (ret)
>> + return -EINVAL;
>> +
>> migf->total_length = sizeof(struct acc_vf_data);
>> return 0;
>> }
>
> .
>
