tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

hisi_acc_vfio_pci: Update some log and comment formats

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>
Link: https://lore.kernel.org/r/20220926093332.28824-6-liulongfang@huawei.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

authored by

Longfang Liu and committed by
Alex Williamson 42e1d1ee 3b7cfba0

+12 -12
+9 -9
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
··· 16 16 17 17 #include "hisi_acc_vfio_pci.h" 18 18 19 - /* return 0 on VM acc device ready, -ETIMEDOUT hardware timeout */ 19 + /* Return 0 on VM acc device ready, -ETIMEDOUT hardware timeout */ 20 20 static int qm_wait_dev_not_ready(struct hisi_qm *qm) 21 21 { 22 22 u32 val; ··· 189 189 struct device *dev = &qm->pdev->dev; 190 190 int ret; 191 191 192 - /* check VF state */ 192 + /* Check VF state */ 193 193 if (unlikely(hisi_qm_wait_mb_ready(qm))) { 194 194 dev_err(&qm->pdev->dev, "QM device is not ready to write\n"); 195 195 return -EBUSY; ··· 373 373 return -EINVAL; 374 374 } 375 375 376 - /* vf qp num check */ 376 + /* VF qp num check */ 377 377 ret = qm_get_vft(vf_qm, &vf_qm->qp_base); 378 378 if (ret <= 0) { 379 379 dev_err(dev, "failed to get vft qp nums\n"); ··· 387 387 388 388 vf_qm->qp_num = ret; 389 389 390 - /* vf isolation state check */ 390 + /* VF isolation state check */ 391 391 ret = qm_read_regs(pf_qm, QM_QUE_ISO_CFG_V, &que_iso_state, 1); 392 392 if (ret) { 393 393 dev_err(dev, "failed to read QM_QUE_ISO_CFG_V\n"); ··· 418 418 int ret; 419 419 420 420 vf_data->acc_magic = ACC_DEV_MAGIC; 421 - /* save device id */ 421 + /* Save device id */ 422 422 vf_data->dev_id = hisi_acc_vdev->vf_dev->device; 423 423 424 - /* vf qp num save from PF */ 424 + /* VF qp num save from PF */ 425 425 ret = pf_qm_get_qp_num(pf_qm, vf_id, &vf_data->qp_base); 426 426 if (ret <= 0) { 427 427 dev_err(dev, "failed to get vft qp nums!\n"); ··· 465 465 466 466 ret = qm_set_regs(qm, vf_data); 467 467 if (ret) { 468 - dev_err(dev, "Set VF regs failed\n"); 468 + dev_err(dev, "set VF regs failed\n"); 469 469 return ret; 470 470 } 471 471 472 472 ret = hisi_qm_mb(qm, QM_MB_CMD_SQC_BT, qm->sqc_dma, 0, 0); 473 473 if (ret) { 474 - dev_err(dev, "Set sqc failed\n"); 474 + dev_err(dev, "set sqc failed\n"); 475 475 return ret; 476 476 } 477 477 478 478 ret = hisi_qm_mb(qm, QM_MB_CMD_CQC_BT, qm->cqc_dma, 0, 0); 479 479 if (ret) { 480 - dev_err(dev, "Set cqc failed\n"); 480 + dev_err(dev, "set cqc failed\n"); 481 481 return ret; 482 482 } 483 483
+3 -3
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h
··· 79 79 /* QM reserved 5 regs */ 80 80 u32 qm_rsv_regs[5]; 81 81 u32 padding; 82 - /* qm memory init information */ 82 + /* QM memory init information */ 83 83 u64 eqe_dma; 84 84 u64 aeqe_dma; 85 85 u64 sqc_dma; ··· 98 98 struct hisi_acc_vf_core_device { 99 99 struct vfio_pci_core_device core_device; 100 100 u8 deferred_reset:1; 101 - /* for migration state */ 101 + /* For migration state */ 102 102 struct mutex state_mutex; 103 103 enum vfio_device_mig_state mig_state; 104 104 struct pci_dev *pf_dev; ··· 107 107 struct hisi_qm vf_qm; 108 108 u32 vf_qm_state; 109 109 int vf_id; 110 - /* for reset handler */ 110 + /* For reset handler */ 111 111 spinlock_t reset_lock; 112 112 struct hisi_acc_vf_migration_file *resuming_migf; 113 113 struct hisi_acc_vf_migration_file *saving_migf;