Unverified Commit dfae9478 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-drivers-for-6.7-2' of... 

Merge tag 'qcom-drivers-for-6.7-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/drivers

More Qualcomm driver updates for v6.7

The Qualcomm SMC an QSEECOM drivers are moved into a "qcom"
subdirectory, to declutter the base directory. Missing include guards
are added to the qseecom header file. Unneded extern specifiers are
removed from the scm call wrappers.

__counted_by is added to the apr_rx_buf structure, in the APR driver.

Lastly in the pmic_glink driver the pmic_glink drm_bridge type is
corrected to DisplayPort, over the incorrect "USB" value. The return
values are added to error prints for the various typec set() calls.

* tag 'qcom-drivers-for-6.7-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  soc: qcom: pmic_glink_altmode: Print return value on error
  firmware: qcom: scm: remove unneeded 'extern' specifiers
  firmware: qcom: scm: add a missing forward declaration for struct device
  firmware: qcom: move Qualcomm code into its own directory
  soc: qcom: apr: Add __counted_by for struct apr_rx_buf and use struct_size()
  soc: qcom: pmic_glink: fix connector type to be DisplayPort
  firmware: qcom: qseecom: add missing include guards

Link: https://lore.kernel.org/r/20231025201109.1016121-1-andersson@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 759c2e04 723d3461

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -17805,13 +17805,13 @@ QUALCOMM QSEECOM DRIVER 
M:	Maximilian Luz <luzmaximilian@gmail.com>

L:	linux-arm-msm@vger.kernel.org

S:	Maintained

F:	drivers/firmware/qcom_qseecom.c

F:	drivers/firmware/qcom/qcom_qseecom.c









QUALCOMM QSEECOM UEFISECAPP DRIVER









M:	Maximilian Luz <luzmaximilian@gmail.com>









L:	linux-arm-msm@vger.kernel.org









S:	Maintained









F:	drivers/firmware/qcom_qseecom_uefisecapp.c









F:	drivers/firmware/qcom/qcom_qseecom_uefisecapp.c

















QUALCOMM RMNET DRIVER









M:	Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com>

























drivers/firmware/Kconfig



+1
−47






























Original line number
Diff line number
Diff line







@@ -212,53 +212,6 @@ config MTK_ADSP_IPC







	  ADSP exists on some mtk processors.









	  Client might use shared memory to exchange information with ADSP.



















config QCOM_SCM









	tristate



















config QCOM_SCM_DOWNLOAD_MODE_DEFAULT









	bool "Qualcomm download mode enabled by default"









	depends on QCOM_SCM









	help









	  A device with "download mode" enabled will upon an unexpected









	  warm-restart enter a special debug mode that allows the user to









	  "download" memory content over USB for offline postmortem analysis.









	  The feature can be enabled/disabled on the kernel command line.



















	  Say Y here to enable "download mode" by default.



















config QCOM_QSEECOM









	bool "Qualcomm QSEECOM interface driver"









	depends on QCOM_SCM=y









	select AUXILIARY_BUS









	help









	  Various Qualcomm SoCs have a Secure Execution Environment (SEE) running









	  in the Trust Zone. This module provides an interface to that via the









	  QSEECOM mechanism, using SCM calls.



















	  The QSEECOM interface allows, among other things, access to applications









	  running in the SEE. An example of such an application is 'uefisecapp',









	  which is required to access UEFI variables on certain systems. If









	  selected, the interface will also attempt to detect and register client









	  devices for supported applications.



















	  Select Y here to enable the QSEECOM interface driver.



















config QCOM_QSEECOM_UEFISECAPP









	bool "Qualcomm SEE UEFI Secure App client driver"









	depends on QCOM_QSEECOM









	depends on EFI









	help









	  Various Qualcomm SoCs do not allow direct access to EFI variables.









	  Instead, these need to be accessed via the UEFI Secure Application









	  (uefisecapp), residing in the Secure Execution Environment (SEE).



















	  This module provides a client driver for uefisecapp, installing efivar









	  operations to allow the kernel accessing EFI variables, and via that also









	  provide user-space with access to EFI variables via efivarfs.



















	  Select Y here to provide access to EFI variables on the aforementioned









	  platforms.



















config SYSFB









	bool









	select BOOT_VESA_SUPPORT








@@ -344,6 +297,7 @@ source "drivers/firmware/efi/Kconfig"







