Merge tag 'loongarch-kvm-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson into HEAD

LoongArch KVM changes for v6.9 * Set reserved bits as zero in CPUCFG. * Start SW timer only when vcpu is blocking. * Do not restart SW timer when it is expired. * Remove unnecessary CSR register saving during enter guest.

Paolo Bonzini committed 2 years ago

Commit 233d0bc2 parents 7d8942d b99f783990 files · +9876 −5092Browse files

Showing the changes to include/uapi (6 of 990 files). Show all

Unified · Split

6 files

include/uapi/drm/nouveau_drm.h +14 −0
include/uapi/drm/xe_drm.h +1 −21
include/uapi/linux/iio/types.h +2 −2
include/uapi/linux/in6.h +1 −1
include/uapi/sound/asound.h +2 −2
include/uapi/xen/gntalloc.h +4 −1

include/uapi/drm/nouveau_drm.h+14−0

@@ -54,6 +54,20 @@ extern "C" { · 53 unmodified lines
54	54	*/
55	55	#define NOUVEAU_GETPARAM_EXEC_PUSH_MAX 17
56	56
	57	+/*
	58	+ * NOUVEAU_GETPARAM_VRAM_BAR_SIZE - query bar size
	59	+ *
	60	+ * Query the VRAM BAR size.
	61	+ */
	62	+#define NOUVEAU_GETPARAM_VRAM_BAR_SIZE 18
	63	+
	64	+/*
	65	+ * NOUVEAU_GETPARAM_VRAM_USED
	66	+ *
	67	+ * Get remaining VRAM size.
	68	+ */
	69	+#define NOUVEAU_GETPARAM_VRAM_USED 19
	70	+
57	71	struct drm_nouveau_getparam {
58	72	__u64 param;
59	73	__u64 value;

include/uapi/drm/xe_drm.h+1−21

@@ -831,11 +831,6 @@ struct drm_xe_vm_destroy { · 830 unmodified lines
831	831	* - %DRM_XE_VM_BIND_OP_PREFETCH
832	832	*
833	833	* and the @flags can be:
834		− * - %DRM_XE_VM_BIND_FLAG_READONLY
835		− * - %DRM_XE_VM_BIND_FLAG_ASYNC
836		− * - %DRM_XE_VM_BIND_FLAG_IMMEDIATE - Valid on a faulting VM only, do the
837		− * MAP operation immediately rather than deferring the MAP to the page
838		− * fault handler.
839	834	* - %DRM_XE_VM_BIND_FLAG_NULL - When the NULL flag is set, the page
840	835	* tables are setup with a special bit which indicates writes are
841	836	* dropped and all reads return zero. In the future, the NULL flags
@@ -928,9 +923,8 @@ struct drm_xe_vm_bind_op { · 86 unmodified lines
928	923	/** @op: Bind operation to perform */
929	924	__u32 op;
930	925
931		−#define DRM_XE_VM_BIND_FLAG_READONLY (1 << 0)
932		−#define DRM_XE_VM_BIND_FLAG_IMMEDIATE (1 << 1)
933	926	#define DRM_XE_VM_BIND_FLAG_NULL (1 << 2)
	927	+#define DRM_XE_VM_BIND_FLAG_DUMPABLE (1 << 3)
934	928	/** @flags: Bind flags */
935	929	__u32 flags;
936	930
@@ -1045,20 +1039,6 @@ struct drm_xe_exec_queue_create { · 108 unmodified lines
1045	1039	#define DRM_XE_EXEC_QUEUE_EXTENSION_SET_PROPERTY 0
1046	1040	#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY 0
1047	1041	#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_TIMESLICE 1
1048		−#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_PREEMPTION_TIMEOUT 2
1049		−#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_PERSISTENCE 3
1050		−#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_JOB_TIMEOUT 4
1051		−#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER 5
1052		−#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_ACC_NOTIFY 6
1053		−#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_ACC_GRANULARITY 7
1054		−/* Monitor 128KB contiguous region with 4K sub-granularity */
1055		−#define DRM_XE_ACC_GRANULARITY_128K 0
1056		−/* Monitor 2MB contiguous region with 64KB sub-granularity */
1057		−#define DRM_XE_ACC_GRANULARITY_2M 1
1058		−/* Monitor 16MB contiguous region with 512KB sub-granularity */
1059		−#define DRM_XE_ACC_GRANULARITY_16M 2
1060		−/* Monitor 64MB contiguous region with 2M sub-granularity */
1061		−#define DRM_XE_ACC_GRANULARITY_64M 3
1062	1042
1063	1043	/** @extensions: Pointer to the first extension struct, if any */
1064	1044	__u64 extensions;

include/uapi/linux/iio/types.h+2−2

@@ -91,8 +91,6 @@ enum iio_modifier { · 90 unmodified lines
91	91	IIO_MOD_CO2,
92	92	IIO_MOD_VOC,
93	93	IIO_MOD_LIGHT_UV,
94		− IIO_MOD_LIGHT_UVA,
95		− IIO_MOD_LIGHT_UVB,
96	94	IIO_MOD_LIGHT_DUV,
97	95	IIO_MOD_PM1,
98	96	IIO_MOD_PM2P5,
@@ -107,6 +105,8 @@ enum iio_modifier { · 8 unmodified lines
107	105	IIO_MOD_PITCH,
108	106	IIO_MOD_YAW,
109	107	IIO_MOD_ROLL,
	108	+ IIO_MOD_LIGHT_UVA,
	109	+ IIO_MOD_LIGHT_UVB,
110	110	};
111	111
112	112	enum iio_event_type {

include/uapi/linux/in6.h+1−1

@@ -145,7 +145,7 @@ struct in6_flowlabel_req { · 144 unmodified lines
145	145	#define IPV6_TLV_PADN 1
146	146	#define IPV6_TLV_ROUTERALERT 5
147	147	#define IPV6_TLV_CALIPSO 7 /* RFC 5570 */
148		−#define IPV6_TLV_IOAM 49 /* TEMPORARY IANA allocation for IOAM */
	148	+#define IPV6_TLV_IOAM 49 /* RFC 9486 */
149	149	#define IPV6_TLV_JUMBO 194
150	150	#define IPV6_TLV_HAO 201 /* home address option */
151	151

include/uapi/sound/asound.h+2−2

@@ -142,7 +142,7 @@ struct snd_hwdep_dsp_image { · 141 unmodified lines
142	142	* *
143	143	*****************************************************************************/
144	144
145		−#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 16)
	145	+#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 17)
146	146
147	147	typedef unsigned long snd_pcm_uframes_t;
148	148	typedef signed long snd_pcm_sframes_t;
@@ -416,7 +416,7 @@ struct snd_pcm_hw_params { · 267 unmodified lines
416	416	unsigned int rmask; /* W: requested masks */
417	417	unsigned int cmask; /* R: changed masks */
418	418	unsigned int info; /* R: Info flags for returned setup */
419		− unsigned int msbits; /* R: used most significant bits */
	419	+ unsigned int msbits; /* R: used most significant bits (in sample bit-width) */
420	420	unsigned int rate_num; /* R: rate numerator */
421	421	unsigned int rate_den; /* R: rate denominator */
422	422	snd_pcm_uframes_t fifo_size; /* R: chip FIFO size in frames */

include/uapi/xen/gntalloc.h+4−1

@@ -31,7 +31,10 @@ struct ioctl_gntalloc_alloc_gref { · 30 unmodified lines
31	31	__u64 index;
32	32	/* The grant references of the newly created grant, one per page */
33	33	/* Variable size, depending on count */
34		− __u32 gref_ids[1];
	34	+ union {
	35	+ __u32 gref_ids[1];
	36	+ __DECLARE_FLEX_ARRAY(__u32, gref_ids_flex);
	37	+ };
35	38	};
36	39
37	40	#define GNTALLOC_FLAG_WRITABLE 1

Merge tag 'loongarch-kvm-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson into HEAD

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code