From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 44C9628B513; Thu, 10 Jul 2025 08:06:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752134791; cv=none; b=GHqPp0bNMW1V1P5wcp6Njff9e4S/iMU6MXChjV8LekmXMUJ7hhKSK5zxLzG6LTkv2PmHU0hZPpTPNMeyVF8eECaM3001FDlYxYKHZIV77WQpOvuZdwQg+bcVqLnLXQwoYmVruEpn+e17mLfAqxfXH6xo/gbLOlSTtTrqYZc6aqk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752134791; c=relaxed/simple; bh=NMO3uWbwHBgzseJ9NO1o7dQT1dcu9CFgfYN7QI/jC90=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R/l2X3fzV2pUUd42XzwfMhIH+Eqpyvm/x+BjENVsqQMWloefY7r52z0mEcDLPvauKXUhdFPNfYhERoHBJyjvRbngEPbSifRH3rIXbBL4XKTrxUQ5HqCZIaQfa8FAbbb8kBovdAngQjDP9zsdXO5M9eaX3p6lzrXsuthg9PY+lwc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XyQi6LUO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XyQi6LUO" Received: by smtp.kernel.org (Postfix) with ESMTPS id D2DE9C4CEFB; Thu, 10 Jul 2025 08:06:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752134790; bh=NMO3uWbwHBgzseJ9NO1o7dQT1dcu9CFgfYN7QI/jC90=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=XyQi6LUONMAUUbkH7eEuK4luyIPk0riQY+qjuCwYAl+RkbBqAnD3XVu+6PGk6vjhe Mqi6x8PeDPfv1u2SuFR3LR1SDHkZ2IZHIrynbyjdJH1Ra1mAUxMBttllyPlHMRxAdl 834+jSF9kYUjiw0oWQux7RKAPynJSCHR8Imuq1LqZSPgkC3WaZ/DM4wPUJ525YGxpR JV6jbZZBERvKt03pdotIh9USWc6Id88ZB5pa3+lBAovDt3vrdtZVRoB0C8tI+pdw09 O2Ts9TCDp3F39eT/bZXO8/g71IL6VdOwGTZEJnIL7Yc7IhPLdxAiwwhE+HIGTLKsUl +PWqwDJo/XoLg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C59FEC83F18; Thu, 10 Jul 2025 08:06:30 +0000 (UTC) From: Yassine Oudjana via B4 Relay Date: Thu, 10 Jul 2025 09:06:29 +0100 Subject: [PATCH v2 3/4] net: qrtr: Define macro to convert QMI version and instance to QRTR instance 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: 7bit Message-Id: <20250710-qcom-smgr-v2-3-f6e198b7aa8e@protonmail.com> References: <20250710-qcom-smgr-v2-0-f6e198b7aa8e@protonmail.com> In-Reply-To: <20250710-qcom-smgr-v2-0-f6e198b7aa8e@protonmail.com> To: Manivannan Sadhasivam , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Bjorn Andersson , Konrad Dybcio , Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Jonathan Cameron , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko , Luca Weiss Cc: linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-iio@vger.kernel.org, Yassine Oudjana X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1752134788; l=2801; i=y.oudjana@protonmail.com; s=20250710; h=from:subject:message-id; bh=CdngQtC98LuPwMh1HJPPpnlIAibI0ynHsnrmaihvPoY=; b=pCKWZ0ajdUSXjuOj+1zI1jFgI6sXqzY9ZdCsJKqO/pHK1PARy7YA7K879AiWTOGokzg1p6CFd 2Ldzt/tAsWHDcDlxn28PKaYJ8zmXMeSMbQoYaiA6h+5xtwi+kB322Mq X-Developer-Key: i=y.oudjana@protonmail.com; a=ed25519; pk=kZKEHR1e5QKCbhElU9LF/T1SbfTr8xzy2cO8fN70QgY= X-Endpoint-Received: by B4 Relay for y.oudjana@protonmail.com/20250710 with auth_id=455 X-Original-From: Yassine Oudjana Reply-To: y.oudjana@protonmail.com From: Yassine Oudjana Move QRTR instance conversion from qmi_interface into a new macro in order to reuse it in QRTR device ID tables. Signed-off-by: Yassine Oudjana --- drivers/soc/qcom/qmi_interface.c | 5 +++-- include/linux/soc/qcom/qrtr.h | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/soc/qcom/qmi_interface.c b/drivers/soc/qcom/qmi_interface.c index 6500f863aae5ca218892d13233d4c9bf4b63a0f4..bd97b006757fc20778e4bb512945d85f4cd31b24 100644 --- a/drivers/soc/qcom/qmi_interface.c +++ b/drivers/soc/qcom/qmi_interface.c @@ -14,6 +14,7 @@ #include #include #include +#include static struct socket *qmi_sock_create(struct qmi_handle *qmi, struct sockaddr_qrtr *sq); @@ -173,7 +174,7 @@ static void qmi_send_new_lookup(struct qmi_handle *qmi, struct qmi_service *svc) memset(&pkt, 0, sizeof(pkt)); pkt.cmd = cpu_to_le32(QRTR_TYPE_NEW_LOOKUP); pkt.server.service = cpu_to_le32(svc->service); - pkt.server.instance = cpu_to_le32(svc->version | svc->instance << 8); + pkt.server.instance = cpu_to_le32(QRTR_INSTANCE(svc->version, svc->instance)); sq.sq_family = qmi->sq.sq_family; sq.sq_node = qmi->sq.sq_node; @@ -236,7 +237,7 @@ static void qmi_send_new_server(struct qmi_handle *qmi, struct qmi_service *svc) memset(&pkt, 0, sizeof(pkt)); pkt.cmd = cpu_to_le32(QRTR_TYPE_NEW_SERVER); pkt.server.service = cpu_to_le32(svc->service); - pkt.server.instance = cpu_to_le32(svc->version | svc->instance << 8); + pkt.server.instance = cpu_to_le32(QRTR_INSTANCE(svc->version, svc->instance)); pkt.server.node = cpu_to_le32(qmi->sq.sq_node); pkt.server.port = cpu_to_le32(qmi->sq.sq_port); diff --git a/include/linux/soc/qcom/qrtr.h b/include/linux/soc/qcom/qrtr.h index e9249d9422b8ca96baa43073cf07c4a75c163219..e2aca520fdbe22bc855004143dc8baa7a3f67517 100644 --- a/include/linux/soc/qcom/qrtr.h +++ b/include/linux/soc/qcom/qrtr.h @@ -3,6 +3,8 @@ #ifndef __QCOM_QRTR_H__ #define __QCOM_QRTR_H__ +#include +#include #include struct qrtr_device { @@ -15,6 +17,14 @@ struct qrtr_device { #define to_qrtr_device(d) container_of(d, struct qrtr_device, dev) +#define QRTR_INSTANCE(qmi_version, qmi_instance) \ + (FIELD_PREP(GENMASK(7, 0), qmi_version) | \ + FIELD_PREP(GENMASK(15, 8), qmi_instance)) + +#define QRTR_INSTANCE_CONST(qmi_version, qmi_instance) \ + (FIELD_PREP_CONST(GENMASK(7, 0), qmi_version) | \ + FIELD_PREP_CONST(GENMASK(15, 8), qmi_instance)) + struct qrtr_driver { int (*probe)(struct qrtr_device *qdev); void (*remove)(struct qrtr_device *qdev); -- 2.50.0