Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132228/?format=api
{ "id": 132228, "url": "http://patchwork.dpdk.org/api/patches/132228/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230929163516.3636499-7-nicolas.chautru@intel.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230929163516.3636499-7-nicolas.chautru@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230929163516.3636499-7-nicolas.chautru@intel.com", "date": "2023-09-29T16:35:10", "name": "[v3,06/12] baseband/acc: refactor to allow unified driver extension", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c6d1e85ffaacf193f966ff4ee759d9309f48cc56", "submitter": { "id": 1314, "url": "http://patchwork.dpdk.org/api/people/1314/?format=api", "name": "Chautru, Nicolas", "email": "nicolas.chautru@intel.com" }, "delegate": { "id": 2642, "url": "http://patchwork.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230929163516.3636499-7-nicolas.chautru@intel.com/mbox/", "series": [ { "id": 29702, "url": "http://patchwork.dpdk.org/api/series/29702/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29702", "date": "2023-09-29T16:35:04", "name": "VRB2 bbdev PMD introduction", "version": 3, "mbox": "http://patchwork.dpdk.org/series/29702/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/132228/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/132228/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 3FD0142674;\n\tFri, 29 Sep 2023 18:38:43 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 84611406B6;\n\tFri, 29 Sep 2023 18:38:12 +0200 (CEST)", "from mgamail.intel.com (mgamail.intel.com [192.55.52.151])\n by mails.dpdk.org (Postfix) with ESMTP id 6FA00402AD\n for <dev@dpdk.org>; Fri, 29 Sep 2023 18:38:04 +0200 (CEST)", "from fmsmga007.fm.intel.com ([10.253.24.52])\n by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 29 Sep 2023 09:38:03 -0700", "from spr-npg-bds1-eec2.sn.intel.com (HELO spr-npg-bds1-eec2..)\n ([10.233.181.123])\n by fmsmga007.fm.intel.com with ESMTP; 29 Sep 2023 09:38:02 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1696005484; x=1727541484;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=PKa8FT9QFow+mXpAjPYIACP2ALp97tp85AcKFjd8OW4=;\n b=MYeK/gZAa7LzCPeKXQs7uUpKj94Q/M3jQIJJEiloJRcHr+AMJGRI/WaW\n DzvX+azmNss2gun3+WyZprZMd65mtmJZKJz/uW8hvHPV5nDKO0MKMLNIU\n xAyeSIIDvBCBTDSuV2k1GJfOo2cVGMxdS2Q8IsR3SuWYx1GthA2x7Nh3c\n CWVUeu1TceYTeqw35YrxgHPlYH+soTQqBiyI4Ifa4V0VCmf3aXpfs8RnU\n PGacl6LQ48FovusHe4uHjaMpICOCnEx+pmYHREZO+hPJZq9EkOFIaQpen\n QOf0RPfrSU7bvpsmI8fmqCI/AtjygPNZAvmh6Eq3XiZmiWhuvOJ5KKEfU w==;", "X-IronPort-AV": [ "E=McAfee;i=\"6600,9927,10848\"; a=\"362584225\"", "E=Sophos;i=\"6.03,187,1694761200\"; d=\"scan'208\";a=\"362584225\"", "E=McAfee;i=\"6600,9927,10848\"; a=\"753433487\"", "E=Sophos;i=\"6.03,187,1694761200\"; d=\"scan'208\";a=\"753433487\"" ], "X-ExtLoop1": "1", "From": "Nicolas Chautru <nicolas.chautru@intel.com>", "To": "dev@dpdk.org,\n\tmaxime.coquelin@redhat.com", "Cc": "hemant.agrawal@nxp.com, david.marchand@redhat.com,\n hernan.vargas@intel.com,\n Nicolas Chautru <nicolas.chautru@intel.com>", "Subject": "[PATCH v3 06/12] baseband/acc: refactor to allow unified driver\n extension", "Date": "Fri, 29 Sep 2023 16:35:10 +0000", "Message-Id": "<20230929163516.3636499-7-nicolas.chautru@intel.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20230929163516.3636499-1-nicolas.chautru@intel.com>", "References": "<20230929163516.3636499-1-nicolas.chautru@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Adding a few functions and common code prior to\nextending the VRB driver.\n\nSigned-off-by: Nicolas Chautru <nicolas.chautru@intel.com>\n---\n drivers/baseband/acc/acc_common.h | 164 +++++++++++++++++++++++---\n drivers/baseband/acc/rte_acc100_pmd.c | 4 +-\n drivers/baseband/acc/rte_vrb_pmd.c | 62 +++++-----\n 3 files changed, 184 insertions(+), 46 deletions(-)", "diff": "diff --git a/drivers/baseband/acc/acc_common.h b/drivers/baseband/acc/acc_common.h\nindex 788abf1a3c..89893eae43 100644\n--- a/drivers/baseband/acc/acc_common.h\n+++ b/drivers/baseband/acc/acc_common.h\n@@ -18,6 +18,7 @@\n #define ACC_DMA_BLKID_OUT_HARQ 3\n #define ACC_DMA_BLKID_IN_HARQ 3\n #define ACC_DMA_BLKID_IN_MLD_R 3\n+#define ACC_DMA_BLKID_DEWIN_IN 3\n \n /* Values used in filling in decode FCWs */\n #define ACC_FCW_TD_VER 1\n@@ -103,6 +104,9 @@\n #define ACC_MAX_NUM_QGRPS 32\n #define ACC_RING_SIZE_GRANULARITY 64\n #define ACC_MAX_FCW_SIZE 128\n+#define ACC_IQ_SIZE 4\n+\n+#define ACC_FCW_FFT_BLEN_3 28\n \n /* Constants from K0 computation from 3GPP 38.212 Table 5.4.2.1-2 */\n #define ACC_N_ZC_1 66 /* N = 66 Zc for BG 1 */\n@@ -132,6 +136,17 @@\n #define ACC_LIM_21 14 /* 0.21 */\n #define ACC_LIM_31 20 /* 0.31 */\n #define ACC_MAX_E (128 * 1024 - 2)\n+#define ACC_MAX_CS 12\n+\n+#define ACC100_VARIANT 0\n+#define VRB1_VARIANT\t\t2\n+#define VRB2_VARIANT\t\t3\n+\n+/* Queue Index Hierarchy */\n+#define VRB1_GRP_ID_SHIFT 10\n+#define VRB1_VF_ID_SHIFT 4\n+#define VRB2_GRP_ID_SHIFT 12\n+#define VRB2_VF_ID_SHIFT 6\n \n /* Helper macro for logging */\n #define rte_acc_log(level, fmt, ...) \\\n@@ -332,6 +347,37 @@ struct __rte_packed acc_fcw_fft {\n \t\tres:19;\n };\n \n+/* FFT Frame Control Word. */\n+struct __rte_packed acc_fcw_fft_3 {\n+\tuint32_t in_frame_size:16,\n+\t\tleading_pad_size:16;\n+\tuint32_t out_frame_size:16,\n+\t\tleading_depad_size:16;\n+\tuint32_t cs_window_sel;\n+\tuint32_t cs_window_sel2:16,\n+\t\tcs_enable_bmap:16;\n+\tuint32_t num_antennas:8,\n+\t\tidft_size:8,\n+\t\tdft_size:8,\n+\t\tcs_offset:8;\n+\tuint32_t idft_shift:8,\n+\t\tdft_shift:8,\n+\t\tcs_multiplier:16;\n+\tuint32_t bypass:2,\n+\t\tfp16_in:1,\n+\t\tfp16_out:1,\n+\t\texp_adj:4,\n+\t\tpower_shift:4,\n+\t\tpower_en:1,\n+\t\tenable_dewin:1,\n+\t\tfreq_resample_mode:2,\n+\t\tdepad_output_size:16;\n+\tuint16_t cs_theta_0[ACC_MAX_CS];\n+\tuint32_t cs_theta_d[ACC_MAX_CS];\n+\tint8_t cs_time_offset[ACC_MAX_CS];\n+};\n+\n+\n /* MLD-TS Frame Control Word */\n struct __rte_packed acc_fcw_mldts {\n \tuint32_t fcw_version:4,\n@@ -473,14 +519,14 @@ union acc_info_ring_data {\n \t\tuint16_t valid: 1;\n \t};\n \tstruct {\n-\t\tuint32_t aq_id_3: 6;\n-\t\tuint32_t qg_id_3: 5;\n-\t\tuint32_t vf_id_3: 6;\n-\t\tuint32_t int_nb_3: 6;\n-\t\tuint32_t msi_0_3: 1;\n-\t\tuint32_t vf2pf_3: 6;\n-\t\tuint32_t loop_3: 1;\n-\t\tuint32_t valid_3: 1;\n+\t\tuint32_t aq_id_vrb2: 6;\n+\t\tuint32_t qg_id_vrb2: 5;\n+\t\tuint32_t vf_id_vrb2: 6;\n+\t\tuint32_t int_nb_vrb2: 6;\n+\t\tuint32_t msi_0_vrb2: 1;\n+\t\tuint32_t vf2pf_vrb2: 6;\n+\t\tuint32_t loop_vrb2: 1;\n+\t\tuint32_t valid_vrb2: 1;\n \t};\n } __rte_packed;\n \n@@ -761,22 +807,105 @@ alloc_sw_rings_min_mem(struct rte_bbdev *dev, struct acc_device *d,\n \tfree_base_addresses(base_addrs, i);\n }\n \n+/* Wrapper to provide VF index from ring data. */\n+static inline uint16_t\n+vf_from_ring(const union acc_info_ring_data ring_data, uint16_t device_variant) {\n+\tif (device_variant == VRB2_VARIANT)\n+\t\treturn ring_data.vf_id_vrb2;\n+\telse\n+\t\treturn ring_data.vf_id;\n+}\n+\n+/* Wrapper to provide QG index from ring data. */\n+static inline uint16_t\n+qg_from_ring(const union acc_info_ring_data ring_data, uint16_t device_variant) {\n+\tif (device_variant == VRB2_VARIANT)\n+\t\treturn ring_data.qg_id_vrb2;\n+\telse\n+\t\treturn ring_data.qg_id;\n+}\n+\n+/* Wrapper to provide AQ index from ring data. */\n+static inline uint16_t\n+aq_from_ring(const union acc_info_ring_data ring_data, uint16_t device_variant) {\n+\tif (device_variant == VRB2_VARIANT)\n+\t\treturn ring_data.aq_id_vrb2;\n+\telse\n+\t\treturn ring_data.aq_id;\n+}\n+\n+/* Wrapper to provide int index from ring data. */\n+static inline uint16_t\n+int_from_ring(const union acc_info_ring_data ring_data, uint16_t device_variant) {\n+\tif (device_variant == VRB2_VARIANT)\n+\t\treturn ring_data.int_nb_vrb2;\n+\telse\n+\t\treturn ring_data.int_nb;\n+}\n+\n+/* Wrapper to provide queue index from group and aq index. */\n+static inline int\n+queue_index(uint16_t group_idx, uint16_t aq_idx, uint16_t device_variant) {\n+\tif (device_variant == VRB2_VARIANT)\n+\t\treturn (group_idx << VRB2_GRP_ID_SHIFT) + aq_idx;\n+\telse\n+\t\treturn (group_idx << VRB1_GRP_ID_SHIFT) + aq_idx;\n+}\n+\n+/* Wrapper to provide queue group from queue index. */\n+static inline int\n+qg_from_q(uint32_t q_idx, uint16_t device_variant) {\n+\tif (device_variant == VRB2_VARIANT)\n+\t\treturn (q_idx >> VRB2_GRP_ID_SHIFT) & 0x1F;\n+\telse\n+\t\treturn (q_idx >> VRB1_GRP_ID_SHIFT) & 0xF;\n+}\n+\n+/* Wrapper to provide vf from queue index. */\n+static inline int32_t\n+vf_from_q(uint32_t q_idx, uint16_t device_variant) {\n+\tif (device_variant == VRB2_VARIANT)\n+\t\treturn (q_idx >> VRB2_VF_ID_SHIFT) & 0x3F;\n+\telse\n+\t\treturn (q_idx >> VRB1_VF_ID_SHIFT) & 0x3F;\n+}\n+\n+/* Wrapper to provide aq index from queue index. */\n+static inline int32_t\n+aq_from_q(uint32_t q_idx, uint16_t device_variant) {\n+\tif (device_variant == VRB2_VARIANT)\n+\t\treturn q_idx & 0x3F;\n+\telse\n+\t\treturn q_idx & 0xF;\n+}\n+\n+/* Wrapper to set VF index in ring data. */\n+static inline int32_t\n+set_vf_in_ring(volatile union acc_info_ring_data *ring_data,\n+\t\tuint16_t device_variant, uint16_t value) {\n+\tif (device_variant == VRB2_VARIANT)\n+\t\treturn ring_data->vf_id_vrb2 = value;\n+\telse\n+\t\treturn ring_data->vf_id = value;\n+}\n+\n /*\n * Find queue_id of a device queue based on details from the Info Ring.\n * If a queue isn't found UINT16_MAX is returned.\n */\n static inline uint16_t\n get_queue_id_from_ring_info(struct rte_bbdev_data *data,\n-\t\tconst union acc_info_ring_data ring_data)\n+\t\tconst union acc_info_ring_data ring_data, uint16_t device_variant)\n {\n \tuint16_t queue_id;\n+\tstruct acc_queue *acc_q;\n \n \tfor (queue_id = 0; queue_id < data->num_queues; ++queue_id) {\n-\t\tstruct acc_queue *acc_q =\n-\t\t\t\tdata->queues[queue_id].queue_private;\n-\t\tif (acc_q != NULL && acc_q->aq_id == ring_data.aq_id &&\n-\t\t\t\tacc_q->qgrp_id == ring_data.qg_id &&\n-\t\t\t\tacc_q->vf_id == ring_data.vf_id)\n+\t\tacc_q = data->queues[queue_id].queue_private;\n+\n+\t\tif (acc_q != NULL && acc_q->aq_id == aq_from_ring(ring_data, device_variant) &&\n+\t\t\t\tacc_q->qgrp_id == qg_from_ring(ring_data, device_variant) &&\n+\t\t\t\tacc_q->vf_id == vf_from_ring(ring_data, device_variant))\n \t\t\treturn queue_id;\n \t}\n \n@@ -1438,4 +1567,11 @@ get_num_cbs_in_tb_ldpc_enc(struct rte_bbdev_op_ldpc_enc *ldpc_enc)\n \treturn cbs_in_tb;\n }\n \n+static inline void\n+acc_reg_fast_write(struct acc_device *d, uint32_t offset, uint32_t value)\n+{\n+\tvoid *reg_addr = RTE_PTR_ADD(d->mmio_base, offset);\n+\tmmio_write(reg_addr, value);\n+}\n+\n #endif /* _ACC_COMMON_H_ */\ndiff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c\nindex 5362d39c30..7f8d05b5a9 100644\n--- a/drivers/baseband/acc/rte_acc100_pmd.c\n+++ b/drivers/baseband/acc/rte_acc100_pmd.c\n@@ -294,7 +294,7 @@ acc100_pf_interrupt_handler(struct rte_bbdev *dev)\n \t\tcase ACC100_PF_INT_DMA_UL5G_DESC_IRQ:\n \t\tcase ACC100_PF_INT_DMA_DL5G_DESC_IRQ:\n \t\t\tdeq_intr_det.queue_id = get_queue_id_from_ring_info(\n-\t\t\t\t\tdev->data, *ring_data);\n+\t\t\t\t\tdev->data, *ring_data, acc100_dev->device_variant);\n \t\t\tif (deq_intr_det.queue_id == UINT16_MAX) {\n \t\t\t\trte_bbdev_log(ERR,\n \t\t\t\t\t\t\"Couldn't find queue: aq_id: %u, qg_id: %u, vf_id: %u\",\n@@ -348,7 +348,7 @@ acc100_vf_interrupt_handler(struct rte_bbdev *dev)\n \t\t\t */\n \t\t\tring_data->vf_id = 0;\n \t\t\tdeq_intr_det.queue_id = get_queue_id_from_ring_info(\n-\t\t\t\t\tdev->data, *ring_data);\n+\t\t\t\t\tdev->data, *ring_data, acc100_dev->device_variant);\n \t\t\tif (deq_intr_det.queue_id == UINT16_MAX) {\n \t\t\t\trte_bbdev_log(ERR,\n \t\t\t\t\t\t\"Couldn't find queue: aq_id: %u, qg_id: %u\",\ndiff --git a/drivers/baseband/acc/rte_vrb_pmd.c b/drivers/baseband/acc/rte_vrb_pmd.c\nindex a1de012b40..c89c26c59a 100644\n--- a/drivers/baseband/acc/rte_vrb_pmd.c\n+++ b/drivers/baseband/acc/rte_vrb_pmd.c\n@@ -341,17 +341,18 @@ static inline void\n vrb_check_ir(struct acc_device *acc_dev)\n {\n \tvolatile union acc_info_ring_data *ring_data;\n-\tuint16_t info_ring_head = acc_dev->info_ring_head;\n+\tuint16_t info_ring_head = acc_dev->info_ring_head, int_nb;\n \tif (unlikely(acc_dev->info_ring == NULL))\n \t\treturn;\n \n \tring_data = acc_dev->info_ring + (acc_dev->info_ring_head & ACC_INFO_RING_MASK);\n \n \twhile (ring_data->valid) {\n-\t\tif ((ring_data->int_nb < ACC_PF_INT_DMA_DL_DESC_IRQ) || (\n-\t\t\t\tring_data->int_nb > ACC_PF_INT_DMA_MLD_DESC_IRQ)) {\n+\t\tint_nb = int_from_ring(*ring_data, acc_dev->device_variant);\n+\t\tif ((int_nb < ACC_PF_INT_DMA_DL_DESC_IRQ) || (\n+\t\t\t\tint_nb > ACC_PF_INT_DMA_MLD_DESC_IRQ)) {\n \t\t\trte_bbdev_log(WARNING, \"InfoRing: ITR:%d Info:0x%x\",\n-\t\t\t\t\tring_data->int_nb, ring_data->detailed_info);\n+\t\t\t\t\tint_nb, ring_data->detailed_info);\n \t\t\t/* Initialize Info Ring entry and move forward. */\n \t\t\tring_data->val = 0;\n \t\t}\n@@ -368,16 +369,21 @@ vrb_dev_interrupt_handler(void *cb_arg)\n \tstruct acc_device *acc_dev = dev->data->dev_private;\n \tvolatile union acc_info_ring_data *ring_data;\n \tstruct acc_deq_intr_details deq_intr_det;\n+\tuint16_t vf_id, aq_id, qg_id, int_nb;\n \n \tring_data = acc_dev->info_ring + (acc_dev->info_ring_head & ACC_INFO_RING_MASK);\n \n \twhile (ring_data->valid) {\n+\t\tvf_id = vf_from_ring(*ring_data, acc_dev->device_variant);\n+\t\taq_id = aq_from_ring(*ring_data, acc_dev->device_variant);\n+\t\tqg_id = qg_from_ring(*ring_data, acc_dev->device_variant);\n+\t\tint_nb = int_from_ring(*ring_data, acc_dev->device_variant);\n \t\tif (acc_dev->pf_device) {\n \t\t\trte_bbdev_log_debug(\n-\t\t\t\t\t\"VRB1 PF Interrupt received, Info Ring data: 0x%x -> %d\",\n-\t\t\t\t\tring_data->val, ring_data->int_nb);\n+\t\t\t\t\t\"PF Interrupt received, Info Ring data: 0x%x -> %d\",\n+\t\t\t\t\tring_data->val, int_nb);\n \n-\t\t\tswitch (ring_data->int_nb) {\n+\t\t\tswitch (int_nb) {\n \t\t\tcase ACC_PF_INT_DMA_DL_DESC_IRQ:\n \t\t\tcase ACC_PF_INT_DMA_UL_DESC_IRQ:\n \t\t\tcase ACC_PF_INT_DMA_FFT_DESC_IRQ:\n@@ -385,13 +391,11 @@ vrb_dev_interrupt_handler(void *cb_arg)\n \t\t\tcase ACC_PF_INT_DMA_DL5G_DESC_IRQ:\n \t\t\tcase ACC_PF_INT_DMA_MLD_DESC_IRQ:\n \t\t\t\tdeq_intr_det.queue_id = get_queue_id_from_ring_info(\n-\t\t\t\t\t\tdev->data, *ring_data);\n+\t\t\t\t\t\tdev->data, *ring_data, acc_dev->device_variant);\n \t\t\t\tif (deq_intr_det.queue_id == UINT16_MAX) {\n \t\t\t\t\trte_bbdev_log(ERR,\n \t\t\t\t\t\t\t\"Couldn't find queue: aq_id: %u, qg_id: %u, vf_id: %u\",\n-\t\t\t\t\t\t\tring_data->aq_id,\n-\t\t\t\t\t\t\tring_data->qg_id,\n-\t\t\t\t\t\t\tring_data->vf_id);\n+\t\t\t\t\t\t\taq_id, qg_id, vf_id);\n \t\t\t\t\treturn;\n \t\t\t\t}\n \t\t\t\trte_bbdev_pmd_callback_process(dev,\n@@ -403,9 +407,9 @@ vrb_dev_interrupt_handler(void *cb_arg)\n \t\t\t}\n \t\t} else {\n \t\t\trte_bbdev_log_debug(\n-\t\t\t\t\t\"VRB1 VF Interrupt received, Info Ring data: 0x%x\\n\",\n+\t\t\t\t\t\"VRB VF Interrupt received, Info Ring data: 0x%x\\n\",\n \t\t\t\t\tring_data->val);\n-\t\t\tswitch (ring_data->int_nb) {\n+\t\t\tswitch (int_nb) {\n \t\t\tcase ACC_VF_INT_DMA_DL_DESC_IRQ:\n \t\t\tcase ACC_VF_INT_DMA_UL_DESC_IRQ:\n \t\t\tcase ACC_VF_INT_DMA_FFT_DESC_IRQ:\n@@ -413,14 +417,13 @@ vrb_dev_interrupt_handler(void *cb_arg)\n \t\t\tcase ACC_VF_INT_DMA_DL5G_DESC_IRQ:\n \t\t\tcase ACC_VF_INT_DMA_MLD_DESC_IRQ:\n \t\t\t\t/* VFs are not aware of their vf_id - it's set to 0. */\n-\t\t\t\tring_data->vf_id = 0;\n+\t\t\t\tset_vf_in_ring(ring_data, acc_dev->device_variant, 0);\n \t\t\t\tdeq_intr_det.queue_id = get_queue_id_from_ring_info(\n-\t\t\t\t\t\tdev->data, *ring_data);\n+\t\t\t\t\t\tdev->data, *ring_data, acc_dev->device_variant);\n \t\t\t\tif (deq_intr_det.queue_id == UINT16_MAX) {\n \t\t\t\t\trte_bbdev_log(ERR,\n \t\t\t\t\t\t\t\"Couldn't find queue: aq_id: %u, qg_id: %u\",\n-\t\t\t\t\t\t\tring_data->aq_id,\n-\t\t\t\t\t\t\tring_data->qg_id);\n+\t\t\t\t\t\t\taq_id, qg_id);\n \t\t\t\t\treturn;\n \t\t\t\t}\n \t\t\t\trte_bbdev_pmd_callback_process(dev,\n@@ -435,8 +438,7 @@ vrb_dev_interrupt_handler(void *cb_arg)\n \t\t/* Initialize Info Ring entry and move forward. */\n \t\tring_data->val = 0;\n \t\t++acc_dev->info_ring_head;\n-\t\tring_data = acc_dev->info_ring +\n-\t\t\t\t(acc_dev->info_ring_head & ACC_INFO_RING_MASK);\n+\t\tring_data = acc_dev->info_ring + (acc_dev->info_ring_head & ACC_INFO_RING_MASK);\n \t}\n }\n \n@@ -556,8 +558,7 @@ vrb_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)\n \n \t/* Configure tail pointer for use when SDONE enabled. */\n \tif (d->tail_ptrs == NULL)\n-\t\td->tail_ptrs = rte_zmalloc_socket(\n-\t\t\t\tdev->device->driver->name,\n+\t\td->tail_ptrs = rte_zmalloc_socket(dev->device->driver->name,\n \t\t\t\tVRB_MAX_QGRPS * VRB_MAX_AQS * sizeof(uint32_t),\n \t\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (d->tail_ptrs == NULL) {\n@@ -783,7 +784,7 @@ vrb_find_free_queue_idx(struct rte_bbdev *dev,\n \t\t\t/* Mark the Queue as assigned. */\n \t\t\td->q_assigned_bit_map[group_idx] |= (1ULL << aq_idx);\n \t\t\t/* Report the AQ Index. */\n-\t\t\treturn (group_idx << VRB1_GRP_ID_SHIFT) + aq_idx;\n+\t\t\treturn queue_index(group_idx, aq_idx, d->device_variant);\n \t\t}\n \t}\n \trte_bbdev_log(INFO, \"Failed to find free queue on %s, priority %u\",\n@@ -922,9 +923,10 @@ vrb_queue_setup(struct rte_bbdev *dev, uint16_t queue_id,\n \t\t}\n \t}\n \n-\tq->qgrp_id = (q_idx >> VRB1_GRP_ID_SHIFT) & 0xF;\n-\tq->vf_id = (q_idx >> VRB1_VF_ID_SHIFT) & 0x3F;\n-\tq->aq_id = q_idx & 0xF;\n+\tq->qgrp_id = qg_from_q(q_idx, d->device_variant);\n+\tq->vf_id = vf_from_q(q_idx, d->device_variant);\n+\tq->aq_id = aq_from_q(q_idx, d->device_variant);\n+\n \tq->aq_depth = 0;\n \tif (conf->op_type == RTE_BBDEV_OP_TURBO_DEC)\n \t\tq->aq_depth = (1 << d->acc_conf.q_ul_4g.aq_depth_log2);\n@@ -1311,7 +1313,7 @@ vrb_fcw_td_fill(const struct rte_bbdev_dec_op *op, struct acc_fcw_td *fcw)\n \t\tfcw->bypass_teq = 0;\n \t}\n \n-\tfcw->code_block_mode = 1; /* FIXME */\n+\tfcw->code_block_mode = 1;\n \tfcw->turbo_crc_type = check_bit(op->turbo_dec.op_flags,\n \t\t\tRTE_BBDEV_TURBO_CRC_TYPE_24B);\n \n@@ -1471,8 +1473,8 @@ vrb_dma_desc_td_fill(struct rte_bbdev_dec_op *op,\n \tif (op->turbo_dec.code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK) {\n \t\tk = op->turbo_dec.tb_params.k_pos;\n \t\te = (r < op->turbo_dec.tb_params.cab)\n-\t\t\t? op->turbo_dec.tb_params.ea\n-\t\t\t: op->turbo_dec.tb_params.eb;\n+\t\t\t\t? op->turbo_dec.tb_params.ea\n+\t\t\t\t: op->turbo_dec.tb_params.eb;\n \t} else {\n \t\tk = op->turbo_dec.cb_params.k;\n \t\te = op->turbo_dec.cb_params.e;\n@@ -1726,7 +1728,7 @@ vrb_dma_desc_ld_update(struct rte_bbdev_dec_op *op,\n \tdesc->op_addr = op;\n }\n \n-/* Enqueue one encode operations for device in CB mode */\n+/* Enqueue one encode operations for device in CB mode. */\n static inline int\n enqueue_enc_one_op_cb(struct acc_queue *q, struct rte_bbdev_enc_op *op,\n \t\tuint16_t total_enqueued_cbs)\n@@ -2263,7 +2265,7 @@ vrb_enqueue_ldpc_dec_one_op_tb(struct acc_queue *q, struct rte_bbdev_dec_op *op,\n \treturn current_enqueued_cbs;\n }\n \n-/* Enqueue one decode operations for device in TB mode */\n+/* Enqueue one decode operations for device in TB mode. */\n static inline int\n enqueue_dec_one_op_tb(struct acc_queue *q, struct rte_bbdev_dec_op *op,\n \t\tuint16_t total_enqueued_cbs, uint8_t cbs_in_tb)\n", "prefixes": [ "v3", "06/12" ] }