Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Subject: Re: [PATCH v2 2/2] rpmsg: glink: Consolidate TX_DATA and TX_DATA_CONT
To:     Bjorn Andersson <quic_bjorande@quicinc.com>,
        Bjorn Andersson <andersson@kernel.org>,
        Mathieu Poirier <mathieu.poirier@linaro.org>
CC:     <linux-arm-msm@vger.kernel.org>,
        <linux-remoteproc@vger.kernel.org>, <linux-kernel@vger.kernel.org>
References: <20230418163018.785524-1-quic_bjorande@quicinc.com>
 <20230418163018.785524-3-quic_bjorande@quicinc.com>
From:   Chris Lew <quic_clew@quicinc.com>
Message-ID: <7ab6ad8b-2403-abba-08b5-028ecc18f12c@quicinc.com>
Date:   Tue, 18 Apr 2023 14:07:29 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
MIME-Version: 1.0
In-Reply-To: <20230418163018.785524-3-quic_bjorande@quicinc.com>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 4/18/2023 9:30 AM, Bjorn Andersson wrote:
> Rather than duplicating most of the code for constructing the initial
> TX_DATA and subsequent TX_DATA_CONT packets, roll them into a single
> loop.
> 
> Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com>
> ---
> 
> Changes since v1:
> - Reduced unnecessary complexity in the chunking condition
>

Reviewed-by: Chris Lew <quic_clew@quicinc.com>

>   drivers/rpmsg/qcom_glink_native.c | 46 +++++++++----------------------
>   1 file changed, 13 insertions(+), 33 deletions(-)
> 
> diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c
> index 62634d020d13..7e6fad4e02f8 100644
> --- a/drivers/rpmsg/qcom_glink_native.c
> +++ b/drivers/rpmsg/qcom_glink_native.c
> @@ -1309,7 +1309,7 @@ static int __qcom_glink_send(struct glink_channel *channel,
>   	int ret;
>   	unsigned long flags;
>   	int chunk_size = len;
> -	int left_size = 0;
> +	size_t offset = 0;
>   
>   	if (!glink->intentless) {
>   		while (!intent) {
> @@ -1343,49 +1343,29 @@ static int __qcom_glink_send(struct glink_channel *channel,
>   		iid = intent->id;
>   	}
>   
> -	if (wait && chunk_size > SZ_8K) {
> -		chunk_size = SZ_8K;
> -		left_size = len - chunk_size;
> -	}
> -	req.msg.cmd = cpu_to_le16(GLINK_CMD_TX_DATA);
> -	req.msg.param1 = cpu_to_le16(channel->lcid);
> -	req.msg.param2 = cpu_to_le32(iid);
> -	req.chunk_size = cpu_to_le32(chunk_size);
> -	req.left_size = cpu_to_le32(left_size);
> -
> -	ret = qcom_glink_tx(glink, &req, sizeof(req), data, chunk_size, wait);
> -
> -	/* Mark intent available if we failed */
> -	if (ret) {
> -		if (intent)
> -			intent->in_use = false;
> -		return ret;
> -	}
> -
> -	while (left_size > 0) {
> -		data = (void *)((char *)data + chunk_size);
> -		chunk_size = left_size;
> -		if (chunk_size > SZ_8K)
> +	while (offset < len) {
> +		chunk_size = len - offset;
> +		if (chunk_size > SZ_8K && wait)
>   			chunk_size = SZ_8K;
> -		left_size -= chunk_size;
>   
> -		req.msg.cmd = cpu_to_le16(GLINK_CMD_TX_DATA_CONT);
> +		req.msg.cmd = cpu_to_le16(offset == 0 ? GLINK_CMD_TX_DATA : GLINK_CMD_TX_DATA_CONT);
>   		req.msg.param1 = cpu_to_le16(channel->lcid);
>   		req.msg.param2 = cpu_to_le32(iid);
>   		req.chunk_size = cpu_to_le32(chunk_size);
> -		req.left_size = cpu_to_le32(left_size);
> +		req.left_size = cpu_to_le32(len - offset - chunk_size);
>   
> -		ret = qcom_glink_tx(glink, &req, sizeof(req), data,
> -				    chunk_size, wait);
> -
> -		/* Mark intent available if we failed */
> +		ret = qcom_glink_tx(glink, &req, sizeof(req), data + offset, chunk_size, wait);
>   		if (ret) {
> +			/* Mark intent available if we failed */
>   			if (intent)
>   				intent->in_use = false;
> -			break;
> +			return ret;
>   		}
> +
> +		offset += chunk_size;
>   	}
> -	return ret;
> +
> +	return 0;
>   }
>   
>   static int qcom_glink_send(struct rpmsg_endpoint *ept, void *data, int len)
>