Commit 7db2bc92 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Revert "firmware: qcom: scm: Add support for MC boot address API" 



This reverts commits 55845f46 and c50031f0, since this still
causes a build failure when QCOM_SCM is a loadable module, or when
CONFIG_SMP is disabled:

ERROR: modpost: "cpu_logical_map" [drivers/firmware/qcom-scm.ko] undefined!

This be done better for 5.17, but it's too late now to rework
properly.

Fixes: c50031f0 ("firmware: qcom: scm: Don't break compile test on non-ARM platforms")
Fixes: 55845f46 ("firmware: qcom: scm: Add support for MC boot address API")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 4f22aa45

drivers/firmware/qcom_scm.c

+17 −77
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
#include <linux/reset-controller.h>

#include <linux/arm-smccc.h>



#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)

#include <asm/smp_plat.h>

#endif



#include "qcom_scm.h"



static bool download_mode = IS_ENABLED(CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT);
@@ -264,44 +260,15 @@ static bool __qcom_scm_is_call_available(struct device *dev, u32 svc_id, 
	return ret ? false : !!res.result[0];

}



#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)

static int __qcom_scm_set_boot_addr_mc(void *entry, const cpumask_t *cpus,

				       unsigned int flags)

{

	struct qcom_scm_desc desc = {

		.svc = QCOM_SCM_SVC_BOOT,

		.cmd = QCOM_SCM_BOOT_SET_ADDR_MC,

		.owner = ARM_SMCCC_OWNER_SIP,

		.arginfo = QCOM_SCM_ARGS(6),

	};

	unsigned int cpu;

	u64 map;



	/* Need a device for DMA of the additional arguments */

	if (!__scm || __get_convention() == SMC_CONVENTION_LEGACY)

		return -EOPNOTSUPP;



	desc.args[0] = virt_to_phys(entry);

	for_each_cpu(cpu, cpus) {

		map = cpu_logical_map(cpu);

		desc.args[1] |= BIT(MPIDR_AFFINITY_LEVEL(map, 0));

		desc.args[2] |= BIT(MPIDR_AFFINITY_LEVEL(map, 1));

		desc.args[3] |= BIT(MPIDR_AFFINITY_LEVEL(map, 2));

	}

	desc.args[4] = ~0ULL; /* Reserved for affinity level 3 */

	desc.args[5] = flags;



	return qcom_scm_call(__scm->dev, &desc, NULL);

}

#else

static inline int __qcom_scm_set_boot_addr_mc(void *entry, const cpumask_t *cpus,

					      unsigned int flags)

{

	return -EINVAL;

}

#endif



static int __qcom_scm_set_warm_boot_addr(void *entry, const cpumask_t *cpus)

/**

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

{

	int ret;

	int flags = 0;
@@ -337,28 +304,17 @@ static int __qcom_scm_set_warm_boot_addr(void *entry, const cpumask_t *cpus) 


	return ret;

}

EXPORT_SYMBOL(qcom_scm_set_warm_boot_addr);



/**

 * qcom_scm_set_warm_boot_addr() - Set the warm boot address for cpus

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

 * 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_warm_boot_addr(void *entry, const cpumask_t *cpus)

{

	if (!cpus || cpumask_empty(cpus))

		return -EINVAL;



	if (__qcom_scm_set_boot_addr_mc(entry, cpus, QCOM_SCM_BOOT_MC_FLAG_WARMBOOT))

		/* Fallback to old SCM call */

		return __qcom_scm_set_warm_boot_addr(entry, cpus);

	return 0;

}

EXPORT_SYMBOL(qcom_scm_set_warm_boot_addr);



static int __qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus)

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

{

	int flags = 0;

	int cpu;
@@ -375,6 +331,9 @@ static int __qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus) 
		.owner = ARM_SMCCC_OWNER_SIP,

	};



	if (!cpus || cpumask_empty(cpus))

		return -EINVAL;



	for_each_cpu(cpu, cpus) {

		if (cpu < ARRAY_SIZE(scm_cb_flags))

			flags |= scm_cb_flags[cpu];
@@ -387,25 +346,6 @@ static int __qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus) 


	return qcom_scm_call_atomic(__scm ? __scm->dev : NULL, &desc, NULL);

}



/**

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

{

	if (!cpus || cpumask_empty(cpus))

		return -EINVAL;



	if (__qcom_scm_set_boot_addr_mc(entry, cpus, QCOM_SCM_BOOT_MC_FLAG_COLDBOOT))

		/* Fallback to old SCM call */

		return __qcom_scm_set_cold_boot_addr(entry, cpus);

	return 0;

}

EXPORT_SYMBOL(qcom_scm_set_cold_boot_addr);



/**

drivers/firmware/qcom_scm.h

+0 −4
Original line number Diff line number Diff line
@@ -78,12 +78,8 @@ extern int scm_legacy_call(struct device *dev, const struct qcom_scm_desc *desc, 
#define QCOM_SCM_BOOT_SET_ADDR		0x01

#define QCOM_SCM_BOOT_TERMINATE_PC	0x02

#define QCOM_SCM_BOOT_SET_DLOAD_MODE	0x10

#define QCOM_SCM_BOOT_SET_ADDR_MC	0x11

#define QCOM_SCM_BOOT_SET_REMOTE_STATE	0x0a

#define QCOM_SCM_FLUSH_FLAG_MASK	0x3

#define QCOM_SCM_BOOT_MC_FLAG_AARCH64	BIT(0)

#define QCOM_SCM_BOOT_MC_FLAG_COLDBOOT	BIT(1)

#define QCOM_SCM_BOOT_MC_FLAG_WARMBOOT	BIT(2)



#define QCOM_SCM_SVC_PIL		0x02

#define QCOM_SCM_PIL_PAS_INIT_IMAGE	0x01