Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66f5d20a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I20ed0dea,I012ebb6b into msm-next 

* changes:
  soc: qcom: pil: Use the new smem api
  soc: qcom: Update the socinfo the use the new smem api
parents 9ad4f612 6e3d7bb2

drivers/soc/qcom/socinfo.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <asm/system_misc.h>

#include <asm/system_misc.h>





#include <soc/qcom/socinfo.h>

#include <soc/qcom/socinfo.h>

#include <soc/qcom/smem.h>

#include <linux/soc/qcom/smem.h>

#include <soc/qcom/boot_stats.h>

#include <soc/qcom/boot_stats.h>





#define BUILD_ID_LENGTH 32

#define BUILD_ID_LENGTH 32
@@ -534,8 +534,10 @@ uint32_t socinfo_get_pmic_die_revision(void) 




static char *socinfo_get_image_version_base_address(void)

static char *socinfo_get_image_version_base_address(void)

{

{

	return smem_find(SMEM_IMAGE_VERSION_TABLE,

	size_t size;

				SMEM_IMAGE_VERSION_SIZE, 0, SMEM_ANY_HOST_FLAG);



	return qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_IMAGE_VERSION_TABLE,

			&size);

}

}





enum msm_cpu socinfo_get_msm_cpu(void)

enum msm_cpu socinfo_get_msm_cpu(void)
@@ -1452,14 +1454,13 @@ static void socinfo_select_format(void) 
int __init socinfo_init(void)

int __init socinfo_init(void)

{

{

	static bool socinfo_init_done;

	static bool socinfo_init_done;

	unsigned int size;

	size_t size;

	uint32_t soc_info_id;

	uint32_t soc_info_id;





	if (socinfo_init_done)

	if (socinfo_init_done)

		return 0;

		return 0;





	socinfo = smem_get_entry(SMEM_HW_SW_BUILD_ID, &size, 0,

	socinfo = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HW_SW_BUILD_ID, &size);

				 SMEM_ANY_HOST_FLAG);

	if (IS_ERR_OR_NULL(socinfo)) {

	if (IS_ERR_OR_NULL(socinfo)) {

		pr_warn("Can't find SMEM_HW_SW_BUILD_ID; falling back on dummy values.\n");

		pr_warn("Can't find SMEM_HW_SW_BUILD_ID; falling back on dummy values.\n");

		socinfo = setup_dummy_socinfo();

		socinfo = setup_dummy_socinfo();

drivers/soc/qcom/subsys-pil-tz.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <soc/qcom/ramdump.h>

#include <soc/qcom/ramdump.h>

#include <soc/qcom/scm.h>

#include <soc/qcom/scm.h>





#include <soc/qcom/smem.h>

#include <linux/soc/qcom/smem.h>





#include "peripheral-loader.h"

#include "peripheral-loader.h"
@@ -788,15 +788,14 @@ static struct pil_reset_ops pil_ops_trusted = { 




static void log_failure_reason(const struct pil_tz_data *d)

static void log_failure_reason(const struct pil_tz_data *d)

{

{

	u32 size;

	size_t size;

	char *smem_reason, reason[MAX_SSR_REASON_LEN];

	char *smem_reason, reason[MAX_SSR_REASON_LEN];

	const char *name = d->subsys_desc.name;

	const char *name = d->subsys_desc.name;





	if (d->smem_id == -1)

	if (d->smem_id == -1)

		return;

		return;





	smem_reason = smem_get_entry_no_rlock(d->smem_id, &size, 0,

	smem_reason = qcom_smem_get(QCOM_SMEM_HOST_ANY, d->smem_id, &size);

							SMEM_ANY_HOST_FLAG);

	if (!smem_reason || !size) {

	if (!smem_reason || !size) {

		pr_err("%s SFR: (unknown, smem_get_entry_no_rlock failed).\n",

		pr_err("%s SFR: (unknown, smem_get_entry_no_rlock failed).\n",

									name);

									name);
@@ -807,7 +806,7 @@ static void log_failure_reason(const struct pil_tz_data *d) 
		return;

		return;

	}

	}





	strlcpy(reason, smem_reason, min(size, MAX_SSR_REASON_LEN));

	strlcpy(reason, smem_reason, min(size, (size_t)MAX_SSR_REASON_LEN));

	pr_err("%s subsystem failure reason: %s.\n", name, reason);

	pr_err("%s subsystem failure reason: %s.\n", name, reason);





	smem_reason[0] = '\0';

	smem_reason[0] = '\0';

include/soc/qcom/socinfo.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -84,6 +84,8 @@ 
#define PLATFORM_SUBTYPE_INTERPOSERV3 2

#define PLATFORM_SUBTYPE_INTERPOSERV3 2

#define PLATFORM_SUBTYPE_SGLTE	6

#define PLATFORM_SUBTYPE_SGLTE	6





#define SMEM_IMAGE_VERSION_TABLE	469

#define SMEM_HW_SW_BUILD_ID		137

enum msm_cpu {

enum msm_cpu {

	MSM_CPU_UNKNOWN = 0,

	MSM_CPU_UNKNOWN = 0,

	MSM_CPU_8960,

	MSM_CPU_8960,