From mboxrd@z Thu Jan 1 00:00:00 1970 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 6ACB33C1D4E for ; Thu, 20 Aug 2026 19:49:00 +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=1787255342; cv=none; b=ciLlI+WRR8x1yjjbdmp/bSPCWJbHlHLPqENktjsPVr0417mWvgXMbaLssvXxYpbZnSIMDQYQi8HzlpLntYIubQGTALQPguqcui07VJFLakJBgt1839oVFjzfbBScOl+ZIS2ZZ0Eg9rHjt30zdluuHL9UTUk/qkG1QDnitaFeIkM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787255342; c=relaxed/simple; bh=4WRilBWhHzZLU8uvO/z39X42z49BUIa3+WWApYbxJ24=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p7QGdPzok9i/uUenOXPklI1xZcmLCXDQPyjNDeya/GZsxpYbBgSA/Uzw9UtX32DrP4FgzE15DKiT7cXvV2B9wMNDvXkEy3tsfLWM6DVEfL6LYNm2EVTKLmDVJUJ9sa1w1VE2cOyw6EKOQaf5q3MZgZDKnFZxn80zj9U9jO44qLA= 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=cDgaiLCF; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=N+GT1gvy; 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="cDgaiLCF"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="N+GT1gvy" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67KIJ2VO017118 for ; Thu, 20 Aug 2026 19:48:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=c5VY/KOB4mi ZQvykR/E8D9DhRmzVzOzBrO3/MiSseIo=; b=cDgaiLCF1U6QfVNFp8f+3Ueeh38 InEt1JCa4eRGJny6UkdnXEJduqbZYLnvFt/R7f1JjpPhw+dCn5cwsdyn9DVuZvN5 MR9Rh2dDKKSWPNk5njY0QlSYqEY4sC42FK4qrG5G1wXoEAdNdGHbqqVW91c2Mh+D TkJ3Z5ec90h/HvI/ErXO2xmJRbAkTJKXYD+6+0Nvpryy8oLEH5x0/6yOKFX1sjFw OapQzIlmLGUwMhI8298Gu8xvKxwyRvx1g/DFoOeAa8wyToJIcYCcb90gbxe6Do2G 3TH7HGHYaPnn5AcjlZJwU9lTrkxnKnvSyil5/iVeeEsHGa9vmeqvqSRmntg== 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 4g5w49bbm8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 20 Aug 2026 19:48:59 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-9368b4c5964so15028885a.1 for ; Thu, 20 Aug 2026 12:48:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1787255339; x=1787860139; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=c5VY/KOB4miZQvykR/E8D9DhRmzVzOzBrO3/MiSseIo=; b=N+GT1gvyTamPYXd7XWJvmrEqtKyCSUBiBq+Fpq9/QMYuYWN52/sukf6B8T7ZAIJjV/ Ae1SW9Aa8+eSTe1DvQ9LZ1Mfw134u7xhHlwuUy5ZeR4FMejA7ifFOYJGojkgxh1C5L6y 70yRU22wCuQMnrns5TkJ1MYJUSAbS5WIHlIsOCZtC3Rm0V8VclhFfJuWWXvd0jKoho5Z EgvPuI7xYzOmmZIPOjqE2IckOy5jWUjmxs4z+oxztaOb3u40IAj2TwzSdmVZKoX5P5FN xpN9vKBNBUt2USfGJNv4byhpFSxa6EfTmK9d45yoacmBioaZI3iJTBnCPMQpenmHWYaE qwxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787255339; x=1787860139; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=c5VY/KOB4miZQvykR/E8D9DhRmzVzOzBrO3/MiSseIo=; b=oqvWIyE8OtZgLl5oFaYrceGry7zvwQ68nvJXeS4Mxirfd2fZpcgAO5X79JK5aOAzEq Bci0htdQ4+jiv0eEC4G6KzMtbT0XMl6Y1c73DMMN3294Xntu7r6cyf7G4KyhO9F8O4g0 r3lR+LGqye5/AB7c1o1bX+VvxmPvud0IizpebhGVMl1EYLsqBxnrboiQsX9e06ZEJYtA CZ40q09Ice2+jkYPXZdFnyaycEgk79fwnroortowTv2Ax5/Rf4A6FZUaFeWP32CL/AqW ctsCJ6DJ7hY+nDKzyer5GG/SH8lgpHjS800R12YRav5JakhUVhTK1h0fH/76UmRaSWWt 6oRA== X-Forwarded-Encrypted: i=1; AHgh+RqNAbiA4J8mvveLyla/NR5VVZS+lFxT+bNZy+zg9wDK76DfaQLi7d/EigYp9jmXAH7+wzDwIaXuOskwNis=@vger.kernel.org X-Gm-Message-State: AOJu0Yz3FbiO+m5KTLD/8h4YJJ5IwbNWip6TFYVpB2L+sQ5GTBJtTiXY kMlPuxMTf5CfcJSs6YZKJ2nYvK5jg0STvzT1xwGx2V/2RCT1mf2F37P6v0GeJ7GvTPda8NJ2bOq rLoTD0tWD19/oi1PKqjamrjaqnC5AveZyuDZBW2LdRtH5+9Crn2bY6x7KGOuf1b2iiNU= X-Gm-Gg: AR+sD11fMJvNyLtFFTEw9UeUGE3/GLhZLo8YmvuxQMwKzEcVdsU4+dmqM1YvFv+vn5S Ce9MEWtI4D6s3o5NnP9A8Tk/K6II1rcRAx7CiXBGmxHVHjMqDl7Afzbd233TkGDKQikci2RhnPe 4YahB1f2nnSjpGL+TFznL98yCZW82FoYAhbo2afMA7UeBFyVZyRKnlM88DBjFdC3sWDDFh8l6Ud pj5xIeYhe/NO4J3vZJ8fpppEUGgK54gjauu+rFWdyv1YS3WLjydUNi865IDhlwGFaOcSg7TlC/p UEa3YW5ChI5OZkPR6Ip2TGpOHx1jfNS51wiYrC5c7qqRYGWAPe1rDyzGs00Qe5d4wSsEAntJzXn yRr/ZOhKaqc/t X-Received: by 2002:a05:620a:4014:b0:936:8840:427f with SMTP id af79cd13be357-937395429e3mr52934085a.4.1787255338615; Thu, 20 Aug 2026 12:48:58 -0700 (PDT) X-Received: by 2002:a05:620a:4014:b0:936:8840:427f with SMTP id af79cd13be357-937395429e3mr52930085a.4.1787255338126; Thu, 20 Aug 2026 12:48:58 -0700 (PDT) Received: from shalem ([2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c2459198ec5sm113433266b.34.2026.08.20.12.48.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2026 12:48:56 -0700 (PDT) From: Hans de Goede To: Bjorn Andersson , Cristian Marussi , Sudeep Holla Cc: Hans de Goede , Daniel Lezcano , arm-scmi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, imx@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] firmware: arm_scmi: Pre-register protocol, name tupples for standard protocols Date: Thu, 20 Aug 2026 21:48:49 +0200 Message-ID: <20260820194850.459739-3-johannes.goede@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820194850.459739-1-johannes.goede@oss.qualcomm.com> References: <20260820194850.459739-1-johannes.goede@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Info: AW1haW4tMjYwODIwMDE0OSBTYWx0ZWRfX+NRCo3jGN4j/ 4x3mPsTEVH9gtuMm/5sJnF3+2AlzCS35pgxBKkNC4XFu5eb/YkM7KnMOq4FqMRAHETiD9J5eamm Na/8405Wo5RX6UmV+x3DDLgX4e/BLBk= X-Authority-Analysis: v=2.4 cv=YP+vDxGx c=1 sm=1 tr=0 ts=6a875a2b cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=bC-a23v3AAAA:8 a=7CQSdrXTAAAA:8 a=EUspDBNiAAAA:8 a=VscC1fOeZKh3OTZq1J8A:9 a=PEH46H7Ffwr30OY-TuGO:22 a=FO4_E8m0qiDe52t0p3_H:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-ORIG-GUID: VY1Q_m5sQAfAWIQhqkQtFFIkhwvjuYEM X-Proofpoint-GUID: VY1Q_m5sQAfAWIQhqkQtFFIkhwvjuYEM X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODIwMDE0OSBTYWx0ZWRfX6+MtqbdgvcqF +4wZOY7fUdzpBFj5BUqkTKdFShvc42qr0jNKX5RrA43yViC7tjBDjFj9DKBPwmbmXfF8fK76rNv PHCR4AJTMu1S+SMnUt3B0DQfk+6mifd9SmI82FhVII+iznfhJBbuppF1cGzXpTC4tOQewz5rJd/ LuBcy1KdcSXJ8+YZFBcIUuIU6gQvUdhc+NV1qe7Oa7ikJnMboiZIr5bNWSnPzHkK+f/B/fgUYMS t2N7UoBy1rJsanA4/FyX04AJR7Q5wOdL8THDa47OTaSiRY9mqzzWwSaFOj+ma8T95JcP5GMmmoT VBekI2FrXYnVMhPBI+qEguOiXtJQnTUCOvZNvGttRCpNYTbZgQal7+MwzxgyodK8n1+nj5SKIop wZ7HFf2xsna9KHptARlIz8ctTHNc4KuopBlVe7Y3Dy+X939CPAM1Zj5DONgT9SFc8km2aPtJEGY tAODxxDxv6CTtWvP1Yg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-20_01,2026-08-20_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 clxscore=1015 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608200149 From: Cristian Marussi Driver module auto-loading requires the devices to already be created for udev to get the necessary uevents based on which udev auto-loads modules. But SCMI devices are only created after their { protocol, name } tupples have been registered which is done from scmi_driver_register(). This creates a circular dependency where device creation is waiting for the driver to register and loading the module with the driver is waiting for the device to be created. Pre-register the tupples for standard protocols to break this circular dependency. Tested-by: Hans de Goede Signed-off-by: Cristian Marussi Signed-off-by: Hans de Goede --- Changes in v3: - Drop adding of a bus uevent function this is already done - Update comments and commit message with a better explanation of why - Link to v1/RFC: https://patch.msgid.link/20250203100154.140877-2-cristian.marussi@arm.com --- drivers/firmware/arm_scmi/bus.c | 47 ++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c index d12d5de15a1a..111727904a89 100644 --- a/drivers/firmware/arm_scmi/bus.c +++ b/drivers/firmware/arm_scmi/bus.c @@ -77,12 +77,13 @@ static int scmi_protocol_device_request(const struct scmi_device_id *id_table) if (phead) { head = phead; list_for_each_entry(rdev, head, node) { + /* pr_debug() because dups are expected for std protocols */ if (!strcmp(rdev->id_table->name, id_table->name)) { - pr_err("Ignoring duplicate request [%d] %s\n", - rdev->id_table->protocol_id, - rdev->id_table->name); - ret = -EINVAL; - goto out; + pr_debug("Device already requested [%d] %s\n", + rdev->id_table->protocol_id, + rdev->id_table->name); + mutex_unlock(&scmi_requested_devices_mtx); + return 0; } } } @@ -579,17 +580,49 @@ static void scmi_devices_unregister(void) bus_for_each_dev(&scmi_bus_type, NULL, NULL, __scmi_devices_unregister); } +/* Standard protocols table */ +static const struct scmi_device_id scmi_std_id_table[] = { + { SCMI_PROTOCOL_POWER, "genpd" }, + { SCMI_PROTOCOL_SYSTEM, "syspower" }, + { SCMI_PROTOCOL_PERF, "perf" }, + { SCMI_PROTOCOL_PERF, "cpufreq" }, + { SCMI_PROTOCOL_CLOCK, "clocks" }, + { SCMI_PROTOCOL_SENSOR, "hwmon" }, + { SCMI_PROTOCOL_SENSOR, "iiodev" }, + { SCMI_PROTOCOL_RESET, "reset" }, + { SCMI_PROTOCOL_VOLTAGE, "regulator" }, + { SCMI_PROTOCOL_POWERCAP, "powercap" }, + { SCMI_PROTOCOL_PINCTRL, "pinctrl" }, + { SCMI_PROTOCOL_PINCTRL, "pinctrl-imx" }, + { }, +}; + static int __init scmi_bus_init(void) { int retval; retval = bus_register(&scmi_bus_type); - if (retval) + if (retval) { pr_err("SCMI protocol bus register failed (%d)\n", retval); + return retval; + } + + /* + * Driver module auto-loading requires the devices to already be created + * for udev to get the necessary uevents. But the devices are only + * created after their { protocol, name } tupples have been registered + * which is done from scmi_driver_register(). Pre-register the tupples + * for known (in tree) drivers to break this circular dependency. + */ + retval = scmi_protocol_table_register(scmi_std_id_table); + if (retval) { + bus_unregister(&scmi_bus_type); + return retval; + } pr_info("SCMI protocol bus registered\n"); - return retval; + return 0; } subsys_initcall(scmi_bus_init); -- 2.55.0