Blame SOURCES/0008-vdpa-align-uapi-headers.patch

32391d
From 548e39858ecf9291494555466e6e931935b4a0ee Mon Sep 17 00:00:00 2001
32391d
Message-Id: <548e39858ecf9291494555466e6e931935b4a0ee.1643220552.git.aclaudi@redhat.com>
32391d
In-Reply-To: <b30268eda844bdebbb8e5e4f5735e3b1bb666368.1643220552.git.aclaudi@redhat.com>
32391d
References: <b30268eda844bdebbb8e5e4f5735e3b1bb666368.1643220552.git.aclaudi@redhat.com>
32391d
From: Andrea Claudi <aclaudi@redhat.com>
32391d
Date: Wed, 26 Jan 2022 10:37:45 +0100
32391d
Subject: [PATCH] vdpa: align uapi headers
32391d
32391d
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2036880
32391d
Upstream Status: iproute2.git commit fa58de9b0c73
32391d
32391d
commit 34672eae6ec8e885f76ae30af10f849720012dd6
32391d
Author: Stephen Hemminger <stephen@networkplumber.org>
32391d
Date:   Thu Nov 18 09:56:57 2021 -0800
32391d
32391d
    vdpa: align uapi headers
32391d
32391d
    Update vdpa headers based on 5.16.0-rc1 and remove redundant
32391d
    copy.
32391d
32391d
    Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
32391d
---
32391d
 include/uapi/linux/vdpa.h            | 40 ----------------------------
32391d
 vdpa/include/uapi/linux/vdpa.h       |  7 +++++
32391d
 vdpa/include/uapi/linux/virtio_ids.h | 26 ++++++++++++++++++
32391d
 3 files changed, 33 insertions(+), 40 deletions(-)
32391d
 delete mode 100644 include/uapi/linux/vdpa.h
32391d
32391d
diff --git a/include/uapi/linux/vdpa.h b/include/uapi/linux/vdpa.h
32391d
deleted file mode 100644
32391d
index 37ae26b6..00000000
32391d
--- a/include/uapi/linux/vdpa.h
32391d
+++ /dev/null
32391d
@@ -1,40 +0,0 @@
32391d
-/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
32391d
-/*
32391d
- * vdpa device management interface
32391d
- * Copyright (c) 2020 Mellanox Technologies Ltd. All rights reserved.
32391d
- */
32391d
-
32391d
-#ifndef _LINUX_VDPA_H_
32391d
-#define _LINUX_VDPA_H_
32391d
-
32391d
-#define VDPA_GENL_NAME "vdpa"
32391d
-#define VDPA_GENL_VERSION 0x1
32391d
-
32391d
-enum vdpa_command {
32391d
-	VDPA_CMD_UNSPEC,
32391d
-	VDPA_CMD_MGMTDEV_NEW,
32391d
-	VDPA_CMD_MGMTDEV_GET,		/* can dump */
32391d
-	VDPA_CMD_DEV_NEW,
32391d
-	VDPA_CMD_DEV_DEL,
32391d
-	VDPA_CMD_DEV_GET,		/* can dump */
32391d
-};
32391d
-
32391d
-enum vdpa_attr {
32391d
-	VDPA_ATTR_UNSPEC,
32391d
-
32391d
-	/* bus name (optional) + dev name together make the parent device handle */
32391d
-	VDPA_ATTR_MGMTDEV_BUS_NAME,		/* string */
32391d
-	VDPA_ATTR_MGMTDEV_DEV_NAME,		/* string */
32391d
-	VDPA_ATTR_MGMTDEV_SUPPORTED_CLASSES,	/* u64 */
32391d
-
32391d
-	VDPA_ATTR_DEV_NAME,			/* string */
32391d
-	VDPA_ATTR_DEV_ID,			/* u32 */
32391d
-	VDPA_ATTR_DEV_VENDOR_ID,		/* u32 */
32391d
-	VDPA_ATTR_DEV_MAX_VQS,			/* u32 */
32391d
-	VDPA_ATTR_DEV_MAX_VQ_SIZE,		/* u16 */
32391d
-
32391d
-	/* new attributes must be added above here */
32391d
-	VDPA_ATTR_MAX,
32391d
-};
32391d
-
32391d
-#endif
32391d
diff --git a/vdpa/include/uapi/linux/vdpa.h b/vdpa/include/uapi/linux/vdpa.h
32391d
index 37ae26b6..b7eab069 100644
32391d
--- a/vdpa/include/uapi/linux/vdpa.h
32391d
+++ b/vdpa/include/uapi/linux/vdpa.h
32391d
@@ -17,6 +17,7 @@ enum vdpa_command {
32391d
 	VDPA_CMD_DEV_NEW,
32391d
 	VDPA_CMD_DEV_DEL,
32391d
 	VDPA_CMD_DEV_GET,		/* can dump */
32391d
+	VDPA_CMD_DEV_CONFIG_GET,	/* can dump */
32391d
 };
