[PATCH 0/8] remove non-base files from base folders

[PATCH 0/8] remove non-base files from base folders

[Bruce Richardson]

The base code folders for intel drivers contained the compatibility
*_osdep.h files as well as meson.build files, both of which are
editable via regular DPDK patches. Although the DPDK documentation
allows this arrangement, I (for one) have always found it a little
awkward and confusing to have editable and non-editable files mixed.

For Intel drivers only, this patchset moves osdep file out of base,
and merges the (in most cases trivial) meson.build files from base
into the main driver meson.build file.

After this patch we have a clean separation - any files in base,
with no exceptions, should be updated only via snapshot update
patchsets from Intel. All files outside base are normal DPDK files
that can be modified by any patch.

Bruce Richardson (8):
  net/e1000: move editable files out of base folder
  net/fm10k: move editable files out of base folder
  net/i40e: move editable files out of base folder
  net/iavf: move editable files out of base folder
  net/ice: move editable files out of base folder
  net/idpf: move editable files out of base folder
  net/ixgbe: move editable files out of base folder
  net/ice: consolidate the sources list

 drivers/net/intel/cpfl/cpfl_actions.h         |  2 +-
 drivers/net/intel/cpfl/cpfl_controlq.h        |  2 +-
 drivers/net/intel/e1000/base/README           |  9 ---
 drivers/net/intel/e1000/base/meson.build      | 24 -------
 .../net/intel/e1000/{base => }/e1000_osdep.c  |  0
 .../net/intel/e1000/{base => }/e1000_osdep.h  |  4 +-
 drivers/net/intel/e1000/em_rxtx.c             |  2 +-
 drivers/net/intel/e1000/igc_ethdev.h          |  2 +-
 drivers/net/intel/e1000/meson.build           | 22 ++++++-
 drivers/net/intel/fm10k/base/meson.build      | 11 ----
 .../net/intel/fm10k/{base => }/fm10k_osdep.h  |  4 +-
 drivers/net/intel/fm10k/meson.build           |  9 ++-
 drivers/net/intel/i40e/base/README            |  8 ---
 drivers/net/intel/i40e/base/meson.build       | 12 ----
 .../net/intel/i40e/{base => }/i40e_osdep.h    |  4 +-
 drivers/net/intel/i40e/meson.build            | 10 ++-
 drivers/net/intel/iavf/base/README            |  8 ---
 .../iavf/{base/iavf_impl.c => iavf_osdep.c}   |  0
 .../net/intel/iavf/{base => }/iavf_osdep.h    |  2 +
 drivers/net/intel/iavf/meson.build            |  2 +-
 drivers/net/intel/ice/base/README             |  8 ---
 drivers/net/intel/ice/base/meson.build        | 51 ---------------
 drivers/net/intel/ice/{base => }/ice_osdep.h  |  4 +-
 drivers/net/intel/ice/meson.build             | 62 ++++++++++++++++---
 drivers/net/intel/idpf/base/README            |  8 ---
 drivers/net/intel/idpf/base/meson.build       |  7 ---
 .../net/intel/idpf/{base => }/idpf_osdep.h    |  4 +-
 drivers/net/intel/idpf/idpf_ptp.h             |  2 +-
 drivers/net/intel/idpf/meson.build            |  5 +-
 drivers/net/intel/ixgbe/base/README           |  9 ---
 drivers/net/intel/ixgbe/base/meson.build      | 19 ------
 drivers/net/intel/ixgbe/ixgbe_ethdev.c        | 12 ++--
 drivers/net/intel/ixgbe/ixgbe_flow.c          | 12 ++--
 .../net/intel/ixgbe/{base => }/ixgbe_osdep.h  |  2 +
 drivers/net/intel/ixgbe/meson.build           | 17 ++++-
 35 files changed, 148 insertions(+), 211 deletions(-)
 delete mode 100644 drivers/net/intel/e1000/base/meson.build
 rename drivers/net/intel/e1000/{base => }/e1000_osdep.c (100%)
 rename drivers/net/intel/e1000/{base => }/e1000_osdep.h (98%)
 delete mode 100644 drivers/net/intel/fm10k/base/meson.build
 rename drivers/net/intel/fm10k/{base => }/fm10k_osdep.h (98%)
 delete mode 100644 drivers/net/intel/i40e/base/meson.build
 rename drivers/net/intel/i40e/{base => }/i40e_osdep.h (98%)
 rename drivers/net/intel/iavf/{base/iavf_impl.c => iavf_osdep.c} (100%)
 rename drivers/net/intel/iavf/{base => }/iavf_osdep.h (98%)
 delete mode 100644 drivers/net/intel/ice/base/meson.build
 rename drivers/net/intel/ice/{base => }/ice_osdep.h (99%)
 delete mode 100644 drivers/net/intel/idpf/base/meson.build
 rename drivers/net/intel/idpf/{base => }/idpf_osdep.h (99%)
 delete mode 100644 drivers/net/intel/ixgbe/base/meson.build
 rename drivers/net/intel/ixgbe/{base => }/ixgbe_osdep.h (99%)

--
2.53.0

[PATCH 1/8] net/e1000: move editable files out of base folder

[Bruce Richardson]

The osdep files contain the macros and other definitions needed to allow
the base code to compile as part of DPDK. They traditionally tend to
reside in the base code folder, but are an exception in that they can be
modified by regular DPDK patches, and not just as part of a base code
snapshot update. Similarly the meson.build file in the base folder is
not part of the snapshots and is an editable file in the base folder.

