lkml.org 
[lkml]   [2022]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v2 3/5] hisi_acc_vfio_pci: Remove useless function parameter
From
Date
On 2022/9/23 18:30, Shameerali Kolothum Thodi wrote:
>
>
>> -----Original Message-----
>> From: liulongfang
>> Sent: 22 September 2022 09:39
>> To: alex.williamson@redhat.com; jgg@nvidia.com; Shameerali Kolothum
>> Thodi <shameerali.kolothum.thodi@huawei.com>
>> Cc: cohuck@redhat.com; linux-kernel@vger.kernel.org;
>> linuxarm@openeuler.org; liulongfang <liulongfang@huawei.com>
>> Subject: [PATCH v2 3/5] hisi_acc_vfio_pci: Remove useless function
>> parameter
>>
>> Remove unused function parameters for vf_qm_fun_reset() and
>> ensure the device is enabled before the reset operation
>> is performed.
>>
>> Signed-off-by: Longfang Liu <liulongfang@huawei.com>
>
> Hi Longfang,
>
> This one seems to have a merge conflict on top of vfio/next branch.
> May be better to rebase and send a v3 picking up Jason's R-by as well?
>

I merged this patchset to the latest tag version vfio-v6.0-rc5 of the
vfio/next branch, and there is no merge conflict.

Which patchset do you refer to as "Jason's R-by"? Can you provide the
title of this patchset?

> Thanks,
> Shameer
>
>> ---
>> 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 0638a8a6b0c1..24c03ff41502 100644
>> --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
>> +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
>> @@ -345,8 +345,7 @@ static struct hisi_acc_vf_core_device
>> *hssi_acc_drvdata(struct pci_dev *pdev)
>> core_device);
>> }
>>
>> -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
>
> .
>

\
 
 \ /
  Last update: 2022-09-24 03:46    [W:0.048 / U:0.816 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site