From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 86FC1A0524; Tue, 30 Jun 2020 19:47:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0E97B1BF76; Tue, 30 Jun 2020 19:47:26 +0200 (CEST) Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) by dpdk.org (Postfix) with ESMTP id BE2B11BF5E for ; Tue, 30 Jun 2020 19:47:20 +0200 (CEST) Received: by mail-il1-f195.google.com with SMTP id w73so6674464ila.11 for ; Tue, 30 Jun 2020 10:47:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=muA5ga7OCj+Bdx3jWpZgGxMAmmECWf16p+NWs6kzAvs=; b=G5qXnC/Fvn6zDfl0d94P1LGlMY7A/pEtbXV0FQpNs+DQvKmCmUrpeJCmHi3HvfCq5u 1IzKaBpC/tizj0e4M5HpfM9iNrcueqEbeDurRpp4ZN2qWfykg58aDJs6C0bx02QEzZdW CF7vj8g18NO5oHa0WqHfImE/nXh59WeQKVhBMRYtbYHrE9wqQXEma5ZSLjj/nfFXmkiL LgCyYZk2Gg0NRxxiMPxZg7yAawObvIwfHv6W+CVfhCwaSbGTOSkiUGmf8YITNUPKQS42 QtoVr++WoIhexRauJJlyLtRFPkXlUxLH2hTsgYBk/6g0DeCe3QY6w1wptpf5RS118167 MGYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=muA5ga7OCj+Bdx3jWpZgGxMAmmECWf16p+NWs6kzAvs=; b=LipIYC104iEM0g7z5idFcjdVC/nczhAoXMPgRYrvpoXEp1gAUUbNyDb2ZTeuzkmRxr Ejx1tvAhzHXQCcTHk5A3H1wRs6yiL7uQh+0l4DfZZOoK0i1zGAJFLRF2VN2gwOPVMPLB GPGMDyyF23lqUqcfwwazBf0uMMaumCpjpcjBRm9VWLBxwTsHjnX/FkyLTftQUUYPQSAT GtqkukjfprGjMY9SrNf9poPEhKfnDvmbguhsct/yoLM/DujBbQPpsKwQIczqP0XFGa51 ObGdUQlSTPMgohw+ILDsZmTlBHt08iPrvFcstRhw4hh8wJvoK9N2T4UCkRU940sBmAlb iCzw== X-Gm-Message-State: AOAM532DLtSbDFCFbAwUx9XdpeyK+Q8DJLu7HrIpYF9IRNN/l21YrVmr NZGcjwPmfjTGypv0gcJWD5wF9p8vVyiT+ZM9BPw= X-Google-Smtp-Source: ABdhPJztCVC9h58ybO+/XwNAOolq2iGJ/2wIZT4kWvsDLplHbqjD5W3l8d4KyduUaweYfu2pwvygxTaz6fDCqFxOBkQ= X-Received: by 2002:a05:6e02:eb3:: with SMTP id u19mr3930660ilj.130.1593539239647; Tue, 30 Jun 2020 10:47:19 -0700 (PDT) MIME-Version: 1.0 References: <20200628055850.5275-1-rmody@marvell.com> <20200630083215.13108-2-rmody@marvell.com> In-Reply-To: <20200630083215.13108-2-rmody@marvell.com> From: Jerin Jacob Date: Tue, 30 Jun 2020 23:17:03 +0530 Message-ID: To: Rasesh Mody Cc: Jerin Jacob , Ferruh Yigit , dpdk-dev , GR-Everest-DPDK-Dev , Igor Russkikh Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-dev] [PATCH v2 1/4] net/qede/base: re-arrange few structures for DDC X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Tue, Jun 30, 2020 at 2:03 PM Rasesh Mody wrote: > > This patch rearranges some of the base driver structures which will be > also used by debug data collection (DDC) implementation. It adds a new > file ecore_hsi_func_common.h with Physical, Virtual memory descriptors. > > Signed-off-by: Rasesh Mody > Signed-off-by: Igor Russkikh This series has shared lib failure. GCC version log at [1] ccache gcc -Idrivers/net/qede/base/f6110d5@@qede_base@sta -Idrivers/net/qede/base -I../drivers/net/qede/base -Ilib/librte_net -I../lib/librte_net -I. -I.. -Iconfig -I../config -Ilib/librte_eal/include -I../lib/librte_eal/include -Ilib/librt e_eal/linux/include -I../lib/librte_eal/linux/include -Ilib/librte_eal/x86/include -I../lib/librte_eal/x86/include -Ilib/librte_eal/common -I../lib/librte_eal/common -Ilib/librte_eal -I../lib/librte_eal -Ilib/librte_kvargs -I../lib/librte_k vargs -Ilib/librte_metrics -I../lib/librte_metrics -Ilib/librte_telemetry -I../lib/librte_telemetry -Ilib/librte_mbuf -I../lib/librte_mbuf -Ilib/librte_mempool -I../lib/librte_mempool -Ilib/librte_ring -I../lib/librte_ring -fdiagnostics-col or=3Dalways -pipe -D_FILE_OFFSET_BITS=3D64 -Wall -Winvalid-pch -Werror -O2 -g -include rte_config.h -Wextra -Wcast-qual -Wdeprecated -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style- definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-address-of-packed-member -Wno-packed-not-aligned -Wno-missing-field-initializers -Wno-zero-length-bounds -D_GNU_SOURCE -fPIC -march=3Dnative -DALLOW_EX PERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-unused-parameter -Wno-sign-compare -Wno-missing-prototypes -Wno-cast-qual -Wno-unused-function -Wno-unused-variable -Wno-strict-aliasing -Wno-missing-prototypes -Wno-unused-val ue -Wno-format-nonliteral -Wno-shift-negative-value -Wno-unused-but-set-variable -Wno-missing-declarations -Wno-maybe-uninitialized -Wno-strict-prototypes -Wno-shift-negative-value -Wno-implicit-fallthrough -Wno-format-extra-args -Wno-empty -body -MD -MQ 'drivers/net/qede/base/f6110d5@@qede_base@sta/ecore_dev.c.o' -MF 'drivers/net/qede/base/f6110d5@@qede_base@sta/ecore_dev.c.o.d' -o 'drivers/net/qede/base/f6110d5@@qede_base@sta/ecore_dev.c.o' -c ../drivers/net/qede/base/ecore_ dev.c ../drivers/net/qede/base/ecore_dev.c: In function =E2=80=98ecore_resc_alloc= =E2=80=99: ../drivers/net/qede/base/ecore_dev.c:2515:6: error: implicit conversion from =E2=80=98enum dbg_status=E2=80=99 to =E2=80=98enum _ecore_s= tatus_t=E2=80=99 [-Werror=3Denum-conversion] 2515 | rc =3D OSAL_DBG_ALLOC_USER_DATA(p_hwfn, &p_hwfn->dbg_user_info); | ^ ../drivers/net/qede/base/ecore_dev.c:2522:6: error: implicit conversion from =E2=80=98enum dbg_status=E2=80=99 to =E2=80=98enum _ecore_s= tatus_t=E2=80=99 [-Werror=3Denum-conversion] 2522 | rc =3D OSAL_DBG_ALLOC_USER_DATA(p_hwfn, &p_hwfn->dbg_user_info); | ^ cc1: all warnings being treated as errors [1612/2184] Linking static target drivers/libtmp_rte_pmd_null_crypto.a [1] [master]dell[dpdk-next-net-mrvl] $ gcc -v Using built-in specs. COLLECT_GCC=3D/usr/bin/gcc COLLECT_LTO_WRAPPER=3D/usr/lib/gcc/x86_64-pc-linux-gnu/10.1.0/lto-wrapper Target: x86_64-pc-linux-gnu Configured with: /build/gcc/src/gcc/configure --prefix=3D/usr --libdir=3D/usr/lib --libexecdir=3D/usr/lib --mandir=3D/usr/share/man --infodir=3D/usr/share/info --with-bugurl=3Dhttps://bugs.archlinux.org/ --enable-languages=3Dc,c++,ada,fortran,go,lto,objc ,obj-c++,d --with-isl --with-linker-hash-style=3Dgnu --with-system-zlib --enable-__cxa_atexit --enable-cet=3Dauto --enable-checking=3Drelease --enable-clocale=3Dgnu --enable-default-pie --enable-default-ssp --enable-gnu-indirect-function --enable-g nu-unique-object --enable-install-libiberty --enable-linker-build-id --enable-lto --enable-multilib --enable-plugin --enable-shared --enable-threads=3Dposix --disable-libssp --disable-libstdcxx-pch --disable-libunwind-exceptions --disable-wer ror gdc_include_dir=3D/usr/include/dlang/gdc Thread model: posix Supported LTO compression algorithms: zlib zstd gcc version 10.1.0 (GCC) > --- > drivers/net/qede/base/ecore.h | 2 + > drivers/net/qede/base/ecore_cxt.c | 140 ++---------------- > drivers/net/qede/base/ecore_cxt.h | 135 ++++++++++++++++- > drivers/net/qede/base/ecore_hsi_func_common.h | 17 +++ > drivers/net/qede/base/ecore_init_fw_funcs.h | 7 - > 5 files changed, 163 insertions(+), 138 deletions(-) > create mode 100644 drivers/net/qede/base/ecore_hsi_func_common.h > > diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.= h > index 498bb6f09..dc5fe4d80 100644 > --- a/drivers/net/qede/base/ecore.h > +++ b/drivers/net/qede/base/ecore.h > @@ -24,6 +24,7 @@ > #include "ecore_hsi_debug_tools.h" > #include "ecore_hsi_init_func.h" > #include "ecore_hsi_init_tool.h" > +#include "ecore_hsi_func_common.h" > #include "ecore_proto_if.h" > #include "mcp_public.h" > > @@ -671,6 +672,7 @@ struct ecore_hwfn { > > struct dbg_tools_data dbg_info; > void *dbg_user_info; > + struct virt_mem_desc dbg_arrays[MAX_BIN_DBG_BUFFER_TYP= E]; > > struct z_stream_s *stream; > > diff --git a/drivers/net/qede/base/ecore_cxt.c b/drivers/net/qede/base/ec= ore_cxt.c > index dda47ea67..23f37b1bf 100644 > --- a/drivers/net/qede/base/ecore_cxt.c > +++ b/drivers/net/qede/base/ecore_cxt.c > @@ -20,12 +20,6 @@ > #include "ecore_sriov.h" > #include "ecore_mcp.h" > > -/* Max number of connection types in HW (DQ/CDU etc.) */ > -#define MAX_CONN_TYPES PROTOCOLID_COMMON > -#define NUM_TASK_TYPES 2 > -#define NUM_TASK_PF_SEGMENTS 4 > -#define NUM_TASK_VF_SEGMENTS 1 > - > /* Doorbell-Queue constants */ > #define DQ_RANGE_SHIFT 4 > #define DQ_RANGE_ALIGN (1 << DQ_RANGE_SHIFT) > @@ -90,128 +84,6 @@ struct src_ent { > /* Alignment is inherent to the type1_task_context structure */ > #define TYPE1_TASK_CXT_SIZE(p_hwfn) sizeof(union type1_task_context) > > -/* PF per protocl configuration object */ > -#define TASK_SEGMENTS (NUM_TASK_PF_SEGMENTS + NUM_TASK_VF_SEGMENTS) > -#define TASK_SEGMENT_VF (NUM_TASK_PF_SEGMENTS) > - > -struct ecore_tid_seg { > - u32 count; > - u8 type; > - bool has_fl_mem; > -}; > - > -struct ecore_conn_type_cfg { > - u32 cid_count; > - u32 cids_per_vf; > - struct ecore_tid_seg tid_seg[TASK_SEGMENTS]; > -}; > - > -/* ILT Client configuration, > - * Per connection type (protocol) resources (cids, tis, vf cids etc.) > - * 1 - for connection context (CDUC) and for each task context we need t= wo > - * values, for regular task context and for force load memory > - */ > -#define ILT_CLI_PF_BLOCKS (1 + NUM_TASK_PF_SEGMENTS * 2) > -#define ILT_CLI_VF_BLOCKS (1 + NUM_TASK_VF_SEGMENTS * 2) > -#define CDUC_BLK (0) > -#define SRQ_BLK (0) > -#define CDUT_SEG_BLK(n) (1 + (u8)(n)) > -#define CDUT_FL_SEG_BLK(n, X) (1 + (n) + NUM_TASK_##X##_SEGMENTS) > - > -struct ilt_cfg_pair { > - u32 reg; > - u32 val; > -}; > - > -struct ecore_ilt_cli_blk { > - u32 total_size; /* 0 means not active */ > - u32 real_size_in_page; > - u32 start_line; > - u32 dynamic_line_offset; > - u32 dynamic_line_cnt; > -}; > - > -struct ecore_ilt_client_cfg { > - bool active; > - > - /* ILT boundaries */ > - struct ilt_cfg_pair first; > - struct ilt_cfg_pair last; > - struct ilt_cfg_pair p_size; > - > - /* ILT client blocks for PF */ > - struct ecore_ilt_cli_blk pf_blks[ILT_CLI_PF_BLOCKS]; > - u32 pf_total_lines; > - > - /* ILT client blocks for VFs */ > - struct ecore_ilt_cli_blk vf_blks[ILT_CLI_VF_BLOCKS]; > - u32 vf_total_lines; > -}; > - > -#define MAP_WORD_SIZE sizeof(unsigned long) > -#define BITS_PER_MAP_WORD (MAP_WORD_SIZE * 8) > - > -struct ecore_cid_acquired_map { > - u32 start_cid; > - u32 max_count; > - u32 *cid_map; > -}; > - > -struct ecore_src_t2 { > - struct phys_mem_desc *dma_mem; > - u32 num_pages; > - u64 first_free; > - u64 last_free; > -}; > - > -struct ecore_cxt_mngr { > - /* Per protocl configuration */ > - struct ecore_conn_type_cfg conn_cfg[MAX_CONN_TYPES]; > - > - /* computed ILT structure */ > - struct ecore_ilt_client_cfg clients[ILT_CLI_MAX]; > - > - /* Task type sizes */ > - u32 task_type_size[NUM_TASK_TYPES]; > - > - /* total number of VFs for this hwfn - > - * ALL VFs are symmetric in terms of HW resources > - */ > - u32 vf_count; > - > - /* Acquired CIDs */ > - struct ecore_cid_acquired_map acquired[MAX_CONN_TYPES]; > - struct ecore_cid_acquired_map *acquired_vf[MAX_CONN_TYPES]; > - > - /* ILT shadow table */ > - struct phys_mem_desc *ilt_shadow; > - u32 pf_start_line; > - > - /* Mutex for a dynamic ILT allocation */ > - osal_mutex_t mutex; > - > - /* SRC T2 */ > - struct ecore_src_t2 src_t2; > - > - /* The infrastructure originally was very generic and context/tas= k > - * oriented - per connection-type we would set how many of those > - * are needed, and later when determining how much memory we're > - * needing for a given block we'd iterate over all the relevant > - * connection-types. > - * But since then we've had some additional resources, some of wh= ich > - * require memory which is indepent of the general context/task > - * scheme. We add those here explicitly per-feature. > - */ > - > - /* total number of SRQ's for this hwfn */ > - u32 srq_count; > - > - /* Maximal number of L2 steering filters */ > - u32 arfs_count; > - > - /* TODO - VF arfs filters ? */ > -}; > - > static OSAL_INLINE bool tm_cid_proto(enum protocol_type type) > { > return type =3D=3D PROTOCOLID_TOE; > @@ -945,7 +817,7 @@ static enum _ecore_status_t ecore_cxt_src_t2_alloc(st= ruct ecore_hwfn *p_hwfn) > } > > #define for_each_ilt_valid_client(pos, clients) \ > - for (pos =3D 0; pos < ILT_CLI_MAX; pos++) \ > + for (pos =3D 0; pos < MAX_ILT_CLIENTS; pos++) \ > if (!clients[pos].active) { \ > continue; \ > } else \ > @@ -1238,7 +1110,7 @@ enum _ecore_status_t ecore_cxt_mngr_alloc(struct ec= ore_hwfn *p_hwfn) > clients[ILT_CLI_TSDM].p_size.reg =3D ILT_CFG_REG(TSDM, P_SIZE); > > /* default ILT page size for all clients is 64K */ > - for (i =3D 0; i < ILT_CLI_MAX; i++) > + for (i =3D 0; i < MAX_ILT_CLIENTS; i++) > p_mngr->clients[i].p_size.val =3D ILT_DEFAULT_HW_P_SIZE; > > /* due to removal of ISCSI/FCoE files union type0_task_context > @@ -2306,3 +2178,11 @@ ecore_cxt_free_ilt_range(struct ecore_hwfn *p_hwfn= , > > return ECORE_SUCCESS; > } > + > +static u16 ecore_blk_calculate_pages(struct ecore_ilt_cli_blk *p_blk) > +{ > + if (p_blk->real_size_in_page =3D=3D 0) > + return 0; > + > + return DIV_ROUND_UP(p_blk->total_size, p_blk->real_size_in_page); > +} > diff --git a/drivers/net/qede/base/ecore_cxt.h b/drivers/net/qede/base/ec= ore_cxt.h > index 55f08027d..7b91b953e 100644 > --- a/drivers/net/qede/base/ecore_cxt.h > +++ b/drivers/net/qede/base/ecore_cxt.h > @@ -31,7 +31,7 @@ enum ilt_clients { > ILT_CLI_TSDM, > ILT_CLI_RGFS, > ILT_CLI_TGFS, > - ILT_CLI_MAX > + MAX_ILT_CLIENTS > }; > > u32 ecore_cxt_get_proto_cid_count(struct ecore_hwfn *p_hwfn, > @@ -212,4 +212,137 @@ enum _ecore_status_t ecore_cxt_free_proto_ilt(struc= t ecore_hwfn *p_hwfn, > #define ECORE_CTX_WORKING_MEM 0 > #define ECORE_CTX_FL_MEM 1 > > +/* Max number of connection types in HW (DQ/CDU etc.) */ > +#define MAX_CONN_TYPES PROTOCOLID_COMMON > +#define NUM_TASK_TYPES 2 > +#define NUM_TASK_PF_SEGMENTS 4 > +#define NUM_TASK_VF_SEGMENTS 1 > + > +/* PF per protocl configuration object */ > +#define TASK_SEGMENTS (NUM_TASK_PF_SEGMENTS + NUM_TASK_VF_SEGMENTS) > +#define TASK_SEGMENT_VF (NUM_TASK_PF_SEGMENTS) > + > +struct ecore_tid_seg { > + u32 count; > + u8 type; > + bool has_fl_mem; > +}; > + > +struct ecore_conn_type_cfg { > + u32 cid_count; > + u32 cids_per_vf; > + struct ecore_tid_seg tid_seg[TASK_SEGMENTS]; > +}; > + > +/* ILT Client configuration, > + * Per connection type (protocol) resources (cids, tis, vf cids etc.) > + * 1 - for connection context (CDUC) and for each task context we need t= wo > + * values, for regular task context and for force load memory > + */ > +#define ILT_CLI_PF_BLOCKS (1 + NUM_TASK_PF_SEGMENTS * 2) > +#define ILT_CLI_VF_BLOCKS (1 + NUM_TASK_VF_SEGMENTS * 2) > +#define CDUC_BLK (0) > +#define SRQ_BLK (0) > +#define CDUT_SEG_BLK(n) (1 + (u8)(n)) > +#define CDUT_FL_SEG_BLK(n, X) (1 + (n) + NUM_TASK_##X##_SEGMENTS) > + > +struct ilt_cfg_pair { > + u32 reg; > + u32 val; > +}; > + > +struct ecore_ilt_cli_blk { > + u32 total_size; /* 0 means not active */ > + u32 real_size_in_page; > + u32 start_line; > + u32 dynamic_line_offset; > + u32 dynamic_line_cnt; > +}; > + > +struct ecore_ilt_client_cfg { > + bool active; > + > + /* ILT boundaries */ > + struct ilt_cfg_pair first; > + struct ilt_cfg_pair last; > + struct ilt_cfg_pair p_size; > + > + /* ILT client blocks for PF */ > + struct ecore_ilt_cli_blk pf_blks[ILT_CLI_PF_BLOCKS]; > + u32 pf_total_lines; > + > + /* ILT client blocks for VFs */ > + struct ecore_ilt_cli_blk vf_blks[ILT_CLI_VF_BLOCKS]; > + u32 vf_total_lines; > +}; > + > +#define MAP_WORD_SIZE sizeof(unsigned long) > +#define BITS_PER_MAP_WORD (MAP_WORD_SIZE * 8) > + > +struct ecore_cid_acquired_map { > + u32 start_cid; > + u32 max_count; > + u32 *cid_map; > +}; > + > +struct ecore_src_t2 { > + struct phys_mem_desc *dma_mem; > + u32 num_pages; > + u64 first_free; > + u64 last_free; > +}; > + > +struct ecore_cxt_mngr { > + /* Per protocl configuration */ > + struct ecore_conn_type_cfg conn_cfg[MAX_CONN_TYPES]; > + > + /* computed ILT structure */ > + struct ecore_ilt_client_cfg clients[MAX_ILT_CLIENTS]; > + > + /* Task type sizes */ > + u32 task_type_size[NUM_TASK_TYPES]; > + > + /* total number of VFs for this hwfn - > + * ALL VFs are symmetric in terms of HW resources > + */ > + u32 vf_count; > + u32 first_vf_in_pf; > + > + /* Acquired CIDs */ > + struct ecore_cid_acquired_map acquired[MAX_CONN_TYPES]; > + struct ecore_cid_acquired_map *acquired_vf[MAX_CONN_TYPES]; > + > + /* ILT shadow table */ > + struct phys_mem_desc *ilt_shadow; > + u32 ilt_shadow_size; > + u32 pf_start_line; > + > + /* Mutex for a dynamic ILT allocation */ > + osal_mutex_t mutex; > + > + /* SRC T2 */ > + struct ecore_src_t2 src_t2; > + > + /* The infrastructure originally was very generic and context/tas= k > + * oriented - per connection-type we would set how many of those > + * are needed, and later when determining how much memory we're > + * needing for a given block we'd iterate over all the relevant > + * connection-types. > + * But since then we've had some additional resources, some of wh= ich > + * require memory which is indepent of the general context/task > + * scheme. We add those here explicitly per-feature. > + */ > + > + /* total number of SRQ's for this hwfn */ > + u32 srq_count; > + > + /* Maximal number of L2 steering filters */ > + u32 arfs_count; > + > + /* TODO - VF arfs filters ? */ > + > + u8 task_type_id; > + u16 task_ctx_size; > + u16 conn_ctx_size; > +}; > #endif /* _ECORE_CID_ */ > diff --git a/drivers/net/qede/base/ecore_hsi_func_common.h b/drivers/net/= qede/base/ecore_hsi_func_common.h > new file mode 100644 > index 000000000..2cd175163 > --- /dev/null > +++ b/drivers/net/qede/base/ecore_hsi_func_common.h > @@ -0,0 +1,17 @@ > +#ifndef _HSI_FUNC_COMMON_H > +#define _HSI_FUNC_COMMON_H > + > +/* Physical memory descriptor */ > +struct phys_mem_desc { > + dma_addr_t phys_addr; > + void *virt_addr; > + u32 size; /* In bytes */ > +}; > + > +/* Virtual memory descriptor */ > +struct virt_mem_desc { > + void *ptr; > + u32 size; /* In bytes */ > +}; > + > +#endif > diff --git a/drivers/net/qede/base/ecore_init_fw_funcs.h b/drivers/net/qe= de/base/ecore_init_fw_funcs.h > index 912451662..a393d088f 100644 > --- a/drivers/net/qede/base/ecore_init_fw_funcs.h > +++ b/drivers/net/qede/base/ecore_init_fw_funcs.h > @@ -9,13 +9,6 @@ > #include "ecore_hsi_common.h" > #include "ecore_hsi_eth.h" > > -/* Physical memory descriptor */ > -struct phys_mem_desc { > - dma_addr_t phys_addr; > - void *virt_addr; > - u32 size; /* In bytes */ > -}; > - > /* Returns the VOQ based on port and TC */ > #define VOQ(port, tc, max_phys_tcs_per_port) \ > ((tc) =3D=3D PURE_LB_TC ? NUM_OF_PHYS_TCS * MAX_NUM_PORTS_BB + (p= ort) : \ > -- > 2.18.0 >