From nobody Wed Oct 8 21:37:36 2025 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 CCC4225E458 for ; Tue, 24 Jun 2025 22:53:41 +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=1750805623; cv=none; b=hi7YuK6m3gGZCt0BzdH2Pa/anpqe7H6mL+TydAon4hKmxNVkZ1hGxgW0a9KOvBdsCTOPalEhkp1XwKu+/96qifhefk56wgjqy8kM+NH5Kg8Puk7O/NuetpXYeWVXa5vzsIw9ZbaAltmIDGmz8S+0nti0clC/krJQoyTpAkVo+4g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750805623; c=relaxed/simple; bh=fzBC2xoL+zqcCdvdFp6QOzxB8vCAph7pd10rAyAoyFQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UsXbEujh09YRPM9vNgcwSPsGEPp+UOsX6I7Yr1OsylDe5AgzLqt5nJtRfDWvbh/6b4cpxt+/KoZQBAXCWmhCo2ikWiaydQ3xAHOt9QtcdYAbar75oTFGTMkZhwYC/LkXUGs4rbeL0My2Itm0OjDMMe/qi0jEDYAI08rVsgNSZZs= 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=GZXI4aAg; 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="GZXI4aAg" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55OF1M99020784 for ; Tue, 24 Jun 2025 22:53:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 8NIM9T6hNdyQApd2V3NHJVIC0mrVXV0ISFYbKqPxryc=; b=GZXI4aAgC5zdYbkB RWawKfyY6Gszevvpx/HE1AhxdO1l3b1aQvRiwdVVQH+cdZtvNoh7mEy24yq16o7c IOOSt6yDbJcCw/Lc3ZbOeCJ1a/OtGzSWyxDyhmarWdFHPXJd98uArZUm6JcSJHfy +ZxufvRbZHJltHsoWkPK84LPlboRVv0PqTI4i3GQoVTb5RgssSmWk3EJYLR/TXUw JU/zTRfNKDp/2sdn/xJhcKtahfsOIzDCuarTuWOqRphDxt8h1lvLd3MdX4SVyXRl 3xxXxi5pFLnAXnRQaD7+pX4oeAykFg7bGjJFIjHYOv24iQTyLQGkNB52dexFJqI1 JI5fsg== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47f4b3wnsu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 24 Jun 2025 22:53:40 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7d399065d55so130817885a.1 for ; Tue, 24 Jun 2025 15:53:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750805619; x=1751410419; 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=8NIM9T6hNdyQApd2V3NHJVIC0mrVXV0ISFYbKqPxryc=; b=LJQb00wdXUAxKRLo6U5d31fwBKM/ogBOZ8xPoMFcge2KC3uEYxYLysqxnTDN7+xzup zxfHqN3zUbKwvZAAhXqhFE+97hhGQN5D4Cxp/MFCuDCOlL0wPPGsxH4iC/4qsuNOb7JT fH8IK9TMMraIk3R5O3h7Sx0lPDUW7gCl30TCPi1zvyQHqR2gWjcU9fGA7i2H9grtiUMv WD7Qu+fhXMcSyXsj0d+NQ+qwrTIqaVR597cEOSd5HpIhJh94vvDU42jcoGn7kH1IxgZr SH6JLr+Lr+AC98wdnlEACFLVZCZXoWb7xmLrAPnDKAAx9MfoQKx6l4BXMLQCCxpHb52n cYAQ== X-Forwarded-Encrypted: i=1; AJvYcCV4GAVIiYtBG+BpUscM5XY0HB6a0V6QOXHbFWar0UbNnxHKc3lYjjjHzRQtTOasWDCwCy4xodzHrYlV6uA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyf3fy3rfmOngtzTQWy5WimqUWmJdx7Cl9GAJNqKoO9sxlUD5wK dBHYRf+KAI70UecbaundhSaVuK15uBAFmihRb5ZPlbCiwL9rlLqH/4pLBe4Z5w/2eQvBGdXXp7o bz0U5Sd07Tc1EdEOGi0MpMXySkoARjmVs03lQWR6jdUwxCqc5r9QlYeoJUggl5DOG8bk= X-Gm-Gg: ASbGncu5nCVT8NQlv5PyMu9CjjuMkTfeG5BQSFy0BdENEraD1iIoJ5AvEJAqsLsWFYj JdRblK8ro+6nRO7RzpUgeT0jFhtm1ZFPa3H8ZtyD7pv+ivISW7Av2E9xWQoFDAItWM0tOi7plCA M9Dz9k0IUU6Zs654nuBVqrsfyLlcBNXLIkB/x5Xm1CniNxATUnSKP2cwbjTxpmrN5BT2pqbJck0 hCjheQZYG8Wf8f+TdMQRh9iYigznb/maRlZ2CHVm3bRHADHJArhoUcHwqDpJQuF8gEL6GajL6rY tFLB61g1U7BQl3qteiertQINTdnsPzYhYOWOIDLK4xAH3dU1IFB7RszpbKi3/7wG2vJG7M6RAoJ o8ngSdJzWHBS6VHipiUcQPrSY3+I5S49EbrU= X-Received: by 2002:a05:620a:489a:b0:7c5:4463:29a3 with SMTP id af79cd13be357-7d4296eaeb3mr136492285a.25.1750805619200; Tue, 24 Jun 2025 15:53:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEArHTt7L3yra76vcOX9pHi5y0XwXAgplfEwKMaA+D1SyjqM/8XRnYIHLsA2KpxGeCCOQTelQ== X-Received: by 2002:a05:620a:489a:b0:7c5:4463:29a3 with SMTP id af79cd13be357-7d4296eaeb3mr136488985a.25.1750805618744; Tue, 24 Jun 2025 15:53:38 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-32b97f5980bsm17843851fa.7.2025.06.24.15.53.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jun 2025 15:53:37 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 25 Jun 2025 01:53:26 +0300 Subject: [PATCH v4 7/8] firmware: qcom: scm: rework QSEECOM allowlist Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250625-more-qseecom-v4-7-aacca9306cee@oss.qualcomm.com> References: <20250625-more-qseecom-v4-0-aacca9306cee@oss.qualcomm.com> In-Reply-To: <20250625-more-qseecom-v4-0-aacca9306cee@oss.qualcomm.com> To: Bjorn Andersson , Maximilian Luz , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Ard Biesheuvel , Konrad Dybcio Cc: Johan Hovold , Steev Klimaszewski , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-efi@vger.kernel.org, Dmitry Baryshkov , Konrad Dybcio X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4931; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=cWoHO0MsVGuzMZsWaCgpVEQsk3VIUIcF/KJvccYMdzs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoWyxjQwD68t32h8d/QHOesm1x5z3pruiLn7HRU w9Ub4Us1bCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaFssYwAKCRCLPIo+Aiko 1RH2B/98/HW2wQwAkPEHQXtfRUHSuLSmvcQvdNliBhX9EGiDR26KoItjdnPz353c2hroFgqzkyt 5MlUIJNAARicuZ17oB8HsJAs1Fj6/kHYJil96po9yxEFUGO7CJgkVZRuDY7/RCN1mlcWlhaK53N RANcoWMs068o6HEAQblUSEMpUgB8kgxm0C/TsClgmyO9Z0ridT6n/pxmSDzhRhxPSFG5wwkpcyL mW5abuK1SGFEoUXfafScbF6uJ9/jkWQDpFWBFj1NNFrNNrfDDxhpMNJ/RkG6m7O1qDTmbQTetWy HVzEhf+q9fJ+pJl9Cx/AN1hUGGAfCt06PlpPPAcH/pCuW4qY X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI0MDE4MiBTYWx0ZWRfXwMTDhWuv5QHC 0CiJGzHlCBZC0d19Iwer+FHRQTOz8FKHAJdFc5pwF2+1SoVBmmwFtGAcSKpwcpx4tlgmf/s4hkx Tf0wP9xfhfyTYvw80Jd2H/514vyHgJitJGjzJEiBmuaurIMNcdYubYCTzbo8ophbgEDk9e7R3Dd LQBSErh8NyEUa8MGWPwV3fp2oW7o508hORdoeB1Gx67ntnmRXGeRMWxu1qrck2eg6cdQw90zoUL onDKW2kY3qA92qrtNPyVLGiVydBlyEiw5iaUXG+I4HiMuiTgEyzbEraKk1+6cuLFZ6v/ApI2vJG gFYRbMRj3X+m3fnkS6h7eaLHCmlmqOELLeLsUb08B59+vwyeltsnTTT6Z7MBiDbIfCc158vBh59 kc7P7QCD+aV9lyYiop/F1ZIveroROfenPA1Z9/28Z5wF2Lk0VsGlaell/daEHmBv4f2H5g1d X-Proofpoint-ORIG-GUID: wlFRi_EfFIYS8vfrQ24VFBA832oi-b0_ X-Proofpoint-GUID: wlFRi_EfFIYS8vfrQ24VFBA832oi-b0_ X-Authority-Analysis: v=2.4 cv=A8BsP7WG c=1 sm=1 tr=0 ts=685b2c74 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=6IFa9wvqVegA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=-DwM1zgTEUuOfulMvEAA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-24_06,2025-06-23_07,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 bulkscore=0 phishscore=0 adultscore=0 impostorscore=0 suspectscore=0 mlxscore=0 clxscore=1015 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506240182 From: Dmitry Baryshkov Listing individual machines in qcom_scm_qseecom_allowlist doesn't scale. Allow it to function as allow and disallow list at the same time by the means of the match->data and list the SoC families instead of devices. In case a particular device has buggy or incompatible firmware user still can disable QSEECOM by specifying qcom_scm.qseecom=3Doff kernel param and (in the longer term) adding machine-specific entry to the qcom_scm_qseecom_allowlist table. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/firmware/qcom/qcom_scm.c | 49 ++++++++++++++------------= ---- include/linux/firmware/qcom/qcom_qseecom.h | 1 + 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_= scm.c index 5bf59eba2a863ba16e59df7fa2de1c50b0a218d0..025f834e95b537b76d41b59b638= 71a4ce5bed717 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -1981,6 +1981,7 @@ int qcom_scm_qseecom_app_send(u32 app_id, void *req, = size_t req_size, } EXPORT_SYMBOL_GPL(qcom_scm_qseecom_app_send); =20 +static unsigned long qcom_qseecom_disable =3D QCOM_QSEECOM_QUIRK_DISABLE; static unsigned long qcom_qseecom_ro_uefi =3D QCOM_QSEECOM_QUIRK_RO_UEFIVA= RS; =20 static char *qseecom =3D "auto"; @@ -1989,32 +1990,20 @@ module_param(qseecom, charp, 0); =20 /* * We do not yet support re-entrant calls via the qseecom interface. To pr= event - * any potential issues with this, only allow validated machines for now. = Users + * any potential issues with this, only allow validated platforms for now.= Users * still can manually enable or disable it via the qcom_scm.qseecom modpar= am. + * + * To disable QSEECOM for a particular machine, add compatible entry and s= et + * data to &qcom_qseecom_disable. */ static const struct of_device_id qcom_scm_qseecom_allowlist[] __maybe_unus= ed =3D { - { .compatible =3D "asus,vivobook-s15" }, - { .compatible =3D "asus,zenbook-a14-ux3407qa" }, - { .compatible =3D "asus,zenbook-a14-ux3407ra" }, - { .compatible =3D "dell,xps13-9345" }, - { .compatible =3D "hp,elitebook-ultra-g1q" }, - { .compatible =3D "hp,omnibook-x14" }, - { .compatible =3D "huawei,gaokun3" }, - { .compatible =3D "lenovo,flex-5g" }, - { .compatible =3D "lenovo,thinkpad-t14s" }, - { .compatible =3D "lenovo,thinkpad-x13s", }, { .compatible =3D "lenovo,yoga-c630", .data =3D &qcom_qseecom_ro_uefi, }, - { .compatible =3D "lenovo,yoga-slim7x" }, - { .compatible =3D "microsoft,arcata", }, - { .compatible =3D "microsoft,blackrock" }, - { .compatible =3D "microsoft,romulus13", }, - { .compatible =3D "microsoft,romulus15", }, - { .compatible =3D "qcom,sc8180x-primus" }, + { .compatible =3D "qcom,sc8180x", }, + { .compatible =3D "qcom,sc8280xp", }, { .compatible =3D "qcom,sc8280xp-crd", .data =3D &qcom_qseecom_ro_uefi, }, - { .compatible =3D "qcom,x1e001de-devkit" }, - { .compatible =3D "qcom,x1e80100-crd" }, - { .compatible =3D "qcom,x1e80100-qcp" }, - { .compatible =3D "qcom,x1p42100-crd" }, + { .compatible =3D "qcom,sdm845", .data =3D &qcom_qseecom_disable, }, + { .compatible =3D "qcom,x1e80100", }, + { .compatible =3D "qcom,x1p42100", }, { } }; =20 @@ -2046,12 +2035,22 @@ static bool qcom_scm_qseecom_machine_is_allowed(str= uct device *scm_dev, match =3D of_match_node(qcom_scm_qseecom_allowlist, np); of_node_put(np); =20 - if (match && match->data) + if (!match) { + dev_info(scm_dev, "qseecom: untested machine, skipping\n"); + return false; + } + + if (match->data) *quirks =3D *(unsigned long *)(match->data); else *quirks =3D 0; =20 - return match; + if (*quirks & QCOM_QSEECOM_QUIRK_DISABLE) { + dev_info(scm_dev, "qseecom: disabled by the quirk\n"); + return false; + } + + return true; } =20 static void qcom_scm_qseecom_free(void *data) @@ -2086,10 +2085,8 @@ static int qcom_scm_qseecom_init(struct qcom_scm *sc= m) =20 dev_info(scm->dev, "qseecom: found qseecom with version 0x%x\n", version); =20 - if (!qcom_scm_qseecom_machine_is_allowed(scm->dev, &quirks)) { - dev_info(scm->dev, "qseecom: untested machine, skipping\n"); + if (!qcom_scm_qseecom_machine_is_allowed(scm->dev, &quirks)) return 0; - } =20 /* * Set up QSEECOM interface device. All application clients will be diff --git a/include/linux/firmware/qcom/qcom_qseecom.h b/include/linux/fir= mware/qcom/qcom_qseecom.h index 8d6d660e854fdb0fabbef10ab5ee6ff23ad79826..d48044ece20cc9ebac3357a642d= c671c349d4343 100644 --- a/include/linux/firmware/qcom/qcom_qseecom.h +++ b/include/linux/firmware/qcom/qcom_qseecom.h @@ -52,5 +52,6 @@ static inline int qcom_qseecom_app_send(struct qseecom_cl= ient *client, } =20 #define QCOM_QSEECOM_QUIRK_RO_UEFIVARS BIT(0) +#define QCOM_QSEECOM_QUIRK_DISABLE BIT(1) =20 #endif /* __QCOM_QSEECOM_H */ --=20 2.39.5