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 6E86274040 for ; Thu, 25 Sep 2025 12:07:53 +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=1758802075; cv=none; b=ChGKFkrGS5a1+kTadO44lPHQFfox41iSq5gty4S0ajm03vtJob7izdFWssIedEbnhpwOIBd/bkbu6wED0u44Kn8ySRn173mnskecHgShvacS8dFNw391k3rKFpJi3Zs4izmNX1wd7iVyHobBGWy3jO7XpWiY/4d8BdToDg0qTuc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758802075; c=relaxed/simple; bh=gDa8eibeTR7pD9qAnsrm2yPwQpm8Mans4IJPZGjSg7U=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=gU6LeD28/S8L8h7ASwDjoVqReKaIz1eUiMGKHxw7cuatIikIgo1O6SuTd6m2790MPGb5vkeKYPfb+Qn13VxVD0dVXKbeVkkAqRAfeBxXUZ2LiOTapPKkRCvbVZshm4+IqP+9tSQHpESZ7Q4tZknegWWO0sphAb6Es4CcgaI7V/g= 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=MVhNeyWU; 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="MVhNeyWU" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 58P9JnOC025358 for ; Thu, 25 Sep 2025 12:07:52 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= weJXdfLjyQOO+L4dDrsKUb0fFZpTyYgiDzGUPHQ1E7E=; b=MVhNeyWU53c1/Vab +ZEeaIyP1GMeNzcIEME/uOAOKSwudXZCFrgmhyzviUteAmPXI5L7afpJWJ+zhUbn QTxQ+JHVbzj/hIETS2UrEDV2tPxbkQxOUblFrdaVAlTZ8Adb3OnxXsWFHHmO8sGj O/mHigFvPV54NDBmOR0Zl9IwFcLtcaXAbbJT77++itdHkT0bT4Nu0YFlyAlBeLjg pM4Mrgi7BCGH/hUft4iWeH6l86Y/ysvuTw9E1aCT5klEZAIlD9W6LyRQ0fkCHCXP O+TojUIJyVm706PfK8C3Ys7j3Y9C9yxAvM/fwgPeXWEyRS0i5Kjpgf5V00pThYDh Vokdxw== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 499hyf0auv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 25 Sep 2025 12:07:52 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-85db8cb38ccso9149985a.0 for ; Thu, 25 Sep 2025 05:07:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758802071; x=1759406871; 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=weJXdfLjyQOO+L4dDrsKUb0fFZpTyYgiDzGUPHQ1E7E=; b=sirh9bgA15NTMXsg8yqGyZws84rc7D3xOtTLNj9HRn/IAcpGOmycHUSzKmyZHF7kBm UseGfISOA3JBY4H+dtXnHoyY12h3kgxtZeetzNaTytaKkAKDw3rBMdoX2izoBZdHeAZO 1ytFds9TeULlAQ/xe3vWVIXem39H5hqlwlcsMfRK6NiBOUcRCjDnHMzWXIy35Ca8gWuE y2mOKdw5WRownVWgNfVj7TWjC3oPQn+geVBYJrDr2mO9tYSk7R7tViHBD5ii+zFjWS5x VeK6jw/RQFb2Zh27Rpjvm27e+16CvmzozIvpXwZsj2W8TbNaIf7qPt/cNMvCKRXhbvSN Rxmw== X-Forwarded-Encrypted: i=1; AJvYcCXTAXWAC8aXgztoss0MH1CnhkVLr9t0gSQ4AL7T+mt/S4KeZooZJdOA/TukSQwfsHv2nkoSxbvABCcwxaE=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5H52Q6d6vdJIzd8JbixdnF6mKwmnjd2UeEqqb8hmmYlga58+6 8SzUeT1mH+P7XgKBZ5pRLzs3KK3kzjaIiTrui9w2yQ4ud3SVx/TOWKBomZdlP74aSV1kKiQ4r6T zCJxh8LpLD5MApOoLAt3KLEJUl8waIrqZkBLbPbX33YOjP+WwUZ0S/r/QAbmsiToCkR0= X-Gm-Gg: ASbGncv5oxwrdFJVzS2J4O/Skq6IuWqpRBD7TFPRspXpVOjp7uQvw0IBXFo7Rc2G/9f uh2rn7LWf1RE2mNWUwk7dh8TCJjEl0LZAO30JwQXu7pv519f5egMZ+k6+IfsMe3jlBNSStM5pjm GzsFmET/1YqqGEmvhJD4ZNtl5vw4/jt+gxSZmS7SvifXmuhegUIcOMVjYZMfR7dDUQkYnUV9A5P QKlKiNPszq+cufa3bIQS5k0pbAuDRAwZfoLxEmVn33akuSY3pKTHeygDwbrdNiUD0aRosSlvxWF I2zE7nE5QR2clu3Bq4cWn36rScqvO+h5+0F/zQP7t06KMMZRx9Ebpwtkfymssduu7iMiqUEq2Fi v72CDMTH7vxDwCui/sJ/6dg== X-Received: by 2002:a05:622a:11d1:b0:4cd:3f47:9786 with SMTP id d75a77b69052e-4da4924fb20mr26435451cf.7.1758802071068; Thu, 25 Sep 2025 05:07:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG/x3fu4OCkYicD8u3aPyJRoZkA+aM3Y3MPrBYWZinB0wQz9Ef6J8V+YzHMOdkXzgoavSWDRQ== X-Received: by 2002:a05:622a:11d1:b0:4cd:3f47:9786 with SMTP id d75a77b69052e-4da4924fb20mr26435031cf.7.1758802070376; Thu, 25 Sep 2025 05:07:50 -0700 (PDT) Received: from [192.168.149.223] (078088045245.garwolin.vectranet.pl. [78.88.45.245]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b353efb8903sm154374366b.33.2025.09.25.05.07.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Sep 2025 05:07:49 -0700 (PDT) Message-ID: Date: Thu, 25 Sep 2025 14:07:47 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 2/2] usb: typec: ucsi_glink: Increase buffer size to support UCSI v2 To: Anjelique Melendez , heikki.krogerus@linux.intel.com, gregkh@linuxfoundation.org Cc: lumag@kernel.org, neil.armstrong@linaro.org, johan+linaro@kernel.org, quic_bjorande@quicinc.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org References: <20250924232631.644234-1-anjelique.melendez@oss.qualcomm.com> <20250924232631.644234-3-anjelique.melendez@oss.qualcomm.com> Content-Language: en-US From: Konrad Dybcio In-Reply-To: <20250924232631.644234-3-anjelique.melendez@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Proofpoint-GUID: BezLGcxgYjK2xATU3vun0zegdD7TIyg5 X-Authority-Analysis: v=2.4 cv=YMOfyQGx c=1 sm=1 tr=0 ts=68d53098 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=FpWmc02/iXfjRdCD7H54yg==:17 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=EUspDBNiAAAA:8 a=IeecORiGvqfwQRmb6Z8A:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTIwMDAwNCBTYWx0ZWRfX1xFmFnzLRSZx T4Tkbjyt9AKzxuQSI+LL0Kd8jWxypOtB/hwtctP9YgEERdKXWk+OgQt5OF0HywPxioU5KkR55ns OzynaHUNdkmztz3MyIpV5B3QHw3A0TFOzOC6m//SsactoEItnW0hHjizFni15A4zLz5OKp1PblU BTtdaLo2G5LqBehG0PzJdijLCsYtT35sizeUGdqGOt6JsdbJFASnxYBQ9ebSKsJrKqarM9gfBFA orWWDfvMoe3U3l80rPBGUDrPBrDc6obMhe8rBBzTCBtajiCGFP93lilsPlwMQzHVdxXFowoCZpC fErKS2NxUoYiA2bpJ1tnKLaOX/UaMvrX6K3AsWG20fRwAZWdDBPZVz/9a5zjUurGIqSZe5xif09 I3EG/914 X-Proofpoint-ORIG-GUID: BezLGcxgYjK2xATU3vun0zegdD7TIyg5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-25_01,2025-09-24_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 adultscore=0 priorityscore=1501 spamscore=0 clxscore=1015 suspectscore=0 phishscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2509200004 On 9/25/25 1:26 AM, Anjelique Melendez wrote: > UCSI v2 specification has increased the MSG_IN and MSG_OUT size from > 16 bytes to 256 bytes each for the message exchange between OPM and PPM > This makes the total buffer size increase from 48 bytes to 528 bytes. > Update the buffer size to support this increase. > > Signed-off-by: Anjelique Melendez > --- [...] > static int pmic_glink_ucsi_read(struct ucsi *__ucsi, unsigned int offset, > @@ -131,18 +143,34 @@ static int pmic_glink_ucsi_read_message_in(struct ucsi *ucsi, void *val, size_t > static int pmic_glink_ucsi_locked_write(struct pmic_glink_ucsi *ucsi, unsigned int offset, > const void *val, size_t val_len) > { > - struct ucsi_write_buf_req_msg req = {}; > - unsigned long left; > + struct ucsi_v2_write_buf_req_msg req = {}; > + unsigned long left, max_buf_len; > + size_t req_len; > int ret; > > + memset(&req, 0, sizeof(req)); = {} already zero-initializes the struct > req.hdr.owner = PMIC_GLINK_OWNER_USBC; > req.hdr.type = MSG_TYPE_REQ_RESP; > req.hdr.opcode = UC_UCSI_WRITE_BUF_REQ; > + > + if (ucsi->ucsi->version >= UCSI_VERSION_2_0) { > + req_len = sizeof(struct ucsi_v2_write_buf_req_msg); > + max_buf_len = UCSI_BUF_V2_SIZE; > + } else if (ucsi->ucsi->version) { > + req_len = sizeof(struct ucsi_v1_write_buf_req_msg); > + max_buf_len = UCSI_BUF_V1_SIZE; > + } else { > + return -EINVAL; > + } > + > + if (offset + val_len > max_buf_len) > + return -EINVAL; > + > memcpy(&req.buf[offset], val, val_len); > > reinit_completion(&ucsi->write_ack); > > - ret = pmic_glink_send(ucsi->client, &req, sizeof(req)); > + ret = pmic_glink_send(ucsi->client, &req, req_len); This code keeps the 'reserved' field zeored out for v1, but it does so in a fragile and implicit way :/ > if (ret < 0) { > dev_err(ucsi->dev, "failed to send UCSI write request: %d\n", ret); > return ret; > @@ -216,12 +244,39 @@ static const struct ucsi_operations pmic_glink_ucsi_ops = { > > static void pmic_glink_ucsi_read_ack(struct pmic_glink_ucsi *ucsi, const void *data, int len) > { > - const struct ucsi_read_buf_resp_msg *resp = data; > + u8 *buf = ((struct ucsi_v2_read_buf_resp_msg *)data)->buf; > + u32 ret_code, max_len; > + u32 buf_len = 0; > + > + if (ucsi->ucsi->version) { > + if (ucsi->ucsi->version >= UCSI_VERSION_2_0) > + buf_len = UCSI_BUF_V2_SIZE; > + else > + buf_len = UCSI_BUF_V1_SIZE; > + } else if (!ucsi->ucsi_registered) { > + /* > + * If UCSI version is not known yet because device is not registered, > + * choose buffer size which best fits incoming data > + */ > + if (len > sizeof(struct pmic_glink_hdr) + UCSI_BUF_V2_SIZE) > + buf_len = UCSI_BUF_V2_SIZE; > + else > + buf_len = UCSI_BUF_V1_SIZE; > + } > > - if (resp->ret_code) > + max_len = sizeof(struct pmic_glink_hdr) + buf_len + sizeof(u32); > + > + if (len > max_len) > + return; > + > + if (buf_len > len - sizeof(struct pmic_glink_hdr) - sizeof(u32)) > + buf_len = len - sizeof(struct pmic_glink_hdr) - sizeof(u32); Is this expected to happen? Konrad > + > + memcpy(&ret_code, buf + buf_len, sizeof(u32)); > + if (ret_code) > return; > > - memcpy(ucsi->read_buf, resp->buf, UCSI_BUF_SIZE); > + memcpy(ucsi->read_buf, buf, buf_len); > complete(&ucsi->read_ack); > } >