History

Merge tag 'char-misc-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver fixes from Greg KH: "Here are some small char and misc driver fixes for 5.11-rc3. The majority here are fixes for the habanalabs drivers, but also in here are: - crypto driver fix - pvpanic driver fix - updated font file - interconnect driver fixes All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (26 commits) Fonts: font_ter16x32: Update font with new upstream Terminus release misc: pvpanic: Check devm_ioport_map() for NULL speakup: Add github repository URL and bug tracker MAINTAINERS: Update Georgi's email address crypto: asym_tpm: correct zero out potential secrets habanalabs: Fix memleak in hl_device_reset interconnect: imx8mq: Use icc_sync_state interconnect: imx: Remove a useless test interconnect: imx: Add a missing of_node_put after of_device_is_available interconnect: qcom: fix rpmh link failures habanalabs: fix order of status check habanalabs: register to pci shutdown callback habanalabs: add validation cs counter, fix misplaced counters habanalabs/gaudi: retry loading TPC f/w on -EINTR habanalabs: adjust pci controller init to new firmware habanalabs: update comment in hl_boot_if.h habanalabs/gaudi: enhance reset message habanalabs: full FW hard reset support habanalabs/gaudi: disable CGM at HW initialization habanalabs: Revise comment to align with mirror list name ...

Linus Torvalds committed 5 years ago

Commit e07cd2f2 parents 0653161 384b77f21 files · +322 −217Browse files

Showing the changes to include/uapi (1 of 21 files). Show all

Unified · Split

include/uapi/misc/habanalabs.h+5−0
@@ -279,6 +279,7 @@ enum hl_device_status { · 278 unmodified lines
279 * HL_INFO_CLK_THROTTLE_REASON - Retrieve clock throttling reason279 * HL_INFO_CLK_THROTTLE_REASON - Retrieve clock throttling reason
280 * HL_INFO_SYNC_MANAGER - Retrieve sync manager info per dcore280 * HL_INFO_SYNC_MANAGER - Retrieve sync manager info per dcore
281 * HL_INFO_TOTAL_ENERGY - Retrieve total energy consumption281 * HL_INFO_TOTAL_ENERGY - Retrieve total energy consumption
282 * HL_INFO_PLL_FREQUENCY - Retrieve PLL frequency
282 */283 */
283#define HL_INFO_HW_IP_INFO 0284#define HL_INFO_HW_IP_INFO 0
284#define HL_INFO_HW_EVENTS 1285#define HL_INFO_HW_EVENTS 1
@@ -425,6 +426,8 @@ struct hl_info_sync_manager { · 140 unmodified lines
425 * @ctx_device_in_reset_drop_cnt: context dropped due to device in reset426 * @ctx_device_in_reset_drop_cnt: context dropped due to device in reset
426 * @total_max_cs_in_flight_drop_cnt: total dropped due to maximum CS in-flight427 * @total_max_cs_in_flight_drop_cnt: total dropped due to maximum CS in-flight
427 * @ctx_max_cs_in_flight_drop_cnt: context dropped due to maximum CS in-flight428 * @ctx_max_cs_in_flight_drop_cnt: context dropped due to maximum CS in-flight
429 * @total_validation_drop_cnt: total dropped due to validation error
430 * @ctx_validation_drop_cnt: context dropped due to validation error
428 */431 */
429struct hl_info_cs_counters {432struct hl_info_cs_counters {
430 __u64 total_out_of_mem_drop_cnt;433 __u64 total_out_of_mem_drop_cnt;
@@ -437,6 +440,8 @@ struct hl_info_cs_counters { · 6 unmodified lines
437 __u64 ctx_device_in_reset_drop_cnt;440 __u64 ctx_device_in_reset_drop_cnt;
438 __u64 total_max_cs_in_flight_drop_cnt;441 __u64 total_max_cs_in_flight_drop_cnt;
439 __u64 ctx_max_cs_in_flight_drop_cnt;442 __u64 ctx_max_cs_in_flight_drop_cnt;
443 __u64 total_validation_drop_cnt;
444 __u64 ctx_validation_drop_cnt;
440};445};
441 446
442enum gaudi_dcores {447enum gaudi_dcores {