]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit
soc: qcom: mdt_loader: Drop PT_LOAD check on hash segment
authorShawn Guo <shawn.guo@linaro.org>
Sat, 28 Aug 2021 07:02:02 +0000 (15:02 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 12 Nov 2021 13:07:27 +0000 (14:07 +0100)
commiteaf645cfd54ab401d4f1225a065ab6d59601f8de
treec75144ba526e6c361b6e34df655bf52d6d5933b1
parent36d31f4d638fa63c62078de3bd5988ab26c4577a
soc: qcom: mdt_loader: Drop PT_LOAD check on hash segment

BugLink: https://bugs.launchpad.net/bugs/1950014
[ Upstream commit 833d51d7c66d6708abbc02398892b96b950167b9 ]

PT_LOAD type denotes that the segment should be loaded into the final
firmware memory region.  Hash segment is not one such, because it's only
needed for PAS init and shouldn't be in the final firmware memory region.
That's why mdt_phdr_valid() explicitly reject non PT_LOAD segment and
hash segment.  This actually makes the hash segment type check in
qcom_mdt_read_metadata() unnecessary and redundant.  For a hash segment,
it won't be loaded into firmware memory region anyway, due to the
QCOM_MDT_TYPE_HASH check in mdt_phdr_valid(), even if it has a PT_LOAD
type for some reason (misusing or abusing?).

Some firmware files on Sony phones are such examples, e.g WCNSS firmware
of Sony Xperia M4 Aqua phone.  The type of hash segment is just PT_LOAD.
Drop the unnecessary hash segment type check in qcom_mdt_read_metadata()
to fix firmware loading failure on these phones, while hash segment is
still kept away from the final firmware memory region.

Fixes: 498b98e93900 ("soc: qcom: mdt_loader: Support loading non-split images")
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210828070202.7033-1-shawn.guo@linaro.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/soc/qcom/mdt_loader.c