Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin: - IRQ bypass support for vdpa and IFC - MLX5 vdpa driver - Endianness fixes for virtio drivers - Misc other fixes * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (71 commits) vdpa/mlx5: fix up endian-ness for mtu vdpa: Fix pointer math bug in vdpasim_get_config() vdpa/mlx5: Fix pointer math in mlx5_vdpa_get_config() vdpa/mlx5: fix memory allocation failure checks vdpa/mlx5: Fix uninitialised variable in core/mr.c vdpa_sim: init iommu lock virtio_config: fix up warnings on parisc vdpa/mlx5: Add VDPA driver for supported mlx5 devices vdpa/mlx5: Add shared memory registration code vdpa/mlx5: Add support library for mlx5 VDPA implementation vdpa/mlx5: Add hardware descriptive header file vdpa: Modify get_vq_state() to return error code net/vdpa: Use struct for set/get vq state vdpa: remove hard coded virtq num vdpasim: support batch updating vhost-vdpa: support IOTLB batching hints vhost-vdpa: support get/set backend features vhost: generialize backend features setting/getting vhost-vdpa: refine ioctl pre-processing vDPA: dont change vq irq after DRIVER_OK ...
这个提交包含在:
@@ -2264,12 +2264,13 @@ static void virtnet_update_settings(struct virtnet_info *vi)
|
||||
if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_SPEED_DUPLEX))
|
||||
return;
|
||||
|
||||
speed = virtio_cread32(vi->vdev, offsetof(struct virtio_net_config,
|
||||
speed));
|
||||
virtio_cread_le(vi->vdev, struct virtio_net_config, speed, &speed);
|
||||
|
||||
if (ethtool_validate_speed(speed))
|
||||
vi->speed = speed;
|
||||
duplex = virtio_cread8(vi->vdev, offsetof(struct virtio_net_config,
|
||||
duplex));
|
||||
|
||||
virtio_cread_le(vi->vdev, struct virtio_net_config, duplex, &duplex);
|
||||
|
||||
if (ethtool_validate_duplex(duplex))
|
||||
vi->duplex = duplex;
|
||||
}
|
||||
|
在新工单中引用
屏蔽一个用户