From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2FF413CAA55 for ; Fri, 24 Jul 2026 09:49:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784886601; cv=none; b=cuoy7PK4nTSYIoXzRCX9LKu/1BpmoerNjN2WfEBht6ysV/a9d4BexzGHw9G9xh2yguM2tfFVDl08cRvbYr4dO93lMJpvIQmoesqQZyPP2F2VrzMH1Nb+Lnmw2Le4oCbwz4Jz6GOp0HvYKNGqQnS8V9GCuvQqU6k/5tjhYa1dTqE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784886601; c=relaxed/simple; bh=nGzwYW9XMYjIOpU7rm2Up8e85vxgCyaRTXlm2Pc71PE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P+azYr7WOtm6ZnEYNexFmX/zgOmkvuOX3SBvWaHzZTDG/VSnwtYC+3uJdSEVUqgccjNz/CCUEPrfPn/+6eROUTaLmQYnYz/luVKkhj6nTCiA+4qy7uqX9sOIyk5IvEkkSjw28qyqNb16KIrr/smZXOO9RYMyobzwkNFGMAeFTbY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=R10iBRgt; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=WamEOW46; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="R10iBRgt"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="WamEOW46" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66O9T15j3785945 for ; Fri, 24 Jul 2026 09:49:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=OHVNsbMAYbj kQ1t/N6D0ZmoMvxe2Y1h1gCTZ8ANDnOQ=; b=R10iBRgtIHc5k431AFgF6aMc4Tu 5pAOCkmCCoZYMHRpaCU1vLZoL4R2R5U/rjNeOxetx4TniDFvN7JNbhXmjYtplNN8 6Xsjzm8365DE90A/nzEFBC5g3HL1T2Me5uUGW4VdZhBKWG1YNmolNh7mJdtcfBNZ P0HzeUr5/tbOAyaDbHKXvmfzQU7IFpX1rBONmhA0gG4LrdZ2lNFh1s6UJaP9Wmoj D5Y6kizXa1kSkA7yZmT/0G0LWWYZpD8sMGuQgQqXzFcss0czdzhg4ag+64U9FjTk e/1iGsvjYCiVytsaY1mhz0ZANjElBn1tCaFL8YptZUeiBgJMoe9NkpoCf8w== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fm5f682hj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 24 Jul 2026 09:49:59 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-8485d853b08so535310b3a.1 for ; Fri, 24 Jul 2026 02:49:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784886599; x=1785491399; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=OHVNsbMAYbjkQ1t/N6D0ZmoMvxe2Y1h1gCTZ8ANDnOQ=; b=WamEOW46QIGsClLra4MVvYqNf0fOnis2wA5WVVAkWcVREr1ThAzcy6J/UH3Xf1Vusu Roa4D7bGCsR3CPUa7oMqi70sXCzZU9ahV+sfqyfwkrhwrPPhKfEOWGhJfZdMh6JVpQMW 4PaEuN7GS2EhWvZS1rHxSwCAf57Iv6S33c/VLBGlNfd8XACwcltvG3uHfmgftcjzb9Y1 25KMj12wIaXIx5UQ9ji1ZiTm4U42QqL7q+YTtz9XcTtlBztYF+8nRmlKD1uNSvYSNLn5 8qj0QCblO/aJL7NYyMJs6rAXaHYLfN/CeffeOC+3i6OxueB2tivW9grmaRZfshQmhP5+ XdaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784886599; x=1785491399; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=OHVNsbMAYbjkQ1t/N6D0ZmoMvxe2Y1h1gCTZ8ANDnOQ=; b=maAu+B6b4PavHaUEAbJZr6WdT3cRmmcY/EAEe7xW+P9JbYPR+JhTTNmAGDO79Htxmv DHdeeXNCuKbAat9D1iRKRkQnR30XgPwfFfGtZCBB3wocHwwcr7wEhvJkl0vqcpRvrF2a ewl89fTntoHrxT8uBTt9nWc+S4PxP9148hvCJ34mwD4GPZ593LKYG9KLloyvT1PUlps8 QIRpeaU8PWteqz8KBIT+rynT0HNtOMaq41cswUe6Ynm47eg25XCm+NCnt7Cq9PYg4dIq ds0YJaURmDyxyxeer4jcM7tu9mWofMnS1e5CZJM7Xcqok2i0UdC03v+vSl0xkTRpzmiI deLw== X-Forwarded-Encrypted: i=1; AHgh+RozWOgLgKDXp2+wNCHwWdIbqE5DBL1vFlkv9Lz+WOcviiPlsMmbPWRIrlhei1PztE+G39QjFvyHHWUccyU=@vger.kernel.org X-Gm-Message-State: AOJu0YzRbeL2u6JgehH/wE5n+A1QXbxMke+c8MZVcs5Br99uSB5h6fJ5 DVrfCluJQY4whvrzH6emD/nVbOZQOwqjq53urE8ij0Q9C6VXEreQ2ULVVfBw7UO1s3xFh7vP3wv u1261AdBdEPNJPElnYBcWJ3kD1Mz++qlLlYbrYRVgHw0t6feZ9ZFnqEJxrkvobHTMNek= X-Gm-Gg: AR+sD12x2+HctrAL4C7vQwVXpowNTUrPOxihA764pSIw0odn1hjYs2Xw9+HajHHS4VN 1eogJ0jHSoTwwd+oRHWMN5mIni/ilSPa2/fQU3ZNSvQCRxYMdcS+AYWZAYA33r9bV65ipxntyMr xP7RcTxJTRcspirkQJhXR3KpaWqj2FIl2lRIEIu+v4SzjLLHkUcgEiRmHbb+IWJDVw4VmQNEccl 6k+XEbESS37VG2f0+Ts+LGRjc1rkg3wX19dCcIsgmTQfnL977xJckDz2C+7jtfolAyFMf/iW/I9 jhaqitwLRHzqMB2wELUGmiEYO/I2yFziLmoJOxfxYPfsuShQfuCPStS4Jyt4FGjeyPl1bIY0U2e kPPxXjRzo/IppqRxTLhJ6fxkAk4w= X-Received: by 2002:a05:6a20:1449:b0:3c3:7ac4:dac7 with SMTP id adf61e73a8af0-3c44b190aa1mr7584977637.45.1784886598629; Fri, 24 Jul 2026 02:49:58 -0700 (PDT) X-Received: by 2002:a05:6a20:1449:b0:3c3:7ac4:dac7 with SMTP id adf61e73a8af0-3c44b190aa1mr7584933637.45.1784886598176; Fri, 24 Jul 2026 02:49:58 -0700 (PDT) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbb8f1a8a7csm3961013a12.24.2026.07.24.02.49.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 02:49:57 -0700 (PDT) From: Mukesh Ojha To: Bjorn Andersson , Konrad Dybcio , Bartosz Golaszewski , Guru Das Srinagesh , Sibi Sankar , Elliot Berman , Andrew Halaney Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Mukesh Ojha , Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v4 3/3] firmware: qcom: scm: Fix tzmem state on probe retry Date: Fri, 24 Jul 2026 15:19:39 +0530 Message-ID: <20260724094939.613844-4-mukesh.ojha@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260724094939.613844-1-mukesh.ojha@oss.qualcomm.com> References: <20260724094939.613844-1-mukesh.ojha@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI0MDA4OSBTYWx0ZWRfX7LSQMuU/jH4L HP4JYuaAWJex6d51LqNaLqGbkwaWOrdarICEfvZ7Zrvq/Tw4BeIfZ1LSegieDORZsf4O2QJCw8W w/7CqdHvl3A9PwugfTfcMUa7kY/+84U= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI0MDA4OSBTYWx0ZWRfX1+UrnYLEoWL8 QzNYs4Qr1J8OhSeLKJcGKmNckiDwXzYGr8Kpm57grkTbq2/9mbND1meQ/ODKLV8M+crGcCUIasZ NN2wvG2tZu3Xf436htICNB3nXYwujONu5gLB5ilpzorkjxENp4mWOO540LzFuoWEPHHrLutT+NE v6igQdY7vU/lRaziVLxaWTgqFWkeIsDhKb3n1M57dGobF3P4qh5j5NpHX9aTzGiliSaoJd/Dp3s OjHpetw2MmcaEsEH98kiPOjjNXDhuKDTrDhlqn+a5iozAc8AAoaVNwXqZMyfDOI+60FL/kRZBe9 sLIlYsYCYsKb5yWY7/DH/ZDkeE4z8fDXox9xdzHutRFVEtW9mF4uN2JCdvdRY1nAIqHy9ZYN1qO m9+eKLgqPjA5yIbVloi5oStH9W82GCP9NVOtMKV/xVCi6cCQCxx2bCP4bJIG9ghKpkbCHPky2TM 7OTrFmL3kZU7C/GPkkg== X-Proofpoint-GUID: 3HNuWJRSxUi0P49g7PKKz-g-WNXdj7Ob X-Authority-Analysis: v=2.4 cv=BNeDalQG c=1 sm=1 tr=0 ts=6a633547 cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=Wn-X5jRZ7-pqfG1RE4UA:9 a=2VI0MkxyNR6bbpdq8BZq:22 X-Proofpoint-ORIG-GUID: 3HNuWJRSxUi0P49g7PKKz-g-WNXdj7Ob X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-24_01,2026-07-22_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 adultscore=0 phishscore=0 lowpriorityscore=0 malwarescore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607240089 qcom_tzmem_enable() returns -EBUSY if called a second time, but this causes probe retries to fail permanently if a later step in qcom_scm_probe() defers after qcom_tzmem_enable() has already succeeded. Use DO_ONCE() to ensure qcom_tzmem_init() runs exactly once across all calls in a thread-safe manner. qcom_tzmem_dev is set on every call since probe retries use the same device pointer. The result of the first initialisation is cached and returned to every subsequent caller. Fixes: 40289e35ca52 ("firmware: qcom: scm: enable the TZ mem allocator") Reviewed-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio Signed-off-by: Mukesh Ojha --- drivers/firmware/qcom/qcom_tzmem.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c index 0635cbeacfc8..0fd9581275f1 100644 --- a/drivers/firmware/qcom/qcom_tzmem.c +++ b/drivers/firmware/qcom/qcom_tzmem.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -507,14 +508,18 @@ phys_addr_t qcom_tzmem_to_phys(void *vaddr) } EXPORT_SYMBOL_GPL(qcom_tzmem_to_phys); +static void qcom_tzmem_do_init(int *result) +{ + *result = qcom_tzmem_init(); +} + int qcom_tzmem_enable(struct device *dev) { - if (qcom_tzmem_dev) - return -EBUSY; + static int result; qcom_tzmem_dev = dev; - - return qcom_tzmem_init(); + DO_ONCE(qcom_tzmem_do_init, &result); + return result; } EXPORT_SYMBOL_GPL(qcom_tzmem_enable); -- 2.53.0