Merge tag 'qcom-fixes-for-4.3-rc1' into base-for-4.4 (f1fed8c0) · Commits · e / devices / android_kernel_sony_msm8998

drivers/firmware/Kconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,14 @@ config QCOM_SCM
		bool
		depends on ARM \|\| ARM64

		config QCOM_SCM_32
		def_bool y
		depends on QCOM_SCM && ARM

		config QCOM_SCM_64
		def_bool y
		depends on QCOM_SCM && ARM64

		source "drivers/firmware/broadcom/Kconfig"
		source "drivers/firmware/google/Kconfig"
		source "drivers/firmware/efi/Kconfig"

drivers/firmware/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,8 @@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o
		obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o
		obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o
		obj-$(CONFIG_QCOM_SCM) += qcom_scm.o
		obj-$(CONFIG_QCOM_SCM) += qcom_scm-32.o
		obj-$(CONFIG_QCOM_SCM_64) += qcom_scm-64.o
		obj-$(CONFIG_QCOM_SCM_32) += qcom_scm-32.o
		CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)

		obj-y += broadcom/

drivers/firmware/qcom_scm-64.c

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		#include <linux/io.h>
		#include <linux/errno.h>
		#include <linux/qcom_scm.h>

		/**
		* qcom_scm_set_cold_boot_addr() - Set the cold boot address for cpus
		* @entry: Entry point function for the cpus
		* @cpus: The cpumask of cpus that will use the entry point
		*
		* Set the cold boot address of the cpus. Any cpu outside the supported
		* range would be removed from the cpu present mask.
		*/
		int __qcom_scm_set_cold_boot_addr(void entry, const cpumask_t cpus)
		{
		return -ENOTSUPP;
		}

		/**
		* qcom_scm_set_warm_boot_addr() - Set the warm boot address for cpus
		* @entry: Entry point function for the cpus
		* @cpus: The cpumask of cpus that will use the entry point
		*
		* Set the Linux entry point for the SCM to transfer control to when coming
		* out of a power down. CPU power down may be executed on cpuidle or hotplug.
		*/
		int __qcom_scm_set_warm_boot_addr(void entry, const cpumask_t cpus)
		{
		return -ENOTSUPP;
		}

		/**
		* qcom_scm_cpu_power_down() - Power down the cpu
		* @flags - Flags to flush cache
		*
		* This is an end point to power down cpu. If there was a pending interrupt,
		* the control would return from this function, otherwise, the cpu jumps to the
		* warm boot entry point set for this cpu upon reset.
		*/
		void __qcom_scm_cpu_power_down(u32 flags)
		{
		}

		int __qcom_scm_is_call_available(u32 svc_id, u32 cmd_id)
		{
		return -ENOTSUPP;
		}

		int __qcom_scm_hdcp_req(struct qcom_scm_hdcp_req req, u32 req_cnt, u32 resp)
		{
		return -ENOTSUPP;
		}