Therefore, we can simplify the rules around base code by moving these
files into the main driver folder, leaving the base code C files all as
uneditable except via snapshot update.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/intel/e1000/base/README           |  9 -------
 drivers/net/intel/e1000/base/meson.build      | 24 -------------------
 .../net/intel/e1000/{base => }/e1000_osdep.c  |  0
 .../net/intel/e1000/{base => }/e1000_osdep.h  |  4 +++-
 drivers/net/intel/e1000/em_rxtx.c             |  2 +-
 drivers/net/intel/e1000/igc_ethdev.h          |  2 +-
 drivers/net/intel/e1000/meson.build           | 22 ++++++++++++++++-
 7 files changed, 26 insertions(+), 37 deletions(-)
 delete mode 100644 drivers/net/intel/e1000/base/meson.build
 rename drivers/net/intel/e1000/{base => }/e1000_osdep.c (100%)
 rename drivers/net/intel/e1000/{base => }/e1000_osdep.h (98%)

diff --git a/drivers/net/intel/e1000/base/README b/drivers/net/intel/e1000/base/README
index f0c1e4af48..861b2650aa 100644
--- a/drivers/net/intel/e1000/base/README
+++ b/drivers/net/intel/e1000/base/README
@@ -27,12 +27,3 @@ This driver is valid for the product(s) listed below
 * Intel® Ethernet Controller I226
 * Intel® Ethernet Controller I354 Series
 * Intel® Ethernet Controller DH89XXCC Series
-
-Updating the driver
-===================
-
-NOTE: The source code in this directory should not be modified apart from
-the following file(s):
-
-    e1000_osdep.c
-    e1000_osdep.h
diff --git a/drivers/net/intel/e1000/base/meson.build b/drivers/net/intel/e1000/base/meson.build
deleted file mode 100644
index 4fe86dc6df..0000000000
--- a/drivers/net/intel/e1000/base/meson.build
+++ /dev/null
@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-base_sources = files(
-        'e1000_base.c',
-        'e1000_80003es2lan.c',
-        'e1000_82540.c',
-        'e1000_82541.c',
-        'e1000_82542.c',
-        'e1000_82543.c',
-        'e1000_82571.c',
-        'e1000_82575.c',
-        'e1000_api.c',
-        'e1000_i210.c',
-        'e1000_i225.c',
-        'e1000_ich8lan.c',
-        'e1000_mac.c',
-        'e1000_manage.c',
-        'e1000_mbx.c',
-        'e1000_nvm.c',
-        'e1000_osdep.c',
-        'e1000_phy.c',
-        'e1000_vf.c',
-)
diff --git a/drivers/net/intel/e1000/base/e1000_osdep.c b/drivers/net/intel/e1000/e1000_osdep.c
similarity index 100%
rename from drivers/net/intel/e1000/base/e1000_osdep.c
rename to drivers/net/intel/e1000/e1000_osdep.c
diff --git a/drivers/net/intel/e1000/base/e1000_osdep.h b/drivers/net/intel/e1000/e1000_osdep.h
similarity index 98%
rename from drivers/net/intel/e1000/base/e1000_osdep.h
rename to drivers/net/intel/e1000/e1000_osdep.h
index 895ffa5182..2a8da37476 100644
--- a/drivers/net/intel/e1000/base/e1000_osdep.h
+++ b/drivers/net/intel/e1000/e1000_osdep.h
@@ -5,6 +5,8 @@
 #ifndef _E1000_OSDEP_H_
 #define _E1000_OSDEP_H_
 
+/* File containing OS dependencies for base code */
+
 #include <stdint.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -17,7 +19,7 @@
 #include <rte_byteorder.h>
 #include <rte_io.h>
 
-#include "../e1000_logs.h"
+#include "e1000_logs.h"
 
 #define DELAY(x) rte_delay_us_sleep(x)
 #define usec_delay(x) DELAY(x)
diff --git a/drivers/net/intel/e1000/em_rxtx.c b/drivers/net/intel/e1000/em_rxtx.c
index f9665127df..3e18ac994a 100644
--- a/drivers/net/intel/e1000/em_rxtx.c
+++ b/drivers/net/intel/e1000/em_rxtx.c
@@ -43,7 +43,7 @@
 #include "e1000_logs.h"
 #include "base/e1000_api.h"
 #include "e1000_ethdev.h"
-#include "base/e1000_osdep.h"
+#include "e1000_osdep.h"
 
 #define	E1000_TXD_VLAN_SHIFT	16
 
diff --git a/drivers/net/intel/e1000/igc_ethdev.h b/drivers/net/intel/e1000/igc_ethdev.h
index 7fa7877adf..e36fa4755e 100644
--- a/drivers/net/intel/e1000/igc_ethdev.h
+++ b/drivers/net/intel/e1000/igc_ethdev.h
@@ -9,7 +9,7 @@
 #include <rte_flow.h>
 #include <rte_time.h>
 
-#include "base/e1000_osdep.h"
+#include "e1000_osdep.h"
 #include "base/e1000_hw.h"
 #include "base/e1000_i225.h"
 #include "base/e1000_api.h"
