As support for DLB v2.5 was added, modifications were made to
dlb_hw_types_new.h, but the old file needed to be preserved during
the port in order to meet the requirement that individual patches in
a series each compile successfully. Since the DLB v2.5 support is
completely integrated, it is now safe to remove the old (original)
file, as well as the DLB2_USE_NEW_HEADERS define that was used to
control which version of the file was to be included in certain
source files. The next commit will rename dlb2_hw_type_new.h
to dlb_hw_types.h.
Signed-off-by: Timothy McDaniel <timothy.mcdan...@intel.com>
---
drivers/event/dlb2/pf/base/dlb2_hw_types.h | 335 ---------------------
drivers/event/dlb2/pf/base/dlb2_resource.c | 2 -
drivers/event/dlb2/pf/dlb2_main.c | 2 -
drivers/event/dlb2/pf/dlb2_main.h | 4 -
drivers/event/dlb2/pf/dlb2_pf.c | 2 -
5 files changed, 345 deletions(-)
delete mode 100644 drivers/event/dlb2/pf/base/dlb2_hw_types.h
diff --git a/drivers/event/dlb2/pf/base/dlb2_hw_types.h
b/drivers/event/dlb2/pf/base/dlb2_hw_types.h
deleted file mode 100644
index b007e1674..000000000
--- a/drivers/event/dlb2/pf/base/dlb2_hw_types.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2016-2020 Intel Corporation
- */
-
-#ifndef __DLB2_HW_TYPES_H
-#define __DLB2_HW_TYPES_H
-
-#include "../../dlb2_priv.h"
-#include "dlb2_user.h"
-
-#include "dlb2_osdep_list.h"
-#include "dlb2_osdep_types.h"
-
-#define DLB2_MAX_NUM_VDEVS 16
-#define DLB2_MAX_NUM_SEQUENCE_NUMBER_GROUPS 2
-#define DLB2_NUM_ARB_WEIGHTS 8
-#define DLB2_MAX_NUM_AQED_ENTRIES 2048
-#define DLB2_MAX_WEIGHT 255
-#define DLB2_NUM_COS_DOMAINS 4
-#define DLB2_MAX_NUM_SEQUENCE_NUMBER_GROUPS 2
-#define DLB2_MAX_NUM_SEQUENCE_NUMBER_MODES 5
-#define DLB2_MAX_CQ_COMP_CHECK_LOOPS 409600
-#define DLB2_MAX_QID_EMPTY_CHECK_LOOPS (32 * 64 * 1024 * (800 / 30))
-
-#define DLB2_FUNC_BAR 0
-#define DLB2_CSR_BAR 2
-
-#define PCI_DEVICE_ID_INTEL_DLB2_PF 0x2710
-#define PCI_DEVICE_ID_INTEL_DLB2_VF 0x2711
-
-#define PCI_DEVICE_ID_INTEL_DLB2_5_PF 0x2714
-#define PCI_DEVICE_ID_INTEL_DLB2_5_VF 0x2715
-
-#define DLB2_ALARM_HW_SOURCE_SYS 0
-#define DLB2_ALARM_HW_SOURCE_DLB 1
-
-#define DLB2_ALARM_HW_UNIT_CHP 4
-
-#define DLB2_ALARM_SYS_AID_ILLEGAL_QID 3
-#define DLB2_ALARM_SYS_AID_DISABLED_QID 4
-#define DLB2_ALARM_SYS_AID_ILLEGAL_HCW 5
-#define DLB2_ALARM_HW_CHP_AID_ILLEGAL_ENQ 1
-#define DLB2_ALARM_HW_CHP_AID_EXCESS_TOKEN_POPS 2
-
-/*
- * Hardware-defined base addresses. Those prefixed 'DLB2_DRV' are only used by
- * the PF driver.
- */
-#define DLB2_DRV_LDB_PP_BASE 0x2300000
-#define DLB2_DRV_LDB_PP_STRIDE 0x1000
-#define DLB2_DRV_LDB_PP_BOUND (DLB2_DRV_LDB_PP_BASE + \
- DLB2_DRV_LDB_PP_STRIDE * DLB2_MAX_NUM_LDB_PORTS)
-#define DLB2_DRV_DIR_PP_BASE 0x2200000
-#define DLB2_DRV_DIR_PP_STRIDE 0x1000
-#define DLB2_DRV_DIR_PP_BOUND (DLB2_DRV_DIR_PP_BASE + \
- DLB2_DRV_DIR_PP_STRIDE * DLB2_MAX_NUM_DIR_PORTS)
-#define DLB2_LDB_PP_BASE 0x2100000
-#define DLB2_LDB_PP_STRIDE 0x1000
-#define DLB2_LDB_PP_BOUND (DLB2_LDB_PP_BASE + \
- DLB2_LDB_PP_STRIDE * DLB2_MAX_NUM_LDB_PORTS)
-#define DLB2_LDB_PP_OFFS(id) (DLB2_LDB_PP_BASE + (id) * DLB2_PP_SIZE)
-#define DLB2_DIR_PP_BASE 0x2000000
-#define DLB2_DIR_PP_STRIDE 0x1000
-#define DLB2_DIR_PP_BOUND (DLB2_DIR_PP_BASE + \
- DLB2_DIR_PP_STRIDE * \
- DLB2_MAX_NUM_DIR_PORTS_V2_5)
-#define DLB2_DIR_PP_OFFS(id) (DLB2_DIR_PP_BASE + (id) * DLB2_PP_SIZE)
-
-struct dlb2_resource_id {
- u32 phys_id;
- u32 virt_id;
- u8 vdev_owned;
- u8 vdev_id;
-};
-
-struct dlb2_freelist {
- u32 base;
- u32 bound;
- u32 offset;
-};
-
-static inline u32 dlb2_freelist_count(struct dlb2_freelist *list)
-{
- return list->bound - list->base - list->offset;
-}
-
-struct dlb2_hcw {
- u64 data;
- /* Word 3 */
- u16 opaque;
- u8 qid;
- u8 sched_type:2;
- u8 priority:3;
- u8 msg_type:3;
- /* Word 4 */
- u16 lock_id;
- u8 ts_flag:1;
- u8 rsvd1:2;
- u8 no_dec:1;
- u8 cmp_id:4;
- u8 cq_token:1;
- u8 qe_comp:1;
- u8 qe_frag:1;
- u8 qe_valid:1;
- u8 int_arm:1;
- u8 error:1;
- u8 rsvd:2;
-};
-
-struct dlb2_ldb_queue {
- struct dlb2_list_entry domain_list;
- struct dlb2_list_entry func_list;
- struct dlb2_resource_id id;
- struct dlb2_resource_id domain_id;
- u32 num_qid_inflights;
- u32 aqed_limit;
- u32 sn_group; /* sn == sequence number */
- u32 sn_slot;
- u32 num_mappings;
- u8 sn_cfg_valid;
- u8 num_pending_additions;
- u8 owned;
- u8 configured;
-};
-
-/*
- * Directed ports and queues are paired by nature, so the driver tracks them
- * with a single data structure.
- */
-struct dlb2_dir_pq_pair {
- struct dlb2_list_entry domain_list;
- struct dlb2_list_entry func_list;
- struct dlb2_resource_id id;
- struct dlb2_resource_id domain_id;
- u32 ref_cnt;
- u8 init_tkn_cnt;
- u8 queue_configured;
- u8 port_configured;
- u8 owned;
- u8 enabled;
-};
-
-enum dlb2_qid_map_state {
- /* The slot doesn't contain a valid queue mapping */
- DLB2_QUEUE_UNMAPPED,
- /* The slot contains a valid queue mapping */
- DLB2_QUEUE_MAPPED,
- /* The driver is mapping a queue into this slot */
- DLB2_QUEUE_MAP_IN_PROG,
- /* The driver is unmapping a queue from this slot */
- DLB2_QUEUE_UNMAP_IN_PROG,
- /*
- * The driver is unmapping a queue from this slot, and once complete
- * will replace it with another mapping.
- */
- DLB2_QUEUE_UNMAP_IN_PROG_PENDING_MAP,
-};
-
-struct dlb2_ldb_port_qid_map {
- enum dlb2_qid_map_state state;
- u16 qid;
- u16 pending_qid;
- u8 priority;
- u8 pending_priority;
-};
-
-struct dlb2_ldb_port {
- struct dlb2_list_entry domain_list;
- struct dlb2_list_entry func_list;
- struct dlb2_resource_id id;
- struct dlb2_resource_id domain_id;
- /* The qid_map represents the hardware QID mapping state. */
- struct dlb2_ldb_port_qid_map qid_map[DLB2_MAX_NUM_QIDS_PER_LDB_CQ];
- u32 hist_list_entry_base;
- u32 hist_list_entry_limit;
- u32 ref_cnt;
- u8 init_tkn_cnt;
- u8 num_pending_removals;
- u8 num_mappings;
- u8 owned;
- u8 enabled;
- u8 configured;
-};
-
-struct dlb2_sn_group {
- u32 mode;
- u32 sequence_numbers_per_queue;
- u32 slot_use_bitmap;
- u32 id;
-};
-
-static inline bool dlb2_sn_group_full(struct dlb2_sn_group *group)
-{
- const u32 mask[] = {
- 0x0000ffff, /* 64 SNs per queue */
- 0x000000ff, /* 128 SNs per queue */
- 0x0000000f, /* 256 SNs per queue */
- 0x00000003, /* 512 SNs per queue */
- 0x00000001}; /* 1024 SNs per queue */
-
- return group->slot_use_bitmap == mask[group->mode];
-}
-
-static inline int dlb2_sn_group_alloc_slot(struct dlb2_sn_group *group)
-{
- const u32 bound[] = {16, 8, 4, 2, 1};
- u32 i;
-
- for (i = 0; i < bound[group->mode]; i++) {
- if (!(group->slot_use_bitmap & (1 << i))) {
- group->slot_use_bitmap |= 1 << i;
- return i;
- }
- }
-
- return -1;
-}
-
-static inline void
-dlb2_sn_group_free_slot(struct dlb2_sn_group *group, int slot)
-{
- group->slot_use_bitmap &= ~(1 << slot);
-}
-
-static inline int dlb2_sn_group_used_slots(struct dlb2_sn_group *group)
-{
- int i, cnt = 0;
-
- for (i = 0; i < 32; i++)
- cnt += !!(group->slot_use_bitmap & (1 << i));
-
- return cnt;
-}
-
-struct dlb2_hw_domain {
- struct dlb2_function_resources *parent_func;
- struct dlb2_list_entry func_list;
- struct dlb2_list_head used_ldb_queues;
- struct dlb2_list_head used_ldb_ports[DLB2_NUM_COS_DOMAINS];
- struct dlb2_list_head used_dir_pq_pairs;
- struct dlb2_list_head avail_ldb_queues;
- struct dlb2_list_head avail_ldb_ports[DLB2_NUM_COS_DOMAINS];
- struct dlb2_list_head avail_dir_pq_pairs;
- u32 total_hist_list_entries;
- u32 avail_hist_list_entries;
- u32 hist_list_entry_base;
- u32 hist_list_entry_offset;
- u32 num_ldb_credits;
- u32 num_dir_credits;
- u32 num_avail_aqed_entries;
- u32 num_used_aqed_entries;
- struct dlb2_resource_id id;
- int num_pending_removals;
- int num_pending_additions;
- u8 configured;
- u8 started;
-};
-
-struct dlb2_bitmap;
-
-struct dlb2_function_resources {
- struct dlb2_list_head avail_domains;
- struct dlb2_list_head used_domains;
- struct dlb2_list_head avail_ldb_queues;
- struct dlb2_list_head avail_ldb_ports[DLB2_NUM_COS_DOMAINS];
- struct dlb2_list_head avail_dir_pq_pairs;
- struct dlb2_bitmap *avail_hist_list_entries;
- u32 num_avail_domains;
- u32 num_avail_ldb_queues;
- u32 num_avail_ldb_ports[DLB2_NUM_COS_DOMAINS];
- u32 num_avail_dir_pq_pairs;
- u32 num_avail_qed_entries;
- u32 num_avail_dqed_entries;
- u32 num_avail_aqed_entries;
- u8 locked; /* (VDEV only) */
-};
-
-/*
- * After initialization, each resource in dlb2_hw_resources is located in one
- * of the following lists:
- * -- The PF's available resources list. These are unconfigured resources owned
- * by the PF and not allocated to a dlb2 scheduling domain.
- * -- A VDEV's available resources list. These are VDEV-owned unconfigured
- * resources not allocated to a dlb2 scheduling domain.
- * -- A domain's available resources list. These are domain-owned unconfigured
- * resources.
- * -- A domain's used resources list. These are domain-owned configured
- * resources.
- *
- * A resource moves to a new list when a VDEV or domain is created or
destroyed,
- * or when the resource is configured.
- */
-struct dlb2_hw_resources {
- struct dlb2_ldb_queue ldb_queues[DLB2_MAX_NUM_LDB_QUEUES];
- struct dlb2_ldb_port ldb_ports[DLB2_MAX_NUM_LDB_PORTS];
- struct dlb2_dir_pq_pair dir_pq_pairs[DLB2_MAX_NUM_DIR_PORTS_V2_5];
- struct dlb2_sn_group sn_groups[DLB2_MAX_NUM_SEQUENCE_NUMBER_GROUPS];
-};
-
-struct dlb2_mbox {
- u32 *mbox;
- u32 *isr_in_progress;
-};
-
-struct dlb2_sw_mbox {
- struct dlb2_mbox vdev_to_pf;
- struct dlb2_mbox pf_to_vdev;
- void (*pf_to_vdev_inject)(void *arg);
- void *pf_to_vdev_inject_arg;
-};
-
-struct dlb2_hw {
- uint8_t ver;
-
- /* BAR 0 address */
- void *csr_kva;
- unsigned long csr_phys_addr;
- /* BAR 2 address */
- void *func_kva;
- unsigned long func_phys_addr;
-
- /* Resource tracking */
- struct dlb2_hw_resources rsrcs;
- struct dlb2_function_resources pf;
- struct dlb2_function_resources vdev[DLB2_MAX_NUM_VDEVS];
- struct dlb2_hw_domain domains[DLB2_MAX_NUM_DOMAINS];
- u8 cos_reservation[DLB2_NUM_COS_DOMAINS];
-
- /* Virtualization */
- int virt_mode;
- struct dlb2_sw_mbox mbox[DLB2_MAX_NUM_VDEVS];
- unsigned int pasid[DLB2_MAX_NUM_VDEVS];
-};
-
-#endif /* __DLB2_HW_TYPES_H */
diff --git a/drivers/event/dlb2/pf/base/dlb2_resource.c
b/drivers/event/dlb2/pf/base/dlb2_resource.c
index 2f66b2c71..76b8b71db 100644
--- a/drivers/event/dlb2/pf/base/dlb2_resource.c
+++ b/drivers/event/dlb2/pf/base/dlb2_resource.c
@@ -2,8 +2,6 @@
* Copyright(c) 2016-2020 Intel Corporation
*/
-#define DLB2_USE_NEW_HEADERS /* TEMPORARY FOR MERGE */
-
#include "dlb2_user.h"
#include "dlb2_hw_types_new.h"
diff --git a/drivers/event/dlb2/pf/dlb2_main.c
b/drivers/event/dlb2/pf/dlb2_main.c
index bac07f097..3ab0c3ef5 100644
--- a/drivers/event/dlb2/pf/dlb2_main.c
+++ b/drivers/event/dlb2/pf/dlb2_main.c
@@ -13,8 +13,6 @@
#include <rte_malloc.h>
#include <rte_errno.h>
-#define DLB2_USE_NEW_HEADERS /* TEMPORARY FOR MERGE */
-
#include "base/dlb2_regs_new.h"
#include "base/dlb2_hw_types_new.h"
#include "base/dlb2_resource.h"
diff --git a/drivers/event/dlb2/pf/dlb2_main.h
b/drivers/event/dlb2/pf/dlb2_main.h
index 892298d7a..a1fab7c43 100644
--- a/drivers/event/dlb2/pf/dlb2_main.h
+++ b/drivers/event/dlb2/pf/dlb2_main.h
@@ -12,11 +12,7 @@
#include <rte_bus_pci.h>
#include <rte_eal_paging.h>
-#ifdef DLB2_USE_NEW_HEADERS
#include "base/dlb2_hw_types_new.h"
-#else
-#include "base/dlb2_hw_types.h"
-#endif
#include "../dlb2_user.h"
#define DLB2_DEFAULT_UNREGISTER_TIMEOUT_S 5
diff --git a/drivers/event/dlb2/pf/dlb2_pf.c b/drivers/event/dlb2/pf/dlb2_pf.c
index 880964a29..b475ff0b1 100644
--- a/drivers/event/dlb2/pf/dlb2_pf.c
+++ b/drivers/event/dlb2/pf/dlb2_pf.c
@@ -32,8 +32,6 @@
#include <rte_memory.h>
#include <rte_string_fns.h>
-#define DLB2_USE_NEW_HEADERS /* TEMPORARY FOR MERGE */
-
#include "../dlb2_priv.h"
#include "../dlb2_iface.h"
#include "../dlb2_inline_fns.h"
--
2.23.0
