Add Support for DLB v2.5

From: Timothy McDaniel <[email protected]>

This patch series adds support for DLB v2.5 to the current DLB V2.0 PMD. The resulting PMD supports both hardware versions.

The main differences between the DLB v2.5 and v2.0 hardware are:
- Number of queues/ports
- DLB v2.5 uses a combined credit pool, whereas DLB v2.0 splits credits into 2 pools, a directed credit pool and a load balanced credit pool.
- Different register maps, with different bit names and offsets

In order to support both hardware versions with the same PMD, and avoid code duplication, the file dlb2_resource.c required a complete rewrite. This required some creative staging of the changes in order to keep the individual patches relatively small, while also meeting the requirement that all individual patches in the set compile cleanly.

To accomplish this, a few temporary files are used:

dlb2_hw_types_new.h
dlb2_resources_new.h
dlb2_resources_new.c

As dlb2_resources_new.c is populated with the new combined v2.0/v2.5 low level logic, the corresponding old code is removed from dlb2_resource.c, thus allowing both the original and new code to continue to compile and link cleanly. Once all of the code has been migrated to the new model, the old versions of the files are removed, and the new versions are renamed, effectively replacing the old original files.

As you review the code, you can ignore the code deletions from dlb2_resource.c, as that file continues to shrink as the new corresponding logic is added to dlb2_resource_new.c.

Changes since V4:
1) restore original PMD name (dlb2)
2) resore original PMD source location (drivers/event/dlb2)
3) restore documentation, such that it references dlb2_event, instead of dlb_event

Changes since V3:
1) Moved minor cleanup to its own patch. This included
a) remove FPGA references
b) eliminate duplicate macros/defines in hw_types
c) don't include dlb2_mbox.h
d) delete unused defines.macros (SMON, INT, ...)
2) Changed DLB V2.x and V2.x to simply v2.x, where v is lower case
3) Updated 20.11 release notes to remove reference to dlb2 doc, since it is now named dlb.rst
4) Updated commit message/header text, as requested

Changes since V2:
1) fix commit headers
2) fix commit message repeated words
3) remove FPGA reference
4) split out new v2.5 register definitions into separate patch
5) fixed documentation to use DLB and dlb_event exclusively, instead of the old names such as dlb1_event, dlb2_event, DLB2, ... Final doc updates are done in patch that performs device rename from DLB2 tosimply DLB
6) use component event/dlb at commit which changes device name and all subsequent commits
7) Move all DLB constants out of config/rte_config.h except QUELL_STATS, which is used in the fastpath. Exposed these as devarg command line parameters
8) Removed "TEMPORARY" comment leftover in dlb2_osdep.h
9) squashed 20-21 and 22-23 since they were logically the same as 19-20, which was requested to be squashed
10) delete old dlb2.rst - dlb.rst has been updated for v2.0 and v2.1

Changes since V1:
1) Simplified subject text for all patches
2) correct typos/spelling
3) remove FPGA references
4) remove stale sysconf() references
5) fixed patches that had compilation issues
6) updated release notes
7) renamed dlb device from dlb2_event to dlb_event
8) moved dlb2 directory to dlb,to match name change
9) fixed other cases where "dlb2" was being used externally

Timothy McDaniel (26):
event/dlb2: minor code cleanup
event/dlb2: add v2.5 probe
event/dlb2: add v2.5 HW register definitions event/dlb2: add v2.5 HW init
event/dlb2: add v2.5 get resources event/dlb2: add v2.5 create sched domain event/dlb2: add v2.5 domain reset
event/dlb2: add v2.5 create ldb queue event/dlb2: add v2.5 create ldb port event/dlb2: add v2.5 create dir port event/dlb2: add v2.5 create dir queue event/dlb2: add v2.5 map qid
event/dlb2: add v2.5 unmap queue
event/dlb2: add v2.5 start domain
event/dlb2: add v2.5 credit scheme event/dlb2: add v2.5 queue depth functions event/dlb2: add v2.5 finish map/unmap event/dlb2: add v2.5 sparse cq mode event/dlb2: add v2.5 sequence number management event/dlb2: use new implementation of resource header event/dlb2: use new implementation of resource file event/dlb2: use new implementation of HW types header event/dlb2: use new combined register map event/dlb2: update xstats for v2.5 event/dlb2: move rte config defines to runtime devargs doc/dlb2: update documentation for v2.5

 config/rte_config.h                        |    4 -
 doc/guides/eventdevs/dlb2.rst              |  153 +-
 drivers/event/dlb2/dlb2.c                  |  550 +-
 drivers/event/dlb2/dlb2_priv.h             |  170 +-
 drivers/event/dlb2/dlb2_user.h             |   27 +-
 drivers/event/dlb2/dlb2_xstats.c           |   70 +-
 drivers/event/dlb2/pf/base/dlb2_hw_types.h |  106 +-
 drivers/event/dlb2/pf/base/dlb2_mbox.h     |  596 --
 drivers/event/dlb2/pf/base/dlb2_osdep.h    |    2 +
 drivers/event/dlb2/pf/base/dlb2_regs.h     | 5955 +++++++++++++-------
 drivers/event/dlb2/pf/base/dlb2_resource.c | 3278 ++++++-----
 drivers/event/dlb2/pf/base/dlb2_resource.h |   28 +-
 drivers/event/dlb2/pf/dlb2_main.c          |   37 +-
 drivers/event/dlb2/pf/dlb2_pf.c            |   67 +-
 14 files changed, 6445 insertions(+), 4598 deletions(-)
 delete mode 100644 drivers/event/dlb2/pf/base/dlb2_mbox.h

--
2.23.0

-----Original Message-----
From: Timothy McDaniel <[email protected]>
Sent: Wednesday, March 17, 2021 3:49 AM
To: [email protected]

Cc: Jerin Jacob Kollanukkaran <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Pavan Nikhilesh Bhagavatula <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [EXT] [PATCH 02/25] event/dlb2: add DLB v2.5 probe-time hardware init

----------------------------------------------------------------------
This commit adds support for DLB v2.5 probe-time hardware init, and sets up a framework for incorporating the remaining changes required to support DLB v2.5.

DLB v2.0 and DLB v2.5 are similar in many respects, but their register offsets and definitions are different. As a result of these, differences, the low level hardware functions must take the devicei

version into consideration. This requires that the hardware version be passed to many of the low level functions, so that the PMD can take the appropriate action based on the device version.

To ease the transition and keep the individual patches small, three temporary files are added in this commit. These files have "new" in their names. The files with "new" contain changes specific to a consolidated PMD that supports both DLB v2.0 and DLB 2.5. Their sister files of the same name (minus "new") contain the old DLB v2.0 specific code. The intent is to remove code from the original files as that code is ported to the combined DLB 2.0/2.5 PMD model and added to the "new" files in a series of commits. At end of the patch series, the old files will be empty and the "new" files will have the logic needed to implement a single PMD that supports both DLB v2.0 and DLB v2.5. At that time, the original DLB v2.0 specific files will be deleted, and the "new" files will be renamed and replace them.

Signed-off-by Timothy McDaniel <[email protected]>

---
 drivers/event/dlb2/dlb2_priv.h                |    5 +
 drivers/event/dlb2/meson.build                |    1 +
 .../event/dlb2/pf/base/dlb2_hw_types_new.h    |  362 ++
 drivers/event/dlb2/pf/base/dlb2_mbox.h        |    1 -
 drivers/event/dlb2/pf/base/dlb2_osdep.h       |    4 +
 drivers/event/dlb2/pf/base/dlb2_regs_new.h    | 4412 +++++++++++++++++
 drivers/event/dlb2/pf/base/dlb2_resource.c    |  180 +-
 drivers/event/dlb2/pf/base/dlb2_resource.h    |   36 -
 .../event/dlb2/pf/base/dlb2_resource_new.c    |  271 +
 .../event/dlb2/pf/base/dlb2_resource_new.h    |   73 +
 drivers/event/dlb2/pf/dlb2_main.c             |   41 +-
 drivers/event/dlb2/pf/dlb2_main.h             |    4 +
 drivers/event/dlb2/pf/dlb2_pf.c               |    6 +-
 13 files changed, 5165 insertions(+), 231 deletions(-)
 create mode 100644 drivers/event/dlb2/pf/base/dlb2_hw_types_new.h
 create mode 100644 drivers/event/dlb2/pf/base/dlb2_regs_new.h
 create mode 100644 drivers/event/dlb2/pf/base/dlb2_resource_new.c
 create mode 100644 drivers/event/dlb2/pf/base/dlb2_resource_new.h

