Unverified Commit 7dfd93c1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3343 [sync] 22.03 LTS SP1 sync vdpa patches from branch OLK-5.10 

Merge Pull Request from: @jiangdongxu1 
 
sync patch from branch OLK-5.10：
https://gitee.com/openeuler/kernel/pulls/2756
https://gitee.com/openeuler/kernel/pulls/3009
https://gitee.com/openeuler/kernel/pulls/3145
https://gitee.com/openeuler/kernel/pulls/3148 
 
Link:https://gitee.com/openeuler/kernel/pulls/3343

 

Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Reviewed-by: default avatarKevin Zhu <zhukeqian1@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 81444bde be344374

arch/arm64/configs/openeuler_defconfig

+6 −1
Original line number Diff line number Diff line
@@ -5815,19 +5815,24 @@ CONFIG_VIRTIO_PCI_LIB=m 
CONFIG_VIRTIO_MENU=y

CONFIG_VIRTIO_PCI=m

CONFIG_VIRTIO_PCI_LEGACY=y

# CONFIG_VIRTIO_VDPA is not set

# CONFIG_VIRTIO_PMEM is not set

CONFIG_VIRTIO_BALLOON=m

CONFIG_VIRTIO_INPUT=m

CONFIG_VIRTIO_MMIO=m

# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set

CONFIG_VIRTIO_DMA_SHARED_BUFFER=m

# CONFIG_VDPA is not set

CONFIG_VDPA=m

# CONFIG_IFCVF is not set

# CONFIG_MLX5_VDPA_NET is not set

# CONFIG_VP_VDPA is not set

CONFIG_VHOST_IOTLB=m

CONFIG_VHOST=m

CONFIG_VHOST_MENU=y

CONFIG_VHOST_NET=m

CONFIG_VHOST_SCSI=m

CONFIG_VHOST_VSOCK=m

CONFIG_VHOST_VDPA=m

# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set



#

drivers/iommu/iommu.c

+2 −0
Original line number Diff line number Diff line
@@ -3040,6 +3040,7 @@ void iommu_get_resv_regions(struct device *dev, struct list_head *list) 
	if (ops && ops->get_resv_regions)

		ops->get_resv_regions(dev, list);

}

EXPORT_SYMBOL_GPL(iommu_get_resv_regions);



void iommu_put_resv_regions(struct device *dev, struct list_head *list)

{
@@ -3048,6 +3049,7 @@ void iommu_put_resv_regions(struct device *dev, struct list_head *list) 
	if (ops && ops->put_resv_regions)

		ops->put_resv_regions(dev, list);

}

EXPORT_SYMBOL_GPL(iommu_put_resv_regions);



/**

 * generic_iommu_put_resv_regions - Reserved region driver helper

drivers/pci/iov.c

+14 −0
Original line number Diff line number Diff line
@@ -32,6 +32,20 @@ int pci_iov_virtfn_devfn(struct pci_dev *dev, int vf_id) 
		dev->sriov->stride * vf_id) & 0xff;

}



int pci_iov_vf_id(struct pci_dev *dev)

{

	struct pci_dev *pf;



	if (!dev->is_virtfn)

		return -EINVAL;



	pf = pci_physfn(dev);

	return (((dev->bus->number << 8) + dev->devfn) -

		((pf->bus->number << 8) + pf->devfn + pf->sriov->offset)) /

	       pf->sriov->stride;

}

EXPORT_SYMBOL_GPL(pci_iov_vf_id);



/*

 * Per SR-IOV spec sec 3.3.10 and 3.3.11, First VF Offset and VF Stride may

 * change when NumVFs changes.

drivers/vdpa/ifcvf/ifcvf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static void ifcvf_vdpa_set_status(struct vdpa_device *vdpa_dev, u8 status) 
	ifcvf_set_status(vf, status);

}



static int ifcvf_vdpa_reset(struct vdpa_device *vdpa_dev)

static int ifcvf_vdpa_reset(struct vdpa_device *vdpa_dev, int state)

{

	struct ifcvf_adapter *adapter;

	struct ifcvf_hw *vf;

drivers/vdpa/mlx5/net/mlx5_vnet.c

+1 −1
Original line number Diff line number Diff line
@@ -1800,7 +1800,7 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status) 
	ndev->mvdev.status |= VIRTIO_CONFIG_S_FAILED;

}



static int mlx5_vdpa_reset(struct vdpa_device *vdev)

static int mlx5_vdpa_reset(struct vdpa_device *vdev, int state)

{

	struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev);

	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);