From patchwork Wed Nov 12 10:28:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 622 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 7DDC0307AE4 for ; Wed, 12 Nov 2025 10:29:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762943361; cv=none; b=THhidntbWBarul55FdQaL/qxwn6R0j6r41ipUoYjzMaA+hHq/I7iFpm2IrYz+lJy29H7+1yalQa05nNliIToNHc2QqfA9T75KlaTi1PnvXSsSDj8LgPcOT/8DL5TCVyy9KSSsRAsw2o76Ii8mec/c43pZq1xrVxyJAfH++rGvCA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762943361; c=relaxed/simple; bh=kT5IA0GtAEQVfWhYH3L9qEziSnbAJtbqUptdjRPcgUw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QlaF7JGj3U0zn9FIXoPEMzxbAQWqk/ytzlj+bRrDGZf+ACbQCMH8sOjVaXqvN9uO/7EPPis/7sh4GEjyjv30myESZngnb62EHSE6x/WXTQLns1s6+6VFvCJKpqNqtWi9qAJexxFgFne/nlgwCqLeYbEoU8RyvuFvdmMLSVaVbGU= 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=qtg5PC3L; arc=none smtp.client-ip=209.85.221.47 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="qtg5PC3L" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-42b2cff817aso98814f8f.0 for ; Wed, 12 Nov 2025 02:29:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762943357; x=1763548157; darn=lists.linux.dev; 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=kBavdG36JhZKmN/pedjw25qWHClEhA6t5bxsk6oa0rs=; b=qtg5PC3LjSuglhT6w3eYZpqj05hcDr5eISDQPJE7kEetCukfKXekBet+0i6sFlDC1Q uPc/FF23dcQNOFAVJH/Sm9DdMed2vzZ5WToKEYedeeqz2El6KzZBlUdSInR5n1R+KbJ9 M/0Is2EBm7QZ9sd5aNO6uRdHxHVfmqWg1t8MAAUWDG5jrVCJc4woQlXqIM6NvC+oCZRp uznoFX71sst4isCCS6ww0iV8Va6xqDTkDqEKzImvsGX00K9RBNYSmVPawgufsh7E2TYm 0YcJjOHKLWtPsMpQb99k4ZKx9XyA/GZRhmpzdbMjw8aB4Kfq+Z5RdSus0wCpetrwvkJj uB4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762943357; x=1763548157; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=kBavdG36JhZKmN/pedjw25qWHClEhA6t5bxsk6oa0rs=; b=Ty/EhVElZfxxYz3p1h18eSnAhqoX11fxpfG2iwxbMXJO7+nF17YA1kHjbxO2Ox0zTu SElGuru2lqzhozmK/sBccogtjBTOkpMDaD7ytDQrysigOA8XQoFIG13IFkJyc0iZJD7b lehnDK7diTfe1QrptRYF4BQXjOsoiXmn1LgqusVOOWIA4nRJK60JwNyxxucLZWREnNkC VuaTgV3w9XYSqaDhBWW7V9WSmWuOzUFdDv5VSRFcol1zi5ok4JIdSiOQadmOtJvpJVH1 YDL4tBami8gBuZWgEQeM1dGtLwkR+S5Eyz4Z7RUbIAKx2jiyxlIwtGla1BFQb0kPrYnd q2eg== X-Forwarded-Encrypted: i=1; AJvYcCWexDkV8aE5ghomNZMV0Wqx/OoebCRaUZeefuQD3hcbJJhXUGBMBw8iOGV9EHukfpzsr/jt9+xqG2heAQ==@lists.linux.dev X-Gm-Message-State: AOJu0YzO6ukjdqnk+jVZHSNEkE5i5n7h1SVxPaAqDjxa6CMBMUhY5oE7 roCYrkW/kEMXOhisDg1gGIpJ4qfrlR0j3jPgKGCSJykLrfd/PhFviidVLNrPdRQLjO8= X-Gm-Gg: ASbGncv9yM21UfFxUlpMi+sQOiyxnzuXJRQz5IKv3Y+BvqhfnFXqa0kd2msnLESVfdO ORyC0McPnXo2G6BAwm2FhMxFxDSDXGf/75PcObC5i2id0fgu5eRgGu2b88bmxiGHUTIJdUBMH8R L+OJqvdICvE0oW+/DEddZQLYgezRCeCf25glqnrt0WicNBC5gA6PBVcsFaAQLC9yGznxaz4Zxi/ ALxRZAiVm8b0ZN2jKgeaYP+4NDeEftaB5YR+FN+RWinDM+WsOXPI1xsSIHHs2ccUknArQaoxb3e s/Qs1pS8QPR1d75ALnKgsjeAGSR42y8aFA25mOzo2KG4c9nKMLB1viZTFbEV3FtPAYvO0NBD0kc c7JxgWjsE4eFnwFqXEL/VWMEr2UVTxE/e1S0SDqiXCWDUZrMVN3Osszc0u4kiUoSMDzUYjTAfoV 1Gb5hsXO7bKV9b9kTG X-Google-Smtp-Source: AGHT+IFcsJyQX0vQHIxt0g6rxRaeK4KQcZ7ubS4Xn6BHNva6HYRONLKZdEpigTSHkx+N3rxTuPNAQA== X-Received: by 2002:a05:6000:2888:b0:429:d4c2:caf3 with SMTP id ffacd0b85a97d-42b4bddfecfmr917139f8f.10.1762943356808; Wed, 12 Nov 2025 02:29:16 -0800 (PST) Received: from [127.0.1.1] ([178.197.219.123]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42b32ecf522sm22020001f8f.45.2025.11.12.02.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 02:29:16 -0800 (PST) From: Krzysztof Kozlowski Date: Wed, 12 Nov 2025 11:28:51 +0100 Subject: [PATCH v2 06/11] firmware: qcom: scm: Simplify with of_machine_device_match() Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20251112-b4-of-match-matchine-data-v2-6-d46b72003fd6@linaro.org> References: <20251112-b4-of-match-matchine-data-v2-0-d46b72003fd6@linaro.org> In-Reply-To: <20251112-b4-of-match-matchine-data-v2-0-d46b72003fd6@linaro.org> To: Rob Herring , Saravana Kannan , "Rafael J. Wysocki" , Viresh Kumar , Matthias Brugger , AngeloGioacchino Del Regno , Yangtao Li , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Lorenzo Pieralisi , Daniel Lezcano , Bjorn Andersson , Konrad Dybcio , Thomas Gleixner , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Maximilian Luz , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Daniel Lezcano , Thierry Reding , Jonathan Hunter Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-arm-msm@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-tegra@vger.kernel.org, Konrad Dybcio , Krzysztof Kozlowski X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1468; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=kT5IA0GtAEQVfWhYH3L9qEziSnbAJtbqUptdjRPcgUw=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBpFGFoaaq85XzS8Gm+QHLYdjGk6xAwN9M9CcUpd yKEYT6rj7WJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaRRhaAAKCRDBN2bmhouD 10RbD/0QYyKGuzIytM2noX3te8ScA/nUleatTJOM6knZFKx9CzhpYG1nOZVLI10Q72t5HzseI+4 Oi4wEKdkIUc6XVheTGBlr8XH/Ezs2NIXUugeMoQ28U1w20QF+5sOdKiBJ8lFGbqUkaW5ErSIVt/ /3YLlicO6MacIZ4wG1GV3ODj0yi29Vwzsw8iQ6oINdD7te+YPp7eyFYr3u9hVy7D9m+AtgpqlhE 1jwS8nFRrDTRBr3vIOIiXi6uTMdXTyROOufwqlETGtvxuy6WC0fZnONEg2PJ8qVsPQNOyCBh0Qe KuXhHY2766mkdS+jVh41HhZh7SIw5e2xVOU2um3CFI40O24+xT7NU210IHtd0D59Tlt7f8ahqeT gqgGRTtrIZEtR1EJqjwVRMIFU03xVQa0xRCSi0n0lLlN+IbtqaO6q7tuszNI5dmnr83xoxqPSmw +ADtjoptZfcndaqEjxeun09qQBsRMAEB6TRQESSXEFwnhpgJx5nYI/WyXlNdMqRoWjIPW9dVcVZ 2tmiITlPOWGxzTM7M0qFmJKgZds1jse18mQQhDI4U8b1YwJ5dY51NFWt/lDicye1EK9A1LMjS2h EuQHxg4sJU6eEe4Iuvo3xH1mzT4yrfSHABnMOF76JT3JLeDs1x8Mp3J67S03B0BKK8z92LlIU4Y mvucL86lWwzH1vQ== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Status: O Replace open-coded getting root OF node and matching against it with new of_machine_device_match() helper. Reviewed-by: Konrad Dybcio Signed-off-by: Krzysztof Kozlowski --- Depends on the first OF patch. --- drivers/firmware/qcom/qcom_scm.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index e777b7cb9b12..1a6f85e463e0 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -2018,21 +2018,6 @@ static const struct of_device_id qcom_scm_qseecom_allowlist[] __maybe_unused = { { } }; -static bool qcom_scm_qseecom_machine_is_allowed(void) -{ - struct device_node *np; - bool match; - - np = of_find_node_by_path("/"); - if (!np) - return false; - - match = of_match_node(qcom_scm_qseecom_allowlist, np); - of_node_put(np); - - return match; -} - static void qcom_scm_qseecom_free(void *data) { struct platform_device *qseecom_dev = data; @@ -2064,7 +2049,7 @@ 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()) { + if (!of_machine_device_match(qcom_scm_qseecom_allowlist)) { dev_info(scm->dev, "qseecom: untested machine, skipping\n"); return 0; }