From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8012EC433EF for ; Mon, 30 May 2022 07:40:17 +0000 (UTC) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 52D4140A8A; Mon, 30 May 2022 09:40:16 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id F3F3740A89 for ; Mon, 30 May 2022 09:40:14 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24TMw4nw008834; Mon, 30 May 2022 00:40:14 -0700 Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2043.outbound.protection.outlook.com [104.47.57.43]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3gbh3pcurt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 30 May 2022 00:40:13 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FMtvlJReNXSJHadZ7HvJBNIj7LQ7kyv9yckIU5jSAWWlJN/uYK5CmvTxlppr4gKKhmmdtp/CIMtYycaBsmh4Q5h3jDAz70Cs8Hj8pPBYbk8Quxj2GYvWb6iXlKK/PnioCRI4E2yXrSAcl3ge9d3mg0/dLzIwWNk6A5iYsTW0mwxTuwCuXDrTq55R3EcBc1eWQd0I4X/s4cKCQmM8JCkX86yDXLlRVehSzfBRDEkR4B3GWsdE5B7c/35ZHG/UfvbsydxJAsLiskY55F2cF2qjZpGHbCOoVZa0zFFYb7wrWtNchf4DzKlc8w7Zu8NKBlLs4dmE9Q46faxG8lcS/E6qtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=w3N8MbKUTAwOxomTNNt1E6ruPY5M3YkBBZtAF7PKCok=; b=U2KWwQ0V7cJa6XDpZrhzDXjmkk+3MzC71JZu4NiyqkQ9hDBLG712i4H5YqYjdSqe/IpN5XA/ho9coISAjKpgt33Yew+h2QKzM2umiXi14TjVlTasM7XMpLyLYGRNr5sg23tkNQdrkiGbxN6lrGucKQ/03rObTajnrNGYcoPStooudhrBG/YGI1J4ZaZyP0lSEHIftUoBrJn45Vg5qcGRfuOYrMFe27XL+0veWySUPxFxlowxVOsp1Vz0QKxbVKQmhdwNUUNN2hivMfe+fKa4itI3CZ3MuAzGb4qcfi4KXrDtgKbgnBNhWLJ4/mFa2zZnHcfTkymY+8DSk1KoE9qHiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w3N8MbKUTAwOxomTNNt1E6ruPY5M3YkBBZtAF7PKCok=; b=W7idjT2bSLGD6CayghIVa68ZHZZlgRrY4CH7cDPoVilhUcO/pOirV3U69F/ISTlA0b4/AHvruUt1pAW5Fw/5GQ0ea2FRH6ZVJYgrl/n9lHiRkuUR9pHbmMts3YRQT2yCv39/xuz7zcEBm5KCjLjboGvl7zxwtMfCrQtIV6PWpUc= Received: from CO6PR18MB4484.namprd18.prod.outlook.com (2603:10b6:5:359::9) by PH0PR18MB5116.namprd18.prod.outlook.com (2603:10b6:510:16d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.18; Mon, 30 May 2022 07:40:10 +0000 Received: from CO6PR18MB4484.namprd18.prod.outlook.com ([fe80::f154:453d:893:f6ce]) by CO6PR18MB4484.namprd18.prod.outlook.com ([fe80::f154:453d:893:f6ce%7]) with mapi id 15.20.5293.019; Mon, 30 May 2022 07:40:10 +0000 From: Akhil Goyal To: Nicolas Chautru , "dev@dpdk.org" , "trix@redhat.com" , "maxime.coquelin@redhat.com" CC: "thomas@monjalon.net" , "ray.kinsella@intel.com" , "bruce.richardson@intel.com" , "hemant.agrawal@nxp.com" , "hernan.vargas@intel.com" , "david.marchand@redhat.com" Subject: RE: [EXT] [PATCH v6 3/5] baseband/acc100: introduce PMD for ACC101 Thread-Topic: [EXT] [PATCH v6 3/5] baseband/acc100: introduce PMD for ACC101 Thread-Index: AQHYcJyND1cYoUhRVUCW6Z+klHdXA603DLow Date: Mon, 30 May 2022 07:40:10 +0000 Message-ID: References: <1653350912-53876-1-git-send-email-nicolas.chautru@intel.com> <1653526523-68839-1-git-send-email-nicolas.chautru@intel.com> <1653526523-68839-4-git-send-email-nicolas.chautru@intel.com> In-Reply-To: <1653526523-68839-4-git-send-email-nicolas.chautru@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: cf536019-20ce-497a-469c-08da420fa048 x-ms-traffictypediagnostic: PH0PR18MB5116:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: AYO6GZZ+HW6gKSB/i28FcYGuX+Rxb170nt8BNOC2GgjEeD+vp3mzWPgVnZvQJlfZm3bbAMN8MEtpNyTa8GRiq7kZj4J242lHWA8EQJc2wRaKEK4drVdMFpzTn1l32mVgFuT+dWLdenzqK3Odg7vPUEs2FR98V9eb7VtHQuyCN42uAI22BNdut4gWa4Qbg3ROsyEyVq76sQ9onybHecKblrgNJXnlUeE4gqakCQBcD80R4xXvljFAIOFMzKtUKjAYKwZhUE6V+NHF6a4lBsnu22ro+IAcFTWWBNz6kE9ObdHGvzhV+5coWfWuH4DkrTBFRNrAO053EAwZdu6jgRm5YV2U/txM5pfFxPRJ4YdCAviXSdPXLExzLzr2n1aVCVz3jYLQWZeOHSUJ8Q4k3xR+fvq8qpGhUoOm//hV7LDoVBwYGKnoaS6acR3CwI1PyfnmcgF26vdhLTXBdFSS5KVvyhAtRp/XArqORv67o7+YhlPgx2TyiAM+AfjpPr3IIAFlgvL7CZ+DFY4j9OMH5SSjyuLKeXKG3alodqe1wtKAXdmz7z+BNszeQgI2QPznZwg144ohc9v8nIDU2gl8S61CWjP6JXZemsa5fK4t6DOE4n2bnaIge6scqz88XhE3e6BaMRUWpmXwElc2wxx87hMPoITr5N9W8eh2Vy6Moi36zoS+tyndT7rQeH7K8MmG8PBvXnppFt2Ni/QypbHlAf8asw== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO6PR18MB4484.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(9686003)(316002)(33656002)(110136005)(54906003)(8676002)(4326008)(6506007)(76116006)(38100700002)(55236004)(71200400001)(26005)(66476007)(66946007)(64756008)(2906002)(66556008)(66446008)(7416002)(7696005)(38070700005)(83380400001)(122000001)(186003)(5660300002)(52536014)(508600001)(55016003)(8936002)(86362001)(30864003); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?+11Dsqaqy6SN7Dj33SbHTGz1EzTO69c9NWICYv/vqc8ZH4WqjeRR+MNLaP6q?= =?us-ascii?Q?j0qliz19LlP0O6ReEy6lYWemzt72QIJIC5MEAXU9yCYCYD+a44uExQUJehJn?= =?us-ascii?Q?Nsz2qZhbYJaWBn2DoqV3VCs+neZkNTMEOaeka3M9ZWO0KUxUArPzFVoscMld?= =?us-ascii?Q?gru/tZS+bEMFQD2Ome7Yo6AUyOWOCqBP/hF0qDUNgYL1BDufXSyjbBbQX5nX?= =?us-ascii?Q?CbmQs6yqw0sjA5+dvRPLbc/+AdR0Ywow5Dvtxp1myyUF0tQ7l0qRc1a/NT5G?= =?us-ascii?Q?ZLy8tum5+Abr1Ix4ndnWcKu16yx6oOiLiopqdcqBaw5C4eLMjpzda0tdReLB?= =?us-ascii?Q?MrTOn3UQ7n3fyKW2i29SEH7mbvrKHyuCTguxDVJgvtlH+WIM655uLphDSXwO?= =?us-ascii?Q?cGdt9p61MrUPI1/9C2Y6JgQHOqr7p0b49n1jWeJqfkvEu65Bjp6VY/FBARKH?= =?us-ascii?Q?Z97CCtb7PtFBKrQUqztMdmLmD6aMTWgAUf4fCh9DcieOus1+gCZUwXaMPfT3?= =?us-ascii?Q?zoD0amfWh7sDPnsDhLDLf1DaZcoeldrq4JoMMxFUxnHYT613laBoWRJO12Op?= =?us-ascii?Q?QGrwn9ojXN1So9o6DZal5Pn9HmAJSPIvBszcIQic+uEcy9ZY2rYS0EQ65lXc?= =?us-ascii?Q?KaWY5Vx1kshBTf1q12SnVZfoB5VHYu2P7XzzsLd+jj7juXevwHAEYaPmKLC2?= =?us-ascii?Q?NyEiqEtx0TFLAB+39I5T+SDq8p8MnkEI/sa5j04JkiZoeB8s31u6SDsck2iE?= =?us-ascii?Q?9Ngxtdl/fR+pE17PaPhMwHdOH627G3Lspf2iEhaxARAnwo+9CfT4QAa/nIJa?= =?us-ascii?Q?91WBTTxT/tc8Zq8+IbBsxl+I6bTWk/aQ/cQDRzhqQ88/deMnfi7KBjvSbwC1?= =?us-ascii?Q?dwYhHCwCJ8D3722ldbaHQBE5cRB/QNiDzmMbOpeh9y8bXbZPkrhHkigVFeFG?= =?us-ascii?Q?NbqFLMPeZOCkwpizAxnOcJgVTAcwirfynLIzKTrWrcqGXr3FeqXcQI97+NcT?= =?us-ascii?Q?ICB9GQUqJiMNmYzP3JCPKlRCUR8VrdqmTTNHlpe6Oo+TYhjcumY5vmr7h6sy?= =?us-ascii?Q?eF6oseEWIpFr+uPt8yQKB0ZenJQ3iqCEl62roXYWNW4WNnvgO9/8dYuizFMu?= =?us-ascii?Q?xWz0s4hH7yqb/JisdbFtIKKZDvx0qVKDN043E3eoj302YCOzn9jrXc4gsG4l?= =?us-ascii?Q?1tgltnD2fMYpNn+2F0X5cl9rZZH7IVXfHiR4n/6JM3+08XMRDjIUNe4wAI0p?= =?us-ascii?Q?i1CrQdRwq+2ciBobI/z9lsDYxE7cvw8E2tLBHqEtEBKHLgwd0v+NGYoWK3/h?= =?us-ascii?Q?Pws5gdy5v9y5WwGRT7jXqJ44sMJFA2cPTTjfSGDkS4D1fj+eQxcXC4KGyDfg?= =?us-ascii?Q?hpfI77aHVC4ce+5vPZMgTWgVJXBuhQDQCpONEnllHYQuSh4Wcuh7NmcEF262?= =?us-ascii?Q?3fcoKxYlE+kGSHV9ae8Nnrro+v4WUaxL7Dp/6tmc/VNdYSSYcsLDmW9xaDGd?= =?us-ascii?Q?kaDM6SpOdJtm3LJxlh3lfGhs0409PQ5bd2oHavDERwVGmbtU5i4KQfArB/GT?= =?us-ascii?Q?9Nknx8e27UmD4wtD7OleNBqN6hmAiXLiutMSSetsGnIt/hpDxQ8p6U/8LTem?= =?us-ascii?Q?QjvBXGn+wbMCX31CFLxeTP99fa+7m/cUsqPX0n0Ivim6tM9qs2u6TQuCs/j2?= =?us-ascii?Q?BNYQkhP9NemBZwEuJ369bu0d/qz1obf2iOMwv5ykFnrVXwI0MFrRNmFTGEdM?= =?us-ascii?Q?/YLcK90UUA=3D=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: marvell.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO6PR18MB4484.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf536019-20ce-497a-469c-08da420fa048 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 May 2022 07:40:10.7224 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 030CErpy1l7gMVwitnOMcLQa1ARXOozQZuXSqS8pznn773ezJE9Ski26mkExAZiVw79dSDF22WFpDpJFmTlBgg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR18MB5116 X-Proofpoint-GUID: mOMA0oUReIwTpgkOFSaXPhBZS3YQ2vxU X-Proofpoint-ORIG-GUID: mOMA0oUReIwTpgkOFSaXPhBZS3YQ2vxU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-05-30_02,2022-05-27_01,2022-02-23_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org >=20 >=20 > Enable Virtual Functions > @@ -167,14 +172,14 @@ queues, priorities, load balance, bandwidth and oth= er > settings necessary for the > device to perform FEC functions. >=20 > This configuration needs to be executed at least once after reboot or PC= I FLR > and can > -be achieved by using the function ``acc100_configure()``, which sets up = the > -parameters defined in ``acc100_conf`` structure. > +be achieved by using the functions ``acc100_configure()`` or > ``acc101_configure()``, I believe the API for user is common now. Right? So why to have two referen= ces? > +which sets up the parameters defined in the compatible ``acc100_conf`` > structure. >=20 > Test Application > ---------------- >=20 > BBDEV provides a test application, ``test-bbdev.py`` and range of test d= ata for > testing > -the functionality of ACC100 5G/4G FEC encode and decode, depending on th= e > device's > +the functionality of the device 5G/4G FEC encode and decode, depending o= n > the device's > capabilities. The test application is located under app->test-bbdev fold= er and > has the > following options: >=20 > @@ -212,7 +217,7 @@ Test Vectors >=20 > In addition to the simple LDPC decoder and LDPC encoder tests, bbdev als= o > provides > a range of additional tests under the test_vectors folder, which may be = useful. > The results > -of these tests will depend on the ACC100 5G/4G FEC capabilities which ma= y > cause some > +of these tests will depend on the device 5G/4G FEC capabilities which ma= y > cause some > testcases to be skipped, but no failure should be reported. >=20 >=20 > @@ -233,3 +238,11 @@ Specifically for the BBDEV ACC100 PMD, the command > below can be used: >=20 > ./pf_bb_config ACC100 -c acc100/acc100_config_vf_5g.cfg > ./test-bbdev.py -e=3D"-c 0xff0 -a${VF_PCI_ADDR}" -c validation -n 64 -= b 32 -l 1 -v > ./ldpc_dec_default.data > + > +Specifically for the BBDEV ACC101 PMD, the command below can be used: > + > +.. code-block:: console > + > + ./pf_bb_config ACC101 -c acc101/acc101_config_2vf_4g5g.cfg > + ./test-bbdev.py -e=3D"-c 0xff0 -a${VF_PCI_ADDR}" -c validation -n 64 -= b 32 -l 1 - > v ./ldpc_dec_default.data > + > diff --git a/doc/guides/bbdevs/features/acc101.ini > b/doc/guides/bbdevs/features/acc101.ini > new file mode 100644 > index 0000000..0e2c21a > --- /dev/null > +++ b/doc/guides/bbdevs/features/acc101.ini > @@ -0,0 +1,13 @@ > +; > +; Supported features of the 'acc101' bbdev driver. > +; > +; Refer to default.ini for the full list of available PMD features. > +; > +[Features] > +Turbo Decoder (4G) =3D Y > +Turbo Encoder (4G) =3D Y > +LDPC Decoder (5G) =3D Y > +LDPC Encoder (5G) =3D Y > +LLR/HARQ Compression =3D Y > +External DDR Access =3D Y > +HW Accelerated =3D Y > diff --git a/doc/guides/rel_notes/release_22_07.rst > b/doc/guides/rel_notes/release_22_07.rst > index e49cace..1803947 100644 > --- a/doc/guides/rel_notes/release_22_07.rst > +++ b/doc/guides/rel_notes/release_22_07.rst > @@ -104,6 +104,9 @@ New Features > * ``RTE_EVENT_QUEUE_ATTR_WEIGHT`` > * ``RTE_EVENT_QUEUE_ATTR_AFFINITY`` >=20 > +* **Added Intel ACC101 baseband PMD.** > + > + * Added a new baseband PMD for Intel ACC101 device. >=20 > Removed Items > ------------- > diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c > b/drivers/baseband/acc100/rte_acc100_pmd.c > index 3fdf17d..6a2123b 100644 > --- a/drivers/baseband/acc100/rte_acc100_pmd.c > +++ b/drivers/baseband/acc100/rte_acc100_pmd.c > @@ -22,6 +22,7 @@ > #include > #include > #include "rte_acc100_pmd.h" > +#include "rte_acc101_pmd.h" >=20 > #ifdef RTE_LIBRTE_BBDEV_DEBUG > RTE_LOG_REGISTER_DEFAULT(acc100_logtype, DEBUG); > @@ -1133,7 +1134,10 @@ > /* ACC100 PCI PF address map */ > static struct rte_pci_id pci_id_acc100_pf_map[] =3D { > { > - RTE_PCI_DEVICE(RTE_ACC100_VENDOR_ID, > RTE_ACC100_PF_DEVICE_ID) > + RTE_PCI_DEVICE(RTE_ACC100_VENDOR_ID, > RTE_ACC100_PF_DEVICE_ID), > + }, > + { > + RTE_PCI_DEVICE(RTE_ACC101_VENDOR_ID, > RTE_ACC101_PF_DEVICE_ID), > }, > {.device_id =3D 0}, > }; > @@ -1141,7 +1145,10 @@ > /* ACC100 PCI VF address map */ > static struct rte_pci_id pci_id_acc100_vf_map[] =3D { > { > - RTE_PCI_DEVICE(RTE_ACC100_VENDOR_ID, > RTE_ACC100_VF_DEVICE_ID) > + RTE_PCI_DEVICE(RTE_ACC100_VENDOR_ID, > RTE_ACC100_VF_DEVICE_ID), > + }, > + { > + RTE_PCI_DEVICE(RTE_ACC101_VENDOR_ID, > RTE_ACC101_VF_DEVICE_ID), > }, > {.device_id =3D 0}, > }; > @@ -1290,7 +1297,7 @@ >=20 > /* Fill in a frame control word for LDPC decoding. */ > static inline void > -acc100_fcw_ld_fill(const struct rte_bbdev_dec_op *op, struct acc100_fcw_= ld > *fcw, > +acc100_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc100_fcw_ld *fc= w, > union acc100_harq_layout_data *harq_layout) > { > uint16_t harq_out_length, harq_in_length, ncb_p, k0_p, parity_offset; > @@ -1414,6 +1421,128 @@ > } > } >=20 > +/* Convert offset to harq index for harq_layout structure */ > +static inline uint32_t hq_index(uint32_t offset) > +{ > + return (offset >> ACC100_HARQ_OFFSET_SHIFT) & > ACC100_HARQ_OFFSET_MASK; > +} > + > +/* Fill in a frame control word for LDPC decoding for ACC101 */ > +static inline void > +acc101_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc100_fcw_ld *fc= w, > + union acc100_harq_layout_data *harq_layout) > +{ > + uint16_t harq_out_length, harq_in_length, ncb_p, k0_p, parity_offset; > + uint32_t harq_index; > + uint32_t l; > + > + fcw->qm =3D op->ldpc_dec.q_m; > + fcw->nfiller =3D op->ldpc_dec.n_filler; > + fcw->BG =3D (op->ldpc_dec.basegraph - 1); > + fcw->Zc =3D op->ldpc_dec.z_c; > + fcw->ncb =3D op->ldpc_dec.n_cb; > + fcw->k0 =3D get_k0(fcw->ncb, fcw->Zc, op->ldpc_dec.basegraph, > + op->ldpc_dec.rv_index); > + if (op->ldpc_dec.code_block_mode =3D=3D RTE_BBDEV_CODE_BLOCK) > + fcw->rm_e =3D op->ldpc_dec.cb_params.e; > + else > + fcw->rm_e =3D (op->ldpc_dec.tb_params.r < > + op->ldpc_dec.tb_params.cab) ? > + op->ldpc_dec.tb_params.ea : > + op->ldpc_dec.tb_params.eb; > + > + if (unlikely(check_bit(op->ldpc_dec.op_flags, > + RTE_BBDEV_LDPC_HQ_COMBINE_IN_ENABLE) && > + (op->ldpc_dec.harq_combined_input.length =3D=3D 0))) { > + rte_bbdev_log(WARNING, "Null HARQ input size provided"); > + /* Disable HARQ input in that case to carry forward */ > + op->ldpc_dec.op_flags ^=3D > RTE_BBDEV_LDPC_HQ_COMBINE_IN_ENABLE; > + } > + > + fcw->hcin_en =3D check_bit(op->ldpc_dec.op_flags, > + RTE_BBDEV_LDPC_HQ_COMBINE_IN_ENABLE); > + fcw->hcout_en =3D check_bit(op->ldpc_dec.op_flags, > + RTE_BBDEV_LDPC_HQ_COMBINE_OUT_ENABLE); > + fcw->crc_select =3D check_bit(op->ldpc_dec.op_flags, > + RTE_BBDEV_LDPC_CRC_TYPE_24B_CHECK); > + fcw->bypass_dec =3D check_bit(op->ldpc_dec.op_flags, > + RTE_BBDEV_LDPC_DECODE_BYPASS); > + fcw->bypass_intlv =3D check_bit(op->ldpc_dec.op_flags, > + RTE_BBDEV_LDPC_DEINTERLEAVER_BYPASS); > + if (op->ldpc_dec.q_m =3D=3D 1) { > + fcw->bypass_intlv =3D 1; > + fcw->qm =3D 2; > + } > + fcw->hcin_decomp_mode =3D check_bit(op->ldpc_dec.op_flags, > + RTE_BBDEV_LDPC_HARQ_6BIT_COMPRESSION); > + fcw->hcout_comp_mode =3D check_bit(op->ldpc_dec.op_flags, > + RTE_BBDEV_LDPC_HARQ_6BIT_COMPRESSION); > + fcw->llr_pack_mode =3D check_bit(op->ldpc_dec.op_flags, > + RTE_BBDEV_LDPC_LLR_COMPRESSION); > + harq_index =3D hq_index(op->ldpc_dec.harq_combined_output.offset); > + if (fcw->hcin_en > 0) { > + harq_in_length =3D op->ldpc_dec.harq_combined_input.length; > + if (fcw->hcin_decomp_mode > 0) > + harq_in_length =3D harq_in_length * 8 / 6; > + harq_in_length =3D RTE_MIN(harq_in_length, op->ldpc_dec.n_cb > + - op->ldpc_dec.n_filler); > + /* Alignment on next 64B - Already enforced from HC output */ > + harq_in_length =3D RTE_ALIGN_FLOOR(harq_in_length, 64); > + fcw->hcin_size0 =3D harq_in_length; > + fcw->hcin_offset =3D 0; > + fcw->hcin_size1 =3D 0; > + } else { > + fcw->hcin_size0 =3D 0; > + fcw->hcin_offset =3D 0; > + fcw->hcin_size1 =3D 0; > + } > + > + fcw->itmax =3D op->ldpc_dec.iter_max; > + fcw->itstop =3D check_bit(op->ldpc_dec.op_flags, > + RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE); > + fcw->synd_precoder =3D fcw->itstop; > + /* > + * These are all implicitly set > + * fcw->synd_post =3D 0; > + * fcw->so_en =3D 0; > + * fcw->so_bypass_rm =3D 0; > + * fcw->so_bypass_intlv =3D 0; > + * fcw->dec_convllr =3D 0; > + * fcw->hcout_convllr =3D 0; > + * fcw->hcout_size1 =3D 0; > + * fcw->so_it =3D 0; > + * fcw->hcout_offset =3D 0; > + * fcw->negstop_th =3D 0; > + * fcw->negstop_it =3D 0; > + * fcw->negstop_en =3D 0; > + * fcw->gain_i =3D 1; > + * fcw->gain_h =3D 1; > + */ > + if (fcw->hcout_en > 0) { > + parity_offset =3D (op->ldpc_dec.basegraph =3D=3D 1 ? 20 : 8) > + * op->ldpc_dec.z_c - op->ldpc_dec.n_filler; > + k0_p =3D (fcw->k0 > parity_offset) ? > + fcw->k0 - op->ldpc_dec.n_filler : fcw->k0; > + ncb_p =3D fcw->ncb - op->ldpc_dec.n_filler; > + l =3D RTE_MIN(k0_p + fcw->rm_e, INT16_MAX); > + harq_out_length =3D (uint16_t) fcw->hcin_size0; > + harq_out_length =3D RTE_MAX(harq_out_length, l); > + /* Cannot exceed the pruned Ncb circular buffer */ > + harq_out_length =3D RTE_MIN(harq_out_length, ncb_p); > + /* Alignment on next 64B */ > + harq_out_length =3D RTE_ALIGN_CEIL(harq_out_length, 64); > + fcw->hcout_size0 =3D harq_out_length; > + fcw->hcout_size1 =3D 0; > + fcw->hcout_offset =3D 0; > + harq_layout[harq_index].offset =3D fcw->hcout_offset; > + harq_layout[harq_index].size0 =3D fcw->hcout_size0; > + } else { > + fcw->hcout_size0 =3D 0; > + fcw->hcout_size1 =3D 0; > + fcw->hcout_offset =3D 0; > + } > +} > + > /** > * Fills descriptor with data pointers of one block type. > * > @@ -2966,7 +3095,7 @@ > struct acc100_fcw_ld *fcw; > uint32_t seg_total_left; > fcw =3D &desc->req.fcw_ld; > - acc100_fcw_ld_fill(op, fcw, harq_layout); > + q->d->fcw_ld_fill(op, fcw, harq_layout); >=20 > /* Special handling when overusing mbuf */ > if (fcw->rm_e < ACC100_MAX_E_MBUF) > @@ -3033,7 +3162,7 @@ > desc =3D q->ring_addr + desc_idx; > uint64_t fcw_offset =3D (desc_idx << 8) + ACC100_DESC_FCW_OFFSET; > union acc100_harq_layout_data *harq_layout =3D q->d->harq_layout; > - acc100_fcw_ld_fill(op, &desc->req.fcw_ld, harq_layout); > + q->d->fcw_ld_fill(op, &desc->req.fcw_ld, harq_layout); >=20 > input =3D op->ldpc_dec.input.data; > h_output_head =3D h_output =3D op->ldpc_dec.hard_output.data; > @@ -4145,9 +4274,19 @@ > dev->dequeue_ldpc_enc_ops =3D acc100_dequeue_ldpc_enc; > dev->dequeue_ldpc_dec_ops =3D acc100_dequeue_ldpc_dec; >=20 > + /* Device variant specific handling */ > + if ((pci_dev->id.device_id =3D=3D RTE_ACC100_PF_DEVICE_ID) || > + (pci_dev->id.device_id =3D=3D RTE_ACC100_VF_DEVICE_ID)) > { > + ((struct acc100_device *) dev->data->dev_private)- > >device_variant =3D ACC100_VARIANT; > + ((struct acc100_device *) dev->data->dev_private)->fcw_ld_fill > =3D acc100_fcw_ld_fill; > + } else { > + ((struct acc100_device *) dev->data->dev_private)- > >device_variant =3D ACC101_VARIANT; > + ((struct acc100_device *) dev->data->dev_private)->fcw_ld_fill > =3D acc101_fcw_ld_fill; > + } > + > ((struct acc100_device *) dev->data->dev_private)->pf_device =3D > - !strcmp(drv->driver.name, > - RTE_STR(ACC100PF_DRIVER_NAME)); > + !strcmp(drv->driver.name, > RTE_STR(ACC100PF_DRIVER_NAME)); > + > ((struct acc100_device *) dev->data->dev_private)->mmio_base =3D > pci_dev->mem_resource[0].addr; >=20 > diff --git a/drivers/baseband/acc100/rte_acc100_pmd.h > b/drivers/baseband/acc100/rte_acc100_pmd.h > index 8fea322..39d5f22 100644 > --- a/drivers/baseband/acc100/rte_acc100_pmd.h > +++ b/drivers/baseband/acc100/rte_acc100_pmd.h > @@ -22,6 +22,9 @@ > #define rte_bbdev_log_debug(fmt, ...) > #endif >=20 > +#define ACC100_VARIANT 0 > +#define ACC101_VARIANT 1 Since you are using PCI dev id for identifying the device. Do we still need= above defines? > + > /* ACC100 PF and VF driver names */ > #define ACC100PF_DRIVER_NAME intel_acc100_pf > #define ACC100VF_DRIVER_NAME intel_acc100_vf > @@ -67,6 +70,8 @@ > #define ACC100_HARQ_LAYOUT (64*1024*1024) > /* Assume offset for HARQ in memory */ > #define ACC100_HARQ_OFFSET (32*1024) > +#define ACC100_HARQ_OFFSET_SHIFT 15 > +#define ACC100_HARQ_OFFSET_MASK 0x7ffffff > /* Mask used to calculate an index in an Info Ring array (not a byte off= set) */ > #define ACC100_INFO_RING_MASK (ACC100_INFO_RING_NUM_ENTRIES- > 1) > /* Number of Virtual Functions ACC100 supports */ > @@ -574,6 +579,10 @@ struct __rte_cache_aligned acc100_queue { > struct acc100_device *d; > }; >=20 > +typedef void (*acc10x_fcw_ld_fill_fun_t)(struct rte_bbdev_dec_op *op, > + struct acc100_fcw_ld *fcw, > + union acc100_harq_layout_data *harq_layout); > + > /* Private data structure for each ACC100 device */ > struct acc100_device { > void *mmio_base; /**< Base address of MMIO registers (BAR0) */ > @@ -605,6 +614,8 @@ struct acc100_device { > uint16_t q_assigned_bit_map[ACC100_NUM_QGRPS]; > bool pf_device; /**< True if this is a PF ACC100 device */ > bool configured; /**< True if this ACC100 device is configured */ > + uint16_t device_variant; /**< Device variant */ > + acc10x_fcw_ld_fill_fun_t fcw_ld_fill; /**< 5GUL FCW generation > function */ > }; >=20 > /** > diff --git a/drivers/baseband/acc100/rte_acc101_pmd.h > b/drivers/baseband/acc100/rte_acc101_pmd.h > new file mode 100644 > index 0000000..8f1f4ab > --- /dev/null > +++ b/drivers/baseband/acc100/rte_acc101_pmd.h This file is internal, shouldn't we drop the rte? > @@ -0,0 +1,55 @@ > +/* SPDX-License-Identifier: BSD-3-Clause > + * Copyright(c) 2022 Intel Corporation > + */ > + > +/* ACC101 PCI vendor & device IDs */ > +#define RTE_ACC101_VENDOR_ID (0x8086) > +#define RTE_ACC101_PF_DEVICE_ID (0x57c4) > +#define RTE_ACC101_VF_DEVICE_ID (0x57c5) > + > +/* Define as 1 to use only a single FEC engine */ > +#ifndef RTE_ACC101_SINGLE_FEC > +#define RTE_ACC101_SINGLE_FEC 0 > +#endif Also the above defines should drop RTE if they are internal symbols. > + > +/* Number of Virtual Functions ACC101 supports */ > +#define ACC101_NUM_VFS 16 > +#define ACC101_NUM_QGRPS 8 > +#define ACC101_NUM_AQS 16 > +/* All ACC101 Registers alignment are 32bits =3D 4B */ > +#define ACC101_BYTES_IN_WORD 4 > + > +#define ACC101_TMPL_PRI_0 0x03020100 > +#define ACC101_TMPL_PRI_1 0x07060504 > +#define ACC101_TMPL_PRI_2 0x0b0a0908 > +#define ACC101_TMPL_PRI_3 0x0f0e0d0c > +#define ACC101_WORDS_IN_ARAM_SIZE (128 * 1024 / 4) > + > +#define ACC101_NUM_TMPL 32 > +/* Mapping of signals for the available engines */ > +#define ACC101_SIG_UL_5G 0 > +#define ACC101_SIG_UL_5G_LAST 8 > +#define ACC101_SIG_DL_5G 13 > +#define ACC101_SIG_DL_5G_LAST 15 > +#define ACC101_SIG_UL_4G 16 > +#define ACC101_SIG_UL_4G_LAST 19 > +#define ACC101_SIG_DL_4G 27 > +#define ACC101_SIG_DL_4G_LAST 31 > +#define ACC101_NUM_ACCS 5 > +#define ACC101_PF_VAL 2 > + > +/* ACC101 Configuration */ > +#define ACC101_CFG_DMA_ERROR 0x3D7 > +#define ACC101_CFG_AXI_CACHE 0x11 > +#define ACC101_CFG_QMGR_HI_P 0x0F0F > +#define ACC101_CFG_PCI_AXI 0xC003 > +#define ACC101_CFG_PCI_BRIDGE 0x40006033 > +#define ACC101_ENGINE_OFFSET 0x1000 > +#define ACC101_LONG_WAIT 1000 > +#define ACC101_GPEX_AXIMAP_NUM 17 > +#define ACC101_CLOCK_GATING_EN 0x30000 > +#define ACC101_DMA_INBOUND 0x104 > +/* DDR Size per VF - 512MB by default > + * Can be increased up to 4 GB with single PF/VF > + */ > +#define ACC101_HARQ_DDR (512 * 1) > -- > 1.8.3.1