On 04/07/2024 13:12, Dmitry Baryshkov wrote:
The SHM bridge makes the Qualcomm RB3 and SM8150-HDK reset while probing the RMTFS (in qcom_scm_assign_mem()). Blacklist the SHM Bridge on corresponding platforms using SoC-level compat string. If later it's found that the bad behaviour is limited just to the particular boards rather than SoC, the compat strings can be adjusted. Reported-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx> Fixes: f86c61498a57 ("firmware: qcom: tzmem: enable SHM Bridge support") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> --- drivers/firmware/qcom/qcom_tzmem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c index 5d526753183d..c715729f071c 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 };--- base-commit: 82e4255305c554b0bb18b7ccf2db86041b4c8b6e change-id: 20240704-shmbridge-blacklist-021bd97b8a93 Best regards,
Tested-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx> # on Qualcomm RB3 Tested-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx> # on SM8150-HDK Thanks, Neil
