Merge tag 'qcom-soc-for-4.5' of... (47ec7e0b) · Commits · 戴 / test

MAINTAINERS

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1401,11 +1401,13 @@ S: Maintained

	ARM/QUALCOMM SUPPORT		ARM/QUALCOMM SUPPORT
	M: Kumar Gala <galak@codeaurora.org>		M: Kumar Gala <galak@codeaurora.org>
	M: Andy Gross <agross@codeaurora.org>		M: Andy Gross <andy.gross@linaro.org>
	M: David Brown <davidb@codeaurora.org>		M: David Brown <david.brown@linaro.org>
	L: linux-arm-msm@vger.kernel.org		L: linux-arm-msm@vger.kernel.org
	L: linux-soc@vger.kernel.org		L: linux-soc@vger.kernel.org
	S: Maintained		S: Maintained
			F: arch/arm/boot/dts/qcom-*.dts
			F: arch/arm/boot/dts/qcom-*.dtsi
	F: arch/arm/mach-qcom/		F: arch/arm/mach-qcom/
	F: drivers/soc/qcom/		F: drivers/soc/qcom/
	F: drivers/tty/serial/msm_serial.h		F: drivers/tty/serial/msm_serial.h
	@@ -1413,7 +1415,7 @@ F: drivers/tty/serial/msm_serial.c
	F: drivers//pm8???-		F: drivers//pm8???-
	F: drivers/mfd/ssbi.c		F: drivers/mfd/ssbi.c
	F: drivers/firmware/qcom_scm.c		F: drivers/firmware/qcom_scm.c
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git

	ARM/RADISYS ENP2611 MACHINE SUPPORT		ARM/RADISYS ENP2611 MACHINE SUPPORT
	M: Lennert Buytenhek <kernel@wantstofly.org>		M: Lennert Buytenhek <kernel@wantstofly.org>

drivers/soc/qcom/Kconfig

+27 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,7 @@ config QCOM_GSBI
	config QCOM_PM		config QCOM_PM
	bool "Qualcomm Power Management"		bool "Qualcomm Power Management"
	depends on ARCH_QCOM && !ARM64		depends on ARCH_QCOM && !ARM64
			select ARM_CPU_SUSPEND
	select QCOM_SCM		select QCOM_SCM
	help		help
	QCOM Platform specific power driver to manage cores and L2 low power		QCOM Platform specific power driver to manage cores and L2 low power
	@@ -49,3 +50,29 @@ config QCOM_SMD_RPM

	Say M here if you want to include support for the Qualcomm RPM as a		Say M here if you want to include support for the Qualcomm RPM as a
	module. This will build a module called "qcom-smd-rpm".		module. This will build a module called "qcom-smd-rpm".

			config QCOM_SMEM_STATE
			bool

			config QCOM_SMP2P
			tristate "Qualcomm Shared Memory Point to Point support"
			depends on QCOM_SMEM
			select QCOM_SMEM_STATE
			help
			Say yes here to support the Qualcomm Shared Memory Point to Point
			protocol.

			config QCOM_SMSM
			tristate "Qualcomm Shared Memory State Machine"
			depends on QCOM_SMEM
			select QCOM_SMEM_STATE
			help
			Say yes here to support the Qualcomm Shared Memory State Machine.
			The state machine is represented by bits in shared memory.

			config QCOM_WCNSS_CTRL
			tristate "Qualcomm WCNSS control driver"
			depends on QCOM_SMD
			help
			Client driver for the WCNSS_CTRL SMD channel, used to download nv
			firmware to a newly booted WCNSS chip.

drivers/soc/qcom/Makefile

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3,3 +3,7 @@ obj-$(CONFIG_QCOM_PM) += spm.o
	obj-$(CONFIG_QCOM_SMD) += smd.o		obj-$(CONFIG_QCOM_SMD) += smd.o
	obj-$(CONFIG_QCOM_SMD_RPM) += smd-rpm.o		obj-$(CONFIG_QCOM_SMD_RPM) += smd-rpm.o
	obj-$(CONFIG_QCOM_SMEM) += smem.o		obj-$(CONFIG_QCOM_SMEM) += smem.o
			obj-$(CONFIG_QCOM_SMEM_STATE) += smem_state.o
			obj-$(CONFIG_QCOM_SMP2P) += smp2p.o
			obj-$(CONFIG_QCOM_SMSM) += smsm.o
			obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o

drivers/soc/qcom/smd-rpm.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -219,6 +219,8 @@ static void qcom_smd_rpm_remove(struct qcom_smd_device *sdev)
	}		}

	static const struct of_device_id qcom_smd_rpm_of_match[] = {		static const struct of_device_id qcom_smd_rpm_of_match[] = {
			{ .compatible = "qcom,rpm-apq8084" },
			{ .compatible = "qcom,rpm-msm8916" },
	{ .compatible = "qcom,rpm-msm8974" },		{ .compatible = "qcom,rpm-msm8974" },
	{}		{}
	};		};

drivers/soc/qcom/smem_state.c

0 → 100644

