diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-07-09 23:50:24 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-07-09 23:50:25 +0300 |
| commit | 8cfda4059fe1e45dcb1326a5e117e1371a7cf0e6 (patch) | |
| tree | aef341f83449fe6e18eaf6729b9b43924bd74c80 /drivers/firmware | |
| parent | 782b726201471326575f386128fa03db90c83ad8 (diff) | |
| parent | 55751d3e9e96d5d64dc6ebb5bbdf70f45098f279 (diff) | |
| download | linux-8cfda4059fe1e45dcb1326a5e117e1371a7cf0e6.tar.xz | |
Merge tag 'qcom-drivers-for-6.11-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/drivers
A few more Qualcomm driver updates for v6.11
This adds a quirk to skip using the newly introduced SHM Bridge
implementation while regressions are being investigated.
One occurance of return no_free_ptr() is replaced with return_ptr() to
make code easier to read. llcc, mdt_loader, ocmem, pdr, socinfo and
wcnss drivers gets simplified using cleanup.h.
* tag 'qcom-drivers-for-6.11-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
firmware: qcom: tzmem: blacklist more platforms for SHM Bridge
soc: qcom: wcnss: simplify with cleanup.h
soc: qcom: pdr: simplify with cleanup.h
soc: qcom: ocmem: simplify with cleanup.h
soc: qcom: mdt_loader: simplify with cleanup.h
soc: qcom: llcc: simplify with cleanup.h
firmware: qcom: tzmem: simplify returning pointer without cleanup
soc: qcom: socinfo: Add PM6350 PMIC
Link: https://lore.kernel.org/r/20240709191246.3053-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/qcom/qcom_tzmem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c index 5d526753183d..17948cfc82e7 100644 --- a/drivers/firmware/qcom/qcom_tzmem.c +++ b/drivers/firmware/qcom/qcom_tzmem.c @@ -78,6 +78,8 @@ static bool qcom_tzmem_using_shm_bridge; /* List of machines that are known to not support SHM bridge correctly. */ static const char *const qcom_tzmem_blacklist[] = { "qcom,sc8180x", + "qcom,sdm845", /* reset in rmtfs memory assignment */ + "qcom,sm8150", /* reset in rmtfs memory assignment */ NULL }; @@ -242,7 +244,7 @@ qcom_tzmem_pool_new(const struct qcom_tzmem_pool_config *config) } } - return no_free_ptr(pool); + return_ptr(pool); } EXPORT_SYMBOL_GPL(qcom_tzmem_pool_new); |