diff --git a/drivers/net/intel/e1000/meson.build b/drivers/net/intel/e1000/meson.build
index 924fe4ecae..6f1e300718 100644
--- a/drivers/net/intel/e1000/meson.build
+++ b/drivers/net/intel/e1000/meson.build
@@ -1,10 +1,30 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-subdir('base')
+base_sources = files(
+        'base/e1000_base.c',
+        'base/e1000_80003es2lan.c',
+        'base/e1000_82540.c',
+        'base/e1000_82541.c',
+        'base/e1000_82542.c',
+        'base/e1000_82543.c',
+        'base/e1000_82571.c',
+        'base/e1000_82575.c',
+        'base/e1000_api.c',
+        'base/e1000_i210.c',
+        'base/e1000_i225.c',
+        'base/e1000_ich8lan.c',
+        'base/e1000_mac.c',
+        'base/e1000_manage.c',
+        'base/e1000_mbx.c',
+        'base/e1000_nvm.c',
+        'base/e1000_phy.c',
+        'base/e1000_vf.c',
+)
 
 sources += files(
         'e1000_logs.c',
+        'e1000_osdep.c',
         'em_ethdev.c',
         'em_rxtx.c',
         'igb_ethdev.c',
-- 
2.53.0

[PATCH 2/8] net/fm10k: move editable files out of base folder

[Bruce Richardson]

The osdep headers contain the macros and other definitions needed to
allow the base code to compile as part of DPDK. They traditionally tend
to reside in the base code folder, but are an exception in that they can
be modified by regular DPDK patches, and not just as part of a base code
snapshot update. Similarly the meson.build file in the base folder is
not part of the snapshots and is an editable file in the base folder.

Therefore, we can simplify the rules around base code by moving these
files into the main driver folder, leaving the base code C files all as
uneditable except via snapshot update.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/intel/fm10k/base/meson.build         | 11 -----------
 drivers/net/intel/fm10k/{base => }/fm10k_osdep.h |  4 +++-
 drivers/net/intel/fm10k/meson.build              |  9 ++++++++-
 3 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 drivers/net/intel/fm10k/base/meson.build
 rename drivers/net/intel/fm10k/{base => }/fm10k_osdep.h (98%)

diff --git a/drivers/net/intel/fm10k/base/meson.build b/drivers/net/intel/fm10k/base/meson.build
deleted file mode 100644
index c45b31d6b2..0000000000
--- a/drivers/net/intel/fm10k/base/meson.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-base_sources = files(
-        'fm10k_api.c',
-        'fm10k_common.c',
-        'fm10k_mbx.c',
-        'fm10k_pf.c',
-        'fm10k_tlv.c',
-        'fm10k_vf.c',
-)
diff --git a/drivers/net/intel/fm10k/base/fm10k_osdep.h b/drivers/net/intel/fm10k/fm10k_osdep.h
similarity index 98%
rename from drivers/net/intel/fm10k/base/fm10k_osdep.h
rename to drivers/net/intel/fm10k/fm10k_osdep.h
index 5f8ff10474..69c542a6d0 100644
--- a/drivers/net/intel/fm10k/base/fm10k_osdep.h
+++ b/drivers/net/intel/fm10k/fm10k_osdep.h
@@ -5,6 +5,8 @@
 #ifndef _FM10K_OSDEP_H_
 #define _FM10K_OSDEP_H_
 
+/* File containing OS dependencies for base code */
+
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
@@ -13,7 +15,7 @@
 #include <rte_cycles.h>
 #include <rte_io.h>
 
-#include "../fm10k_logs.h"
+#include "fm10k_logs.h"
 
 /* TODO: this does not look like it should be used... */
 #define ERROR_REPORT2(v1, v2, v3)   do { } while (0)
diff --git a/drivers/net/intel/fm10k/meson.build b/drivers/net/intel/fm10k/meson.build
index fac4750f8d..a532b35818 100644
--- a/drivers/net/intel/fm10k/meson.build
+++ b/drivers/net/intel/fm10k/meson.build
@@ -7,7 +7,14 @@ if is_windows
     subdir_done()
 endif
 
-subdir('base')
+base_sources = files(
+        'base/fm10k_api.c',
+        'base/fm10k_common.c',
+        'base/fm10k_mbx.c',
+        'base/fm10k_pf.c',
+        'base/fm10k_tlv.c',
+        'base/fm10k_vf.c',
+)
 
 sources += files(
         'fm10k_ethdev.c',
-- 
2.53.0

[PATCH 3/8] net/i40e: move editable files out of base folder

[Bruce Richardson]

The osdep headers contain the macros and other definitions needed to
allow the base code to compile as part of DPDK. They traditionally tend
to reside in the base code folder, but are an exception in that they can
be modified by regular DPDK patches, and not just as part of a base code
snapshot update. Similarly the meson.build file in the base folder is
not part of the snapshots and is an editable file in the base folder.

Therefore, we can simplify the rules around base code by moving these
files into the main driver folder, leaving the base code C files all as
uneditable except via snapshot update.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/intel/i40e/base/README             |  8 --------
 drivers/net/intel/i40e/base/meson.build        | 12 ------------
 drivers/net/intel/i40e/{base => }/i40e_osdep.h |  4 +++-
 drivers/net/intel/i40e/meson.build             | 10 +++++++++-
 4 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 drivers/net/intel/i40e/base/meson.build
 rename drivers/net/intel/i40e/{base => }/i40e_osdep.h (98%)

diff --git a/drivers/net/intel/i40e/base/README b/drivers/net/intel/i40e/base/README
index 59cae0fc90..77ae90dcd1 100644
--- a/drivers/net/intel/i40e/base/README
+++ b/drivers/net/intel/i40e/base/README
@@ -21,11 +21,3 @@ This driver is valid for the product(s) listed below
 * Intel® Ethernet Controller X710 and XL710 Family
 * Intel® Ethernet Controller XXV710 for 25GbE backplane
 * Intel® Ethernet Controller XXV710 for 25GbE SFP28
-
-Updating the driver
-===================
-
-NOTE: The source code in this directory should not be modified apart from
-the following file(s):
-
-    i40e_osdep.h
diff --git a/drivers/net/intel/i40e/base/meson.build b/drivers/net/intel/i40e/base/meson.build
deleted file mode 100644
index 7b4882ad1d..0000000000
--- a/drivers/net/intel/i40e/base/meson.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017-2020 Intel Corporation
-
-base_sources = files(
-        'i40e_adminq.c',
-        'i40e_common.c',
-        'i40e_dcb.c',
-        'i40e_diag.c',
-        'i40e_hmc.c',
-        'i40e_lan_hmc.c',
-        'i40e_nvm.c',
-)
diff --git a/drivers/net/intel/i40e/base/i40e_osdep.h b/drivers/net/intel/i40e/i40e_osdep.h
similarity index 98%
rename from drivers/net/intel/i40e/base/i40e_osdep.h
rename to drivers/net/intel/i40e/i40e_osdep.h
index 9c5a94f055..1139c9c1fb 100644
--- a/drivers/net/intel/i40e/base/i40e_osdep.h
+++ b/drivers/net/intel/i40e/i40e_osdep.h
@@ -5,6 +5,8 @@
 #ifndef _I40E_OSDEP_H_
 #define _I40E_OSDEP_H_
 
+/* File containing OS dependencies for base code */
+
 #include <string.h>
 #include <stdint.h>
 #include <stdbool.h>
@@ -18,7 +20,7 @@
 #include <rte_log.h>
 #include <rte_io.h>
 
-#include "../i40e_logs.h"
+#include "i40e_logs.h"
 #include "i40e_status.h"
 
 #define INLINE inline
diff --git a/drivers/net/intel/i40e/meson.build b/drivers/net/intel/i40e/meson.build
index bccae1ffc1..3229233f50 100644
--- a/drivers/net/intel/i40e/meson.build
+++ b/drivers/net/intel/i40e/meson.build
@@ -17,7 +17,15 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0
     subdir_done()
 endif
 
-subdir('base')
+base_sources = files(
+        'base/i40e_adminq.c',
+        'base/i40e_common.c',
+        'base/i40e_dcb.c',
+        'base/i40e_diag.c',
+        'base/i40e_hmc.c',
+        'base/i40e_lan_hmc.c',
+        'base/i40e_nvm.c',
+)
 
 sources += files(
         'i40e_ethdev.c',
-- 
2.53.0

[PATCH 4/8] net/iavf: move editable files out of base folder

[Bruce Richardson]

The osdep header and iavf_impl.c file contain the macros and other
definitions needed to allow the base code to compile as part of DPDK.
Although they are stored in the base code folder, but are an exception
in that they can be modified by regular DPDK patches, and not just as
part of a base code snapshot update.

Therefore, we can simplify the rules around base code by moving these
files into the main driver folder, leaving the base code C files all as
uneditable except via snapshot update.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/intel/iavf/base/README                        | 8 --------
 drivers/net/intel/iavf/{base/iavf_impl.c => iavf_osdep.c} | 0
 drivers/net/intel/iavf/{base => }/iavf_osdep.h            | 2 ++
 drivers/net/intel/iavf/meson.build                        | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)
 rename drivers/net/intel/iavf/{base/iavf_impl.c => iavf_osdep.c} (100%)
 rename drivers/net/intel/iavf/{base => }/iavf_osdep.h (98%)

diff --git a/drivers/net/intel/iavf/base/README b/drivers/net/intel/iavf/base/README
index 61bcf0ef0e..d6a1dfbc96 100644
--- a/drivers/net/intel/iavf/base/README
+++ b/drivers/net/intel/iavf/base/README
@@ -7,11 +7,3 @@ Intel® IAVF driver
 
 This directory contains a snapshot of the iavf shared, or base, driver code.
 The snapshot was generated on 2024.09.17.
-
-Updating the driver
-===================
-
-NOTE: The source code in this directory should not be modified apart from the following files:
-
-    iavf_osdep.h
-    iavf_impl.c
diff --git a/drivers/net/intel/iavf/base/iavf_impl.c b/drivers/net/intel/iavf/iavf_osdep.c
similarity index 100%
rename from drivers/net/intel/iavf/base/iavf_impl.c
rename to drivers/net/intel/iavf/iavf_osdep.c
diff --git a/drivers/net/intel/iavf/base/iavf_osdep.h b/drivers/net/intel/iavf/iavf_osdep.h
similarity index 98%
rename from drivers/net/intel/iavf/base/iavf_osdep.h
rename to drivers/net/intel/iavf/iavf_osdep.h
index cb95b848b6..dc2145b8c2 100644
--- a/drivers/net/intel/iavf/base/iavf_osdep.h
+++ b/drivers/net/intel/iavf/iavf_osdep.h
@@ -5,6 +5,8 @@
 #ifndef _IAVF_OSDEP_H_
 #define _IAVF_OSDEP_H_
 
+/* File containing OS dependencies for base code */
+
 #include <string.h>
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/drivers/net/intel/iavf/meson.build b/drivers/net/intel/iavf/meson.build
index 50630a88c8..9b071a3a4b 100644
--- a/drivers/net/intel/iavf/meson.build
+++ b/drivers/net/intel/iavf/meson.build
@@ -12,7 +12,6 @@ deps += ['security', 'cryptodev']
 sources = files(
         'base/iavf_adminq.c',
         'base/iavf_common.c',
-        'base/iavf_impl.c',
 
         'iavf_base_symbols.c',
         'iavf_ethdev.c',
@@ -21,6 +20,7 @@ sources = files(
         'iavf_generic_flow.c',
         'iavf_fdir.c',
         'iavf_hash.c',
+        'iavf_osdep.c',
         'iavf_tm.c',
         'iavf_ipsec_crypto.c',
         'iavf_fsub.c',
-- 
2.53.0

[PATCH 5/8] net/ice: move editable files out of base folder

[Bruce Richardson]

The osdep headers contain the macros and other definitions needed to
allow the base code to compile as part of DPDK. They traditionally tend
to reside in the base code folder, but are an exception in that they can
be modified by regular DPDK patches, and not just as part of a base code
snapshot update. Similarly the meson.build file in the base folder is
not part of the snapshots and is an editable file in the base folder.

Therefore, we can simplify the rules around base code by moving these
files into the main driver folder, leaving the base code C files all as
uneditable except via snapshot update.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/intel/ice/base/README            |  8 ---
 drivers/net/intel/ice/base/meson.build       | 51 --------------------
 drivers/net/intel/ice/{base => }/ice_osdep.h |  4 +-
 drivers/net/intel/ice/meson.build            | 51 +++++++++++++++++++-
 4 files changed, 52 insertions(+), 62 deletions(-)
 delete mode 100644 drivers/net/intel/ice/base/meson.build
 rename drivers/net/intel/ice/{base => }/ice_osdep.h (99%)

diff --git a/drivers/net/intel/ice/base/README b/drivers/net/intel/ice/base/README
index 1f6b53c4c2..caec47217c 100644
--- a/drivers/net/intel/ice/base/README
+++ b/drivers/net/intel/ice/base/README
@@ -13,11 +13,3 @@ This driver is valid for the product(s) listed below
 
 * Intel® Ethernet Network Adapters E810
 * Intel® Ethernet Network Adapters E830
-
-Updating the driver
-===================
-
-NOTE: The source code in this directory should not be modified apart from
-the following file(s):
-
-    ice_osdep.h
diff --git a/drivers/net/intel/ice/base/meson.build b/drivers/net/intel/ice/base/meson.build
deleted file mode 100644
index da961f0752..0000000000
--- a/drivers/net/intel/ice/base/meson.build
+++ /dev/null
@@ -1,51 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018-2021 Intel Corporation
-
-base_sources = files(
-        'ice_controlq.c',
-        'ice_common.c',
-        'ice_sched.c',
-        'ice_switch.c',
-        'ice_nvm.c',
-        'ice_flex_pipe.c',
-        'ice_flow.c',
-        'ice_dcb.c',
-        'ice_fdir.c',
-        'ice_acl.c',
-        'ice_acl_ctrl.c',
-        'ice_vlan_mode.c',
-        'ice_ptp_hw.c',
-        'ice_parser.c',
-        'ice_imem.c',
-        'ice_metainit.c',
-        'ice_pg_cam.c',
-        'ice_bst_tcam.c',
-        'ice_ptype_mk.c',
-        'ice_mk_grp.c',
-        'ice_proto_grp.c',
-        'ice_flg_rd.c',
-        'ice_xlt_kb.c',
-        'ice_parser_rt.c',
-        'ice_ddp.c',
-        'ice_fwlog.c',
-        'ice_vf_mbx.c',
-)
-
-if is_ms_compiler
-    error_cflags = [
-            '/wd4101', # unreferenced local variable
-            '/wd4334', # result of 32-bit shift implicitly converted to 64 bits
-            '/wd4319', # zero extending 'unsigned long' to 'u64' of greater size
-    ]
-else
-    error_cflags = [
-            '-Wno-unused-but-set-variable',
-            '-Wno-unused-parameter',
-    ]
-endif
-
-foreach flag: error_cflags
-    if cc.has_argument(flag)
-        base_cflags += flag
-    endif
-endforeach
diff --git a/drivers/net/intel/ice/base/ice_osdep.h b/drivers/net/intel/ice/ice_osdep.h
similarity index 99%
rename from drivers/net/intel/ice/base/ice_osdep.h
rename to drivers/net/intel/ice/ice_osdep.h
index 5d92cf5aa4..599bd4086b 100644
--- a/drivers/net/intel/ice/base/ice_osdep.h
+++ b/drivers/net/intel/ice/ice_osdep.h
@@ -5,6 +5,8 @@
 #ifndef _ICE_OSDEP_H_
 #define _ICE_OSDEP_H_
 
+/* File containing OS dependencies for base code */
+
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -24,7 +26,7 @@
 
 #include "ice_alloc.h"
 
-#include "../ice_logs.h"
+#include "ice_logs.h"
 
 #ifndef __INTEL_NET_BASE_OSDEP__
 #define __INTEL_NET_BASE_OSDEP__
diff --git a/drivers/net/intel/ice/meson.build b/drivers/net/intel/ice/meson.build
index a205304c89..b12077f7bd 100644
--- a/drivers/net/intel/ice/meson.build
+++ b/drivers/net/intel/ice/meson.build
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
-subdir('base')
-
 sources = files(
         'ice_acl_filter.c',
         'ice_diagnose.c',
@@ -46,3 +44,52 @@ sources += files(
 )
 
 require_iova_in_mbuf = false
+
+base_sources = files(
+        'base/ice_controlq.c',
+        'base/ice_common.c',
+        'base/ice_sched.c',
+        'base/ice_switch.c',
+        'base/ice_nvm.c',
+        'base/ice_flex_pipe.c',
+        'base/ice_flow.c',
+        'base/ice_dcb.c',
+        'base/ice_fdir.c',
+        'base/ice_acl.c',
+        'base/ice_acl_ctrl.c',
+        'base/ice_vlan_mode.c',
+        'base/ice_ptp_hw.c',
+        'base/ice_parser.c',
+        'base/ice_imem.c',
+        'base/ice_metainit.c',
+        'base/ice_pg_cam.c',
+        'base/ice_bst_tcam.c',
+        'base/ice_ptype_mk.c',
+        'base/ice_mk_grp.c',
+        'base/ice_proto_grp.c',
+        'base/ice_flg_rd.c',
+        'base/ice_xlt_kb.c',
+        'base/ice_parser_rt.c',
+        'base/ice_ddp.c',
+        'base/ice_fwlog.c',
+        'base/ice_vf_mbx.c',
+)
+
+if is_ms_compiler
+    base_error_cflags = [
+            '/wd4101', # unreferenced local variable
+            '/wd4334', # result of 32-bit shift implicitly converted to 64 bits
+            '/wd4319', # zero extending 'unsigned long' to 'u64' of greater size
+    ]
+else
+    base_error_cflags = [
+            '-Wno-unused-but-set-variable',
+            '-Wno-unused-parameter',
+    ]
+endif
+
+foreach flag: base_error_cflags
+    if cc.has_argument(flag)
+        base_cflags += flag
+    endif
+endforeach
-- 
2.53.0

[PATCH 6/8] net/idpf: move editable files out of base folder

[Bruce Richardson]

The osdep headers contain the macros and other definitions needed to
allow the base code to compile as part of DPDK. They traditionally tend
to reside in the base code folder, but are an exception in that they can
be modified by regular DPDK patches, and not just as part of a base code
snapshot update. Similarly the meson.build file in the base folder is
not part of the snapshots and is an editable file in the base folder.

Therefore, we can simplify the rules around base code by moving these
files into the main driver folder, leaving the base code C files all as
uneditable except via snapshot update.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/intel/cpfl/cpfl_actions.h          | 2 +-
 drivers/net/intel/cpfl/cpfl_controlq.h         | 2 +-
 drivers/net/intel/idpf/base/README             | 8 --------
 drivers/net/intel/idpf/base/meson.build        | 7 -------
 drivers/net/intel/idpf/{base => }/idpf_osdep.h | 4 +++-
 drivers/net/intel/idpf/idpf_ptp.h              | 2 +-
 drivers/net/intel/idpf/meson.build             | 5 ++++-
 7 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 drivers/net/intel/idpf/base/meson.build
 rename drivers/net/intel/idpf/{base => }/idpf_osdep.h (99%)

diff --git a/drivers/net/intel/cpfl/cpfl_actions.h b/drivers/net/intel/cpfl/cpfl_actions.h
index 7b82119e39..772b3ff999 100644
--- a/drivers/net/intel/cpfl/cpfl_actions.h
+++ b/drivers/net/intel/cpfl/cpfl_actions.h
@@ -5,7 +5,7 @@
 #ifndef _CPFL_ACTIONS_H_
 #define _CPFL_ACTIONS_H_
 
-#include "base/idpf_osdep.h"
+#include "idpf_osdep.h"
 
 #pragma pack(1)
 
diff --git a/drivers/net/intel/cpfl/cpfl_controlq.h b/drivers/net/intel/cpfl/cpfl_controlq.h
index 740ae6522c..812b1b14a6 100644
--- a/drivers/net/intel/cpfl/cpfl_controlq.h
+++ b/drivers/net/intel/cpfl/cpfl_controlq.h
@@ -5,7 +5,7 @@
 #ifndef _CPFL_CONTROLQ_H_
 #define _CPFL_CONTROLQ_H_
 
-#include "base/idpf_osdep.h"
+#include "idpf_osdep.h"
 #include "base/idpf_controlq_api.h"
 
 #define CPFL_CTLQ_DESCRIPTOR_SIZE	32
diff --git a/drivers/net/intel/idpf/base/README b/drivers/net/intel/idpf/base/README
index 457b5a81f3..aa617f1819 100644
--- a/drivers/net/intel/idpf/base/README
+++ b/drivers/net/intel/idpf/base/README
@@ -11,11 +11,3 @@ The directory of base/ contains the original source package.
 This driver is valid for the product(s) listed below
 
 * Intel® IPU E2100
-
-Updating the driver
-===================
-
-NOTE: The source code in this directory should not be modified apart from
-the following file(s):
-
-    idpf_osdep.h
diff --git a/drivers/net/intel/idpf/base/meson.build b/drivers/net/intel/idpf/base/meson.build
deleted file mode 100644
index 78782e463e..0000000000
--- a/drivers/net/intel/idpf/base/meson.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2023 Intel Corporation
-
-base_sources = files(
-        'idpf_controlq.c',
-        'idpf_controlq_setup.c',
-)
diff --git a/drivers/net/intel/idpf/base/idpf_osdep.h b/drivers/net/intel/idpf/idpf_osdep.h
similarity index 99%
rename from drivers/net/intel/idpf/base/idpf_osdep.h
rename to drivers/net/intel/idpf/idpf_osdep.h
index 67bc33f2e6..9c758fb3c0 100644
--- a/drivers/net/intel/idpf/base/idpf_osdep.h
+++ b/drivers/net/intel/idpf/idpf_osdep.h
@@ -5,6 +5,8 @@
 #ifndef _IDPF_OSDEP_H_
 #define _IDPF_OSDEP_H_
 
+/* File containing OS dependencies for base code */
+
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -24,7 +26,7 @@
 #include <rte_io.h>
 #include <rte_compat.h>
 
-#include "../idpf_common_logs.h"
+#include "idpf_common_logs.h"
 
 #define INLINE inline
 #define STATIC static
diff --git a/drivers/net/intel/idpf/idpf_ptp.h b/drivers/net/intel/idpf/idpf_ptp.h
index 0c901440fb..ecb59200bd 100644
--- a/drivers/net/intel/idpf/idpf_ptp.h
+++ b/drivers/net/intel/idpf/idpf_ptp.h
@@ -5,7 +5,7 @@
 #ifndef _IDPF_PTP_H_
 #define _IDPF_PTP_H_
 
-#include "base/idpf_osdep.h"
+#include "idpf_osdep.h"
 #include <rte_time.h>
 #include "idpf_common_device.h"
 
diff --git a/drivers/net/intel/idpf/meson.build b/drivers/net/intel/idpf/meson.build
index 740c1a5985..311f300ccb 100644
--- a/drivers/net/intel/idpf/meson.build
+++ b/drivers/net/intel/idpf/meson.build
@@ -7,7 +7,10 @@ if is_windows
     subdir_done()
 endif
 
-subdir('base')
+base_sources = files(
+        'base/idpf_controlq.c',
+        'base/idpf_controlq_setup.c',
+)
 
 includes += include_directories('../iavf/base')
 
-- 
2.53.0

[PATCH 7/8] net/ixgbe: move editable files out of base folder

[Bruce Richardson]

The osdep headers contain the macros and other definitions needed to
allow the base code to compile as part of DPDK. They traditionally tend
to reside in the base code folder, but are an exception in that they can
be modified by regular DPDK patches, and not just as part of a base code
snapshot update. Similarly the meson.build file in the base folder is
not part of the snapshots and is an editable file in the base folder.

Therefore, we can simplify the rules around base code by moving these
files into the main driver folder, leaving the base code C files all as
uneditable except via snapshot update.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/intel/ixgbe/base/README           |  9 ---------
 drivers/net/intel/ixgbe/base/meson.build      | 19 -------------------
 drivers/net/intel/ixgbe/ixgbe_ethdev.c        | 12 ++++++------
 drivers/net/intel/ixgbe/ixgbe_flow.c          | 12 ++++++------
 .../net/intel/ixgbe/{base => }/ixgbe_osdep.h  |  2 ++
 drivers/net/intel/ixgbe/meson.build           | 17 ++++++++++++++++-
 6 files changed, 30 insertions(+), 41 deletions(-)
 delete mode 100644 drivers/net/intel/ixgbe/base/meson.build
 rename drivers/net/intel/ixgbe/{base => }/ixgbe_osdep.h (99%)

diff --git a/drivers/net/intel/ixgbe/base/README b/drivers/net/intel/ixgbe/base/README
index b48438f1db..bea5061abc 100644
--- a/drivers/net/intel/ixgbe/base/README
+++ b/drivers/net/intel/ixgbe/base/README
@@ -25,12 +25,3 @@ This driver is valid for the product(s) listed below
 * Intel® Ethernet Server Adapter X520-T2
 * Intel® Ethernet Controller X550 Series
 * Intel® Ethernet Controller E610 Series
-
-Updating the driver
-===================
-
-NOTE: The source code in this directory should not be modified apart from
-the following file(s):
-
-    ixgbe_osdep.h
-    ixgbe_osdep.c
diff --git a/drivers/net/intel/ixgbe/base/meson.build b/drivers/net/intel/ixgbe/base/meson.build
deleted file mode 100644
index c0b14a1db3..0000000000
--- a/drivers/net/intel/ixgbe/base/meson.build
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017-2024 Intel Corporation
-
-base_sources = files(
-        'ixgbe_82598.c',
-        'ixgbe_82599.c',
-        'ixgbe_api.c',
-        'ixgbe_common.c',
-        'ixgbe_dcb_82598.c',
-        'ixgbe_dcb_82599.c',
-        'ixgbe_dcb.c',
-        'ixgbe_e610.c',
-        'ixgbe_hv_vf.c',
-        'ixgbe_mbx.c',
-        'ixgbe_phy.c',
-        'ixgbe_vf.c',
-        'ixgbe_x540.c',
-        'ixgbe_x550.c',
-)
diff --git a/drivers/net/intel/ixgbe/ixgbe_ethdev.c b/drivers/net/intel/ixgbe/ixgbe_ethdev.c
index 3d4f4fb7fc..8e44bb3a09 100644
--- a/drivers/net/intel/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/intel/ixgbe/ixgbe_ethdev.c
@@ -36,15 +36,15 @@
 #include <rte_os_shim.h>
 
 #include "ixgbe_logs.h"
-#include "base/ixgbe_api.h"
-#include "base/ixgbe_vf.h"
-#include "base/ixgbe_common.h"
+#include "ixgbe_api.h"
+#include "ixgbe_vf.h"
+#include "ixgbe_common.h"
 #include "ixgbe_ethdev.h"
 #include "ixgbe_bypass.h"
 #include "ixgbe_rxtx.h"
-#include "base/ixgbe_type.h"
-#include "base/ixgbe_phy.h"
-#include "base/ixgbe_osdep.h"
+#include "ixgbe_type.h"
+#include "ixgbe_phy.h"
+#include "ixgbe_osdep.h"
 #include "ixgbe_regs.h"
 
 /*
diff --git a/drivers/net/intel/ixgbe/ixgbe_flow.c b/drivers/net/intel/ixgbe/ixgbe_flow.c
index 7f1241951f..01ee4dbb4a 100644
--- a/drivers/net/intel/ixgbe/ixgbe_flow.c
+++ b/drivers/net/intel/ixgbe/ixgbe_flow.c
@@ -35,15 +35,15 @@
 #include <rte_flow_driver.h>
 
 #include "ixgbe_logs.h"
-#include "base/ixgbe_api.h"
-#include "base/ixgbe_vf.h"
-#include "base/ixgbe_common.h"
-#include "base/ixgbe_osdep.h"
+#include "ixgbe_api.h"
+#include "ixgbe_vf.h"
+#include "ixgbe_common.h"
+#include "ixgbe_osdep.h"
 #include "ixgbe_ethdev.h"
 #include "ixgbe_bypass.h"
 #include "ixgbe_rxtx.h"
-#include "base/ixgbe_type.h"
-#include "base/ixgbe_phy.h"
+#include "ixgbe_type.h"
+#include "ixgbe_phy.h"
 #include "rte_pmd_ixgbe.h"
 
 #include "../common/flow_check.h"
diff --git a/drivers/net/intel/ixgbe/base/ixgbe_osdep.h b/drivers/net/intel/ixgbe/ixgbe_osdep.h
similarity index 99%
rename from drivers/net/intel/ixgbe/base/ixgbe_osdep.h
rename to drivers/net/intel/ixgbe/ixgbe_osdep.h
index 4dfed02137..9f4f5e8038 100644
--- a/drivers/net/intel/ixgbe/base/ixgbe_osdep.h
+++ b/drivers/net/intel/ixgbe/ixgbe_osdep.h
@@ -5,6 +5,8 @@
 #ifndef _IXGBE_OS_H_
 #define _IXGBE_OS_H_
 
+/* File containing OS dependencies for base code */
+
 #include <pthread.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/drivers/net/intel/ixgbe/meson.build b/drivers/net/intel/ixgbe/meson.build
index 7e737ee7b4..0531d37acd 100644
--- a/drivers/net/intel/ixgbe/meson.build
+++ b/drivers/net/intel/ixgbe/meson.build
@@ -3,7 +3,22 @@
 
 cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS']
 
-subdir('base')
+base_sources = files(
+        'base/ixgbe_82598.c',
+        'base/ixgbe_82599.c',
+        'base/ixgbe_api.c',
+        'base/ixgbe_common.c',
+        'base/ixgbe_dcb_82598.c',
+        'base/ixgbe_dcb_82599.c',
+        'base/ixgbe_dcb.c',
+        'base/ixgbe_e610.c',
+        'base/ixgbe_hv_vf.c',
+        'base/ixgbe_mbx.c',
+        'base/ixgbe_phy.c',
+        'base/ixgbe_vf.c',
+        'base/ixgbe_x540.c',
+        'base/ixgbe_x550.c',
+)
 
 sources += files(
         'ixgbe_82599_bypass.c',
-- 
2.53.0

[PATCH 8/8] net/ice: consolidate the sources list

[Bruce Richardson]

The sources list for DCF part of ice driver was separated out for no
functional reason. Merge these into the main sources list for ice
driver.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/intel/ice/meson.build | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/net/intel/ice/meson.build b/drivers/net/intel/ice/meson.build
index b12077f7bd..29fb91634e 100644
--- a/drivers/net/intel/ice/meson.build
+++ b/drivers/net/intel/ice/meson.build
@@ -3,6 +3,11 @@
 
 sources = files(
         'ice_acl_filter.c',
+        'ice_dcf.c',
+        'ice_dcf_vf_representor.c',
+        'ice_dcf_ethdev.c',
+        'ice_dcf_parent.c',
+        'ice_dcf_sched.c',
         'ice_diagnose.c',
         'ice_ethdev.c',
         'ice_fdir_filter.c',
@@ -35,14 +40,6 @@ elif arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64')
     sources += files('ice_rxtx_vec_neon.c')
 endif
 
-sources += files(
-        'ice_dcf.c',
-        'ice_dcf_vf_representor.c',
-        'ice_dcf_ethdev.c',
-        'ice_dcf_parent.c',
-        'ice_dcf_sched.c',
-)
-
 require_iova_in_mbuf = false
 
 base_sources = files(
-- 
2.53.0