Commit e07cd2f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 0653161f 384b77fd

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -9240,7 +9240,7 @@ F: tools/testing/selftests/sgx/* 
K:	\bSGX_









INTERCONNECT API









M:	Georgi Djakov <georgi.djakov@linaro.org>









M:	Georgi Djakov <djakov@kernel.org>









L:	linux-pm@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/interconnect/








@@ -16709,6 +16709,8 @@ M:	Samuel Thibault <samuel.thibault@ens-lyon.org>







L:	speakup@linux-speakup.org









S:	Odd Fixes









W:	http://www.linux-speakup.org/









W:	https://github.com/linux-speakup/speakup









B:	https://github.com/linux-speakup/speakup/issues









F:	drivers/accessibility/speakup/

















SPEAR CLOCK FRAMEWORK SUPPORT
































crypto/asymmetric_keys/asym_tpm.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -354,7 +354,7 @@ static uint32_t derive_pub_key(const void *pub_key, uint32_t len, uint8_t *buf)







	memcpy(cur, e, sizeof(e));









	cur += sizeof(e);









	/* Zero parameters to satisfy set_pub_key ABI. */









	memset(cur, 0, SETKEY_PARAMS_SIZE);









	memzero_explicit(cur, SETKEY_PARAMS_SIZE);



















	return cur - buf;









}
































drivers/interconnect/imx/imx.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -96,9 +96,10 @@ static int imx_icc_node_init_qos(struct icc_provider *provider,







			return -ENODEV;









		}









		/* Allow scaling to be disabled on a per-node basis */









		if (!dn || !of_device_is_available(dn)) {









		if (!of_device_is_available(dn)) {









			dev_warn(dev, "Missing property %s, skip scaling %s\n",









				 adj->phandle_name, node->name);









			of_node_put(dn);









			return 0;









		}










































drivers/interconnect/imx/imx8mq.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -7,6 +7,7 @@

















#include <linux/module.h>









#include <linux/platform_device.h>









#include <linux/interconnect-provider.h>









#include <dt-bindings/interconnect/imx8mq.h>



















#include "imx.h"








@@ -94,6 +95,7 @@ static struct platform_driver imx8mq_icc_driver = {







	.remove = imx8mq_icc_remove,









	.driver = {









		.name = "imx8mq-interconnect",









		.sync_state = icc_sync_state,









	},









};










































drivers/interconnect/qcom/Kconfig



+15
−8






























Original line number
Diff line number
Diff line







@@ -42,13 +42,23 @@ config INTERCONNECT_QCOM_QCS404







	  This is a driver for the Qualcomm Network-on-Chip on qcs404-based









	  platforms.



















config INTERCONNECT_QCOM_RPMH_POSSIBLE









	tristate









	default INTERCONNECT_QCOM









	depends on QCOM_RPMH || (COMPILE_TEST && !QCOM_RPMH)









	depends on QCOM_COMMAND_DB || (COMPILE_TEST && !QCOM_COMMAND_DB)









	depends on OF || COMPILE_TEST









	help









	  Compile-testing RPMH drivers is possible on other platforms,









	  but in order to avoid link failures, drivers must not be built-in









	  when QCOM_RPMH or QCOM_COMMAND_DB are loadable modules



















config INTERCONNECT_QCOM_RPMH









	tristate



















config INTERCONNECT_QCOM_SC7180









	tristate "Qualcomm SC7180 interconnect driver"









	depends on INTERCONNECT_QCOM









	depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST









	depends on INTERCONNECT_QCOM_RPMH_POSSIBLE









	select INTERCONNECT_QCOM_RPMH









	select INTERCONNECT_QCOM_BCM_VOTER









	help








@@ -57,8 +67,7 @@ config INTERCONNECT_QCOM_SC7180

















config INTERCONNECT_QCOM_SDM845









	tristate "Qualcomm SDM845 interconnect driver"









	depends on INTERCONNECT_QCOM









	depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST









	depends on INTERCONNECT_QCOM_RPMH_POSSIBLE









	select INTERCONNECT_QCOM_RPMH









	select INTERCONNECT_QCOM_BCM_VOTER









	help








@@ -67,8 +76,7 @@ config INTERCONNECT_QCOM_SDM845

















config INTERCONNECT_QCOM_SM8150









	tristate "Qualcomm SM8150 interconnect driver"









	depends on INTERCONNECT_QCOM









	depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST









	depends on INTERCONNECT_QCOM_RPMH_POSSIBLE









	select INTERCONNECT_QCOM_RPMH









	select INTERCONNECT_QCOM_BCM_VOTER









	help








@@ -77,8 +85,7 @@ config INTERCONNECT_QCOM_SM8150

















config INTERCONNECT_QCOM_SM8250









	tristate "Qualcomm SM8250 interconnect driver"









	depends on INTERCONNECT_QCOM









	depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST









	depends on INTERCONNECT_QCOM_RPMH_POSSIBLE









	select INTERCONNECT_QCOM_RPMH









	select INTERCONNECT_QCOM_BCM_VOTER









	help