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 5EE2926B098 for ; Wed, 9 Apr 2025 14:54:14 +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=1744210455; cv=none; b=Sx4IllKoFvvA8wp/dTo1RrYXJPNp8a4XHU8zk11uJtGRIMJ4FaopF/YqMGQrXyl95Q+EgdRRDRuTZy49WiRio7Vn9LXB+/QOFfoPwzvSH4iXN8zT0yyLmXq+Qr/s4CKo2Pku9xwh00hKpoZwais/G4Gu6ghei3q+M++NRtnmA+M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744210455; c=relaxed/simple; bh=6g0TfWDuvigbnJLDqJYb2R4PL8SRBJ82ihr5x2bmHek=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=fTt5kviow5mWBu9r73QxJiDnuMQxFlY1SqF/4ArRQTgbDhC1nloz+5TsLZVfqKG3SFPu42nAKrSaM7gT4F6LJQU2jmutHycD3Djv1FmqOY2u6lTdtw3i5PNnQFjhXPAQNhrV2pjRCk1drRZAMdcwr/KXHruTaWd2l9q+Hp5Aoow= 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=SmByAWa+; 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="SmByAWa+" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5398d52d029098 for ; Wed, 9 Apr 2025 14:54:13 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= 2e+zhortkq1PPVBPRYcJak6GvfMLkq1x12up5ZcdsG0=; b=SmByAWa+1AfXtVKW kW7NxtxG4xNKWwjKtwsoXDRknfKrd0cOocRlx/ZRWIKIALZyUZO6ev74eZtaEz8J xHSw3qj7m0wyc2QaL/KMHZaTzMiFg321kMfnnwqPqJ1IGG51YE58+cc1wNmdTfGR 3ZBCbW/h9f00z2qK+UwPzT1U+8vG0Rf2WiVQkTuv3IoCenouGJOdl9V5rAX5MvlP H/f99YsjRpjz6r971m7juzNyEPQ23qICulBfVU/MiiR/gvvzT+CgrOSrySFjEJWy bNHaAzU8A1uKsKhT8Q18IiX3YOzn8gHx5Jh6SZbXnNjJiMv6CesYI4A+qjc60OZD MfNUUA== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twpmbmsn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 09 Apr 2025 14:54:13 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c53d5f85c9so162291985a.1 for ; Wed, 09 Apr 2025 07:54:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744210452; x=1744815252; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2e+zhortkq1PPVBPRYcJak6GvfMLkq1x12up5ZcdsG0=; b=NDdlrrvFsfJWK3ux34gu06fV2N3SF+felUtg6k5JraX6nAUze39FeqZ+XUbH9elYTm G6pMViYCigXvWiY+SPntKpnCCh0V199P6lQMTbTlV/dFVZzf85O5+myicAugF0gIbBsB ZxXPQwGZyhRdNdQ7V0UFjtnsNogylg57eyBn0MyaPMtrQTQOHoiNoEgsoOes6Rpow9dZ oqARQOoq3BgLGgRBy6H4BiokZIvronzmtdbjDs104S/AqDa37rl8NR0xfN7FIfrJ68cs KEjiYN5gKSKC2alK1ufSekrjyJ95d85tReIfND+KAO40hHydwELbXTx7wQxKIIEc25Fk H5OA== X-Forwarded-Encrypted: i=1; AJvYcCXMts/p4dbYhOaFnEkwm9o+86uX3m/tRpFZXCOQrhrR7jUKGbL6GaWVzCd4wB8YSAIrOpzBqPc=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6fYsLtqOjOLbhBFjNWzRe5ls7eOizOZ4HpMKV2d48TjipN/A8 2ubhxPBptctnlxfMOdFRXW1cGyVrhICk4Wp0gjIobLjCiigN/BQSUkxJ+jiU7aKpSVKfqxepdDP gJXssui2I1sXxkXzkK5UD9Jah8D5aoN1DrvMu6Q+ZTSEIUiDi+oSB6uU= X-Gm-Gg: ASbGnctct3ojbmxI+uI3bVECWwJWh8rGjlOUiUIWxbnHwe0g8g6mwUanQvaC6ztk6WM Uz+4r/VLj2m+oNhk65WXHAtd1/GC0iGIiqah+lupiC0cQPBVlIYj/0Yy3Zelwgel04l18VoHcaQ TmooofAAvyMsA+tOEX80VNNtDBUmhx+2sJseqiAuTvef5s2c//bqCcriYlqwpirEBddztjSt62q dQcleuJeLBvWOVApHhVeAKh+zjYXJlvSsiFrgdlrqRfCNPxqUvmxk8RPXMkTNDup4Rk/QmgiWjz ZRBPYixRnBx7jj84lG8BgoRjHa2V+MhsrtDQtW6S2z6a/QUvi+mYCp2G6Va7xRZR6A== X-Received: by 2002:a05:620a:d8d:b0:7c3:c814:591d with SMTP id af79cd13be357-7c79cbcad39mr181547985a.1.1744210451955; Wed, 09 Apr 2025 07:54:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEkhEFX9jW2lxjwZtZRt5wSID+lKfDUWjDhK7POIeIFuD1YPW0A5mtnATcnc6+c78jlhAPyDg== X-Received: by 2002:a05:620a:d8d:b0:7c3:c814:591d with SMTP id af79cd13be357-7c79cbcad39mr181545185a.1.1744210451558; Wed, 09 Apr 2025 07:54:11 -0700 (PDT) Received: from [192.168.65.90] (078088045245.garwolin.vectranet.pl. [78.88.45.245]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1cb4142sm108209666b.101.2025.04.09.07.54.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Apr 2025 07:54:10 -0700 (PDT) Message-ID: Date: Wed, 9 Apr 2025 16:54:05 +0200 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/3] net: qrtr: Define macro to convert QMI version and instance to QRTR instance To: Yassine Oudjana , Jonathan Cameron , Lars-Peter Clausen , Bjorn Andersson , Konrad Dybcio , Manivannan Sadhasivam , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Alexander Sverdlin , Sean Nyekjaer , Javier Carrasco , Matti Vaittinen , Antoniu Miclaus , Ramona Gradinariu , "Yo-Jung (Leo) Lin" <0xff07@gmail.com>, Andy Shevchenko , Neil Armstrong , =?UTF-8?B?QmFybmFiw6FzIEN6w6ltw6Fu?= , Danila Tikhonov , Antoni Pokusinski , Vasileios Amoiridis , Petar Stoykov , shuaijie wang , Yasin Lee , "Borislav Petkov (AMD)" , Dave Hansen , Tony Luck , Pawan Gupta , Ingo Molnar Cc: Yassine Oudjana , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, linux-kbuild@vger.kernel.org References: <20250406140706.812425-1-y.oudjana@protonmail.com> <20250406140706.812425-3-y.oudjana@protonmail.com> Content-Language: en-US From: Konrad Dybcio In-Reply-To: <20250406140706.812425-3-y.oudjana@protonmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Proofpoint-GUID: QLVsXXplpn9x9hW-XbnoqlwJ2sGvB6iD X-Proofpoint-ORIG-GUID: QLVsXXplpn9x9hW-XbnoqlwJ2sGvB6iD X-Authority-Analysis: v=2.4 cv=MpRS63ae c=1 sm=1 tr=0 ts=67f68a15 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=FpWmc02/iXfjRdCD7H54yg==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=sfOm8-O8AAAA:8 a=PIWKGJPQcB-H7wabpAUA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=TvTJqdcANYtsRzA46cdi:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-09_05,2025-04-08_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 mlxlogscore=999 clxscore=1015 priorityscore=1501 impostorscore=0 spamscore=0 bulkscore=0 suspectscore=0 malwarescore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504090093 On 4/6/25 4:07 PM, Yassine Oudjana wrote: > 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 | 2 ++ > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/soc/qcom/qmi_interface.c b/drivers/soc/qcom/qmi_interface.c > index bc6d6379d8b1..cb57b7e1f252 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 4d7f25c64c56..10c89a35cbb9 100644 > --- a/include/linux/soc/qcom/qrtr.h > +++ b/include/linux/soc/qcom/qrtr.h > @@ -13,6 +13,8 @@ struct qrtr_device { > > #define to_qrtr_device(d) container_of(d, struct qrtr_device, dev) > > +#define QRTR_INSTANCE(qmi_version, qmi_instance) (qmi_version | qmi_instance << 8) Please use FIELD_PREP + GENMASK to avoid potential overflows Konrad