| Message ID | 1652778276-2986-10-git-send-email-longli@linuxonhyperv.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | Introduce Microsoft Azure Network Adapter (MANA) RDMA driver | expand |
On Tue, May 17, 2022 at 02:04:33AM -0700, longli@linuxonhyperv.com wrote: > From: Long Li <longli@microsoft.com> > > In preparation to add MANA RDMA driver, move all the required header files > to a common location for use by both Ethernet and RDMA drivers. > > Signed-off-by: Long Li <longli@microsoft.com> > --- > MAINTAINERS | 1 + > drivers/net/ethernet/microsoft/mana/gdma_main.c | 2 +- > drivers/net/ethernet/microsoft/mana/hw_channel.c | 4 ++-- > drivers/net/ethernet/microsoft/mana/mana_bpf.c | 2 +- > drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +- > drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 2 +- > drivers/net/ethernet/microsoft/mana/shm_channel.c | 2 +- > {drivers/net/ethernet/microsoft => include/linux}/mana/gdma.h | 0 > .../ethernet/microsoft => include/linux}/mana/hw_channel.h | 0 > {drivers/net/ethernet/microsoft => include/linux}/mana/mana.h | 0 > .../ethernet/microsoft => include/linux}/mana/shm_channel.h | 0 > 11 files changed, 8 insertions(+), 7 deletions(-) > rename {drivers/net/ethernet/microsoft => include/linux}/mana/gdma.h (100%) > rename {drivers/net/ethernet/microsoft => include/linux}/mana/hw_channel.h (100%) > rename {drivers/net/ethernet/microsoft => include/linux}/mana/mana.h (100%) > rename {drivers/net/ethernet/microsoft => include/linux}/mana/shm_channel.h (100%) I know mlx5 did it like this, but I wonder if include/net is more appropriate? Or maybe include/aux/? Jason
> Subject: Re: [PATCH 09/12] net: mana: Move header files to a common location > > On Tue, May 17, 2022 at 02:04:33AM -0700, longli@linuxonhyperv.com wrote: > > From: Long Li <longli@microsoft.com> > > > > In preparation to add MANA RDMA driver, move all the required header > > files to a common location for use by both Ethernet and RDMA drivers. > > > > Signed-off-by: Long Li <longli@microsoft.com> > > --- > > MAINTAINERS | 1 + > > drivers/net/ethernet/microsoft/mana/gdma_main.c | 2 +- > > drivers/net/ethernet/microsoft/mana/hw_channel.c | 4 ++-- > > drivers/net/ethernet/microsoft/mana/mana_bpf.c | 2 +- > > drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +- > > drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 2 +- > > drivers/net/ethernet/microsoft/mana/shm_channel.c | 2 +- > > {drivers/net/ethernet/microsoft => include/linux}/mana/gdma.h | 0 > > .../ethernet/microsoft => include/linux}/mana/hw_channel.h | 0 > > {drivers/net/ethernet/microsoft => include/linux}/mana/mana.h | 0 > > .../ethernet/microsoft => include/linux}/mana/shm_channel.h | 0 > > 11 files changed, 8 insertions(+), 7 deletions(-) rename > > {drivers/net/ethernet/microsoft => include/linux}/mana/gdma.h (100%) > > rename {drivers/net/ethernet/microsoft => > > include/linux}/mana/hw_channel.h (100%) rename > > {drivers/net/ethernet/microsoft => include/linux}/mana/mana.h (100%) > > rename {drivers/net/ethernet/microsoft => > > include/linux}/mana/shm_channel.h (100%) > > I know mlx5 did it like this, but I wonder if include/net is more appropriate? > > Or maybe include/aux/? I can move the header files to include/net/mana, if that sounds okay and no objection to doing that. Long > > Jason
diff --git a/MAINTAINERS b/MAINTAINERS index 40fa1955ca3f..268c68dc40dc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9108,6 +9108,7 @@ F: include/asm-generic/hyperv-tlfs.h F: include/asm-generic/mshyperv.h F: include/clocksource/hyperv_timer.h F: include/linux/hyperv.h +F: include/mana/ F: include/uapi/linux/hyperv.h F: net/vmw_vsock/hyperv_transport.c F: tools/hv/ diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c index 9c93d7a403ea..96edf8491ebd 100644 --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c @@ -6,7 +6,7 @@ #include <linux/utsname.h> #include <linux/version.h> -#include "mana.h" +#include <linux/mana/mana.h> static u32 mana_gd_r32(struct gdma_context *g, u64 offset) { diff --git a/drivers/net/ethernet/microsoft/mana/hw_channel.c b/drivers/net/ethernet/microsoft/mana/hw_channel.c index 078d6a5a0768..609cd714dcc0 100644 --- a/drivers/net/ethernet/microsoft/mana/hw_channel.c +++ b/drivers/net/ethernet/microsoft/mana/hw_channel.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* Copyright (c) 2021, Microsoft Corporation. */ -#include "gdma.h" -#include "hw_channel.h" +#include <linux/mana/gdma.h> +#include <linux/mana/hw_channel.h> static int mana_hwc_get_msg_index(struct hw_channel_context *hwc, u16 *msg_id) { diff --git a/drivers/net/ethernet/microsoft/mana/mana_bpf.c b/drivers/net/ethernet/microsoft/mana/mana_bpf.c index 1d2f948b5c00..7476f21e5f37 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_bpf.c +++ b/drivers/net/ethernet/microsoft/mana/mana_bpf.c @@ -8,7 +8,7 @@ #include <linux/bpf_trace.h> #include <net/xdp.h> -#include "mana.h" +#include <linux/mana/mana.h> void mana_xdp_tx(struct sk_buff *skb, struct net_device *ndev) { diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 6bb38c90b008..928b14a7ee1f 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -11,7 +11,7 @@ #include <net/checksum.h> #include <net/ip6_checksum.h> -#include "mana.h" +#include <linux/mana/mana.h> static DEFINE_IDA(mana_adev_ida); diff --git a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c index e13f2453eabb..c2ecb5154139 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c +++ b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c @@ -5,7 +5,7 @@ #include <linux/etherdevice.h> #include <linux/ethtool.h> -#include "mana.h" +#include <linux/mana/mana.h> static const struct { char name[ETH_GSTRING_LEN]; diff --git a/drivers/net/ethernet/microsoft/mana/shm_channel.c b/drivers/net/ethernet/microsoft/mana/shm_channel.c index da255da62176..161a4e6ba32a 100644 --- a/drivers/net/ethernet/microsoft/mana/shm_channel.c +++ b/drivers/net/ethernet/microsoft/mana/shm_channel.c @@ -6,7 +6,7 @@ #include <linux/io.h> #include <linux/mm.h> -#include "shm_channel.h" +#include <linux/mana/shm_channel.h> #define PAGE_FRAME_L48_WIDTH_BYTES 6 #define PAGE_FRAME_L48_WIDTH_BITS (PAGE_FRAME_L48_WIDTH_BYTES * 8) diff --git a/drivers/net/ethernet/microsoft/mana/gdma.h b/include/linux/mana/gdma.h similarity index 100% rename from drivers/net/ethernet/microsoft/mana/gdma.h rename to include/linux/mana/gdma.h diff --git a/drivers/net/ethernet/microsoft/mana/hw_channel.h b/include/linux/mana/hw_channel.h similarity index 100% rename from drivers/net/ethernet/microsoft/mana/hw_channel.h rename to include/linux/mana/hw_channel.h diff --git a/drivers/net/ethernet/microsoft/mana/mana.h b/include/linux/mana/mana.h similarity index 100% rename from drivers/net/ethernet/microsoft/mana/mana.h rename to include/linux/mana/mana.h diff --git a/drivers/net/ethernet/microsoft/mana/shm_channel.h b/include/linux/mana/shm_channel.h similarity index 100% rename from drivers/net/ethernet/microsoft/mana/shm_channel.h rename to include/linux/mana/shm_channel.h