Commit 69054348 authored by Mukesh Ojha's avatar Mukesh Ojha Committed by Bjorn Andersson
Browse files

firmware: qcom_scm: Rename peripheral as pas_id 



Peripheral and pas_id refers to unique id for a subsystem and used only
when peripheral authentication service from secure world is utilized.

Lets rename peripheral to pas_id to reflect closer to its meaning.

Reviewed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: default avatarMukesh Ojha <mukesh.ojha@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260105-kvmrprocv10-v10-3-022e96815380@oss.qualcomm.com


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 25906ae9

drivers/firmware/qcom/qcom_scm.c

+15 −15
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static void qcom_scm_set_download_mode(u32 dload_mode) 
 * qcom_scm_pas_init_image() - Initialize peripheral authentication service

 *			       state machine for a given peripheral, using the

 *			       metadata

 * @peripheral: peripheral id

 * @pas_id:	peripheral authentication service id

 * @metadata:	pointer to memory containing ELF header, program header table

 *		and optional blob of data used for authenticating the metadata

 *		and the rest of the firmware
@@ -575,7 +575,7 @@ static void qcom_scm_set_download_mode(u32 dload_mode) 
 * track the metadata allocation, this needs to be released by invoking

 * qcom_scm_pas_metadata_release() by the caller.

 */

int qcom_scm_pas_init_image(u32 peripheral, const void *metadata, size_t size,

int qcom_scm_pas_init_image(u32 pas_id, const void *metadata, size_t size,

			    struct qcom_scm_pas_metadata *ctx)

{

	dma_addr_t mdata_phys;
@@ -585,7 +585,7 @@ int qcom_scm_pas_init_image(u32 peripheral, const void *metadata, size_t size, 
		.svc = QCOM_SCM_SVC_PIL,

		.cmd = QCOM_SCM_PIL_PAS_INIT_IMAGE,

		.arginfo = QCOM_SCM_ARGS(2, QCOM_SCM_VAL, QCOM_SCM_RW),

		.args[0] = peripheral,

		.args[0] = pas_id,

		.owner = ARM_SMCCC_OWNER_SIP,

	};

	struct qcom_scm_res res;
@@ -656,20 +656,20 @@ EXPORT_SYMBOL_GPL(qcom_scm_pas_metadata_release); 
/**

 * qcom_scm_pas_mem_setup() - Prepare the memory related to a given peripheral

 *			      for firmware loading

 * @peripheral:	peripheral id

 * @pas_id:	peripheral authentication service id

 * @addr:	start address of memory area to prepare

 * @size:	size of the memory area to prepare

 *

 * Returns 0 on success.

 */

int qcom_scm_pas_mem_setup(u32 peripheral, phys_addr_t addr, phys_addr_t size)

int qcom_scm_pas_mem_setup(u32 pas_id, phys_addr_t addr, phys_addr_t size)

{

	int ret;

	struct qcom_scm_desc desc = {

		.svc = QCOM_SCM_SVC_PIL,

		.cmd = QCOM_SCM_PIL_PAS_MEM_SETUP,

		.arginfo = QCOM_SCM_ARGS(3),

		.args[0] = peripheral,

		.args[0] = pas_id,

		.args[1] = addr,

		.args[2] = size,

		.owner = ARM_SMCCC_OWNER_SIP,
@@ -697,18 +697,18 @@ EXPORT_SYMBOL_GPL(qcom_scm_pas_mem_setup); 
/**

 * qcom_scm_pas_auth_and_reset() - Authenticate the given peripheral firmware

 *				   and reset the remote processor

 * @peripheral:	peripheral id

 * @pas_id:	peripheral authentication service id

 *

 * Return 0 on success.

 */

int qcom_scm_pas_auth_and_reset(u32 peripheral)

int qcom_scm_pas_auth_and_reset(u32 pas_id)

{

	int ret;

	struct qcom_scm_desc desc = {

		.svc = QCOM_SCM_SVC_PIL,

		.cmd = QCOM_SCM_PIL_PAS_AUTH_AND_RESET,

		.arginfo = QCOM_SCM_ARGS(1),

		.args[0] = peripheral,

		.args[0] = pas_id,

		.owner = ARM_SMCCC_OWNER_SIP,

	};

	struct qcom_scm_res res;
@@ -733,18 +733,18 @@ EXPORT_SYMBOL_GPL(qcom_scm_pas_auth_and_reset); 


/**

 * qcom_scm_pas_shutdown() - Shut down the remote processor

 * @peripheral: peripheral id

 * @pas_id:	peripheral authentication service id

 *

 * Returns 0 on success.

 */

int qcom_scm_pas_shutdown(u32 peripheral)

int qcom_scm_pas_shutdown(u32 pas_id)

{

	int ret;

	struct qcom_scm_desc desc = {

		.svc = QCOM_SCM_SVC_PIL,

		.cmd = QCOM_SCM_PIL_PAS_SHUTDOWN,

		.arginfo = QCOM_SCM_ARGS(1),

		.args[0] = peripheral,

		.args[0] = pas_id,

		.owner = ARM_SMCCC_OWNER_SIP,

	};

	struct qcom_scm_res res;
@@ -770,18 +770,18 @@ EXPORT_SYMBOL_GPL(qcom_scm_pas_shutdown); 
/**

 * qcom_scm_pas_supported() - Check if the peripheral authentication service is

 *			      available for the given peripherial

 * @peripheral:	peripheral id

 * @pas_id:	peripheral authentication service id

 *

 * Returns true if PAS is supported for this peripheral, otherwise false.

 */

bool qcom_scm_pas_supported(u32 peripheral)

bool qcom_scm_pas_supported(u32 pas_id)

{

	int ret;

	struct qcom_scm_desc desc = {

		.svc = QCOM_SCM_SVC_PIL,

		.cmd = QCOM_SCM_PIL_PAS_IS_SUPPORTED,

		.arginfo = QCOM_SCM_ARGS(1),

		.args[0] = peripheral,

		.args[0] = pas_id,

		.owner = ARM_SMCCC_OWNER_SIP,

	};

	struct qcom_scm_res res;

include/linux/firmware/qcom/qcom_scm.h

+5 −5
Original line number Diff line number Diff line
@@ -72,13 +72,13 @@ struct qcom_scm_pas_metadata { 
	ssize_t size;

};



int qcom_scm_pas_init_image(u32 peripheral, const void *metadata, size_t size,

int qcom_scm_pas_init_image(u32 pas_id, const void *metadata, size_t size,

			    struct qcom_scm_pas_metadata *ctx);

void qcom_scm_pas_metadata_release(struct qcom_scm_pas_metadata *ctx);

int qcom_scm_pas_mem_setup(u32 peripheral, phys_addr_t addr, phys_addr_t size);

int qcom_scm_pas_auth_and_reset(u32 peripheral);

int qcom_scm_pas_shutdown(u32 peripheral);

bool qcom_scm_pas_supported(u32 peripheral);

int qcom_scm_pas_mem_setup(u32 pas_id, phys_addr_t addr, phys_addr_t size);

int qcom_scm_pas_auth_and_reset(u32 pas_id);

int qcom_scm_pas_shutdown(u32 pas_id);

bool qcom_scm_pas_supported(u32 pas_id);



int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val);

int qcom_scm_io_writel(phys_addr_t addr, unsigned int val);