+201 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (c) 2015, Sony Mobile Communications Inc.
			* Copyright (c) 2012-2013, 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/device.h>
			#include <linux/list.h>
			#include <linux/module.h>
			#include <linux/of.h>
			#include <linux/slab.h>
			#include <linux/soc/qcom/smem_state.h>

			static LIST_HEAD(smem_states);
			static DEFINE_MUTEX(list_lock);

			/**
			* struct qcom_smem_state - state context
			* @refcount: refcount for the state
			* @orphan: boolean indicator that this state has been unregistered
			* @list: entry in smem_states list
			* @of_node: of_node to use for matching the state in DT
			* @priv: implementation private data
			* @ops: ops for the state
			*/
			struct qcom_smem_state {
			struct kref refcount;
			bool orphan;

			struct list_head list;
			struct device_node *of_node;

			void *priv;

			struct qcom_smem_state_ops ops;
			};

			/**
			* qcom_smem_state_update_bits() - update the masked bits in state with value
			* @state: state handle acquired by calling qcom_smem_state_get()
			* @mask: bit mask for the change
			* @value: new value for the masked bits
			*
			* Returns 0 on success, otherwise negative errno.
			*/
			int qcom_smem_state_update_bits(struct qcom_smem_state *state,
			u32 mask,
			u32 value)
			{
			if (state->orphan)
			return -ENXIO;

			if (!state->ops.update_bits)
			return -ENOTSUPP;

			return state->ops.update_bits(state->priv, mask, value);
			}
			EXPORT_SYMBOL_GPL(qcom_smem_state_update_bits);

			static struct qcom_smem_state of_node_to_state(struct device_node np)
			{
			struct qcom_smem_state *state;

			mutex_lock(&list_lock);

			list_for_each_entry(state, &smem_states, list) {
			if (state->of_node == np) {
			kref_get(&state->refcount);
			goto unlock;
			}
			}
			state = ERR_PTR(-EPROBE_DEFER);

			unlock:
			mutex_unlock(&list_lock);

			return state;
			}

			/**
			* qcom_smem_state_get() - acquire handle to a state
			* @dev: client device pointer
			* @con_id: name of the state to lookup
			* @bit: flags from the state reference, indicating which bit's affected
			*
			* Returns handle to the state, or ERR_PTR(). qcom_smem_state_put() must be
			* called to release the returned state handle.
			*/
			struct qcom_smem_state qcom_smem_state_get(struct device dev,
			const char *con_id,
			unsigned *bit)
			{
			struct qcom_smem_state *state;
			struct of_phandle_args args;
			int index = 0;
			int ret;

			if (con_id) {
			index = of_property_match_string(dev->of_node,
			"qcom,state-names",
			con_id);
			if (index < 0) {
			dev_err(dev, "missing qcom,state-names\n");
			return ERR_PTR(index);
			}
			}

			ret = of_parse_phandle_with_args(dev->of_node,
			"qcom,state",
			"#qcom,state-cells",
			index,
			&args);
			if (ret) {
			dev_err(dev, "failed to parse qcom,state property\n");
			return ERR_PTR(ret);
			}

			if (args.args_count != 1) {
			dev_err(dev, "invalid #qcom,state-cells\n");
			return ERR_PTR(-EINVAL);
			}

			state = of_node_to_state(args.np);
			if (IS_ERR(state))
			goto put;

			*bit = args.args[0];

			put:
			of_node_put(args.np);
			return state;
			}
			EXPORT_SYMBOL_GPL(qcom_smem_state_get);

			static void qcom_smem_state_release(struct kref *ref)
			{
			struct qcom_smem_state *state = container_of(ref, struct qcom_smem_state, refcount);

			list_del(&state->list);
			kfree(state);
			}

			/**
			* qcom_smem_state_put() - release state handle
			* @state: state handle to be released
			*/
			void qcom_smem_state_put(struct qcom_smem_state *state)
			{
			mutex_lock(&list_lock);
			kref_put(&state->refcount, qcom_smem_state_release);
			mutex_unlock(&list_lock);
			}
			EXPORT_SYMBOL_GPL(qcom_smem_state_put);

			/**
			* qcom_smem_state_register() - register a new state
			* @of_node: of_node used for matching client lookups
			* @ops: implementation ops
			* @priv: implementation specific private data
			*/
			struct qcom_smem_state qcom_smem_state_register(struct device_node of_node,
			const struct qcom_smem_state_ops *ops,
			void *priv)
			{
			struct qcom_smem_state *state;

			state = kzalloc(sizeof(*state), GFP_KERNEL);
			if (!state)
			return ERR_PTR(-ENOMEM);

			kref_init(&state->refcount);

			state->of_node = of_node;
			state->ops = *ops;
			state->priv = priv;

			mutex_lock(&list_lock);
			list_add(&state->list, &smem_states);
			mutex_unlock(&list_lock);

			return state;
			}
			EXPORT_SYMBOL_GPL(qcom_smem_state_register);

			/**
			* qcom_smem_state_unregister() - unregister a registered state
			* @state: state handle to be unregistered
			*/
			void qcom_smem_state_unregister(struct qcom_smem_state *state)
			{
			state->orphan = true;
			qcom_smem_state_put(state);
			}
			EXPORT_SYMBOL_GPL(qcom_smem_state_unregister);

Admin message