+#ifdef FPGA

drivers/event/dlb2/pf/dlb2_main.h +0 -0

 #endif

-----Original Message-----
From: Jerin Jacob Kollanukkaran <[email protected]>
Sent: Sunday, March 21, 2021 5:30 AM
To: McDaniel, Timothy <[email protected]>; [email protected]
Cc: Van Haaren, Harry <[email protected]>; [email protected]; [email protected]; Rao, Nikhil <[email protected]>; Carrillo, Erik G <[email protected]>; Gujjar, Abhinandan S <[email protected]>; Pavan Nikhilesh Bhagavatula <[email protected]>; [email protected]; mattias.ronnblom <[email protected]>; Mccarthy, Peter <[email protected]>
Subject: RE: [EXT] [PATCH 02/25] event/dlb2: add DLB v2.5 probe-time hardware init

Quoted 4 lines

-----Original Message-----
From: Timothy McDaniel <[email protected]>
Sent: Wednesday, March 17, 2021 3:49 AM
To: [email protected]

Quoted 8 lines

Cc: Jerin Jacob Kollanukkaran <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Pavan Nikhilesh Bhagavatula <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [EXT] [PATCH 02/25] event/dlb2: add DLB v2.5 probe-time hardware init

Please simplify subject in all the patches like
event/dlb2: add v2.5 HW init

Quoted 6 lines

----------------------------------------------------------------------
This commit adds support for DLB v2.5 probe-time hardware init, and sets up a framework for incorporating the remaining changes required to support DLB v2.5.

Quoted 3 lines

DLB v2.0 and DLB v2.5 are similar in many respects, but their register offsets and definitions are different. As a result of these, differences, the low level hardware functions must take the devicei

s/devicei/device

Quoted 38 lines

version into consideration. This requires that the hardware version be passed to many of the low level functions, so that the PMD can take the appropriate action based on the device version.

To ease the transition and keep the individual patches small, three temporary files are added in this commit. These files have "new" in their names. The files with "new" contain changes specific to a consolidated PMD that supports both DLB v2.0 and DLB 2.5. Their sister files of the same name (minus "new") contain the old DLB v2.0 specific code. The intent is to remove code from the original files as that code is ported to the combined DLB 2.0/2.5 PMD model and added to the "new" files in a series of commits. At end of the patch series, the old files will be empty and the "new" files will have the logic needed to implement a single PMD that supports both DLB v2.0 and DLB v2.5. At that time, the original DLB v2.0 specific files will be deleted, and the "new" files will be renamed and replace them.

Signed-off-by Timothy McDaniel <[email protected]>

---
 drivers/event/dlb2/dlb2_priv.h                |    5 +
 drivers/event/dlb2/meson.build                |    1 +
 .../event/dlb2/pf/base/dlb2_hw_types_new.h    |  362 ++
 drivers/event/dlb2/pf/base/dlb2_mbox.h        |    1 -
 drivers/event/dlb2/pf/base/dlb2_osdep.h       |    4 +
 drivers/event/dlb2/pf/base/dlb2_regs_new.h    | 4412 +++++++++++++++++
 drivers/event/dlb2/pf/base/dlb2_resource.c    |  180 +-
 drivers/event/dlb2/pf/base/dlb2_resource.h    |   36 -
 .../event/dlb2/pf/base/dlb2_resource_new.c    |  271 +
 .../event/dlb2/pf/base/dlb2_resource_new.h    |   73 +
 drivers/event/dlb2/pf/dlb2_main.c             |   41 +-
 drivers/event/dlb2/pf/dlb2_main.h             |    4 +
 drivers/event/dlb2/pf/dlb2_pf.c               |    6 +-
 13 files changed, 5165 insertions(+), 231 deletions(-)
 create mode 100644 drivers/event/dlb2/pf/base/dlb2_hw_types_new.h
 create mode 100644 drivers/event/dlb2/pf/base/dlb2_regs_new.h
 create mode 100644 drivers/event/dlb2/pf/base/dlb2_resource_new.c
 create mode 100644 drivers/event/dlb2/pf/base/dlb2_resource_new.h

Quoted 1 line

+#ifdef FPGA

Don't do this. Either detect the FPGA presence or make it devargs

drivers/event/dlb2/pf/base/dlb2_hw_types_new.h

Quoted 7 lines

drivers/event/dlb2/pf/base/dlb2_hw_types_new.h new file +7 -0

+#define DLB2_HZ					2000000
+#else
+#define DLB2_HZ					800000000
+#endif
+
+
+/* TEMPORARY inclusion of both headers for merge */

Please make sure to remove this comments in sub sequent patches.

drivers/event/dlb2/pf/dlb2_main.h line 15

Quoted 6 lines

b/drivers/event/dlb2/pf/dlb2_main.h
index f3bee71fb..01a24e8a4 100644

drivers/event/dlb2/pf/dlb2_main.h +0 -0

@@ -15,7 +15,11 @@
 #define PAGE_SIZE (sysconf(_SC_PAGESIZE))

Please use DPDK APIs for this.

Quoted 1 line

drivers/event/dlb2/pf/dlb2_main.h +0 -0

 #endif

Update domain creation logic to account for DLB v2.5 credit scheme, new register map, and new register access macros.

Signed-off-by Timothy McDaniel <[email protected]>

---
 drivers/event/dlb2/dlb2_user.h                |  13 +-
 drivers/event/dlb2/pf/base/dlb2_resource.c    | 645 ----------------
 .../event/dlb2/pf/base/dlb2_resource_new.c    | 696 ++++++++++++++++++

 3 files changed, 707 insertions(+), 647 deletions(-)

drivers/event/dlb2/dlb2_user.h +11 -2

