From patchwork Tue Jun 24 02:13:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 899540 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 D731B23BCF0 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 (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55NKl7bb014579 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-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47f2rptph2-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-f197.google.com with SMTP id af79cd13be357-7d38fe2eff2so818215585a.2 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=ti1zzQZdW61KOJWz+5RL0OuK8Tt5WKjvOqtaysDeAUDFxTnj10O/D6OnEtquhVG8oT roEon2po6Vf8Cv3VfafwD3Ka/L3GtGc9XqRetENbek06oa1saZEEC4w1bOTPkKKmzTIt 2o6jC28Mc9iUvKMYyxFowyVlw2KiVOzyzJKqL5Fg8kBAixU++gjPzDxPSNFl/meGOrxL xoNQV2/CcuTMg19XKYUX4xR3zmoI/Mrd7h8ojZRme8aT9UOolWu+C3NL+Fhjk/RTWuVw VW9kdLn1WO18mz0OXsl70+bLd2awTsHxCG+Pb/TzdYlY9sxs+fL2gGEqBAWAtCbxaiOo z4KA== X-Forwarded-Encrypted: i=1; AJvYcCWgcoZ8CbVqLbx7Bd79E9HSVXZccnwxY5lfunf2wMpi+T1ctJhTA9zxwQy2fUCYsg8vHnxsK0Rsogs=@vger.kernel.org X-Gm-Message-State: AOJu0YyF15cJsDCj9QX7UsVZH/W3Vlxyhh/aNVMjnJE4fkA4tkG2IXsL 2EyN82EENx7Yim2xPOTdzdGaHW+asUe4XBaZdfQnuk5HHkY7qlGSGlec1fwttOlecLhgZ/HkY2L PszV/9JVRQlvU4pWLRETivylkPEwtrdjbBPukb1egXpH2fMoz//0YHljQX17Lm9U= X-Gm-Gg: ASbGncvhXTg35PdqtPlfMtJltCp0hL/kdObx5h7P+hQ75ZgSsYDpySI4iz2fywmS44Q 10hVxkRWiPnJkoW92f8JzN10GrHC2hqU1SEsdluN2CcoCYqd0+ShJ+V79k5VQIl6hkpO+ItNA4B 3GhWH/3hGFZsEGlVwm0AAVhQr5NYY60JTMmlK7hABQJEyDP2zutqVracC8X7Py0VRqZgRI9RpNO hk0iFt3gD+gzSUwo1b+ajoY1kLYlbfNqgT5KOZKjrwPsAmwHkAXstiYlKX/+hYyDPO59Z9HzH50 DvOzUfLXTN5Dthptj9IvUg6UD7HLnLDD6K0Fr675OTMgsadYXSdQnQVRU/zXyTAQrTHTQIdCmeg 20ukiDBYOpQmmOfliR569mlQuth1qwAmmeA4= X-Received: by 2002:a05:620a:3184:b0:7d3:9108:2f5e with SMTP id af79cd13be357-7d3f9955eb1mr2175621885a.58.1750731256669; 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-efi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-Authority-Analysis: v=2.4 cv=NdDm13D4 c=1 sm=1 tr=0 ts=685a09f9 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=6IFa9wvqVegA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=-DwM1zgTEUuOfulMvEAA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI0MDAxNyBTYWx0ZWRfX9E8v8lvh5HfD rjsKw0Of1cvb2md2+1Jz6TH+KLdupWNLPyR++d/ul/sG4jXN2SMVDxMwiW7M2tKYIqtuwhK7Ux/ EcjbajYdvzy1cyKmKMfzBMRVQ5yBByrHXJtQWNm69kfbf7v/exSrmLpd9uk77nAYwWNJ+UIdu+a 6STfRnuoNIiWS45Y/c3zaA1sWCsxy/d54evUnytfRnTIeH2mRQWoG9LiZhBlNuEP2KVDSQVZcyT zbujXlH643n0TQRExij00+97xlCuevvTOr18ETfzqWhjYpub9Y6sKYEXxrHMPNaFEzeWPXoExrE STUrQMjI5oXeplhaJN/V++sO3CB1S/XNbqLY/SrsBPOV6zbpduenjMBcXpgAQ2gd0O+aaEKuNw+ sNI0rEyaf5SCEHIxXttwHOT1IZIgqufnYrxQRf0C7P5Il9t2J7/S7/uFtrrBXnQ/rEpVAz6B X-Proofpoint-ORIG-GUID: x1LTFpUy-NlZphCQ3xgDqGlcQgmPT07V X-Proofpoint-GUID: x1LTFpUy-NlZphCQ3xgDqGlcQgmPT07V 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 bulkscore=0 mlxscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 adultscore=0 clxscore=1015 impostorscore=0 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=off 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..49dcb30311f9c5eae697317ec6f32ac73d81314a 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); +static unsigned long qcom_qseecom_disable = QCOM_QSEECOM_QUIRK_DISABLE; static unsigned long qcom_qseecom_ro_uefi = QCOM_QSEECOM_QUIRK_RO_UEFIVARS; static char *qseecom = "auto"; @@ -1989,32 +1990,20 @@ module_param(qseecom, charp, 0); /* * We do not yet support re-entrant calls via the qseecom interface. To prevent - * 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 modparam. + * + * To disable QSEECOM for a particular machine, add compatible entry and set + * data to (void *)false. */ static const struct of_device_id qcom_scm_qseecom_allowlist[] __maybe_unused = { - { .compatible = "asus,vivobook-s15" }, - { .compatible = "asus,zenbook-a14-ux3407qa" }, - { .compatible = "asus,zenbook-a14-ux3407ra" }, - { .compatible = "dell,xps13-9345" }, - { .compatible = "hp,elitebook-ultra-g1q" }, - { .compatible = "hp,omnibook-x14" }, - { .compatible = "huawei,gaokun3" }, - { .compatible = "lenovo,flex-5g" }, - { .compatible = "lenovo,thinkpad-t14s" }, - { .compatible = "lenovo,thinkpad-x13s", }, { .compatible = "lenovo,yoga-c630", .data = &qcom_qseecom_ro_uefi, }, - { .compatible = "lenovo,yoga-slim7x" }, - { .compatible = "microsoft,arcata", }, - { .compatible = "microsoft,blackrock" }, - { .compatible = "microsoft,romulus13", }, - { .compatible = "microsoft,romulus15", }, - { .compatible = "qcom,sc8180x-primus" }, + { .compatible = "qcom,sc8180x", }, + { .compatible = "qcom,sc8280xp", }, { .compatible = "qcom,sc8280xp-crd", .data = &qcom_qseecom_ro_uefi, }, - { .compatible = "qcom,x1e001de-devkit" }, - { .compatible = "qcom,x1e80100-crd" }, - { .compatible = "qcom,x1e80100-qcp" }, - { .compatible = "qcom,x1p42100-crd" }, + { .compatible = "qcom,sdm845", .data = &qcom_qseecom_disable, }, + { .compatible = "qcom,x1e80100", }, + { .compatible = "qcom,x1p42100", }, { } }; @@ -2046,12 +2035,22 @@ static bool qcom_scm_qseecom_machine_is_allowed(struct device *scm_dev, match = of_match_node(qcom_scm_qseecom_allowlist, np); of_node_put(np); - if (match && match->data) + if (!match) { + dev_info(scm_dev, "qseecom: untested machine, skipping\n"); + return false; + } + + if (match->data) *quirks = *(unsigned long *)(match->data); else *quirks = 0; - return match; + if (*quirks & QCOM_QSEECOM_QUIRK_DISABLE) { + dev_info(scm_dev, "qseecom: disabled by the quirk\n"); + return false; + } + + return true; } static void qcom_scm_qseecom_free(void *data) @@ -2086,10 +2085,8 @@ static int qcom_scm_qseecom_init(struct qcom_scm *scm) dev_info(scm->dev, "qseecom: found qseecom with version 0x%x\n", version); - 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; - } /* * Set up QSEECOM interface device. All application clients will be diff --git a/include/linux/firmware/qcom/qcom_qseecom.h b/include/linux/firmware/qcom/qcom_qseecom.h index 8d6d660e854fdb0fabbef10ab5ee6ff23ad79826..d48044ece20cc9ebac3357a642dc671c349d4343 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_client *client, } #define QCOM_QSEECOM_QUIRK_RO_UEFIVARS BIT(0) +#define QCOM_QSEECOM_QUIRK_DISABLE BIT(1) #endif /* __QCOM_QSEECOM_H */