Merge "soc: qcom: socinfo: Add version 20"

This commit is contained in:
qctecmdr 2024-03-28 17:51:10 -07:00 committed by Gerrit - the friendly Code Review server
commit 7db2297ee5

View file

@ -304,6 +304,8 @@ struct socinfo {
__le32 num_func_clusters;
__le32 boot_cluster;
__le32 boot_core;
/* Version 20 */
__le32 raw_package_type;
} *socinfo;
#ifdef CONFIG_DEBUG_FS
@ -330,6 +332,7 @@ struct socinfo_params {
u32 num_func_clusters;
u32 boot_cluster;
u32 boot_core;
u32 raw_package_type;
};
struct smem_image_version {
@ -1154,6 +1157,7 @@ static void socinfo_populate_sysfs(struct qcom_socinfo *qcom_socinfo)
int i = 0;
switch (socinfo_format) {
case SOCINFO_VERSION(0, 20):
case SOCINFO_VERSION(0, 19):
case SOCINFO_VERSION(0, 18):
case SOCINFO_VERSION(0, 17):
@ -1405,6 +1409,11 @@ static void socinfo_debugfs_init(struct qcom_socinfo *qcom_socinfo,
&qcom_socinfo->info.fmt);
switch (qcom_socinfo->info.fmt) {
case SOCINFO_VERSION(0, 20):
qcom_socinfo->info.raw_package_type = __le32_to_cpu(info->raw_package_type);
debugfs_create_u32("raw_package_type", 0444, qcom_socinfo->dbg_root,
&qcom_socinfo->info.raw_package_type);
fallthrough;
case SOCINFO_VERSION(0, 19):
qcom_socinfo->info.num_func_clusters = __le32_to_cpu(info->num_func_clusters);
qcom_socinfo->info.boot_cluster = __le32_to_cpu(info->boot_cluster);