D59484.id186135.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D59484.id186135.diff
View Options

	diff --git a/sys/dev/virtio/block/virtio_blk.c b/sys/dev/virtio/block/virtio_blk.c
	--- a/sys/dev/virtio/block/virtio_blk.c
	+++ b/sys/dev/virtio/block/virtio_blk.c
	@@ -238,7 +238,8 @@
	VIRTIO_BLK_F_TOPOLOGY \| \
	VIRTIO_BLK_F_CONFIG_WCE \| \
	VIRTIO_BLK_F_DISCARD \| \
	- VIRTIO_RING_F_INDIRECT_DESC)
	+ VIRTIO_RING_F_INDIRECT_DESC \| \
	+ VIRTIO_F_IOMMU_PLATFORM)

	#define VTBLK_MODERN_FEATURES (VTBLK_COMMON_FEATURES)
	#define VTBLK_LEGACY_FEATURES (VIRTIO_BLK_F_BARRIER \| VTBLK_COMMON_FEATURES)
	diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h
	--- a/sys/dev/virtio/network/if_vtnetvar.h
	+++ b/sys/dev/virtio/network/if_vtnetvar.h
	@@ -355,7 +355,7 @@
	VIRTIO_RING_F_EVENT_IDX \| \
	VIRTIO_RING_F_INDIRECT_DESC)

	-#define VTNET_MODERN_FEATURES (VTNET_COMMON_FEATURES)
	+#define VTNET_MODERN_FEATURES (VTNET_COMMON_FEATURES \| VIRTIO_F_IOMMU_PLATFORM)
	#define VTNET_LEGACY_FEATURES (VTNET_COMMON_FEATURES \| VIRTIO_NET_F_GSO)

	/*
	diff --git a/sys/dev/virtio/virtio.c b/sys/dev/virtio/virtio.c
	--- a/sys/dev/virtio/virtio.c
	+++ b/sys/dev/virtio/virtio.c
	@@ -213,6 +213,7 @@
	mask = -1ULL & ~transport;
	mask \|= VIRTIO_RING_F_INDIRECT_DESC;
	mask \|= VIRTIO_RING_F_EVENT_IDX;
	+ mask \|= VIRTIO_F_IOMMU_PLATFORM;
	mask \|= VIRTIO_F_VERSION_1;

	return (features & mask);