Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Jakub Kicinski committed 5 years ago

Commit 1d9f03c2 parents e4abfd8 1466205397 files · +3926 −2622Browse files

Showing the changes to include/uapi (3 of 397 files). Show all

Unified · Split

3 files

@@ -213,7 +213,7 @@ struct cache_sb_disk { · 212 unmodified lines
213	__le16 keys;	213	__le16 keys;
214	};	214	};
215	__le64 d[SB_JOURNAL_BUCKETS]; /* journal buckets */	215	__le64 d[SB_JOURNAL_BUCKETS]; /* journal buckets */
216	__le16 bucket_size_hi;	216	__le16 obso_bucket_size_hi; /* obsoleted */
217	};	217	};
218		218
219	/*	219	/*

 #define KVM_EXIT_X86_RDMSR        29
 #define KVM_EXIT_X86_WRMSR        30
 #define KVM_EXIT_DIRTY_RING_FULL  31
+#define KVM_EXIT_AP_RESET_HOLD    32
 /* For KVM_EXIT_INTERNAL_ERROR */
 /* Emulate instruction failed. */
 #define KVM_MP_STATE_CHECK_STOP        6
 #define KVM_MP_STATE_OPERATING         7
 #define KVM_MP_STATE_LOAD              8
+#define KVM_MP_STATE_AP_RESET_HOLD     9
 struct kvm_mp_state {
 	__u32 mp_state;

  * HL_INFO_CLK_THROTTLE_REASON - Retrieve clock throttling reason
  * HL_INFO_SYNC_MANAGER  - Retrieve sync manager info per dcore
  * HL_INFO_TOTAL_ENERGY  - Retrieve total energy consumption
+ * HL_INFO_PLL_FREQUENCY - Retrieve PLL frequency
  */
 #define HL_INFO_HW_IP_INFO		0
 #define HL_INFO_HW_EVENTS		1
  * @ctx_device_in_reset_drop_cnt: context dropped due to device in reset
  * @total_max_cs_in_flight_drop_cnt: total dropped due to maximum CS in-flight
  * @ctx_max_cs_in_flight_drop_cnt: context dropped due to maximum CS in-flight
+ * @total_validation_drop_cnt: total dropped due to validation error
+ * @ctx_validation_drop_cnt: context dropped due to validation error
  */
 struct hl_info_cs_counters {
 	__u64 total_out_of_mem_drop_cnt;
 	__u64 ctx_device_in_reset_drop_cnt;
 	__u64 total_max_cs_in_flight_drop_cnt;
 	__u64 ctx_max_cs_in_flight_drop_cnt;
+	__u64 total_validation_drop_cnt;
+	__u64 ctx_validation_drop_cnt;
 };
 enum gaudi_dcores {

Keyboard shortcuts