From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A671523182D for ; Wed, 29 Oct 2025 13:33:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761744819; cv=none; b=jdd/vl0FSc95x7UL8rRRAMUskkXT3v1VQEvG9JXkfWTUbwgtn07F0QA1BrAKzDuzmr1gPdYfnwzg1ZNq0JPMMgtBisylCMFAfX7guoIAZF0zXiO6Z2PS/yW9q+U2A3IpLc/RmBsbNbLFr7M08hRw48DFQowT6nMUfLuGehCfaJQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761744819; c=relaxed/simple; bh=Y8ZLQ/SYOzXImyS22Ym7aiIdnHdMzavchNbXR3fIpBs=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k/UqPGg5A2c9sApWZ7ZUQJtEAYqm4kipcUgpF0i5WiqsZM7sRIuIwKw6xLJGoMdduNX7KB8nB2hz+1CYMPqdHu1YAJxgGFdAY2feok8+js2Rr6YscwylRliHqx2cbAZtnD8FY9oGe3YUyMfELb4w1zN3mn/eBlZiVid2AnPJhag= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=THiaqa9J; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="THiaqa9J" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-47719ad0c7dso19599815e9.0 for ; Wed, 29 Oct 2025 06:33:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761744815; x=1762349615; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=o4H4p7cAGznM+u0vakSfKHlmdigUWGLnzD2FSausLfI=; b=THiaqa9JVIb7gHrsYfX/YS+y4WVAi3Cd8dNd985JoCbtHCldDzuPTo1UrDQNxJ6wy/ OSBp/e28WY9s6ucsKpnoV4ZMzCwTGWXANQ/KafXU/JErVv6L65yGmlmeTUHyisWr4soi iXJq7Bz52TQ6H+jmBDpI1ZDhe22zRTKb89ImOgws6BGhimbTWlJoIo6eb8nOEiLGv80M umGtbj1W9iHtZ5MPn4Lgs80wqmGizqwq+I+ZiHaOf8h+ItQyYuyX0nSLbOAPXmnPJBA0 TNQhsWsc5pgrUWBLB1YX6CfLD/iPY7tip/igGV2egvbR7C/ZNP9omuFdjZDErSWAc3lU 2m9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761744815; x=1762349615; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o4H4p7cAGznM+u0vakSfKHlmdigUWGLnzD2FSausLfI=; b=oNwhjf9c75+ZLQqJl+99iABmJUhqpDIyZCnD+6606yj+QiH/5TBXQSYSQEgSYyX6yN fEv2uqy0MujFzjDCp8W73ySaVIUzdehvBqcyzDvX2QqiBeT7telXbL4JoIz1ucbGXtRx snrXzHz2sW3aQp2uf6QUVXC0jWXXJz9B+MUegEnCADLXJcJLIftTMFCv15NqilN7gCjP sj579x2b1TvDHyRIcFfYd3KMyzQcXpzmNh0MoNBEPuVGm6FGLXFay8ZY4KKYEMDbGh76 0yINelyMe+EyNa+YEMd8305c0tLCMGj6p+fhKzKR75Yu1e18xuAK1jHOWKkUiv/uSQEU f/sg== X-Forwarded-Encrypted: i=1; AJvYcCUe6Lcb9vGZds8PsN9Pdroi5rIi9NjyShgUDXt7IoI/6BVf/efx8KMxNk40/S67Bf3Fu1r83gzA9idk4hI=@vger.kernel.org X-Gm-Message-State: AOJu0YwHdwoYpmrxKxiPzbq3zJ75SS9Gl0hNtqBMDsJTHbzDNoioV4L0 gl2luAmmbnn+so/jg3jz0AWD3aUDlAEMIXW72brUXA9Lrq9IGMhhuByo X-Gm-Gg: ASbGncuU5A6XqFsCOvuVKQxLAPwbrz/9IKP0Z0YrMB5QVVfOFWHUYT4OZemEKeoU/+Q y0nBH5+aQliK+a3QCtkLuifNIyCeYpn6lZQFiDyt34wFrWyQcS0M4aTKamWe7gjLqXTQ4K6gL+P zMmc3HgfjWS3y38/1fRCKwuakmlfej8zr9i8gW1GD6SBBXpFFrM/X/rW7uA7S6v4hxW9pyKNbCX A9D32BGktr79CbwVNpnEu2vvfaHCDma1i3fndWwzdUJJY1kD7LGDs3raDwZbo8rYdHa2qidoOds xO28MO3Fv7vIbp3QcYsc0hfWa1V+LqwOJ2ShoSIBLSKhlf4m039vvvj0DijbVkQtEkhsmzqHPeJ vlCJ3xxwOcwwP1qQkSmgjHp7V4bvtlvCzrOoMA+P4LPHbda/7yp70LcXndxb4RMH2DT1SvtmJU7 G8PqP3MlU3UICw/ENpIjJrVtTrFPUOkA== X-Google-Smtp-Source: AGHT+IGKTaGAZFOPryBpj8t36omqPXrDXVW3wtFaTSngpELE8eCJOJgMukJnq0llCfEkdriy+fkMCQ== X-Received: by 2002:a05:600c:46ca:b0:475:da13:2566 with SMTP id 5b1f17b1804b1-4771e20b2famr26010825e9.35.1761744814695; Wed, 29 Oct 2025 06:33:34 -0700 (PDT) Received: from Ansuel-XPS24 (93-34-90-37.ip49.fastwebnet.it. [93.34.90.37]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4771e387a14sm47955195e9.3.2025.10.29.06.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Oct 2025 06:33:33 -0700 (PDT) From: Christian Marangi To: Ilia Lin , "Rafael J. Wysocki" , Viresh Kumar , Bjorn Andersson , Konrad Dybcio , Christian Marangi , Raag Jadav , Arnd Bergmann , Andy Shevchenko , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] soc: qcom: smem: better track SMEM uninitialized state Date: Wed, 29 Oct 2025 14:33:20 +0100 Message-ID: <20251029133323.24565-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029133323.24565-1-ansuelsmth@gmail.com> References: <20251029133323.24565-1-ansuelsmth@gmail.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 There is currently a problem where, in the specific case of SMEM not initialized by SBL, any SMEM API wrongly returns PROBE_DEFER communicating wrong info to any user of this API. A better way to handle this would be to track the SMEM state and return a different kind of error than PROBE_DEFER. Rework the __smem handle to always init it to the error pointer -EPROBE_DEFER following what is already done by the SMEM API. If we detect that the SBL didn't initialized SMEM, set the __smem handle to the error pointer -ENODEV. Also rework the SMEM API to handle the __smem handle to be an error pointer and return it appropriately. This way user of the API can react and return a proper error or use fallback way for the failing API. Signed-off-by: Christian Marangi --- drivers/soc/qcom/smem.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c index 592819701809..d6136369262a 100644 --- a/drivers/soc/qcom/smem.c +++ b/drivers/soc/qcom/smem.c @@ -353,8 +353,12 @@ static void *cached_entry_to_item(struct smem_private_entry *e) return p - le32_to_cpu(e->size); } -/* Pointer to the one and only smem handle */ -static struct qcom_smem *__smem; +/* + * Pointer to the one and only smem handle. + * Init to -EPROBE_DEFER to signal SMEM still has to be probed. + * Can be set to -ENODEV if SMEM is not initialized by SBL. + */ +static struct qcom_smem *__smem = ERR_PTR_CONST(-EPROBE_DEFER); /* Timeout (ms) for the trylock of remote spinlocks */ #define HWSPINLOCK_TIMEOUT 1000 @@ -508,8 +512,8 @@ int qcom_smem_alloc(unsigned host, unsigned item, size_t size) unsigned long flags; int ret; - if (!__smem) - return -EPROBE_DEFER; + if (IS_ERR(__smem)) + return PTR_ERR(__smem); if (item < SMEM_ITEM_LAST_FIXED) { dev_err(__smem->dev, @@ -685,10 +689,10 @@ static void *qcom_smem_get_private(struct qcom_smem *smem, void *qcom_smem_get(unsigned host, unsigned item, size_t *size) { struct smem_partition *part; - void *ptr = ERR_PTR(-EPROBE_DEFER); + void *ptr; - if (!__smem) - return ptr; + if (IS_ERR(__smem)) + return __smem; if (WARN_ON(item >= __smem->item_count)) return ERR_PTR(-EINVAL); @@ -723,8 +727,8 @@ int qcom_smem_get_free_space(unsigned host) struct smem_header *header; unsigned ret; - if (!__smem) - return -EPROBE_DEFER; + if (IS_ERR(__smem)) + return PTR_ERR(__smem); if (host < SMEM_HOST_COUNT && __smem->partitions[host].virt_base) { part = &__smem->partitions[host]; @@ -1182,6 +1186,7 @@ static int qcom_smem_probe(struct platform_device *pdev) if (le32_to_cpu(header->initialized) != 1 || le32_to_cpu(header->reserved)) { dev_err(&pdev->dev, "SMEM is not initialized by SBL\n"); + __smem = ERR_PTR(-ENODEV); return -EINVAL; } -- 2.51.0