index b7d125dec..9760e9bda 100644
@@ -18,6 +18,7 @@ enum dlb2_error {
        DLB2_ST_LDB_QUEUES_UNAVAILABLE,
        DLB2_ST_LDB_CREDITS_UNAVAILABLE,
        DLB2_ST_DIR_CREDITS_UNAVAILABLE,
+       DLB2_ST_CREDITS_UNAVAILABLE,
        DLB2_ST_SEQUENCE_NUMBERS_UNAVAILABLE,
        DLB2_ST_INVALID_DOMAIN_ID,
        DLB2_ST_INVALID_QID_INFLIGHT_ALLOCATION,

@@ -57,6 +58,7 @@ static const char dlb2_error_strings[][128] = {
        "DLB2_ST_LDB_QUEUES_UNAVAILABLE",
        "DLB2_ST_LDB_CREDITS_UNAVAILABLE",
        "DLB2_ST_DIR_CREDITS_UNAVAILABLE",
+       "DLB2_ST_CREDITS_UNAVAILABLE",
        "DLB2_ST_SEQUENCE_NUMBERS_UNAVAILABLE",
        "DLB2_ST_INVALID_DOMAIN_ID",
        "DLB2_ST_INVALID_QID_INFLIGHT_ALLOCATION",

@@ -170,8 +172,15 @@ struct dlb2_create_sched_domain_args {
        __u32 num_dir_ports;
        __u32 num_atomic_inflights;
        __u32 num_hist_list_entries;
-       __u32 num_ldb_credits;
-       __u32 num_dir_credits;
+       union {
+               struct {
+                       __u32 num_ldb_credits;
+                       __u32 num_dir_credits;
+               };
+               struct {
+                       __u32 num_credits;
+               };
+       };
        __u8 cos_strict;
        __u8 padding1[3];
 };

drivers/event/dlb2/pf/base/dlb2_resource.c +0 -645

index 5b8723aaf..5d296f725 100644
@@ -33,21 +33,6 @@
 #define DLB2_FUNC_LIST_FOR_SAFE(head, ptr, ptr_tmp, it, it_tmp) \
        DLB2_LIST_FOR_EACH_SAFE((head), ptr, ptr_tmp, func_list, it, it_tmp)
 
-static void dlb2_init_domain_rsrc_lists(struct dlb2_hw_domain *domain)
-{
-       int i;
-
-       dlb2_list_init_head(&domain->used_ldb_queues);
-       dlb2_list_init_head(&domain->used_dir_pq_pairs);
-       dlb2_list_init_head(&domain->avail_ldb_queues);
-       dlb2_list_init_head(&domain->avail_dir_pq_pairs);
-
-       for (i = 0; i < DLB2_NUM_COS_DOMAINS; i++)
-               dlb2_list_init_head(&domain->used_ldb_ports[i]);
-       for (i = 0; i < DLB2_NUM_COS_DOMAINS; i++)
-               dlb2_list_init_head(&domain->avail_ldb_ports[i]);
-}
-
 void dlb2_hw_enable_sparse_dir_cq_mode(struct dlb2_hw *hw)
 {
        union dlb2_chp_cfg_chp_csr_ctrl r0;

@@ -70,636 +55,6 @@ void dlb2_hw_enable_sparse_ldb_cq_mode(struct dlb2_hw *hw)
        DLB2_CSR_WR(hw, DLB2_CHP_CFG_CHP_CSR_CTRL, r0.val);
 }
 
-static void dlb2_configure_domain_credits(struct dlb2_hw *hw,
-                                         struct dlb2_hw_domain *domain)
-{
-       union dlb2_chp_cfg_ldb_vas_crd r0 = { {0} };
-       union dlb2_chp_cfg_dir_vas_crd r1 = { {0} };
-
-       r0.field.count = domain->num_ldb_credits;
-
-       DLB2_CSR_WR(hw, DLB2_CHP_CFG_LDB_VAS_CRD(domain->id.phys_id), r0.val);
-
-       r1.field.count = domain->num_dir_credits;
-
-       DLB2_CSR_WR(hw, DLB2_CHP_CFG_DIR_VAS_CRD(domain->id.phys_id), r1.val);
-}
-
-static struct dlb2_ldb_port *
-dlb2_get_next_ldb_port(struct dlb2_hw *hw,
-                      struct dlb2_function_resources *rsrcs,
-                      u32 domain_id,
-                      u32 cos_id)
-{
-       struct dlb2_list_entry *iter;
-       struct dlb2_ldb_port *port;
-       RTE_SET_USED(iter);
-       /*
-        * To reduce the odds of consecutive load-balanced ports mapping to the
-        * same queue(s), the driver attempts to allocate ports whose neighbors
-        * are owned by a different domain.
-        */
-       DLB2_FUNC_LIST_FOR(rsrcs->avail_ldb_ports[cos_id], port, iter) {
-               u32 next, prev;
-               u32 phys_id;
-
-               phys_id = port->id.phys_id;
-               next = phys_id + 1;
-               prev = phys_id - 1;
-
-               if (phys_id == DLB2_MAX_NUM_LDB_PORTS - 1)
-                       next = 0;
-               if (phys_id == 0)
-                       prev = DLB2_MAX_NUM_LDB_PORTS - 1;
-
-               if (!hw->rsrcs.ldb_ports[next].owned ||
-                   hw->rsrcs.ldb_ports[next].domain_id.phys_id == domain_id)
-                       continue;
-
-               if (!hw->rsrcs.ldb_ports[prev].owned ||
-                   hw->rsrcs.ldb_ports[prev].domain_id.phys_id == domain_id)
-                       continue;
-
-               return port;
-       }
-
-       /*
-        * Failing that, the driver looks for a port with one neighbor owned by
-        * a different domain and the other unallocated.
-        */
-       DLB2_FUNC_LIST_FOR(rsrcs->avail_ldb_ports[cos_id], port, iter) {
-               u32 next, prev;
-               u32 phys_id;
-
-               phys_id = port->id.phys_id;
-               next = phys_id + 1;
-               prev = phys_id - 1;
-
-               if (phys_id == DLB2_MAX_NUM_LDB_PORTS - 1)
-                       next = 0;
-               if (phys_id == 0)
-                       prev = DLB2_MAX_NUM_LDB_PORTS - 1;
-
-               if (!hw->rsrcs.ldb_ports[prev].owned &&
-                   hw->rsrcs.ldb_ports[next].owned &&
-                   hw->rsrcs.ldb_ports[next].domain_id.phys_id != domain_id)
-                       return port;
-
-               if (!hw->rsrcs.ldb_ports[next].owned &&
-                   hw->rsrcs.ldb_ports[prev].owned &&
-                   hw->rsrcs.ldb_ports[prev].domain_id.phys_id != domain_id)
-                       return port;
-       }
-
-       /*
-        * Failing that, the driver looks for a port with both neighbors
-        * unallocated.
-        */
-       DLB2_FUNC_LIST_FOR(rsrcs->avail_ldb_ports[cos_id], port, iter) {
-               u32 next, prev;
-               u32 phys_id;
-
-               phys_id = port->id.phys_id;
-               next = phys_id + 1;
-               prev = phys_id - 1;
-
-               if (phys_id == DLB2_MAX_NUM_LDB_PORTS - 1)
-                       next = 0;
-               if (phys_id == 0)
-                       prev = DLB2_MAX_NUM_LDB_PORTS - 1;
-
-               if (!hw->rsrcs.ldb_ports[prev].owned &&
-                   !hw->rsrcs.ldb_ports[next].owned)
-                       return port;
-       }
-
-       /* If all else fails, the driver returns the next available port. */
-       return DLB2_FUNC_LIST_HEAD(rsrcs->avail_ldb_ports[cos_id],
-                                  typeof(*port));
-}
-
-static int __dlb2_attach_ldb_ports(struct dlb2_hw *hw,
-                                  struct dlb2_function_resources *rsrcs,
-                                  struct dlb2_hw_domain *domain,
-                                  u32 num_ports,
-                                  u32 cos_id,
-                                  struct dlb2_cmd_response *resp)
-{
-       unsigned int i;
-
-       if (rsrcs->num_avail_ldb_ports[cos_id] < num_ports) {
-               resp->status = DLB2_ST_LDB_PORTS_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       for (i = 0; i < num_ports; i++) {
-               struct dlb2_ldb_port *port;
-
-               port = dlb2_get_next_ldb_port(hw, rsrcs,
-                                             domain->id.phys_id, cos_id);
-               if (port == NULL) {
-                       DLB2_HW_ERR(hw,
-                                   "[%s()] Internal error: domain validation failed\n",
-                                   __func__);
-                       return -EFAULT;
-               }
-
-               dlb2_list_del(&rsrcs->avail_ldb_ports[cos_id],
-                             &port->func_list);
-
-               port->domain_id = domain->id;
-               port->owned = true;
-
-               dlb2_list_add(&domain->avail_ldb_ports[cos_id],
-                             &port->domain_list);
-       }
-
-       rsrcs->num_avail_ldb_ports[cos_id] -= num_ports;
-
-       return 0;
-}
-
-static int dlb2_attach_ldb_ports(struct dlb2_hw *hw,
-                                struct dlb2_function_resources *rsrcs,
-                                struct dlb2_hw_domain *domain,
-                                struct dlb2_create_sched_domain_args *args,
-                                struct dlb2_cmd_response *resp)
-{
-       unsigned int i, j;
-       int ret;
-
-       if (args->cos_strict) {
-               for (i = 0; i < DLB2_NUM_COS_DOMAINS; i++) {
-                       u32 num = args->num_cos_ldb_ports[i];
-
-                       /* Allocate ports from specific classes-of-service */
-                       ret = __dlb2_attach_ldb_ports(hw,
-                                                     rsrcs,
-                                                     domain,
-                                                     num,
-                                                     i,
-                                                     resp);
-                       if (ret)
-                               return ret;
-               }
-       } else {
-               unsigned int k;
-               u32 cos_id;
-
-               /*
-                * Attempt to allocate from specific class-of-service, but
-                * fallback to the other classes if that fails.
-                */
-               for (i = 0; i < DLB2_NUM_COS_DOMAINS; i++) {
-                       for (j = 0; j < args->num_cos_ldb_ports[i]; j++) {
-                               for (k = 0; k < DLB2_NUM_COS_DOMAINS; k++) {
-                                       cos_id = (i + k) % DLB2_NUM_COS_DOMAINS;
-
-                                       ret = __dlb2_attach_ldb_ports(hw,
-                                                                     rsrcs,
-                                                                     domain,
-                                                                     1,
-                                                                     cos_id,
-                                                                     resp);
-                                       if (ret == 0)
-                                               break;
-                               }
-
-                               if (ret < 0)
-                                       return ret;
-                       }
-               }
-       }
-
-       /* Allocate num_ldb_ports from any class-of-service */
-       for (i = 0; i < args->num_ldb_ports; i++) {
-               for (j = 0; j < DLB2_NUM_COS_DOMAINS; j++) {
-                       ret = __dlb2_attach_ldb_ports(hw,
-                                                     rsrcs,
-                                                     domain,
-                                                     1,
-                                                     j,
-                                                     resp);
-                       if (ret == 0)
-                               break;
-               }
-
-               if (ret < 0)
-                       return ret;
-       }
-
-       return 0;
-}
-
-static int dlb2_attach_dir_ports(struct dlb2_hw *hw,
-                                struct dlb2_function_resources *rsrcs,
-                                struct dlb2_hw_domain *domain,
-                                u32 num_ports,
-                                struct dlb2_cmd_response *resp)
-{
-       unsigned int i;
-
-       if (rsrcs->num_avail_dir_pq_pairs < num_ports) {
-               resp->status = DLB2_ST_DIR_PORTS_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       for (i = 0; i < num_ports; i++) {
-               struct dlb2_dir_pq_pair *port;
-
-               port = DLB2_FUNC_LIST_HEAD(rsrcs->avail_dir_pq_pairs,
-                                          typeof(*port));
-               if (port == NULL) {
-                       DLB2_HW_ERR(hw,
-                                   "[%s()] Internal error: domain validation failed\n",
-                                   __func__);
-                       return -EFAULT;
-               }
-
-               dlb2_list_del(&rsrcs->avail_dir_pq_pairs, &port->func_list);
-
-               port->domain_id = domain->id;
-               port->owned = true;
-
-               dlb2_list_add(&domain->avail_dir_pq_pairs, &port->domain_list);
-       }
-
-       rsrcs->num_avail_dir_pq_pairs -= num_ports;
-
-       return 0;
-}
-
-static int dlb2_attach_ldb_credits(struct dlb2_function_resources *rsrcs,
-                                  struct dlb2_hw_domain *domain,
-                                  u32 num_credits,
-                                  struct dlb2_cmd_response *resp)
-{
-       if (rsrcs->num_avail_qed_entries < num_credits) {
-               resp->status = DLB2_ST_LDB_CREDITS_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       rsrcs->num_avail_qed_entries -= num_credits;
-       domain->num_ldb_credits += num_credits;
-       return 0;
-}
-
-static int dlb2_attach_dir_credits(struct dlb2_function_resources *rsrcs,
-                                  struct dlb2_hw_domain *domain,
-                                  u32 num_credits,
-                                  struct dlb2_cmd_response *resp)
-{
-       if (rsrcs->num_avail_dqed_entries < num_credits) {
-               resp->status = DLB2_ST_DIR_CREDITS_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       rsrcs->num_avail_dqed_entries -= num_credits;
-       domain->num_dir_credits += num_credits;
-       return 0;
-}
-
-static int dlb2_attach_atomic_inflights(struct dlb2_function_resources *rsrcs,
-                                       struct dlb2_hw_domain *domain,
-                                       u32 num_atomic_inflights,
-                                       struct dlb2_cmd_response *resp)
-{
-       if (rsrcs->num_avail_aqed_entries < num_atomic_inflights) {
-               resp->status = DLB2_ST_ATOMIC_INFLIGHTS_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       rsrcs->num_avail_aqed_entries -= num_atomic_inflights;
-       domain->num_avail_aqed_entries += num_atomic_inflights;
-       return 0;
-}
-
-static int
-dlb2_attach_domain_hist_list_entries(struct dlb2_function_resources *rsrcs,
-                                    struct dlb2_hw_domain *domain,
-                                    u32 num_hist_list_entries,
-                                    struct dlb2_cmd_response *resp)
-{
-       struct dlb2_bitmap *bitmap;
-       int base;
-
-       if (num_hist_list_entries) {
-               bitmap = rsrcs->avail_hist_list_entries;
-
-               base = dlb2_bitmap_find_set_bit_range(bitmap,
-                                                     num_hist_list_entries);
-               if (base < 0)
-                       goto error;
-
-               domain->total_hist_list_entries = num_hist_list_entries;
-               domain->avail_hist_list_entries = num_hist_list_entries;
-               domain->hist_list_entry_base = base;
-               domain->hist_list_entry_offset = 0;
-
-               dlb2_bitmap_clear_range(bitmap, base, num_hist_list_entries);
-       }
-       return 0;
-
-error:
-       resp->status = DLB2_ST_HIST_LIST_ENTRIES_UNAVAILABLE;
-       return -EINVAL;
-}
-
-static int dlb2_attach_ldb_queues(struct dlb2_hw *hw,
-                                 struct dlb2_function_resources *rsrcs,
-                                 struct dlb2_hw_domain *domain,
-                                 u32 num_queues,
-                                 struct dlb2_cmd_response *resp)
-{
-       unsigned int i;
-
-       if (rsrcs->num_avail_ldb_queues < num_queues) {
-               resp->status = DLB2_ST_LDB_QUEUES_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       for (i = 0; i < num_queues; i++) {
-               struct dlb2_ldb_queue *queue;
-
-               queue = DLB2_FUNC_LIST_HEAD(rsrcs->avail_ldb_queues,
-                                           typeof(*queue));
-               if (queue == NULL) {
-                       DLB2_HW_ERR(hw,
-                                   "[%s()] Internal error: domain validation failed\n",
-                                   __func__);
-                       return -EFAULT;
-               }
-
-               dlb2_list_del(&rsrcs->avail_ldb_queues, &queue->func_list);
-
-               queue->domain_id = domain->id;
-               queue->owned = true;
-
-               dlb2_list_add(&domain->avail_ldb_queues, &queue->domain_list);
-       }
-
-       rsrcs->num_avail_ldb_queues -= num_queues;
-
-       return 0;
-}
-
-static int
-dlb2_domain_attach_resources(struct dlb2_hw *hw,
-                            struct dlb2_function_resources *rsrcs,
-                            struct dlb2_hw_domain *domain,
-                            struct dlb2_create_sched_domain_args *args,
-                            struct dlb2_cmd_response *resp)
-{
-       int ret;
-
-       ret = dlb2_attach_ldb_queues(hw,
-                                    rsrcs,
-                                    domain,
-                                    args->num_ldb_queues,
-                                    resp);
-       if (ret < 0)
-               return ret;
-
-       ret = dlb2_attach_ldb_ports(hw,
-                                   rsrcs,
-                                   domain,
-                                   args,
-                                   resp);
-       if (ret < 0)
-               return ret;
-
-       ret = dlb2_attach_dir_ports(hw,
-                                   rsrcs,
-                                   domain,
-                                   args->num_dir_ports,
-                                   resp);
-       if (ret < 0)
-               return ret;
-
-       ret = dlb2_attach_ldb_credits(rsrcs,
-                                     domain,
-                                     args->num_ldb_credits,
-                                     resp);
-       if (ret < 0)
-               return ret;
-
-       ret = dlb2_attach_dir_credits(rsrcs,
-                                     domain,
-                                     args->num_dir_credits,
-                                     resp);
-       if (ret < 0)
-               return ret;
-
-       ret = dlb2_attach_domain_hist_list_entries(rsrcs,
-                                                  domain,
-                                                  args->num_hist_list_entries,
-                                                  resp);
-       if (ret < 0)
-               return ret;
-
-       ret = dlb2_attach_atomic_inflights(rsrcs,
-                                          domain,
-                                          args->num_atomic_inflights,
-                                          resp);
-       if (ret < 0)
-               return ret;
-
-       dlb2_configure_domain_credits(hw, domain);
-
-       domain->configured = true;
-
-       domain->started = false;
-
-       rsrcs->num_avail_domains--;
-
-       return 0;
-}
-
-static int
-dlb2_verify_create_sched_dom_args(struct dlb2_function_resources *rsrcs,
-                                 struct dlb2_create_sched_domain_args *args,
-                                 struct dlb2_cmd_response *resp)
-{
-       u32 num_avail_ldb_ports, req_ldb_ports;
-       struct dlb2_bitmap *avail_hl_entries;
-       unsigned int max_contig_hl_range;
-       int i;
-
-       avail_hl_entries = rsrcs->avail_hist_list_entries;
-
-       max_contig_hl_range = dlb2_bitmap_longest_set_range(avail_hl_entries);
-
-       num_avail_ldb_ports = 0;
-       req_ldb_ports = 0;
-       for (i = 0; i < DLB2_NUM_COS_DOMAINS; i++) {
-               num_avail_ldb_ports += rsrcs->num_avail_ldb_ports[i];
-
-               req_ldb_ports += args->num_cos_ldb_ports[i];
-       }
-
-       req_ldb_ports += args->num_ldb_ports;
-
-       if (rsrcs->num_avail_domains < 1) {
-               resp->status = DLB2_ST_DOMAIN_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       if (rsrcs->num_avail_ldb_queues < args->num_ldb_queues) {
-               resp->status = DLB2_ST_LDB_QUEUES_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       if (req_ldb_ports > num_avail_ldb_ports) {
-               resp->status = DLB2_ST_LDB_PORTS_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       for (i = 0; args->cos_strict && i < DLB2_NUM_COS_DOMAINS; i++) {
-               if (args->num_cos_ldb_ports[i] >
-                   rsrcs->num_avail_ldb_ports[i]) {
-                       resp->status = DLB2_ST_LDB_PORTS_UNAVAILABLE;
-                       return -EINVAL;
-               }
-       }
-
-       if (args->num_ldb_queues > 0 && req_ldb_ports == 0) {
-               resp->status = DLB2_ST_LDB_PORT_REQUIRED_FOR_LDB_QUEUES;
-               return -EINVAL;
-       }
-
-       if (rsrcs->num_avail_dir_pq_pairs < args->num_dir_ports) {
-               resp->status = DLB2_ST_DIR_PORTS_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       if (rsrcs->num_avail_qed_entries < args->num_ldb_credits) {
-               resp->status = DLB2_ST_LDB_CREDITS_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       if (rsrcs->num_avail_dqed_entries < args->num_dir_credits) {
-               resp->status = DLB2_ST_DIR_CREDITS_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       if (rsrcs->num_avail_aqed_entries < args->num_atomic_inflights) {
-               resp->status = DLB2_ST_ATOMIC_INFLIGHTS_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       if (max_contig_hl_range < args->num_hist_list_entries) {
-               resp->status = DLB2_ST_HIST_LIST_ENTRIES_UNAVAILABLE;
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-static void
-dlb2_log_create_sched_domain_args(struct dlb2_hw *hw,
-                                 struct dlb2_create_sched_domain_args *args,
-                                 bool vdev_req,
-                                 unsigned int vdev_id)
-{
-       DLB2_HW_DBG(hw, "DLB2 create sched domain arguments:\n");
-       if (vdev_req)
-               DLB2_HW_DBG(hw, "(Request from vdev %d)\n", vdev_id);
-       DLB2_HW_DBG(hw, "\tNumber of LDB queues:          %d\n",
-                   args->num_ldb_queues);
-       DLB2_HW_DBG(hw, "\tNumber of LDB ports (any CoS): %d\n",
-                   args->num_ldb_ports);
-       DLB2_HW_DBG(hw, "\tNumber of LDB ports (CoS 0):   %d\n",
-                   args->num_cos_ldb_ports[0]);
-       DLB2_HW_DBG(hw, "\tNumber of LDB ports (CoS 1):   %d\n",
-                   args->num_cos_ldb_ports[1]);
-       DLB2_HW_DBG(hw, "\tNumber of LDB ports (CoS 2):   %d\n",
-                   args->num_cos_ldb_ports[1]);
-       DLB2_HW_DBG(hw, "\tNumber of LDB ports (CoS 3):   %d\n",
-                   args->num_cos_ldb_ports[1]);
-       DLB2_HW_DBG(hw, "\tStrict CoS allocation:         %d\n",
-                   args->cos_strict);
-       DLB2_HW_DBG(hw, "\tNumber of DIR ports:           %d\n",
-                   args->num_dir_ports);
-       DLB2_HW_DBG(hw, "\tNumber of ATM inflights:       %d\n",
-                   args->num_atomic_inflights);
-       DLB2_HW_DBG(hw, "\tNumber of hist list entries:   %d\n",
-                   args->num_hist_list_entries);
-       DLB2_HW_DBG(hw, "\tNumber of LDB credits:         %d\n",
-                   args->num_ldb_credits);
-       DLB2_HW_DBG(hw, "\tNumber of DIR credits:         %d\n",
-                   args->num_dir_credits);
-}
-
-/**
- * dlb2_hw_create_sched_domain() - Allocate and initialize a DLB scheduling
- *     domain and its resources.
- * @hw:        Contains the current state of the DLB2 hardware.
- * @args: User-provided arguments.
- * @resp: Response to user.
- * @vdev_req: Request came from a virtual device.
- * @vdev_id: If vdev_req is true, this contains the virtual device's ID.
- *
- * Return: returns < 0 on error, 0 otherwise. If the driver is unable to
- * satisfy a request, resp->status will be set accordingly.
- */
-int dlb2_hw_create_sched_domain(struct dlb2_hw *hw,
-                               struct dlb2_create_sched_domain_args *args,
-                               struct dlb2_cmd_response *resp,
-                               bool vdev_req,
-                               unsigned int vdev_id)
-{
-       struct dlb2_function_resources *rsrcs;
-       struct dlb2_hw_domain *domain;
-       int ret;
-
-       rsrcs = (vdev_req) ? &hw->vdev[vdev_id] : &hw->pf;
-
-       dlb2_log_create_sched_domain_args(hw, args, vdev_req, vdev_id);
-
-       /*
-        * Verify that hardware resources are available before attempting to
-        * satisfy the request. This simplifies the error unwinding code.
-        */
-       ret = dlb2_verify_create_sched_dom_args(rsrcs, args, resp);
-       if (ret)
-               return ret;
-
-       domain = DLB2_FUNC_LIST_HEAD(rsrcs->avail_domains, typeof(*domain));
-       if (domain == NULL) {
-               DLB2_HW_ERR(hw,
-                           "[%s():%d] Internal error: no available domains\n",
-                           __func__, __LINE__);
-               return -EFAULT;
-       }
-
-       if (domain->configured) {
-               DLB2_HW_ERR(hw,
-                           "[%s()] Internal error: avail_domains contains configured domains.\n",
-                           __func__);
-               return -EFAULT;
-       }
-
-       dlb2_init_domain_rsrc_lists(domain);
-
-       ret = dlb2_domain_attach_resources(hw, rsrcs, domain, args, resp);
-       if (ret < 0) {
-               DLB2_HW_ERR(hw,
-                           "[%s()] Internal error: failed to verify args.\n",
-                           __func__);
-
-               return ret;
-       }
-
-       dlb2_list_del(&rsrcs->avail_domains, &domain->func_list);
-
-       dlb2_list_add(&rsrcs->used_domains, &domain->func_list);
-
-       resp->id = (vdev_req) ? domain->id.virt_id : domain->id.phys_id;
-       resp->status = 0;
-
-       return 0;
-}
-
 /*
  * The PF driver cannot assume that a register write will affect subsequent HCW
  * writes. To ensure a write completes, the driver must read back a CSR. This

drivers/event/dlb2/pf/base/dlb2_resource_new.c +696 -1

index b0fd37a55..4d679a0a9 100644
@@ -335,3 +335,699 @@ int dlb2_hw_get_num_resources(struct dlb2_hw *hw,
        }
        return 0;
 }
+
+static void dlb2_configure_domain_credits_v2_5(struct dlb2_hw *hw,
+                                              struct dlb2_hw_domain *domain)
+{
+       u32 reg = 0;
+
+       DLB2_BITS_SET(reg, domain->num_credits, DLB2_CHP_CFG_LDB_VAS_CRD_COUNT);
+       DLB2_CSR_WR(hw, DLB2_CHP_CFG_VAS_CRD(domain->id.phys_id), reg);
+}
+
+static void dlb2_configure_domain_credits_v2(struct dlb2_hw *hw,
+                                            struct dlb2_hw_domain *domain)
+{
+       u32 reg = 0;
+
+       DLB2_BITS_SET(reg, domain->num_ldb_credits,
+                     DLB2_CHP_CFG_LDB_VAS_CRD_COUNT);
+       DLB2_CSR_WR(hw, DLB2_CHP_CFG_LDB_VAS_CRD(domain->id.phys_id), reg);
+
+       reg = 0;
+       DLB2_BITS_SET(reg, domain->num_dir_credits,
+                     DLB2_CHP_CFG_DIR_VAS_CRD_COUNT);
+       DLB2_CSR_WR(hw, DLB2_CHP_CFG_DIR_VAS_CRD(domain->id.phys_id), reg);
+}
+
+static void dlb2_configure_domain_credits(struct dlb2_hw *hw,
+                                         struct dlb2_hw_domain *domain)
+{
+       if (hw->ver == DLB2_HW_V2)
+               dlb2_configure_domain_credits_v2(hw, domain);
+       else
+               dlb2_configure_domain_credits_v2_5(hw, domain);
+}
+
+static int dlb2_attach_credits(struct dlb2_function_resources *rsrcs,
+                              struct dlb2_hw_domain *domain,
+                              u32 num_credits,
+                              struct dlb2_cmd_response *resp)
+{
+       if (rsrcs->num_avail_entries < num_credits) {
+               resp->status = DLB2_ST_CREDITS_UNAVAILABLE;
+               return -EINVAL;
+       }
+
+       rsrcs->num_avail_entries -= num_credits;
+       domain->num_credits += num_credits;
+       return 0;
+}
+
+static struct dlb2_ldb_port *
+dlb2_get_next_ldb_port(struct dlb2_hw *hw,
+                      struct dlb2_function_resources *rsrcs,
+                      u32 domain_id,
+                      u32 cos_id)
+{
+       struct dlb2_list_entry *iter;
+       struct dlb2_ldb_port *port;
+       RTE_SET_USED(iter);
+
+       /*
+        * To reduce the odds of consecutive load-balanced ports mapping to the
+        * same queue(s), the driver attempts to allocate ports whose neighbors
+        * are owned by a different domain.
+        */
+       DLB2_FUNC_LIST_FOR(rsrcs->avail_ldb_ports[cos_id], port, iter) {
+               u32 next, prev;
+               u32 phys_id;
+
+               phys_id = port->id.phys_id;
+               next = phys_id + 1;
+               prev = phys_id - 1;
+
+               if (phys_id == DLB2_MAX_NUM_LDB_PORTS - 1)
+                       next = 0;
+               if (phys_id == 0)
+                       prev = DLB2_MAX_NUM_LDB_PORTS - 1;
+
+               if (!hw->rsrcs.ldb_ports[next].owned ||
+                   hw->rsrcs.ldb_ports[next].domain_id.phys_id == domain_id)
+                       continue;
+
+               if (!hw->rsrcs.ldb_ports[prev].owned ||
+                   hw->rsrcs.ldb_ports[prev].domain_id.phys_id == domain_id)
+                       continue;
+
+               return port;
+       }
+
+       /*
+        * Failing that, the driver looks for a port with one neighbor owned by
+        * a different domain and the other unallocated.
+        */
+       DLB2_FUNC_LIST_FOR(rsrcs->avail_ldb_ports[cos_id], port, iter) {
+               u32 next, prev;
+               u32 phys_id;
+
+               phys_id = port->id.phys_id;
+               next = phys_id + 1;
+               prev = phys_id - 1;
+
+               if (phys_id == DLB2_MAX_NUM_LDB_PORTS - 1)
+                       next = 0;
+               if (phys_id == 0)
+                       prev = DLB2_MAX_NUM_LDB_PORTS - 1;
+
+               if (!hw->rsrcs.ldb_ports[prev].owned &&
+                   hw->rsrcs.ldb_ports[next].owned &&
+                   hw->rsrcs.ldb_ports[next].domain_id.phys_id != domain_id)
+                       return port;
+
+               if (!hw->rsrcs.ldb_ports[next].owned &&
+                   hw->rsrcs.ldb_ports[prev].owned &&
+                   hw->rsrcs.ldb_ports[prev].domain_id.phys_id != domain_id)
+                       return port;
+       }
+
+       /*
+        * Failing that, the driver looks for a port with both neighbors
+        * unallocated.
+        */
+       DLB2_FUNC_LIST_FOR(rsrcs->avail_ldb_ports[cos_id], port, iter) {
+               u32 next, prev;
+               u32 phys_id;
+
+               phys_id = port->id.phys_id;
+               next = phys_id + 1;
+               prev = phys_id - 1;
+
+               if (phys_id == DLB2_MAX_NUM_LDB_PORTS - 1)
+                       next = 0;
+               if (phys_id == 0)
+                       prev = DLB2_MAX_NUM_LDB_PORTS - 1;
+
+               if (!hw->rsrcs.ldb_ports[prev].owned &&
+                   !hw->rsrcs.ldb_ports[next].owned)
+                       return port;
+       }
+
+       /* If all else fails, the driver returns the next available port. */
+       return DLB2_FUNC_LIST_HEAD(rsrcs->avail_ldb_ports[cos_id],
+                                  typeof(*port));
+}
+
+static int __dlb2_attach_ldb_ports(struct dlb2_hw *hw,
+                                  struct dlb2_function_resources *rsrcs,
+                                  struct dlb2_hw_domain *domain,
+                                  u32 num_ports,
+                                  u32 cos_id,
+                                  struct dlb2_cmd_response *resp)
+{
+       unsigned int i;
+
+       if (rsrcs->num_avail_ldb_ports[cos_id] < num_ports) {
+               resp->status = DLB2_ST_LDB_PORTS_UNAVAILABLE;
+               return -EINVAL;
+       }
+
+       for (i = 0; i < num_ports; i++) {
+               struct dlb2_ldb_port *port;
+
+               port = dlb2_get_next_ldb_port(hw, rsrcs,
+                                             domain->id.phys_id, cos_id);
+               if (port == NULL) {
+                       DLB2_HW_ERR(hw,
+                                   "[%s()] Internal error: domain validation failed\n",
+                                   __func__);
+                       return -EFAULT;
+               }
+
+               dlb2_list_del(&rsrcs->avail_ldb_ports[cos_id],
+                             &port->func_list);
+
+               port->domain_id = domain->id;
+               port->owned = true;
+
+               dlb2_list_add(&domain->avail_ldb_ports[cos_id],
+                             &port->domain_list);
+       }
+
+       rsrcs->num_avail_ldb_ports[cos_id] -= num_ports;
+
+       return 0;
+}
+
+
+static int dlb2_attach_ldb_ports(struct dlb2_hw *hw,
+                                struct dlb2_function_resources *rsrcs,
+                                struct dlb2_hw_domain *domain,
+                                struct dlb2_create_sched_domain_args *args,
+                                struct dlb2_cmd_response *resp)
+{
+       unsigned int i, j;
+       int ret;
+
+       if (args->cos_strict) {
+               for (i = 0; i < DLB2_NUM_COS_DOMAINS; i++) {
+                       u32 num = args->num_cos_ldb_ports[i];
+
+                       /* Allocate ports from specific classes-of-service */
+                       ret = __dlb2_attach_ldb_ports(hw,
+                                                     rsrcs,
+                                                     domain,
+                                                     num,
+                                                     i,
+                                                     resp);
+                       if (ret)
+                               return ret;
+               }
+       } else {
+               unsigned int k;
+               u32 cos_id;
+
+               /*
+                * Attempt to allocate from specific class-of-service, but
+                * fallback to the other classes if that fails.
+                */
+               for (i = 0; i < DLB2_NUM_COS_DOMAINS; i++) {
+                       for (j = 0; j < args->num_cos_ldb_ports[i]; j++) {
+                               for (k = 0; k < DLB2_NUM_COS_DOMAINS; k++) {
+                                       cos_id = (i + k) % DLB2_NUM_COS_DOMAINS;
+
+                                       ret = __dlb2_attach_ldb_ports(hw,
+                                                                     rsrcs,
+                                                                     domain,
+                                                                     1,
+                                                                     cos_id,
+                                                                     resp);
+                                       if (ret == 0)
+                                               break;
+                               }
+
+                               if (ret)
+                                       return ret;
+                       }
+               }
+       }
+
+       /* Allocate num_ldb_ports from any class-of-service */
+       for (i = 0; i < args->num_ldb_ports; i++) {
+               for (j = 0; j < DLB2_NUM_COS_DOMAINS; j++) {
+                       ret = __dlb2_attach_ldb_ports(hw,
+                                                     rsrcs,
+                                                     domain,
+                                                     1,
+                                                     j,
+                                                     resp);
+                       if (ret == 0)
+                               break;
+               }
+
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+
+static int dlb2_attach_dir_ports(struct dlb2_hw *hw,
+                                struct dlb2_function_resources *rsrcs,
+                                struct dlb2_hw_domain *domain,
+                                u32 num_ports,
+                                struct dlb2_cmd_response *resp)
+{
+       unsigned int i;
+
+       if (rsrcs->num_avail_dir_pq_pairs < num_ports) {
+               resp->status = DLB2_ST_DIR_PORTS_UNAVAILABLE;
+               return -EINVAL;
+       }
+
+       for (i = 0; i < num_ports; i++) {
+               struct dlb2_dir_pq_pair *port;
+
+               port = DLB2_FUNC_LIST_HEAD(rsrcs->avail_dir_pq_pairs,
+                                          typeof(*port));
+               if (port == NULL) {
+                       DLB2_HW_ERR(hw,
+                                   "[%s()] Internal error: domain validation failed\n",
+                                   __func__);
+                       return -EFAULT;
+               }
+
+               dlb2_list_del(&rsrcs->avail_dir_pq_pairs, &port->func_list);
+
+               port->domain_id = domain->id;
+               port->owned = true;
+
+               dlb2_list_add(&domain->avail_dir_pq_pairs, &port->domain_list);
+       }
+
+       rsrcs->num_avail_dir_pq_pairs -= num_ports;
+
+       return 0;
+}
+
+static int dlb2_attach_ldb_credits(struct dlb2_function_resources *rsrcs,
+                                  struct dlb2_hw_domain *domain,
+                                  u32 num_credits,
+                                  struct dlb2_cmd_response *resp)
+{
+       if (rsrcs->num_avail_qed_entries < num_credits) {
+               resp->status = DLB2_ST_LDB_CREDITS_UNAVAILABLE;
+               return -EINVAL;
+       }
+
+       rsrcs->num_avail_qed_entries -= num_credits;
+       domain->num_ldb_credits += num_credits;
+       return 0;
+}
+
+static int dlb2_attach_dir_credits(struct dlb2_function_resources *rsrcs,
+                                  struct dlb2_hw_domain *domain,
+                                  u32 num_credits,
+                                  struct dlb2_cmd_response *resp)
+{
+       if (rsrcs->num_avail_dqed_entries < num_credits) {
+               resp->status = DLB2_ST_DIR_CREDITS_UNAVAILABLE;
+               return -EINVAL;
+       }
+
+       rsrcs->num_avail_dqed_entries -= num_credits;
+       domain->num_dir_credits += num_credits;
+       return 0;
+}
+
+
+static int dlb2_attach_atomic_inflights(struct dlb2_function_resources *rsrcs,
+                                       struct dlb2_hw_domain *domain,
+                                       u32 num_atomic_inflights,
+                                       struct dlb2_cmd_response *resp)
+{
+       if (rsrcs->num_avail_aqed_entries < num_atomic_inflights) {
+               resp->status = DLB2_ST_ATOMIC_INFLIGHTS_UNAVAILABLE;
+               return -EINVAL;
+       }
+
+       rsrcs->num_avail_aqed_entries -= num_atomic_inflights;
+       domain->num_avail_aqed_entries += num_atomic_inflights;
+       return 0;
+}
+
+static int
+dlb2_attach_domain_hist_list_entries(struct dlb2_function_resources *rsrcs,
+                                    struct dlb2_hw_domain *domain,
+                                    u32 num_hist_list_entries,
+                                    struct dlb2_cmd_response *resp)
+{
+       struct dlb2_bitmap *bitmap;
+       int base;
+
+       if (num_hist_list_entries) {
+               bitmap = rsrcs->avail_hist_list_entries;
+
+               base = dlb2_bitmap_find_set_bit_range(bitmap,
+                                                     num_hist_list_entries);
+               if (base < 0)
+                       goto error;
+
+               domain->total_hist_list_entries = num_hist_list_entries;
+               domain->avail_hist_list_entries = num_hist_list_entries;
+               domain->hist_list_entry_base = base;
+               domain->hist_list_entry_offset = 0;
+
+               dlb2_bitmap_clear_range(bitmap, base, num_hist_list_entries);
+       }
+       return 0;
+
+error:
+       resp->status = DLB2_ST_HIST_LIST_ENTRIES_UNAVAILABLE;
+       return -EINVAL;
+}
+
+static int dlb2_attach_ldb_queues(struct dlb2_hw *hw,
+                                 struct dlb2_function_resources *rsrcs,
+                                 struct dlb2_hw_domain *domain,
+                                 u32 num_queues,
+                                 struct dlb2_cmd_response *resp)
+{
+       unsigned int i;
+
+       if (rsrcs->num_avail_ldb_queues < num_queues) {
+               resp->status = DLB2_ST_LDB_QUEUES_UNAVAILABLE;
+               return -EINVAL;
+       }
+
+       for (i = 0; i < num_queues; i++) {
+               struct dlb2_ldb_queue *queue;
+
+               queue = DLB2_FUNC_LIST_HEAD(rsrcs->avail_ldb_queues,
+                                           typeof(*queue));
+               if (queue == NULL) {
+                       DLB2_HW_ERR(hw,
+                                   "[%s()] Internal error: domain validation failed\n",
+                                   __func__);
+                       return -EFAULT;
+               }
+
+               dlb2_list_del(&rsrcs->avail_ldb_queues, &queue->func_list);
+
+               queue->domain_id = domain->id;
+               queue->owned = true;
+
+               dlb2_list_add(&domain->avail_ldb_queues, &queue->domain_list);
+       }
+
+       rsrcs->num_avail_ldb_queues -= num_queues;
+
+       return 0;
+}
+
+static int
+dlb2_domain_attach_resources(struct dlb2_hw *hw,
+                            struct dlb2_function_resources *rsrcs,
+                            struct dlb2_hw_domain *domain,
+                            struct dlb2_create_sched_domain_args *args,
+                            struct dlb2_cmd_response *resp)
+{
+       int ret;
+
+       ret = dlb2_attach_ldb_queues(hw,
+                                    rsrcs,
+                                    domain,
+                                    args->num_ldb_queues,
+                                    resp);
+       if (ret)
+               return ret;
+
+       ret = dlb2_attach_ldb_ports(hw,
+                                   rsrcs,
+                                   domain,
+                                   args,
+                                   resp);
+       if (ret)
+               return ret;
+
+       ret = dlb2_attach_dir_ports(hw,
+                                   rsrcs,
+                                   domain,
+                                   args->num_dir_ports,
+                                   resp);
+       if (ret)
+               return ret;
+
+       if (hw->ver == DLB2_HW_V2) {
+               ret = dlb2_attach_ldb_credits(rsrcs,
+                                             domain,
+                                             args->num_ldb_credits,
+                                             resp);
+               if (ret)
+                       return ret;
+
+               ret = dlb2_attach_dir_credits(rsrcs,
+                                             domain,
+                                             args->num_dir_credits,
+                                             resp);
+               if (ret)
+                       return ret;
+       } else {  /* DLB 2.5 */
+               ret = dlb2_attach_credits(rsrcs,
+                                         domain,
+                                         args->num_credits,
+                                         resp);
+               if (ret)
+                       return ret;
+       }
+
+       ret = dlb2_attach_domain_hist_list_entries(rsrcs,
+                                                  domain,
+                                                  args->num_hist_list_entries,
+                                                  resp);
+       if (ret)
+               return ret;
+
+       ret = dlb2_attach_atomic_inflights(rsrcs,
+                                          domain,
+                                          args->num_atomic_inflights,
+                                          resp);
+       if (ret)
+               return ret;
+
+       dlb2_configure_domain_credits(hw, domain);
+
+       domain->configured = true;
+
+       domain->started = false;
+
+       rsrcs->num_avail_domains--;
+
+       return 0;
+}
+
+static int
+dlb2_verify_create_sched_dom_args(struct dlb2_function_resources *rsrcs,
+                                 struct dlb2_create_sched_domain_args *args,
+                                 struct dlb2_cmd_response *resp,
+                                 struct dlb2_hw *hw,
+                                 struct dlb2_hw_domain **out_domain)
+{
+       u32 num_avail_ldb_ports, req_ldb_ports;
+       struct dlb2_bitmap *avail_hl_entries;
+       unsigned int max_contig_hl_range;
+       struct dlb2_hw_domain *domain;
+       int i;
+
+       avail_hl_entries = rsrcs->avail_hist_list_entries;
+
+       max_contig_hl_range = dlb2_bitmap_longest_set_range(avail_hl_entries);
+
+       num_avail_ldb_ports = 0;
+       req_ldb_ports = 0;
+       for (i = 0; i < DLB2_NUM_COS_DOMAINS; i++) {
+               num_avail_ldb_ports += rsrcs->num_avail_ldb_ports[i];
+
+               req_ldb_ports += args->num_cos_ldb_ports[i];
+       }
+
+       req_ldb_ports += args->num_ldb_ports;
+
+       if (rsrcs->num_avail_domains < 1) {
+               resp->status = DLB2_ST_DOMAIN_UNAVAILABLE;
+               return -EINVAL;
+       }
+
+       domain = DLB2_FUNC_LIST_HEAD(rsrcs->avail_domains, typeof(*domain));
+       if (domain == NULL) {
+               resp->status = DLB2_ST_DOMAIN_UNAVAILABLE;
+               return -EFAULT;
+       }
+
+       if (rsrcs->num_avail_ldb_queues < args->num_ldb_queues) {
+               resp->status = DLB2_ST_LDB_QUEUES_UNAVAILABLE;
+               return -EINVAL;
+       }
+
+       if (req_ldb_ports > num_avail_ldb_ports) {
+               resp->status = DLB2_ST_LDB_PORTS_UNAVAILABLE;
+               return -EINVAL;
+       }
+
+       for (i = 0; args->cos_strict && i < DLB2_NUM_COS_DOMAINS; i++) {
+               if (args->num_cos_ldb_ports[i] >
+                   rsrcs->num_avail_ldb_ports[i]) {
+                       resp->status = DLB2_ST_LDB_PORTS_UNAVAILABLE;
+                       return -EINVAL;
+               }
+       }
+
+       if (args->num_ldb_queues > 0 && req_ldb_ports == 0) {
+               resp->status = DLB2_ST_LDB_PORT_REQUIRED_FOR_LDB_QUEUES;
+               return -EINVAL;
+       }
+
+       if (rsrcs->num_avail_dir_pq_pairs < args->num_dir_ports) {
+               resp->status = DLB2_ST_DIR_PORTS_UNAVAILABLE;
+               return -EINVAL;
+       }
+       if (hw->ver == DLB2_HW_V2_5) {
+               if (rsrcs->num_avail_entries < args->num_credits) {
+                       resp->status = DLB2_ST_CREDITS_UNAVAILABLE;
+                       return -EINVAL;
+               }
+       } else {
+               if (rsrcs->num_avail_qed_entries < args->num_ldb_credits) {
+                       resp->status = DLB2_ST_LDB_CREDITS_UNAVAILABLE;
+                       return -EINVAL;
+               }
+               if (rsrcs->num_avail_dqed_entries < args->num_dir_credits) {
+                       resp->status = DLB2_ST_DIR_CREDITS_UNAVAILABLE;
+                       return -EINVAL;
+               }
+       }
+
+       if (rsrcs->num_avail_aqed_entries < args->num_atomic_inflights) {
+               resp->status = DLB2_ST_ATOMIC_INFLIGHTS_UNAVAILABLE;
+               return -EINVAL;
+       }
+
+       if (max_contig_hl_range < args->num_hist_list_entries) {
+               resp->status = DLB2_ST_HIST_LIST_ENTRIES_UNAVAILABLE;
+               return -EINVAL;
+       }
+
+       *out_domain = domain;
+
+       return 0;
+}
+
+static void
+dlb2_log_create_sched_domain_args(struct dlb2_hw *hw,
+                                 struct dlb2_create_sched_domain_args *args,
+                                 bool vdev_req,
+                                 unsigned int vdev_id)
+{
+       DLB2_HW_DBG(hw, "DLB2 create sched domain arguments:\n");
+       if (vdev_req)
+               DLB2_HW_DBG(hw, "(Request from vdev %d)\n", vdev_id);
+       DLB2_HW_DBG(hw, "\tNumber of LDB queues:          %d\n",
+                   args->num_ldb_queues);
+       DLB2_HW_DBG(hw, "\tNumber of LDB ports (any CoS): %d\n",
+                   args->num_ldb_ports);
+       DLB2_HW_DBG(hw, "\tNumber of LDB ports (CoS 0):   %d\n",
+                   args->num_cos_ldb_ports[0]);
+       DLB2_HW_DBG(hw, "\tNumber of LDB ports (CoS 1):   %d\n",
+                   args->num_cos_ldb_ports[1]);
+       DLB2_HW_DBG(hw, "\tNumber of LDB ports (CoS 2):   %d\n",
+                   args->num_cos_ldb_ports[2]);
+       DLB2_HW_DBG(hw, "\tNumber of LDB ports (CoS 3):   %d\n",
+                   args->num_cos_ldb_ports[3]);
+       DLB2_HW_DBG(hw, "\tStrict CoS allocation:         %d\n",
+                   args->cos_strict);
+       DLB2_HW_DBG(hw, "\tNumber of DIR ports:           %d\n",
+                   args->num_dir_ports);
+       DLB2_HW_DBG(hw, "\tNumber of ATM inflights:       %d\n",
+                   args->num_atomic_inflights);
+       DLB2_HW_DBG(hw, "\tNumber of hist list entries:   %d\n",
+                   args->num_hist_list_entries);
+       if (hw->ver == DLB2_HW_V2) {
+               DLB2_HW_DBG(hw, "\tNumber of LDB credits:         %d\n",
+                           args->num_ldb_credits);
+               DLB2_HW_DBG(hw, "\tNumber of DIR credits:         %d\n",
+                           args->num_dir_credits);
+       } else {
+               DLB2_HW_DBG(hw, "\tNumber of credits:         %d\n",
+                           args->num_credits);
+       }
+}
+
+/**
+ * dlb2_hw_create_sched_domain() - create a scheduling domain
+ * @hw: dlb2_hw handle for a particular device.
+ * @args: scheduling domain creation arguments.
+ * @resp: response structure.
+ * @vdev_req: indicates whether this request came from a vdev.
+ * @vdev_id: If vdev_req is true, this contains the vdev's ID.
+ *
+ * This function creates a scheduling domain containing the resources specified
+ * in args. The individual resources (queues, ports, credits) can be configured
+ * after creating a scheduling domain.
+ *
+ * A vdev can be either an SR-IOV virtual function or a Scalable IOV virtual
+ * device.
+ *
+ * Return:
+ * Returns 0 upon success, < 0 otherwise. If an error occurs, resp->status is
+ * assigned a detailed error code from enum dlb2_error. If successful, resp->id
+ * contains the domain ID.
+ *
+ * resp->id contains a virtual ID if vdev_req is true.
+ *
+ * Errors:
+ * EINVAL - A requested resource is unavailable, or the requested domain name
+ *         is already in use.
+ * EFAULT - Internal error (resp->status not set).
+ */
+int dlb2_hw_create_sched_domain(struct dlb2_hw *hw,
+                               struct dlb2_create_sched_domain_args *args,
+                               struct dlb2_cmd_response *resp,
+                               bool vdev_req,
+                               unsigned int vdev_id)
+{
+       struct dlb2_function_resources *rsrcs;
+       struct dlb2_hw_domain *domain;
+       int ret;
+
+       rsrcs = (vdev_req) ? &hw->vdev[vdev_id] : &hw->pf;
+
+       dlb2_log_create_sched_domain_args(hw, args, vdev_req, vdev_id);
+
+       /*
+        * Verify that hardware resources are available before attempting to
+        * satisfy the request. This simplifies the error unwinding code.
+        */
+       ret = dlb2_verify_create_sched_dom_args(rsrcs, args, resp, hw, &domain);
+       if (ret)
+               return ret;
+
+       dlb2_init_domain_rsrc_lists(domain);
+
+       ret = dlb2_domain_attach_resources(hw, rsrcs, domain, args, resp);
+       if (ret) {
+               DLB2_HW_ERR(hw,
+                           "[%s()] Internal error: failed to verify args.\n",
+                           __func__);
+
+               return ret;
+       }
+
+       dlb2_list_del(&rsrcs->avail_domains, &domain->func_list);
+
+       dlb2_list_add(&rsrcs->used_domains, &domain->func_list);
+
+       resp->id = (vdev_req) ? domain->id.virt_id : domain->id.phys_id;
+       resp->status = 0;
+
+       return 0;
+}
--

2.23.0