From nobody Thu Oct 9 00:02:37 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 9949023AE93 for ; Tue, 24 Jun 2025 02:14:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750731260; cv=none; b=WBLTMeG7ttmgBkWy2C7AhngIx9lH3/xwVJpEKecI2Agl5BbV9AnDt0tTf5EhxKeoFeAn58PJzMreL6PMx/55wleue3tpNZgRcm1KgbbtObdCvIf54Jlb1xPZk3u3GcsoNWC7+mBNNVwN1uecF+W0M+XlI4sOZo/vlt4tmzq7iiw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750731260; c=relaxed/simple; bh=/NIXeaLJW7ceni+zMV2gP7uWevC/GndSzaHOxcNpLVY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AqZuV7zYAYcRS31smaKAmdhPHrOaqJzkNbt3zX+RPWgSGODiuwaxI5Rv5tov3xM4GW9EU7n1E4ulHHest+OHzJx+uWJxanxW3Wz5E67pNayFNReF4LfOEgcxFfxWL3rdQLLgURmReK/0d6brhEU1C2QeRRRo81P47tGc4gBmPhA= 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=Rnr5ft7I; arc=none smtp.client-ip=205.220.180.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="Rnr5ft7I" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55NHUZVw005903 for ; Tue, 24 Jun 2025 02:14:17 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= KSsmFRYtKsy8tt0rPP75MYEWkXOKJnB/cMl7H48cmto=; b=Rnr5ft7IFX0ovfPY s3511GrfBjxXoVRYpTCCC70sOz7k3eNN31iMx9MVVZVw0VdQkYmfrVY5pJ5wrLkr D0CRx9pBsJU8ESC6TYN8sFayB2q5+9TSPZiJZpDp0+/f2jVHU2rXvvk2m9DctmNH egBkxVUsK+9o5zrJnFM1oCJVDjuXUQXAlL0Ab/VYQvvWHFVfp1ES5zoxhPbdQzhf R6z/95Lk6MgdB/qXRUQIjd0GS+v8imIxDBwVHYD+PhkFqTMzXP+xnjLooN7TYWxU ajKNmDpD2hUqCj8OqC7Jy4vdi/xLn0d8IOEVdGNlIxJ75p2+U7ZRqngpjNj9x0tk p0OCxg== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47f3bgahe8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 24 Jun 2025 02:14:17 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7d09ed509aaso707900685a.3 for ; Mon, 23 Jun 2025 19:14:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750731257; x=1751336057; 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=KSsmFRYtKsy8tt0rPP75MYEWkXOKJnB/cMl7H48cmto=; b=DebqklGF/S5im0Myle9QZq3PxquMPUDbnIQdlhhCQtRoapOsRgfh5SMwsnQbP6R9E8 Cf5X7gUpJXW3I+h3PKOpbiZ3EUlx0Wvy7nLsOg5RuGrwCCsq+uFdBGSjVyJqoTdAjGdf EGqgYcevcqXhyGQgctZKU35IYNd+jNQ8T7PKYv230d/2M9xHOjpUUIrp6XZVmDG2JR5h kJZKNu59MROkKp1QqXREJn74dzna0Z35EYu0srluvKKiJ1ffu/d3TOssz8qW9DVPZK5U /72/EvFNgsYACnrotN4ViD/cq1gazEp1yPVdjaqaYSQXtI/5gAMxyzxpufGug9ciKfSU vyMQ== X-Forwarded-Encrypted: i=1; AJvYcCUIatrSn89DKefklw4vNIQWY6hJ0hTajw6kCSge4qQhjv4r1cXjHo5eBvOqmrnvPWAxsJAzWA3jgKth4dM=@vger.kernel.org X-Gm-Message-State: AOJu0YyXdZZc+EpMd/iqtPIqynkx48xFaxYc6a3f57NbuVgrW1Ei2z+s hClao4DWjV5nheaJNZVWngUVW/6yqs2JMmWXTsk4WI2Zd3rzt6dmW4iVgXNfD7U3cZ3rmAWFQ4u HSEjSwvsiVsPVxARzzv6GyI/ULioUe6/bfNV/EKCzP7VLNYrPRtHxYdh0qzB1AH2B48Y= X-Gm-Gg: ASbGnculplDfff+T8kBu0FHk1in2XKZaWJHoQiX6NqC6gtkpqUEZJH6Ekgq7GJ8HjBx YJH7ip8yxRO43JWpaEZ80OGQhsBdj48AYfbgsWPbk5McPhjeS1T55X3kFdGavRDJBHxDLjyNlMT JhARaruYVTGYopw89G1qYz6UBnOdDrgIbpG2foDrPAby0bXBjd9RuX/LCvVCqDIKBVFDsI/I6vE 6Q43MvbxJrbmJUx6aZaEI+P9TwiNBWBgvl2yE8th9rvJBp4Ew5gieAlYu8oI98uBoUlmHswd+XT zyz+MNqxwIi/746kLA8lXN3PbKQY9cMCP8xarvp0KH2IBRx8heYQts2mlwDDN1oYBstk81oyjD/ 6VB2hkvPUYb9arKEO8hcFb7cvwiXwbDY2+xs= X-Received: by 2002:a05:620a:3184:b0:7d3:9108:2f5e with SMTP id af79cd13be357-7d3f9955eb1mr2175621385a.58.1750731256660; Mon, 23 Jun 2025 19:14:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEEvPGKzqq/ERq9Ab3y+s9Q0WOIWW1WDVFqtOrmONNECLpS3Se/wffNwM0S269x7P5cnh7UfQ== X-Received: by 2002:a05:620a:3184:b0:7d3:9108:2f5e with SMTP id af79cd13be357-7d3f9955eb1mr2175619385a.58.1750731256204; Mon, 23 Jun 2025 19:14:16 -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 2adb3069b0e04-553e41446e2sm1637764e87.32.2025.06.23.19.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jun 2025 19:14:14 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 24 Jun 2025 05:13:58 +0300 Subject: [PATCH v3 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: <20250624-more-qseecom-v3-7-95205cd88cc2@oss.qualcomm.com> References: <20250624-more-qseecom-v3-0-95205cd88cc2@oss.qualcomm.com> In-Reply-To: <20250624-more-qseecom-v3-0-95205cd88cc2@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4862; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=WYHsAMervqm5DoLC3yRi7Ntut5budPkixZWiTgVfZ9k=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ0YU57OPQU7Lk6fcrjl0ptDxvHvjFHeeN1GHLPQz0sQ3S n/m/MbWyWjMwsDIxSArpsjiU9AyNWZTctiHHVPrYQaxMoFMYeDiFICJREqw/y8r9urNq1K89bSr kmv79YKERREzp3846ag1399uceyOqJNXtrJuq+xoPNuzqHPND2ON/uV5jknuvWqzY4PW6DNpF6+ We+Te1ygSVrbgiZ/RIzne0ju7pL7wtXdr/M/ct9bBsVXS4cqH8gALJ6WJLvI6pfsc2Z0Vj6ouX3 Bza/Deq6uL7FKMF20VemOxe7mT8estqZKvHCTVp626dt+lgU3F4IHhF9XM5+ximZ2yyc833VJUY N4nphLzM7gzL+lv+umIuz8nSsQUlXCWrDjPefRXu9EZpz0Xrxl2zOZbf7hpX1iefaX617JVyxW/ Ov4tiQlkC4uPkjf9s1FwYTl3VZpaebatxN75JyNEGBQA X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: GOQDvmE33GoRRzcaGWnDimfiRn5RXCKw X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI0MDAxNyBTYWx0ZWRfXzrj8m3g08u65 33jv87ExyiCSt4hiQRU4b/z26jT+AdZxoG3bqazV82V4Z3COVyQrVApM2KKVL/OzmxtPevv+zvF rUYM+Z6UcRKD12qotwKtxUcYb98KVObNtxRbsOJ3y9x0E2gEiIlHK2UO3hAL8bpdvOrVilQXJq9 YvVmnh5THLPVbH+XV7fLzlEcalSJVcxfMcdcuRyCANqiIuA+jaKxOlYmPQRChAorC5jpASQ+Qzy bbjwhkrbtG4i84AtgKZkZBqturEkBrm0IM9laTnFVtNAvr+4UmaB4SMSAV8XC4Rvfy3id8XDX+Y 64D2OT17eKkfTYUq6DR8hGf93grDclukcBBhcuofNppD525LO3FAlN0i/x9zDpD67ZWo+A7Uwr8 BSO05ME6qUjPI5BXuLSIkZoXHcnyA1MlSCngMXExqcVfQssm8l1maNvsFrYHh0P/nCavKebz X-Authority-Analysis: v=2.4 cv=L4kdQ/T8 c=1 sm=1 tr=0 ts=685a09f9 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=6IFa9wvqVegA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=-DwM1zgTEUuOfulMvEAA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: GOQDvmE33GoRRzcaGWnDimfiRn5RXCKw 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_01,2025-06-23_07,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 bulkscore=0 clxscore=1015 suspectscore=0 adultscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 spamscore=0 phishscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506240017 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 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..49dcb30311f9c5eae697317ec6f= 32ac73d81314a 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 (void *)false. */ 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