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

Commit 29756033 authored by FNU Ramendra's avatar FNU Ramendra Committed by Stephen Boyd
Browse files

msm: smd: Update edge enumeration with new TZ - RPM edge. 



A new smd edge is defined between  Trust Zone(TZ) processor
and RPM processor. This change renders the edge enumeration
in smd implementation incomplete. It also has a side effect
of smem_find() reporting "wrong size" warning.

Add new edge information to the existing enumeration and
update the code to report this new edge as word aligned.

CRs-Fixed: 515017
Change-Id: I57f87e7910958f244124a0ca4f43f6d0e33b5452
Signed-off-by: default avatarFNU Ramendra <rramendr@codeaurora.org>
parent df820a7b

arch/arm/mach-msm/include/mach/msm_smd.h

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ enum { 
	SMD_MODEM = SMEM_MODEM,

	SMD_Q6 = SMEM_Q6,

	SMD_DSPS = SMEM_DSPS,

	SMD_TZ = SMEM_DSPS,

	SMD_WCNSS = SMEM_WCNSS,

	SMD_MODEM_Q6_FW = SMEM_MODEM_Q6_FW,

	SMD_RPM = SMEM_RPM,
@@ -72,6 +73,7 @@ enum { 
	SMD_MODEM_RPM,

	SMD_QDSP_RPM,

	SMD_WCNSS_RPM,

	SMD_TZ_RPM,

	SMD_NUM_TYPE,

	SMD_LOOPBACK_TYPE = 100,

arch/arm/mach-msm/smd.c

+1 −0
Original line number Diff line number Diff line
@@ -723,6 +723,7 @@ static struct edge_to_pid edge_to_pids[] = { 
	[SMD_MODEM_RPM] = {SMD_MODEM, SMD_RPM},

	[SMD_QDSP_RPM] = {SMD_Q6, SMD_RPM},

	[SMD_WCNSS_RPM] = {SMD_WCNSS, SMD_RPM},

	[SMD_TZ_RPM] = {SMD_TZ, SMD_RPM},

};



struct restart_notifier_block {

arch/arm/mach-msm/smd_private.c

+2 −1
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ unsigned get_head_word_access(volatile void __iomem *half_channel) 
int is_word_access_ch(unsigned ch_type)

{

	if (ch_type == SMD_APPS_RPM || ch_type == SMD_MODEM_RPM ||

		ch_type == SMD_QDSP_RPM || ch_type == SMD_WCNSS_RPM)

		ch_type == SMD_QDSP_RPM || ch_type == SMD_WCNSS_RPM ||

		ch_type == SMD_TZ_RPM)

		return 1;

	else

		return 0;