From nobody Fri Dec 19 04:07:43 2025 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 CA3051891C0 for ; Mon, 29 Jul 2024 19:52:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722282744; cv=none; b=iwwAj1ULIY/GeB+IK2NPub8JwHB0D63520P7HswCvywSxV9w4aqgG1pPuolXBe1cVJzxHi6LQSti/VuXKyFEKktvKQr17u/9x4h8dQyuJA8lLnRxHb3U3OzASLd3D2+xfboUBLR55pPejPwjy53NR9Kf/udO9xkVURm6ME6jELw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722282744; c=relaxed/simple; bh=eAWrLr7syK4v9OEqvlyX0jICgB4CRiMGpoCpwqQgJpI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IfwVmg1DbVFpEb+Hi5dzWYqBEk55wwSx0ZhUYSj9SzvhZYJKWUz7+gNyO4C8FqTW9l+BeCFH3dYhFeeOz9/vd8UQsF/0igDZo9EgAXzqHGcs9J/xmGWyvnVmxUxiw7dZHn5mocr6HRi4//Ssa862U1kEVktdQiEqYlGiLPE3Eig= 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=DYDNzClN; arc=none smtp.client-ip=209.85.167.45 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="DYDNzClN" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-52efaae7edfso4319923e87.2 for ; Mon, 29 Jul 2024 12:52:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722282739; x=1722887539; darn=vger.kernel.org; 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=Nvigx8ftGFF7H3oC6jrwYCq182+kCMKq67geJyZJwro=; b=DYDNzClN3HjqbPrO9e2tHHpL8Vua6aB0g5eAW6bFL+y0NslgYm1GZs+Z2h33uSrtcP dqqQWBd4t3bHqrpU92YQjuSb111rT5KvHN1Ku2Amuafa20ab28NQdxPUmoZzVCyjV31E eIQ6bx8khWnhMNK4O/Im4JMA+nqyhkJlrBTh9iy/ar8QN78VTmSjgyiUVK8R1EJ6IOif z0BsvwiIb6pjlQFuLJMNEMZo2WUJ8FiST8An5/nNIk4siJOOC/zouJ/swmZB/HzzLrRY bter5rw4aDWzfeh7HrkZ74uk+8SX/fFVHYNCGqE6L84MC/sCoc3hs79cRH1jLeNaN2sQ 9DPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722282739; x=1722887539; 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=Nvigx8ftGFF7H3oC6jrwYCq182+kCMKq67geJyZJwro=; b=rBBtQcPmTbTPIrGDrqueLrhbT/s48qDJNJ6f2OBLHhUYeHwLLdm34XJmyoJ+b0YjIs RizywIvVbDE0dSGKke4fl5JiJoyC/Cwji3zRtbZsuQD3/xId+F3Wr89yzwwo0cRH86Iz AI8pH1WW5GIQuMHRIYSFWXTYuSUdr7UpQku5vUMCfMZWaSesU8C6k8BYCmgtPg3ZQw5L pu1YV0nSu+JwlyMu8Oes68Wq4cj7IXewkqs1f9VEQ0P+/ZUqgMscHVJUXWxEHR6i5gMj X7y+KfDVvBXXvPrlOIHn0hppJnvTDEBOEUkzMGLi+D4NHN6YWsHb/Rx1XGC2K+FZQwqi T98A== X-Forwarded-Encrypted: i=1; AJvYcCUTlmS/l/AP/Ls9ElR/8LctNW9Dad2edSVZOYc5jdDqp7m8KcZ/eui9VOThsdELmuKnWMKsfPlweGKJBkw+IQntxyReqoJBtOvsHvH8 X-Gm-Message-State: AOJu0YyCY2NaHc/+hLOCEMzNFehLvwEnxI1n3t5z+6M4fz0nieYHo2/v kfAhaBQ4vc2MgG2FMEHTQxvs71lQ00uR9sYDyGAOC7DcI7hshwPKCeFTL5nCczw= X-Google-Smtp-Source: AGHT+IGZlWDv3cUJamS7yAPDFJ6RuaWt80rzcBym584uDDeV+HSA4wGbfxK7k/Vq0NoejHp/4NZMYA== X-Received: by 2002:a05:6512:39c2:b0:52e:9f6b:64 with SMTP id 2adb3069b0e04-5309b280988mr6581712e87.34.1722282738946; Mon, 29 Jul 2024 12:52:18 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52fd5bd1088sm1615590e87.106.2024.07.29.12.52.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 12:52:18 -0700 (PDT) From: Dmitry Baryshkov Date: Mon, 29 Jul 2024 22:52:14 +0300 Subject: [PATCH v2 1/5] Revert "soc: qcom: smd-rpm: Match rpmsg channel instead of compatible" 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: <20240729-fix-smd-rpm-v2-1-0776408a94c5@linaro.org> References: <20240729-fix-smd-rpm-v2-0-0776408a94c5@linaro.org> In-Reply-To: <20240729-fix-smd-rpm-v2-0-0776408a94c5@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Gross , Stephan Gerhold , Michael Turquette , Stephen Boyd , Mathieu Poirier Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , linux-clk@vger.kernel.org, linux-remoteproc@vger.kernel.org, Dmitry Baryshkov , stable@vger.kernel.org X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2654; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=eAWrLr7syK4v9OEqvlyX0jICgB4CRiMGpoCpwqQgJpI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBmp/LwCTuCYU/6YSCjas4tG0SVviSh/CHbKxAIY fuevwTc63KJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZqfy8AAKCRCLPIo+Aiko 1al3B/sHtT2AVBPTL48APedB46dbqPApKIDMgtlWXbXRRqxinGGdDTVgPF+JEQXY43+bzpO5X9H kP603xOrJ0y9Iq+d5Xnz0sRHcKENQMXbiNV2jmpFwuoe/4SORdHShTmrwIpIC/65GegFokHc3Y9 nP9aCSfF1WbV2JSzSRR7QKWoWbHk7o6a51sClz/cBepB3iOKObdLvbPLC5DOqgyjNFTHeN2orME 7lnDmaH7pnIV+5CQ/V7Q2rIHU+0pb9t9RlWC7uzdS05a+5x8UXmSAbHMugoo6OV7KqNRx3WfHGd FabAM4MlzKiRgXvJ4uG7ZXdhfEeONdh6eQ2G5BskecsAX0rw X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A The rpm_requests device nodes have the compatible node. As such the rpmsg core uses OF modalias instead of a native rpmsg modalias. Thus if smd-rpm is built as a module, it doesn't get autoloaded for the device. Revert the commit bcabe1e09135 ("soc: qcom: smd-rpm: Match rpmsg channel instead of compatible") Fixes: bcabe1e09135 ("soc: qcom: smd-rpm: Match rpmsg channel instead of co= mpatible") Cc: stable@vger.kernel.org Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- drivers/soc/qcom/smd-rpm.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/drivers/soc/qcom/smd-rpm.c b/drivers/soc/qcom/smd-rpm.c index b7056aed4c7d..9d64283d2125 100644 --- a/drivers/soc/qcom/smd-rpm.c +++ b/drivers/soc/qcom/smd-rpm.c @@ -196,9 +196,6 @@ static int qcom_smd_rpm_probe(struct rpmsg_device *rpde= v) { struct qcom_smd_rpm *rpm; =20 - if (!rpdev->dev.of_node) - return -EINVAL; - rpm =3D devm_kzalloc(&rpdev->dev, sizeof(*rpm), GFP_KERNEL); if (!rpm) return -ENOMEM; @@ -218,18 +215,38 @@ static void qcom_smd_rpm_remove(struct rpmsg_device *= rpdev) of_platform_depopulate(&rpdev->dev); } =20 -static const struct rpmsg_device_id qcom_smd_rpm_id_table[] =3D { - { .name =3D "rpm_requests", }, - { /* sentinel */ } +static const struct of_device_id qcom_smd_rpm_of_match[] =3D { + { .compatible =3D "qcom,rpm-apq8084" }, + { .compatible =3D "qcom,rpm-ipq6018" }, + { .compatible =3D "qcom,rpm-ipq9574" }, + { .compatible =3D "qcom,rpm-msm8226" }, + { .compatible =3D "qcom,rpm-msm8909" }, + { .compatible =3D "qcom,rpm-msm8916" }, + { .compatible =3D "qcom,rpm-msm8936" }, + { .compatible =3D "qcom,rpm-msm8953" }, + { .compatible =3D "qcom,rpm-msm8974" }, + { .compatible =3D "qcom,rpm-msm8976" }, + { .compatible =3D "qcom,rpm-msm8994" }, + { .compatible =3D "qcom,rpm-msm8996" }, + { .compatible =3D "qcom,rpm-msm8998" }, + { .compatible =3D "qcom,rpm-sdm660" }, + { .compatible =3D "qcom,rpm-sm6115" }, + { .compatible =3D "qcom,rpm-sm6125" }, + { .compatible =3D "qcom,rpm-sm6375" }, + { .compatible =3D "qcom,rpm-qcm2290" }, + { .compatible =3D "qcom,rpm-qcs404" }, + {} }; -MODULE_DEVICE_TABLE(rpmsg, qcom_smd_rpm_id_table); +MODULE_DEVICE_TABLE(of, qcom_smd_rpm_of_match); =20 static struct rpmsg_driver qcom_smd_rpm_driver =3D { .probe =3D qcom_smd_rpm_probe, .remove =3D qcom_smd_rpm_remove, .callback =3D qcom_smd_rpm_callback, - .id_table =3D qcom_smd_rpm_id_table, - .drv.name =3D "qcom_smd_rpm", + .drv =3D { + .name =3D "qcom_smd_rpm", + .of_match_table =3D qcom_smd_rpm_of_match, + }, }; =20 static int __init qcom_smd_rpm_init(void) --=20 2.39.2