arm: msm: smd: use either package v3 or v4 not both
Subsystems (3)
PATCH 2/7 arm: msm: smd: use either package v3 or v4 not both
From: Daniel Walker <[email protected]>
This modifies SMD to use either the package v3 or package v4, but not both. The current code tries to allocate as v4 on all system which can produce a scary looking error message on boot up,
smem_find(16, 40): wrong size 16424 smd_alloc_channel() cid=02 size=08192 'SMD_RPCCALL'
With this error the code then falls back on the package v3 allocation method. This method is inefficient because it causes a slow down on some systems even when the allocation method can be determined at compile time. It also causes a kernel size increase that effects all system and is not needed.
This change corrects the allocation to use one method or the other and not both.
--- arch/arm/mach-msm/Kconfig | 22 ++++++++++++++- arch/arm/mach-msm/smd.c | 44 +----------------------------- arch/arm/mach-msm/smd_private.h | 58 +++++++++++++++++++++++++++++++++++++- 3 files changed, 78 insertions(+), 46 deletions(-)
arch/arm/mach-msm/Kconfig +21 -1
@@ -1,5 +1,21 @@ if ARCH_MSM +choice + prompt "Qualcomm MSM SoC Type" + default ARCH_MSM7X00A + +config ARCH_MSM7X00A + bool "MSM7x00A / MSM7x01A" + select ARCH_MSM_ARM11 + select MSM_SMD_PKG3 + select CPU_V6 + +endchoice + +config ARCH_MSM_ARM11 + bool + + comment "MSM Board Type" depends on ARCH_MSM
@@ -28,18 +44,22 @@ choice endchoice config MACH_HALIBUT - depends on ARCH_MSM + depends on ARCH_MSM7X00A default y bool "Halibut Board (QCT SURF7201A)" help Support for the Qualcomm SURF7201A eval board. config MACH_TROUT + depends on ARCH_MSM7X00A default y bool "HTC Dream (aka trout)" help Support for the HTC Dream, T-Mobile G1, Android ADP1 devices. +config MSM_SMD_PKG3 + bool + config MSM_SMD default y bool "MSM Shared Memory Driver (SMD)"
arch/arm/mach-msm/smd.c +1 -43
56 lines not on this page · raw message
arch/arm/mach-msm/smd_private.h +56 -2
86 lines not on this page · raw message
Signature · 1 line
1.6.2.3