Commit a353e4a0 authored by Lina Iyer's avatar Lina Iyer Committed by Kumar Gala
Browse files

firmware: qcom: scm: Clean cold boot entry to export only the API 



We dont need to export the SCM specific cold boot flags to the platform
code. Export only a function to set the cold boot address.

Signed-off-by: default avatarLina Iyer <lina.iyer@linaro.org>
Signed-off-by: default avatarKumar Gala <galak@codeaurora.org>
parent 916f743d

arch/arm/mach-qcom/platsmp.c

+3 −18
Original line number Diff line number Diff line
@@ -319,25 +319,10 @@ static int kpssv2_boot_secondary(unsigned int cpu, struct task_struct *idle) 


static void __init qcom_smp_prepare_cpus(unsigned int max_cpus)

{

	int cpu, map;

	unsigned int flags = 0;

	static const int cold_boot_flags[] = {

		0,

		QCOM_SCM_FLAG_COLDBOOT_CPU1,

		QCOM_SCM_FLAG_COLDBOOT_CPU2,

		QCOM_SCM_FLAG_COLDBOOT_CPU3,

	};



	for_each_present_cpu(cpu) {

		map = cpu_logical_map(cpu);

		if (WARN_ON(map >= ARRAY_SIZE(cold_boot_flags))) {

			set_cpu_present(cpu, false);

			continue;

		}

		flags |= cold_boot_flags[map];

	}

	int cpu;



	if (qcom_scm_set_boot_addr(virt_to_phys(secondary_startup_arm), flags)) {

	if (qcom_scm_set_cold_boot_addr(secondary_startup_arm,

					cpu_present_mask)) {

		for_each_present_cpu(cpu) {

			if (cpu == smp_processor_id())

				continue;

drivers/firmware/qcom_scm.c

+39 −2
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ 
#define QCOM_SCM_ERROR		-1

#define QCOM_SCM_INTERRUPTED	1



#define QCOM_SCM_FLAG_COLDBOOT_CPU0	0x00

#define QCOM_SCM_FLAG_COLDBOOT_CPU1	0x01

#define QCOM_SCM_FLAG_COLDBOOT_CPU2	0x08

#define QCOM_SCM_FLAG_COLDBOOT_CPU3	0x20



static DEFINE_MUTEX(qcom_scm_lock);



/**
@@ -329,7 +334,7 @@ EXPORT_SYMBOL(qcom_scm_get_version); 
/*

 * Set the cold/warm boot address for one of the CPU cores.

 */

int qcom_scm_set_boot_addr(u32 addr, int flags)

static int qcom_scm_set_boot_addr(u32 addr, int flags)

{

	struct {

		__le32 flags;
@@ -341,4 +346,36 @@ int qcom_scm_set_boot_addr(u32 addr, int flags) 
	return qcom_scm_call(QCOM_SCM_SVC_BOOT, QCOM_SCM_BOOT_ADDR,

			&cmd, sizeof(cmd), NULL, 0);

}

EXPORT_SYMBOL(qcom_scm_set_boot_addr);
 


/**

 * 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)

{

	int flags = 0;

	int cpu;

	int scm_cb_flags[] = {

		QCOM_SCM_FLAG_COLDBOOT_CPU0,

		QCOM_SCM_FLAG_COLDBOOT_CPU1,

		QCOM_SCM_FLAG_COLDBOOT_CPU2,

		QCOM_SCM_FLAG_COLDBOOT_CPU3,

	};



	if (!cpus || (cpus && cpumask_empty(cpus)))

		return -EINVAL;



	for_each_cpu(cpu, cpus) {

		if (cpu < ARRAY_SIZE(scm_cb_flags))

			flags |= scm_cb_flags[cpu];

		else

			set_cpu_present(cpu, false);

	}



	return qcom_scm_set_boot_addr(virt_to_phys(entry), flags);

}

EXPORT_SYMBOL(qcom_scm_set_cold_boot_addr);

include/linux/qcom_scm.h

+1 −4
Original line number Diff line number Diff line
@@ -12,15 +12,12 @@ 
#ifndef __QCOM_SCM_H

#define __QCOM_SCM_H



#define QCOM_SCM_FLAG_COLDBOOT_CPU1		0x01

#define QCOM_SCM_FLAG_COLDBOOT_CPU2		0x08

#define QCOM_SCM_FLAG_COLDBOOT_CPU3		0x20

#define QCOM_SCM_FLAG_WARMBOOT_CPU0		0x04

#define QCOM_SCM_FLAG_WARMBOOT_CPU1		0x02

#define QCOM_SCM_FLAG_WARMBOOT_CPU2		0x10

#define QCOM_SCM_FLAG_WARMBOOT_CPU3		0x40



extern int qcom_scm_set_boot_addr(u32 addr, int flags);

extern int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus);



#define QCOM_SCM_VERSION(major, minor) (((major) << 16) | ((minor) & 0xFF))