From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BDAFC433E7 for ; Wed, 2 Sep 2020 17:24:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1794320829 for ; Wed, 2 Sep 2020 17:24:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="SUhv304r" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727112AbgIBRYq (ORCPT ); Wed, 2 Sep 2020 13:24:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727094AbgIBRYl (ORCPT ); Wed, 2 Sep 2020 13:24:41 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36235C061244 for ; Wed, 2 Sep 2020 10:24:41 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id q1so132177pjd.1 for ; Wed, 02 Sep 2020 10:24:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=3X8BRA44Z1hXBKYZDxJKPcka+vLO5PtfKxlyTCm9XOs=; b=SUhv304rulALFwH7ruJb2ZyAiTwvOskac7EkzC5R6Ll7BWOjpM8aqLPUb1HvrZSiGP IS8qZ6YcM9II4b4xS5LbtCo65K/dxQ8SPdS576eBRq0RTuIkLnhuuaOVmpA86pboVway fzCgU8240dCfmLp2uZFArNGZ0XhT9j41eszTUOPwOKWfbQZvPpI26nOKxqaeEDeolxMc MUbR3eE/zJAvN2tT1T193OMgUvucNruivMED/8WpRqV/UmTsN8a/c6DBsUGf34wr9dbB lvEmJg8kSEw0Mun6U+kRvw494xMkDdCJkUCn+7wwDwiTAVn3SYSQMRXggEon5RXXK6n/ f3Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=3X8BRA44Z1hXBKYZDxJKPcka+vLO5PtfKxlyTCm9XOs=; b=DeFwJrNNSudkMFNU8/GLrC7VLq7EIjVWdUkax5mGlT7CD2bUVS5I7XsOZ7wRDPNN+0 TKhUaEhwb82v5nGPjahzEo4uaxEd1VJpF6BlW63UT50QZaQK9kqm5Ttb8Y7+zcwMPTBN cRhvj6c1oiQwyUU7QDw9tuGSBasv7X5wzys3Qf6WlrjmKS7HD+lXsZSKwf7/1R/Niut1 Pjp9EUZ+KFzLWtOiP8IyR1pm4FZW5p76B+FAsuYIcPWpdCGPV3s3jUbWOIZwdQfiWx+l HxDkBg+XDYf4+kWxHKGQ3Bfz+E+87QX5HsiEEA8nS/7BA/1dJ3t3OvWsBvV0gD4Fvj14 QGMA== X-Gm-Message-State: AOAM530Ohfpi5avYn1W0coLNODRExaBc+7dl5+4ZrycSV/oizZ8zHqnB 5E9/BbovasJAIsnINYEyo3kAhQ== X-Google-Smtp-Source: ABdhPJwQ+XLL4h4msyJ+wnw3Lom+JwmeImVoURLMKAmeto3b+8ZMc0s/13WN6G+0UPVlAw5BQnTJQQ== X-Received: by 2002:a17:902:a607:: with SMTP id u7mr2923439plq.45.1599067480418; Wed, 02 Sep 2020 10:24:40 -0700 (PDT) Received: from xps15 (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id e7sm95740pfm.43.2020.09.02.10.24.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 10:24:39 -0700 (PDT) Date: Wed, 2 Sep 2020 11:24:37 -0600 From: Mathieu Poirier To: Guennadi Liakhovetski Cc: kvm@vger.kernel.org, linux-remoteproc@vger.kernel.org, virtualization@lists.linux-foundation.org, sound-open-firmware@alsa-project.org, Pierre-Louis Bossart , Liam Girdwood , "Michael S. Tsirkin" , Jason Wang , Ohad Ben-Cohen , Bjorn Andersson , Vincent Whitchurch Subject: Re: [PATCH v6 2/4] rpmsg: move common structures and defines to headers Message-ID: <20200902172437.GC280378@xps15> References: <20200901151153.28111-1-guennadi.liakhovetski@linux.intel.com> <20200901151153.28111-3-guennadi.liakhovetski@linux.intel.com> <20200901172321.GC236120@xps15> <20200902053527.GA31486@ubuntu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200902053527.GA31486@ubuntu> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Wed, Sep 02, 2020 at 07:35:27AM +0200, Guennadi Liakhovetski wrote: > Hi Mathew, > > On Tue, Sep 01, 2020 at 11:23:21AM -0600, Mathieu Poirier wrote: > > On Tue, Sep 01, 2020 at 05:11:51PM +0200, Guennadi Liakhovetski wrote: > > > virtio_rpmsg_bus.c keeps RPMsg protocol structure declarations and > > > common defines like the ones, needed for name-space announcements, > > > internal. Move them to common headers instead. > > > > > > Signed-off-by: Guennadi Liakhovetski > > > > I already reviewed this patch and added my RB to it. Please carry it in your > > next revision. > > But only as long as the patch doesn't change, right? And in fact it did change > this time - I renamed the header, moving it under include/linux/rpmsg, actually Patch 2/4 in V5 was identical to what was submitted in V4 and my RB tag was not added, nor was the entry for virtio_rpmsg.h added to the MAINTAINERS file. > also following your suggestion. Still, formally the patch has changed, so, I > didn't include your "Reviewed-by" in this version. And you anyway would be Reviewed-by: Mathieu Poirier > reviewing the other patches in this series to, right? As much as I'd like to reviewing the other patches in this series won't be possible at this time. > > Thanks > Guennadi > > > Thanks, > > Mathieu > > > > > --- > > > drivers/rpmsg/virtio_rpmsg_bus.c | 78 +----------------------------- > > > include/linux/rpmsg/virtio.h | 83 ++++++++++++++++++++++++++++++++ > > > include/uapi/linux/rpmsg.h | 3 ++ > > > 3 files changed, 88 insertions(+), 76 deletions(-) > > > create mode 100644 include/linux/rpmsg/virtio.h > > > > > > diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c > > > index 9006fc7f73d0..f39c426f9c5e 100644 > > > --- a/drivers/rpmsg/virtio_rpmsg_bus.c > > > +++ b/drivers/rpmsg/virtio_rpmsg_bus.c > > > @@ -19,6 +19,7 @@ > > > #include > > > #include > > > #include > > > +#include > > > #include > > > #include > > > #include > > > @@ -27,6 +28,7 @@ > > > #include > > > #include > > > #include > > > +#include > > > > > > #include "rpmsg_internal.h" > > > > > > @@ -70,58 +72,6 @@ struct virtproc_info { > > > struct rpmsg_endpoint *ns_ept; > > > }; > > > > > > -/* The feature bitmap for virtio rpmsg */ > > > -#define VIRTIO_RPMSG_F_NS 0 /* RP supports name service notifications */ > > > - > > > -/** > > > - * struct rpmsg_hdr - common header for all rpmsg messages > > > - * @src: source address > > > - * @dst: destination address > > > - * @reserved: reserved for future use > > > - * @len: length of payload (in bytes) > > > - * @flags: message flags > > > - * @data: @len bytes of message payload data > > > - * > > > - * Every message sent(/received) on the rpmsg bus begins with this header. > > > - */ > > > -struct rpmsg_hdr { > > > - __virtio32 src; > > > - __virtio32 dst; > > > - __virtio32 reserved; > > > - __virtio16 len; > > > - __virtio16 flags; > > > - u8 data[]; > > > -} __packed; > > > - > > > -/** > > > - * struct rpmsg_ns_msg - dynamic name service announcement message > > > - * @name: name of remote service that is published > > > - * @addr: address of remote service that is published > > > - * @flags: indicates whether service is created or destroyed > > > - * > > > - * This message is sent across to publish a new service, or announce > > > - * about its removal. When we receive these messages, an appropriate > > > - * rpmsg channel (i.e device) is created/destroyed. In turn, the ->probe() > > > - * or ->remove() handler of the appropriate rpmsg driver will be invoked > > > - * (if/as-soon-as one is registered). > > > - */ > > > -struct rpmsg_ns_msg { > > > - char name[RPMSG_NAME_SIZE]; > > > - __virtio32 addr; > > > - __virtio32 flags; > > > -} __packed; > > > - > > > -/** > > > - * enum rpmsg_ns_flags - dynamic name service announcement flags > > > - * > > > - * @RPMSG_NS_CREATE: a new remote service was just created > > > - * @RPMSG_NS_DESTROY: a known remote service was just destroyed > > > - */ > > > -enum rpmsg_ns_flags { > > > - RPMSG_NS_CREATE = 0, > > > - RPMSG_NS_DESTROY = 1, > > > -}; > > > - > > > /** > > > * @vrp: the remote processor this channel belongs to > > > */ > > > @@ -134,27 +84,6 @@ struct virtio_rpmsg_channel { > > > #define to_virtio_rpmsg_channel(_rpdev) \ > > > container_of(_rpdev, struct virtio_rpmsg_channel, rpdev) > > > > > > -/* > > > - * We're allocating buffers of 512 bytes each for communications. The > > > - * number of buffers will be computed from the number of buffers supported > > > - * by the vring, upto a maximum of 512 buffers (256 in each direction). > > > - * > > > - * Each buffer will have 16 bytes for the msg header and 496 bytes for > > > - * the payload. > > > - * > > > - * This will utilize a maximum total space of 256KB for the buffers. > > > - * > > > - * We might also want to add support for user-provided buffers in time. > > > - * This will allow bigger buffer size flexibility, and can also be used > > > - * to achieve zero-copy messaging. > > > - * > > > - * Note that these numbers are purely a decision of this driver - we > > > - * can change this without changing anything in the firmware of the remote > > > - * processor. > > > - */ > > > -#define MAX_RPMSG_NUM_BUFS (512) > > > -#define MAX_RPMSG_BUF_SIZE (512) > > > - > > > /* > > > * Local addresses are dynamically allocated on-demand. > > > * We do not dynamically assign addresses from the low 1024 range, > > > @@ -162,9 +91,6 @@ struct virtio_rpmsg_channel { > > > */ > > > #define RPMSG_RESERVED_ADDRESSES (1024) > > > > > > -/* Address 53 is reserved for advertising remote services */ > > > -#define RPMSG_NS_ADDR (53) > > > - > > > static void virtio_rpmsg_destroy_ept(struct rpmsg_endpoint *ept); > > > static int virtio_rpmsg_send(struct rpmsg_endpoint *ept, void *data, int len); > > > static int virtio_rpmsg_sendto(struct rpmsg_endpoint *ept, void *data, int len, > > > diff --git a/include/linux/rpmsg/virtio.h b/include/linux/rpmsg/virtio.h > > > new file mode 100644 > > > index 000000000000..3ede1a4a68a3 > > > --- /dev/null > > > +++ b/include/linux/rpmsg/virtio.h > > > @@ -0,0 +1,83 @@ > > > +/* SPDX-License-Identifier: GPL-2.0 */ > > > + > > > +#ifndef _LINUX_RPMSG_VIRTIO_H > > > +#define _LINUX_RPMSG_VIRTIO_H > > > + > > > +#include > > > +#include > > > +#include > > > + > > > +/** > > > + * struct rpmsg_hdr - common header for all rpmsg messages > > > + * @src: source address > > > + * @dst: destination address > > > + * @reserved: reserved for future use > > > + * @len: length of payload (in bytes) > > > + * @flags: message flags > > > + * @data: @len bytes of message payload data > > > + * > > > + * Every message sent(/received) on the rpmsg bus begins with this header. > > > + */ > > > +struct rpmsg_hdr { > > > + __virtio32 src; > > > + __virtio32 dst; > > > + __virtio32 reserved; > > > + __virtio16 len; > > > + __virtio16 flags; > > > + u8 data[]; > > > +} __packed; > > > + > > > +/** > > > + * struct rpmsg_ns_msg - dynamic name service announcement message > > > + * @name: name of remote service that is published > > > + * @addr: address of remote service that is published > > > + * @flags: indicates whether service is created or destroyed > > > + * > > > + * This message is sent across to publish a new service, or announce > > > + * about its removal. When we receive these messages, an appropriate > > > + * rpmsg channel (i.e device) is created/destroyed. In turn, the ->probe() > > > + * or ->remove() handler of the appropriate rpmsg driver will be invoked > > > + * (if/as-soon-as one is registered). > > > + */ > > > +struct rpmsg_ns_msg { > > > + char name[RPMSG_NAME_SIZE]; > > > + __virtio32 addr; > > > + __virtio32 flags; > > > +} __packed; > > > + > > > +/** > > > + * enum rpmsg_ns_flags - dynamic name service announcement flags > > > + * > > > + * @RPMSG_NS_CREATE: a new remote service was just created > > > + * @RPMSG_NS_DESTROY: a known remote service was just destroyed > > > + */ > > > +enum rpmsg_ns_flags { > > > + RPMSG_NS_CREATE = 0, > > > + RPMSG_NS_DESTROY = 1, > > > +}; > > > + > > > +/* > > > + * We're allocating buffers of 512 bytes each for communications. The > > > + * number of buffers will be computed from the number of buffers supported > > > + * by the vring, upto a maximum of 512 buffers (256 in each direction). > > > + * > > > + * Each buffer will have 16 bytes for the msg header and 496 bytes for > > > + * the payload. > > > + * > > > + * This will utilize a maximum total space of 256KB for the buffers. > > > + * > > > + * We might also want to add support for user-provided buffers in time. > > > + * This will allow bigger buffer size flexibility, and can also be used > > > + * to achieve zero-copy messaging. > > > + * > > > + * Note that these numbers are purely a decision of this driver - we > > > + * can change this without changing anything in the firmware of the remote > > > + * processor. > > > + */ > > > +#define MAX_RPMSG_NUM_BUFS 512 > > > +#define MAX_RPMSG_BUF_SIZE 512 > > > + > > > +/* Address 53 is reserved for advertising remote services */ > > > +#define RPMSG_NS_ADDR 53 > > > + > > > +#endif > > > diff --git a/include/uapi/linux/rpmsg.h b/include/uapi/linux/rpmsg.h > > > index e14c6dab4223..d669c04ef289 100644 > > > --- a/include/uapi/linux/rpmsg.h > > > +++ b/include/uapi/linux/rpmsg.h > > > @@ -24,4 +24,7 @@ struct rpmsg_endpoint_info { > > > #define RPMSG_CREATE_EPT_IOCTL _IOW(0xb5, 0x1, struct rpmsg_endpoint_info) > > > #define RPMSG_DESTROY_EPT_IOCTL _IO(0xb5, 0x2) > > > > > > +/* The feature bitmap for virtio rpmsg */ > > > +#define VIRTIO_RPMSG_F_NS 0 /* RP supports name service notifications */ > > > + > > > #endif > > > -- > > > 2.28.0 > > >