Commit 16c22c56 authored by Daniel Jurgens's avatar Daniel Jurgens Committed by Michael S. Tsirkin
Browse files

virtio_pci: Use self group type for cap commands 



Section 2.12.1.2 of v1.4 of the VirtIO spec states:

The device and driver capabilities commands are currently defined for
self group type.
1. VIRTIO_ADMIN_CMD_CAP_ID_LIST_QUERY
2. VIRTIO_ADMIN_CMD_DEVICE_CAP_GET
3. VIRTIO_ADMIN_CMD_DRIVER_CAP_SET

Fixes: bfcad518 ("virtio: Manage device and driver capabilities via the admin commands")
Signed-off-by: default avatarDaniel Jurgens <danielj@nvidia.com>
Reviewed-by: default avatarParav Pandit <parav@nvidia.com>
Message-Id: <20250304161442.90700-1-danielj@nvidia.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 8ffd015d

drivers/virtio/virtio_pci_modern.c

+2 −2
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ virtio_pci_admin_cmd_dev_parts_objects_enable(struct virtio_device *virtio_dev) 
	sg_init_one(&data_sg, get_data, sizeof(*get_data));

	sg_init_one(&result_sg, result, sizeof(*result));

	cmd.opcode = cpu_to_le16(VIRTIO_ADMIN_CMD_DEVICE_CAP_GET);

	cmd.group_type = cpu_to_le16(VIRTIO_ADMIN_GROUP_TYPE_SRIOV);

	cmd.group_type = cpu_to_le16(VIRTIO_ADMIN_GROUP_TYPE_SELF);

	cmd.data_sg = &data_sg;

	cmd.result_sg = &result_sg;

	ret = vp_modern_admin_cmd_exec(virtio_dev, &cmd);
@@ -305,7 +305,7 @@ static void virtio_pci_admin_cmd_cap_init(struct virtio_device *virtio_dev) 


	sg_init_one(&result_sg, data, sizeof(*data));

	cmd.opcode = cpu_to_le16(VIRTIO_ADMIN_CMD_CAP_ID_LIST_QUERY);

	cmd.group_type = cpu_to_le16(VIRTIO_ADMIN_GROUP_TYPE_SRIOV);

	cmd.group_type = cpu_to_le16(VIRTIO_ADMIN_GROUP_TYPE_SELF);

	cmd.result_sg = &result_sg;



	ret = vp_modern_admin_cmd_exec(virtio_dev, &cmd);

include/uapi/linux/virtio_pci.h

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ struct virtio_pci_cfg_cap { 
#define VIRTIO_ADMIN_CMD_LIST_USE	0x1



/* Admin command group type. */

#define VIRTIO_ADMIN_GROUP_TYPE_SELF	0x0

#define VIRTIO_ADMIN_GROUP_TYPE_SRIOV	0x1



/* Transitional device admin command. */