source "drivers/firmware/imx/Kconfig"









source "drivers/firmware/meson/Kconfig"









source "drivers/firmware/psci/Kconfig"









source "drivers/firmware/qcom/Kconfig"









source "drivers/firmware/smccc/Kconfig"









source "drivers/firmware/tegra/Kconfig"









source "drivers/firmware/xilinx/Kconfig"
































drivers/firmware/Makefile



+1
−4






























Original line number
Diff line number
Diff line







@@ -18,10 +18,6 @@ obj-$(CONFIG_FIRMWARE_MEMMAP)	+= memmap.o







obj-$(CONFIG_MTK_ADSP_IPC)	+= mtk-adsp-ipc.o









obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o









obj-$(CONFIG_FW_CFG_SYSFS)	+= qemu_fw_cfg.o









obj-$(CONFIG_QCOM_SCM)		+= qcom-scm.o









qcom-scm-objs += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o









obj-$(CONFIG_QCOM_QSEECOM)	+= qcom_qseecom.o









obj-$(CONFIG_QCOM_QSEECOM_UEFISECAPP) += qcom_qseecom_uefisecapp.o









obj-$(CONFIG_SYSFB)		+= sysfb.o









obj-$(CONFIG_SYSFB_SIMPLEFB)	+= sysfb_simplefb.o









obj-$(CONFIG_TI_SCI_PROTOCOL)	+= ti_sci.o








@@ -37,6 +33,7 @@ obj-$(CONFIG_GOOGLE_FIRMWARE)	+= google/







obj-y				+= efi/









obj-y				+= imx/









obj-y				+= psci/









obj-y				+= qcom/









obj-y				+= smccc/









obj-y				+= tegra/









obj-y				+= xilinx/
























drivers/firmware/qcom/Kconfig
0 → 100644



+56
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









#









# For a description of the syntax of this configuration file,









# see Documentation/kbuild/kconfig-language.rst.









#



















menu "Qualcomm firmware drivers"



















config QCOM_SCM









	tristate



















config QCOM_SCM_DOWNLOAD_MODE_DEFAULT









	bool "Qualcomm download mode enabled by default"









	depends on QCOM_SCM









	help









	  A device with "download mode" enabled will upon an unexpected









	  warm-restart enter a special debug mode that allows the user to









	  "download" memory content over USB for offline postmortem analysis.









	  The feature can be enabled/disabled on the kernel command line.



















	  Say Y here to enable "download mode" by default.



















config QCOM_QSEECOM









	bool "Qualcomm QSEECOM interface driver"









	depends on QCOM_SCM=y









	select AUXILIARY_BUS









	help









	  Various Qualcomm SoCs have a Secure Execution Environment (SEE) running









	  in the Trust Zone. This module provides an interface to that via the









	  QSEECOM mechanism, using SCM calls.



















	  The QSEECOM interface allows, among other things, access to applications









	  running in the SEE. An example of such an application is 'uefisecapp',









	  which is required to access UEFI variables on certain systems. If









	  selected, the interface will also attempt to detect and register client









	  devices for supported applications.



















	  Select Y here to enable the QSEECOM interface driver.



















config QCOM_QSEECOM_UEFISECAPP









	bool "Qualcomm SEE UEFI Secure App client driver"









	depends on QCOM_QSEECOM









	depends on EFI









	help









	  Various Qualcomm SoCs do not allow direct access to EFI variables.









	  Instead, these need to be accessed via the UEFI Secure Application









	  (uefisecapp), residing in the Secure Execution Environment (SEE).



















	  This module provides a client driver for uefisecapp, installing efivar









	  operations to allow the kernel accessing EFI variables, and via that also









	  provide user-space with access to EFI variables via efivarfs.



















	  Select Y here to provide access to EFI variables on the aforementioned









	  platforms.



















endmenu
























drivers/firmware/qcom/Makefile
0 → 100644



+9
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









#









# Makefile for the linux kernel.









#



















obj-$(CONFIG_QCOM_SCM)		+= qcom-scm.o









qcom-scm-objs += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o









obj-$(CONFIG_QCOM_QSEECOM)	+= qcom_qseecom.o









obj-$(CONFIG_QCOM_QSEECOM_UEFISECAPP) += qcom_qseecom_uefisecapp.o