From patchwork Fri Mar 8 22:08:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 779076 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 766506024E for ; Fri, 8 Mar 2024 22:08:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709935717; cv=none; b=ZfI1PEzyfm6jR9D97QyM4g1BiDkKBsxoB+7rv4ciCkFAqDmjq3yS6VpNV+qMD1fZ18fuDTl0d9DOevSZci3bDcyJ3QIktd+InYpqYXTgkFbxx5LCEvK9mmy4VdZmT9tjU9sOdd6WfTnP5/6gqIxVPd8Jp014gW7SxGuAg8bFPHA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709935717; c=relaxed/simple; bh=eWOTmd2tsTLxXcstbYbn83ahKI+wXi5kjtikQvd8TmA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qRqPc6Vy5X1lnTkF2Io/lazZVHilMiJVHa9mFx8qfFQnh1RrkhPavNalzwn8eNOuVTbrhMUntLqxlZ5jy9iMrBvWZn8FaeBVNFoO0NX6RFGWcwY7LOXsnChVPSENN37UDu6ziiCGlOe1Fu4SZHKMHUGFavF3QbnJQrEWDo84MJs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=YhyMJIXr; arc=none smtp.client-ip=209.85.167.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="YhyMJIXr" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-5139745e6afso1116741e87.1 for ; Fri, 08 Mar 2024 14:08:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709935714; x=1710540514; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=PwYLLPvl+vc8WoafYRVCdkEDCnelT/9QzPyhGkE8pJY=; b=YhyMJIXrDBsTh70IwTXS3erwIly2laaNXDL6+KURz103rcq1FktJnemZ/zP79RhbHK DV52yJZvBWAtxkezYSA6BkP1tI8l1G+9uzySxjO1T/QPABlyXze7p5tpwFf1icqNL4i6 2P9WBZub056ZXwwjIO358O/4BIeen3CdnuuvFziRvFDnCVt098x+yrnXM9cDEsLhjJHs PP2V/VHQ1O3duIamdSdbpoIu/zvSoE1VJUkL3okmPthSDZ3NfCfNQsF9Rqg2jb78Oiup d5l+8w+Gqs1/65Jk0hpsTvc0J5pMYgQW9pkNr8+lCkDUHMk50mPatzNnNEbYOT66m6gy rTaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709935714; x=1710540514; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PwYLLPvl+vc8WoafYRVCdkEDCnelT/9QzPyhGkE8pJY=; b=aAJsqy369N+Tqu1KFEzF7ZbCUkvszFsPiDibtV7T81HKy93txpUUDxD3iNBVp7U8C4 v6vE44SDCmMummX08Rsn1gN90R2hz/ai6FDUeYZz+o0uwWNEKvN2UJQWRFhmzjvqK65/ mD2m2ZaBgJ5jryqgbG9/Z74nR0kUsvXuq8GdWx5bNYvbLaCvQqMW9G4INs216Za1f09x 5BW6kHLfGzuw9NkLU1iG3t+s+1rs0S/ff0YOXGt1Q9gLSBa+2q/gHmJV2oipAn1+6ETj T9K2+7tEOJ3+wjbTv06N6CIGai6z3ulKlcNb4PwOkbn9GRhkx2TTCsDFaOEwCp6m/g01 wgUg== X-Forwarded-Encrypted: i=1; AJvYcCVlxwZd3Lf20DDpbk7/7IrLMwOYR9jA+/j83eMthPAp5rE+tFBlF2ShXE0PIKU6kPHB0zg7rqlSQnVDec6Fn2wkiDS7rgUZeE0= X-Gm-Message-State: AOJu0Ywd4ROXfwwYhEUAxxYpQqTkWfGITvuqqd0crHividxQQpEBihhQ 7BLTyQT0oHnEr8gS36lws598YCR0A8bhF7m9X0JVFr72OUHoi1fs/khGFykSLfM= X-Google-Smtp-Source: AGHT+IHAV2kpX7EJHsUlb5qz1GWavXRchPg/L3LtUpK4DxckheMNV6bZmY/dkUgbnHUiStHe9NhTmA== X-Received: by 2002:ac2:5e78:0:b0:513:593e:12c3 with SMTP id a24-20020ac25e78000000b00513593e12c3mr155945lfr.50.1709935713679; Fri, 08 Mar 2024 14:08:33 -0800 (PST) Received: from [10.167.154.1] (078088045141.garwolin.vectranet.pl. [78.88.45.141]) by smtp.gmail.com with ESMTPSA id a14-20020a056512020e00b005130ff68b87sm78241lfo.109.2024.03.08.14.08.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 14:08:33 -0800 (PST) From: Konrad Dybcio Date: Fri, 08 Mar 2024 23:08:21 +0100 Subject: [PATCH 2/3] thermal: qcom: lmh: Check for SCM avaiability at probe Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240308-topic-rb1_lmh-v1-2-50c60ffe1130@linaro.org> References: <20240308-topic-rb1_lmh-v1-0-50c60ffe1130@linaro.org> In-Reply-To: <20240308-topic-rb1_lmh-v1-0-50c60ffe1130@linaro.org> To: Bjorn Andersson , "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thara Gopinath , Amit Kucheria Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov , Konrad Dybcio , stable@vger.kernel.org X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1709935708; l=887; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=eWOTmd2tsTLxXcstbYbn83ahKI+wXi5kjtikQvd8TmA=; b=401goTee880ks06op80EKYjIveyZC5BEA5EmmeGSyAwJsuAfi4ne5Vaa2dRdOt5Aq/UBeKmf9 xFVGDRm6yWuCBc2d54oDP6CUiP0MxtyBl/VnmgfIF62nr+BdmAcMdwZ X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Up until now, the necessary scm availability check has not been performed, leading to possible null pointer dereferences (which did happen for me on RB1). Fix that. Fixes: 53bca371cdf7 ("thermal/drivers/qcom: Add support for LMh driver") Cc: Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- drivers/thermal/qcom/lmh.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/thermal/qcom/lmh.c b/drivers/thermal/qcom/lmh.c index f6edb12ec004..5225b3621a56 100644 --- a/drivers/thermal/qcom/lmh.c +++ b/drivers/thermal/qcom/lmh.c @@ -95,6 +95,9 @@ static int lmh_probe(struct platform_device *pdev) unsigned int enable_alg; u32 node_id; + if (!qcom_scm_is_available()) + return -EPROBE_DEFER; + lmh_data = devm_kzalloc(dev, sizeof(*lmh_data), GFP_KERNEL); if (!lmh_data) return -ENOMEM;