Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp4345612pxk; Tue, 29 Sep 2020 23:55:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBiaSJsmzcptOPfHPKpIse3ZJmurDCMLJcnuMKufvuw9eFCf/2p2YehTkBekwG3cFbKMXw X-Received: by 2002:a50:99d6:: with SMTP id n22mr1160181edb.265.1601448931365; Tue, 29 Sep 2020 23:55:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601448931; cv=none; d=google.com; s=arc-20160816; b=tAtNzATyqKs9ucCO0OWdL2RfTJQ2LhJBY/YVIl46ZAm3eULtruf/viAolRp5fjnznU WuuhedRK/CQSIyD2F2w/SRiq98Ppdxoycxs0zVZ2QL1B1IYMhfKLfIzdnsHUUW14XFpH 1T2zcN6DCNfBJvlLdkxlZEIS5bXwVLVcDizHGzX8DQ3YCTitrenxRAwMnZoCjpTkhFTW qWWMijJuhiHnz8Nu7vWkJffiYkq7rfNXvrUeFSH/mzpWYTO5MFSF5S6n/tEAyRybjkyj AdZMUZrrRAEKvPZYnYS0yZOcMU6O1tDT2BbqvQSbHvOB++q+RE32HWTPoMD5re8Hqg/H ZtJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :ironport-sdr:ironport-sdr; bh=mhm5p2ygJYxQNf/zzhQuYPMu6kHON0p4epUenmaF3eA=; b=KzkYLOdzLcEsA5LVhD6lbhbKwRJaxxNSdmDYAlm1Zs2lSy6vMqBOstrReS6JZM8CjE Pf+GlBt8MJ4daDFyAbf5WQHm2gIiH7dhIDmdm8Fst2cDXoaKyT2QW9FduteaHKwQ9eJ2 GuSvAhsEBDHynN/4CWzBnUPh1R4ddHGd3f1lWRPD1SRnp/O/laKJ09gN6VuwjuI4xf0D 83UDxy50rYcyEgsOYN7ArxM3piJVduLJ0cJDjsX6EXo/zavhK4rRdr/6dC3+fEyN4eA6 MuYdZQff6drlInrKy5qWxXE3ZR65a+3ZAFpn6C3cAtSMjsKqyG+rAmyUbQ44qxIEQAoq 2sHg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p12si424789edy.315.2020.09.29.23.55.08; Tue, 29 Sep 2020 23:55:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728173AbgI3GyM (ORCPT + 99 others); Wed, 30 Sep 2020 02:54:12 -0400 Received: from mga14.intel.com ([192.55.52.115]:36130 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725320AbgI3GyM (ORCPT ); Wed, 30 Sep 2020 02:54:12 -0400 IronPort-SDR: LVry4tHQMpfGR8oYMHB0a2ubiPCIJZVlwkjpc0US7i2RYW1zBwQ4g6glRbikOhrRiY4Jezs26j 4UQdl33SpzwQ== X-IronPort-AV: E=McAfee;i="6000,8403,9759"; a="161601632" X-IronPort-AV: E=Sophos;i="5.77,321,1596524400"; d="scan'208";a="161601632" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2020 23:54:10 -0700 IronPort-SDR: xSkpQV6xIhK2vT7Fm6WBbYLuFypbN90iCEi8ktgy1b72y9Lq0jStwJL3R9A5otkcMctT42+6uc cFnvBGpKz5Bg== X-IronPort-AV: E=Sophos;i="5.77,321,1596524400"; d="scan'208";a="495953614" Received: from gliakhov-mobl2.ger.corp.intel.com (HELO ubuntu) ([10.252.32.32]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2020 23:54:08 -0700 Date: Wed, 30 Sep 2020 08:54:05 +0200 From: Guennadi Liakhovetski To: Mathieu Poirier Cc: ohad@wizery.com, bjorn.andersson@linaro.org, loic.pallardy@st.com, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 04/10] rpmsg: Move common structures and defines to headers Message-ID: <20200930065404.GC20683@ubuntu> References: <20200922001000.899956-1-mathieu.poirier@linaro.org> <20200922001000.899956-5-mathieu.poirier@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200922001000.899956-5-mathieu.poirier@linaro.org> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 21, 2020 at 06:09:54PM -0600, Mathieu Poirier wrote: > From: Guennadi Liakhovetski > > 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 > [Renamed header file from linux/rpmsg/rpmsg_virtio.h to linux/rpmsg_ns.h] No, this isn't only for the name-service, the message header is common for all RPMsg messages. Thanks Guennadi > Signed-off-by: Mathieu Poirier > --- > drivers/rpmsg/virtio_rpmsg_bus.c | 78 +----------------------------- > include/linux/rpmsg_ns.h | 83 ++++++++++++++++++++++++++++++++ > include/uapi/linux/rpmsg.h | 3 ++ > 3 files changed, 88 insertions(+), 76 deletions(-) > create mode 100644 include/linux/rpmsg_ns.h > > diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c > index e87cf0b79542..eaf3b2c012c8 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, > -}; > - > /** > * struct virtio_rpmsg_channel - rpmsg channel descriptor > * @rpdev: the rpmsg channel device > @@ -139,27 +89,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, > @@ -167,9 +96,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_ns.h b/include/linux/rpmsg_ns.h > new file mode 100644 > index 000000000000..aabc6c3c0d6d > --- /dev/null > +++ b/include/linux/rpmsg_ns.h > @@ -0,0 +1,83 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +#ifndef _LINUX_RPMSG_NS_H > +#define _LINUX_RPMSG_NS_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.25.1 >