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=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_MUTT autolearn=unavailable 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 AFF0AC04AAC for ; Mon, 20 May 2019 17:17:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B6D120862 for ; Mon, 20 May 2019 17:17:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="W6H3wrKJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392802AbfETRRp (ORCPT ); Mon, 20 May 2019 13:17:45 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:42713 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390521AbfETRRp (ORCPT ); Mon, 20 May 2019 13:17:45 -0400 Received: by mail-pg1-f194.google.com with SMTP id 145so7082898pgg.9 for ; Mon, 20 May 2019 10:17:45 -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:user-agent; bh=2FjhOwFKrVIJAl2LxDN32kEB+6yjli62tiwHSqu8m3Y=; b=W6H3wrKJKcaUjX12VWVVjTzD+FZk9cPmlEyg+n4tTPMRomuqZN8oGiT8ftSwORrLWu SrU1sNgEtcmMHUQTG5Q+SGNl1x4eWyTP86Wa72FlIcB6b23JStrVyE4xHjlS7usHaDNb At223MiDbKz8gzE6A3qG9pLtUnhxudhyFQeBmLqGQLc2gwhMkrIzVaaBPyi3S0ZQ4JNk +i6gOtm8/AxGiZ8TnZJT5tuZOrKikNFZz96dr/BoRQFccYpQnuMedMXUdbXaJ7sVkU5+ jaQ+yGo4yqEBt6urvlbJm6Xe4n9DzeSTKBnvXSp/Y0cnamgtP3DqTCSRheQVi9muWH6D dTMQ== 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:user-agent; bh=2FjhOwFKrVIJAl2LxDN32kEB+6yjli62tiwHSqu8m3Y=; b=Si7qOWZjaNhhF4awV2a+/BWfhfd0ih6Xz6BJNUAuhaPyc3WbZzywWrCGTvVwfr/fwB BNsRcOLTYiHWES608hPOaXy07e0CfyECdUeSrxu1swBYAAFZzxb4TsCbI8jAD1TNUx+h F3SAV6QUZ8A5jwDDSKsTYuOwIsee34xf+d/SFuhOGV+6ZZdfU8ZqpJxCcUti7/ESzNpn BGl4QyxXIfK0mfkffr8OkceIRoCzJCDEYI8Ovg8bF4dTdn+jEflooP+hin6bjwffX0VM fWau7V4lWxsxVCJ4vlU/1NqD61QKDKwaoelDKyuurgc2Z2OZBrfQ3om4qKtyXom6nMb9 4LBA== X-Gm-Message-State: APjAAAVuzK8xQRgg03FbhqeZkr3kmkQzxvF5NKdzyze/hnyior61mBDi meyuDCwRoydaxMIriu5W3f6A4CPRkZk= X-Google-Smtp-Source: APXvYqxGJODZVZZkYCQrDnuhEME1l3MVyx+Qrn7x3ga7XFxkr9lg/WGqNAAC5bsYmf2gHA+/s9ScVw== X-Received: by 2002:a65:42ca:: with SMTP id l10mr23345678pgp.181.1558372664547; Mon, 20 May 2019 10:17:44 -0700 (PDT) Received: from tuxbook-pro (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id h11sm20833183pfn.170.2019.05.20.10.17.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 May 2019 10:17:44 -0700 (PDT) Date: Mon, 20 May 2019 10:18:11 -0700 From: Bjorn Andersson To: Alex Elder Cc: arnd@arndb.de, subashab@codeaurora.org, david.brown@linaro.org, agross@kernel.org, davem@davemloft.net, ilias.apalodimas@linaro.org, cpratapa@codeaurora.org, syadagir@codeaurora.org, evgreen@chromium.org, benchan@google.com, ejcaruso@google.com, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 8/8] net: introduce "include/linux/if_rmnet.h" Message-ID: <20190520171811.GW2085@tuxbook-pro> References: <20190520135354.18628-1-elder@linaro.org> <20190520135354.18628-9-elder@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190520135354.18628-9-elder@linaro.org> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon 20 May 06:53 PDT 2019, Alex Elder wrote: > The IPA driver requires some (but not all) symbols defined in > "drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h". Create a new > public header file "include/linux/if_rmnet.h" and move the needed > definitions there. > Reviewed-by: Bjorn Andersson > Signed-off-by: Alex Elder > --- > .../ethernet/qualcomm/rmnet/rmnet_handlers.c | 1 + > .../net/ethernet/qualcomm/rmnet/rmnet_map.h | 31 ------------- > .../qualcomm/rmnet/rmnet_map_command.c | 1 + > .../ethernet/qualcomm/rmnet/rmnet_map_data.c | 1 + > .../net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 1 + > include/linux/if_rmnet.h | 45 +++++++++++++++++++ > 6 files changed, 49 insertions(+), 31 deletions(-) > create mode 100644 include/linux/if_rmnet.h > > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c > index 5fff6c78ecd5..8e00e14f4ac9 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > #include "rmnet_private.h" > #include "rmnet_config.h" > #include "rmnet_vnd.h" > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h > index 775b98d34e94..d101cabb04c3 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h > @@ -39,37 +39,6 @@ enum rmnet_map_commands { > RMNET_MAP_COMMAND_ENUM_LENGTH > }; > > -struct rmnet_map_header { > - u8 cmd_pad_len; /* RMNET_MAP_* */ > - u8 mux_id; > - __be16 pkt_len; > -} __aligned(1); > - > -#define RMNET_MAP_CMD_FMASK GENMASK(0, 0) /* 0: data; 1: cmd */ > -#define RMNET_MAP_RESERVED_FMASK GENMASK(1, 1) > -#define RMNET_MAP_PAD_LEN_FMASK GENMASK(7, 2) > - > -struct rmnet_map_dl_csum_trailer { > - u8 reserved1; > - u8 flags; /* RMNET_MAP_DL_* */ > - __be16 csum_start_offset; > - __be16 csum_length; > - __be16 csum_value; > -} __aligned(1); > - > -#define RMNET_MAP_DL_CSUM_VALID_FMASK GENMASK(0, 0) > -#define RMNET_MAP_DL_RESERVED_FMASK GENMASK(7, 1) > - > -struct rmnet_map_ul_csum_header { > - __be16 csum_start_offset; > - __be16 csum_info; /* RMNET_MAP_UL_* */ > -} __aligned(1); > - > -/* NOTE: These field masks are defined in CPU byte order */ > -#define RMNET_MAP_UL_CSUM_INSERT_FMASK GENMASK(13, 0) > -#define RMNET_MAP_UL_CSUM_UDP_FMASK GENMASK(14, 14) /* 0: IP; 1: UDP */ > -#define RMNET_MAP_UL_CSUM_ENABLED_FMASK GENMASK(15, 15) > - > #define RMNET_MAP_COMMAND_REQUEST 0 > #define RMNET_MAP_COMMAND_ACK 1 > #define RMNET_MAP_COMMAND_UNSUPPORTED 2 > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c > index f675f47c3495..6832c5939cae 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c > @@ -11,6 +11,7 @@ > */ > > #include > +#include > #include "rmnet_config.h" > #include "rmnet_map.h" > #include "rmnet_private.h" > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c > index 61b7dbab2056..370aee7402e0 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > #include "rmnet_config.h" > #include "rmnet_map.h" > #include "rmnet_private.h" > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c > index d11c16aeb19a..6b39d4d8e523 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > #include "rmnet_config.h" > #include "rmnet_handlers.h" > #include "rmnet_private.h" > diff --git a/include/linux/if_rmnet.h b/include/linux/if_rmnet.h > new file mode 100644 > index 000000000000..ae60472ecc79 > --- /dev/null > +++ b/include/linux/if_rmnet.h > @@ -0,0 +1,45 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved. > + * Copyright (C) 2019 Linaro Ltd. > + */ > +#ifndef _LINUX_IF_RMNET_H_ > +#define _LINUX_IF_RMNET_H_ > + > +#include > + > +/* Header structure that precedes packets in ETH_P_MAP protocol */ > +struct rmnet_map_header { > + u8 cmd_pad_len; /* RMNET_MAP_* */ > + u8 mux_id; > + __be16 pkt_len; > +} __aligned(1); > + > +#define RMNET_MAP_CMD_FMASK GENMASK(0, 0) /* 0: data; 1: cmd */ > +#define RMNET_MAP_RESERVED_FMASK GENMASK(1, 1) > +#define RMNET_MAP_PAD_LEN_FMASK GENMASK(7, 2) > + > +/* Checksum offload metadata header for outbound packets*/ > +struct rmnet_map_ul_csum_header { > + __be16 csum_start_offset; > + __be16 csum_info; /* RMNET_MAP_UL_* */ > +} __aligned(1); > + > +/* NOTE: These field masks are defined in CPU byte order */ > +#define RMNET_MAP_UL_CSUM_INSERT_FMASK GENMASK(13, 0) > +#define RMNET_MAP_UL_CSUM_UDP_FMASK GENMASK(14, 14) /* 0: IP; 1: UDP */ > +#define RMNET_MAP_UL_CSUM_ENABLED_FMASK GENMASK(15, 15) > + > +/* Checksum offload metadata trailer for inbound packets */ > +struct rmnet_map_dl_csum_trailer { > + u8 reserved1; > + u8 flags; /* RMNET_MAP_DL_* */ > + __be16 csum_start_offset; > + __be16 csum_length; > + __be16 csum_value; > +} __aligned(1); > + > +#define RMNET_MAP_DL_CSUM_VALID_FMASK GENMASK(0, 0) > +#define RMNET_MAP_DL_RESERVED_FMASK GENMASK(7, 1) > + > +#endif /* _LINUX_IF_RMNET_H_ */ > -- > 2.20.1 >