Commit 1e210f46 authored by Rob Clark's avatar Rob Clark
Browse files

Merge remote-tracking branch... 


Merge remote-tracking branch 'qcom/20240430-a750-raytracing-v3-2-7f57c5ac082d@gmail.com' into msm-next-robclark

Merge qcom drivers to pick up dependency for SMEM based speedbin.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parents 399af57c 81bbb2b8

drivers/soc/qcom/smem.c

+33 −0
Original line number Diff line number Diff line
@@ -795,6 +795,39 @@ int qcom_smem_get_soc_id(u32 *id) 
}

EXPORT_SYMBOL_GPL(qcom_smem_get_soc_id);



/**

 * qcom_smem_get_feature_code() - return the feature code

 * @code: On success, return the feature code here.

 *

 * Look up the feature code identifier from SMEM and return it.

 *

 * Return: 0 on success, negative errno on failure.

 */

int qcom_smem_get_feature_code(u32 *code)

{

	struct socinfo *info;

	u32 raw_code;



	info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HW_SW_BUILD_ID, NULL);

	if (IS_ERR(info))

		return PTR_ERR(info);



	/* This only makes sense for socinfo >= 16 */

	if (__le32_to_cpu(info->fmt) < SOCINFO_VERSION(0, 16))

		return -EOPNOTSUPP;



	raw_code = __le32_to_cpu(info->feature_code);



	/* Ensure the value makes sense */

	if (raw_code > SOCINFO_FC_INT_MAX)

		raw_code = SOCINFO_FC_UNKNOWN;



	*code = raw_code;



	return 0;

}

EXPORT_SYMBOL_GPL(qcom_smem_get_feature_code);



static int qcom_smem_get_sbl_version(struct qcom_smem *smem)

{

	struct smem_header *header;

drivers/soc/qcom/socinfo.c

+0 −8
Original line number Diff line number Diff line
@@ -21,14 +21,6 @@ 


#include <dt-bindings/arm/qcom,ids.h>



/*

 * SoC version type with major number in the upper 16 bits and minor

 * number in the lower 16 bits.

 */

#define SOCINFO_MAJOR(ver) (((ver) >> 16) & 0xffff)

#define SOCINFO_MINOR(ver) ((ver) & 0xffff)

#define SOCINFO_VERSION(maj, min)  ((((maj) & 0xffff) << 16)|((min) & 0xffff))



/* Helper macros to create soc_id table */

#define qcom_board_id(id) QCOM_ID_ ## id, __stringify(id)

#define qcom_board_id_named(id, name) QCOM_ID_ ## id, (name)

include/linux/soc/qcom/smem.h

+1 −0
Original line number Diff line number Diff line
@@ -13,5 +13,6 @@ int qcom_smem_get_free_space(unsigned host); 
phys_addr_t qcom_smem_virt_to_phys(void *p);



int qcom_smem_get_soc_id(u32 *id);

int qcom_smem_get_feature_code(u32 *code);



#endif

include/linux/soc/qcom/socinfo.h

+34 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
#ifndef __QCOM_SOCINFO_H__

#define __QCOM_SOCINFO_H__



#include <linux/types.h>



/*

 * SMEM item id, used to acquire handles to respective

 * SMEM region.
@@ -12,6 +14,14 @@ 
#define SMEM_SOCINFO_BUILD_ID_LENGTH	32

#define SMEM_SOCINFO_CHIP_ID_LENGTH	32



/*

 * SoC version type with major number in the upper 16 bits and minor

 * number in the lower 16 bits.

 */

#define SOCINFO_MAJOR(ver) (((ver) >> 16) & 0xffff)

#define SOCINFO_MINOR(ver) ((ver) & 0xffff)

#define SOCINFO_VERSION(maj, min)  ((((maj) & 0xffff) << 16)|((min) & 0xffff))



/* Socinfo SMEM item structure */

struct socinfo {

	__le32 fmt;
@@ -74,4 +84,28 @@ struct socinfo { 
	__le32 boot_core;

};



/* Internal feature codes */

enum qcom_socinfo_feature_code {

	/* External feature codes */

	SOCINFO_FC_UNKNOWN = 0x0,

	SOCINFO_FC_AA,

	SOCINFO_FC_AB,

	SOCINFO_FC_AC,

	SOCINFO_FC_AD,

	SOCINFO_FC_AE,

	SOCINFO_FC_AF,

	SOCINFO_FC_AG,

	SOCINFO_FC_AH,

};



/* Internal feature codes */

/* Valid values: 0 <= n <= 0xf */

#define SOCINFO_FC_Yn(n)		(0xf1 + (n))

#define SOCINFO_FC_INT_MAX		SOCINFO_FC_Yn(0xf)



/* Product codes */

#define SOCINFO_PC_UNKNOWN		0

#define SOCINFO_PCn(n)			((n) + 1)

#define SOCINFO_PC_RESERVE		(BIT(31) - 1)



#endif