32391d
 
32391d
 enum vdpa_attr {
32391d
@@ -32,6 +33,12 @@ enum vdpa_attr {
32391d
 	VDPA_ATTR_DEV_VENDOR_ID,		/* u32 */
32391d
 	VDPA_ATTR_DEV_MAX_VQS,			/* u32 */
32391d
 	VDPA_ATTR_DEV_MAX_VQ_SIZE,		/* u16 */
32391d
+	VDPA_ATTR_DEV_MIN_VQ_SIZE,		/* u16 */
32391d
+
32391d
+	VDPA_ATTR_DEV_NET_CFG_MACADDR,		/* binary */
32391d
+	VDPA_ATTR_DEV_NET_STATUS,		/* u8 */
32391d
+	VDPA_ATTR_DEV_NET_CFG_MAX_VQP,		/* u16 */
32391d
+	VDPA_ATTR_DEV_NET_CFG_MTU,		/* u16 */
32391d
 
32391d
 	/* new attributes must be added above here */
32391d
 	VDPA_ATTR_MAX,
32391d
diff --git a/vdpa/include/uapi/linux/virtio_ids.h b/vdpa/include/uapi/linux/virtio_ids.h
32391d
index bc1c0621..80d76b75 100644
32391d
--- a/vdpa/include/uapi/linux/virtio_ids.h
32391d
+++ b/vdpa/include/uapi/linux/virtio_ids.h
32391d
@@ -51,8 +51,34 @@
32391d
 #define VIRTIO_ID_PSTORE		22 /* virtio pstore device */
32391d
 #define VIRTIO_ID_IOMMU			23 /* virtio IOMMU */
32391d
 #define VIRTIO_ID_MEM			24 /* virtio mem */
32391d
+#define VIRTIO_ID_SOUND			25 /* virtio sound */
32391d
 #define VIRTIO_ID_FS			26 /* virtio filesystem */
32391d
 #define VIRTIO_ID_PMEM			27 /* virtio pmem */
32391d
+#define VIRTIO_ID_RPMB			28 /* virtio rpmb */
32391d
 #define VIRTIO_ID_MAC80211_HWSIM	29 /* virtio mac80211-hwsim */
32391d
+#define VIRTIO_ID_VIDEO_ENCODER		30 /* virtio video encoder */
32391d
+#define VIRTIO_ID_VIDEO_DECODER		31 /* virtio video decoder */
32391d
+#define VIRTIO_ID_SCMI			32 /* virtio SCMI */
32391d
+#define VIRTIO_ID_NITRO_SEC_MOD		33 /* virtio nitro secure module*/
32391d
+#define VIRTIO_ID_I2C_ADAPTER		34 /* virtio i2c adapter */
32391d
+#define VIRTIO_ID_WATCHDOG		35 /* virtio watchdog */
32391d
+#define VIRTIO_ID_CAN			36 /* virtio can */
32391d
+#define VIRTIO_ID_DMABUF		37 /* virtio dmabuf */
32391d
+#define VIRTIO_ID_PARAM_SERV		38 /* virtio parameter server */
32391d
+#define VIRTIO_ID_AUDIO_POLICY		39 /* virtio audio policy */
32391d
+#define VIRTIO_ID_BT			40 /* virtio bluetooth */
32391d
+#define VIRTIO_ID_GPIO			41 /* virtio gpio */
32391d
+
32391d
+/*
32391d
+ * Virtio Transitional IDs
32391d
+ */
32391d
+
32391d
+#define VIRTIO_TRANS_ID_NET		1000 /* transitional virtio net */
32391d
+#define VIRTIO_TRANS_ID_BLOCK		1001 /* transitional virtio block */
32391d
+#define VIRTIO_TRANS_ID_BALLOON		1002 /* transitional virtio balloon */
32391d
+#define VIRTIO_TRANS_ID_CONSOLE		1003 /* transitional virtio console */
32391d
+#define VIRTIO_TRANS_ID_SCSI		1004 /* transitional virtio SCSI */
32391d
+#define VIRTIO_TRANS_ID_RNG		1005 /* transitional virtio rng */
32391d
+#define VIRTIO_TRANS_ID_9P		1009 /* transitional virtio 9p console */
32391d
 
32391d
 #endif /* _LINUX_VIRTIO_IDS_H */
32391d
-- 
32391d
2.34.1
32391d