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 D2C2BC433DF for ; Tue, 11 Aug 2020 18:00:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9AE2B20771 for ; Tue, 11 Aug 2020 18:00:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="t3lDSUE+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726366AbgHKSAb (ORCPT ); Tue, 11 Aug 2020 14:00:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726173AbgHKSA3 (ORCPT ); Tue, 11 Aug 2020 14:00:29 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20698C061787 for ; Tue, 11 Aug 2020 10:51:13 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id p8so7046853pgn.13 for ; Tue, 11 Aug 2020 10:51:13 -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=h8yzjR5gEjQGMLEaibHXBXnKMny1lSuxkpUOmeC6vEU=; b=t3lDSUE+2+HwSfXuLVJ38b9cnV6JNuDjePJceg/TqsDckbI1r8+98LhPYI616wk/aC LmXfw/kUfXvJx3ECTfOtqsvwIVVuIFvwMH4XnvA5n+u82AQ6014Valf+WbvX7ak/0tZB c4+GODifQkSNPgxwpZ+GrBQFPGVKt9I21EABDUnZ3BS0VRre2KmfigK2q25Qi5XmPFah xLyfBwErS6w9oIpXUQwxG/nHcl2K2i7kHDOrKN37gwyDGv1yMg4cjzLPgTuWj1EOZ4Ce nJVEcxCFWmih5ULPUnU9nHf1j1qN86ibaogKCGxYDRPjsdFs4JmHVe2pbergOajzYGxT QeDw== 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=h8yzjR5gEjQGMLEaibHXBXnKMny1lSuxkpUOmeC6vEU=; b=iiT02EYbyu78YnK1fuiQ0PR2Xil2kgqTaimRK7LQgajkXgdzWohMkGdEUQaGD3AV91 L2x6nRr5WUar2uSplXqfZszeXy5g4hZ1IP6tmdLSJ6WBAiPNg5MlKw/WkmgR0GzYxsCp RBu8CqQeuR3mKE04oRcsh3MjrNorKueqEpn6eV7pXXkxsLRJrdlsOY47a/e7grOB76Sb 6HvCx1vW0WwfsvKdADvVTMpvINlClZeRz7N4bajGur8/fjpAORgDZPuYgl7eudUYkkbp 3ZTvUqOPmlargXgJP5uR3ZwW7/yRbqjGSuQpxnT4xOzMECJq5PON6rwM5AGcbtVTaqux RniQ== X-Gm-Message-State: AOAM530gdDGCifQeKTDja+Bai7eQtRA8FyPJniIoofoKQO6pJnF3h22L XdZFwUYHXV/pYKD85KFigdIKH8UURr0= X-Google-Smtp-Source: ABdhPJyotbMCWph1W/tWysui9KuDDamAnq5tkcelaBCdPTwpkq8ezkcZuGs9kuFkZXhcXy0b9aM13w== X-Received: by 2002:a63:5012:: with SMTP id e18mr1718125pgb.169.1597168273223; Tue, 11 Aug 2020 10:51:13 -0700 (PDT) Received: from xps15 (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id d17sm3444493pjr.40.2020.08.11.10.51.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2020 10:51:12 -0700 (PDT) Date: Tue, 11 Aug 2020 11:51:10 -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 v4 2/4] rpmsg: move common structures and defines to headers Message-ID: <20200811175110.GA3253363@xps15> References: <20200722150927.15587-1-guennadi.liakhovetski@linux.intel.com> <20200722150927.15587-3-guennadi.liakhovetski@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200722150927.15587-3-guennadi.liakhovetski@linux.intel.com> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org On Wed, Jul 22, 2020 at 05:09:25PM +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 > --- > drivers/rpmsg/virtio_rpmsg_bus.c | 78 +----------------------------- > include/linux/virtio_rpmsg.h | 83 ++++++++++++++++++++++++++++++++ I am ambivalent about whether virtio_rpmsg.h should go under include/linux/rpmsg/ or just stay where you have it. Not that it matters much... I will let Bjorn make the final call on this. If it does stay here, it will need to be added to MAINTAINERS. For the v5.10 merge window only: Reviewed-by: Mathieu Poirier > include/uapi/linux/rpmsg.h | 3 ++ > 3 files changed, 88 insertions(+), 76 deletions(-) > create mode 100644 include/linux/virtio_rpmsg.h > > diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c > index 9006fc7f73d0..9d5dd3f0a648 100644 > --- a/drivers/rpmsg/virtio_rpmsg_bus.c > +++ b/drivers/rpmsg/virtio_rpmsg_bus.c > @@ -26,7 +26,9 @@ > #include > #include > #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/virtio_rpmsg.h b/include/linux/virtio_rpmsg.h > new file mode 100644 > index 000000000000..fcb523831e73 > --- /dev/null > +++ b/include/linux/virtio_rpmsg.h > @@ -0,0 +1,83 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +#ifndef _LINUX_VIRTIO_RPMSG_H > +#define _LINUX_VIRTIO_RPMSG_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.27.0 >