From patchwork Sat Apr 24 10:36:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 92104 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 8F6CBA09E4; Sat, 24 Apr 2021 12:38:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 00FB841127; Sat, 24 Apr 2021 12:38:42 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150051.outbound.protection.outlook.com [40.107.15.51]) by mails.dpdk.org (Postfix) with ESMTP id 020A2410D7 for ; Sat, 24 Apr 2021 12:38:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hhOhOE4KriNAgK8wwLnnvKe9cggfdJ4r4a4ic1hYU3Q2cM9VilU0q3tUcYAJ2/48Pcmw5JDEoA12Ht8TMPP4HeEtTU3O/AGF0Jux9GAfndRuBTj+5t/IAw10xaq56usimgUuBO7oS/X/wol+XJlxDchWV3mDHams6yXqb4WPqQSHf327MZhjTRisDm2Co2niP14FEN1HoD2EBrqiYRUjoXxJeRTNuGceZhJFUo3ZGpgvvliTquMcdmOWBJq9p3sCX5IqrQTecHPLa9cMFDduHwMPxh/gFGDYjEKq2uPr+fSxSOxzEjpkLhPbAFpNfgwpuoabYXeW7R/0IS6En0seOA== 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-SenderADCheck; bh=u0ayBmITf0khCC/YcHn4dDMF/WHCaFJYLMyP8O4Dndo=; b=SErB++kAbCNJhyXCHca/Dm71yyWJtwX2LQZPxZbJxEUehhHAdyJfzktJP58g3PJyZPAQ/hUFJqkxkCFSk/AYOgZ1f7BXqUPgDQgyGfgpgNuD4c1HVJQLOQyphJpLUyyjEWWBlpPZYGJaeHfEeg/A4k7G67SGpfuedK5viZpqZlC1KatLh5H5xZRSlkHf3149q/ePlcACLHISlGPSwVBZvvkB8khI2jgRWyH1lHq484IErw2zYIk8nH6vvHjjpN2Y1b9udlPOTu9THKw4++IqFMd5Qpb5oDwSNpbZbBIpk2VhWFidOYrSoaQjn3FIF5uE9eYNxCqOhpntCxeWp042Xw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=u0ayBmITf0khCC/YcHn4dDMF/WHCaFJYLMyP8O4Dndo=; b=a0cch5d3GHMom6e5c/T9t7ZyCYRqreXARmgwivvmUxeBtuwP3EQVvPNghYY4Mm1nYWPJKsl/ybupJcmr6zEvXUyu77/LX+NaWxVkN6iOSjN0tRL25E6rgwmslua49412EecgF75FAMx/HH196EtYTIdpNqF5nYw2RtSbPFZxQgA= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4456.eurprd04.prod.outlook.com (2603:10a6:20b:22::25) by AM6PR0402MB3895.eurprd04.prod.outlook.com (2603:10a6:209:1a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.25; Sat, 24 Apr 2021 10:38:37 +0000 Received: from AM6PR04MB4456.eurprd04.prod.outlook.com ([fe80::ad9e:a38e:e84e:bf55]) by AM6PR04MB4456.eurprd04.prod.outlook.com ([fe80::ad9e:a38e:e84e:bf55%6]) with mapi id 15.20.4065.023; Sat, 24 Apr 2021 10:38:37 +0000 From: Hemant Agrawal To: dev@dpdk.org, gakhil@marvell.com, nicolas.chautru@intel.com Cc: david.marchand@redhat.com, Hemant Agrawal Date: Sat, 24 Apr 2021 16:06:56 +0530 Message-Id: <20210424103700.8098-5-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210424103700.8098-1-hemant.agrawal@nxp.com> References: <20210413051715.26430-2-hemant.agrawal@nxp.com> <20210424103700.8098-1-hemant.agrawal@nxp.com> X-Originating-IP: [92.120.0.67] X-ClientProxiedBy: HK2PR04CA0088.apcprd04.prod.outlook.com (2603:1096:202:15::32) To AM6PR04MB4456.eurprd04.prod.outlook.com (2603:10a6:20b:22::25) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from dpdk-xeon.ap.freescale.net (92.120.0.67) by HK2PR04CA0088.apcprd04.prod.outlook.com (2603:1096:202:15::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sat, 24 Apr 2021 10:38:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ba455b5c-c012-4bb3-92ee-08d9070d1e54 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3895: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7222gVA7zCzzm+Uk/KD7kHfAeZ47GfqJS5z646qjMEs3F2JkLwLxYZKgINfT23aZkT63gBOkM8jV0bOdByd0+DCsWxiU4k/wlqyu4GsT881WyI5muvb3cW6JzE08o3N+fMzVy5cBco7tOLgNurHVg6DYcTJNpgTsvm4lPYKG2OuiVNe2w215+xTiFxhl+XmYtQ/Qmwo4CMIqvXIJKOE1MIKGAeXwTrg4nn6l28dCTlFTq/iHfgMX6MO1Oq3xIXA4mu88tFSMeevlC14AO0MQ2lra+dr/BuP+/S3d9VlBpzRHM6CtGrjEFvCBX63ADA38WWTlMb6uzV5y0wVLceeABu2j4hd1+PoN9HqwelBBahXN0gd0YdRAMGH1Arl4LTuk19qpUzTKqlpwob0OKEAzsQPU+Qw+vdq0YCSyinPQ8NAJOikWEXWgLaA1o9c1Xe2s18LKnlbOVKOgkiCc/GE+3jBpfw+IRA1jgYdXIMU+LteELxowMfm6CuJrLJzRcJwF9nhfcnNkSiPDiLGZ8fdg28GKhH9VayUNMj2cMofEHWvxW0Uhjmj5nwWqMZ/Xoj/bFXvhGgHqYU6m1I1zxD228FhYpJzbjMLzE5O+Skf34Oz2t1mUntKSQmUVFU5E0EIeXBOZBZpwul5f4l8MCnLjQdIsJM8d/KsNWr0Jy854p20= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB4456.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(396003)(136003)(376002)(366004)(346002)(8936002)(5660300002)(316002)(1076003)(8676002)(6512007)(86362001)(478600001)(38100700002)(2906002)(956004)(2616005)(38350700002)(36756003)(6666004)(186003)(83380400001)(26005)(4326008)(16526019)(6506007)(52116002)(6486002)(44832011)(66476007)(66556008)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: +PUlyDAaZx1Q38vbZeAKKf09ONGN7Y2nzxY+hq7wS278hM3TEhXtfvJqs2nWfQ2416eulYiW9YTuGnUDdo5+x9BHMABjcRyWpGnV7lPIvYutr5hzL0enEE5dtpVeSx4MQkFakGKUT+CUGe1Ag+77PSUF6ivCsE/Vvh4i7GUqosTVTCq+rO6D4D8h8arXsRbF+OWWbVKu74PKMJMYSnwVKGyZVds5SpZXWGi2cNdGLyAJlQBZkGlWWxHL+xB6OpQb4WUF63rUL54BXcczwoJZKsXIiqWVTS7xBtkxDVNdQvMhrQ+rUlZI10fGrBi3kz3EkZXSnS94AXMhPvbWNAiDrkrVuHqfs8OewBLApdFKlbaiIxUHbvb8NX0E/l5eNGEOiF95fJulQQG1BrRllwBJxB92JO3XDbPhKl2DoOmJXblk/S7E2TNdo+OK2RpH1PUIF9j34hB46yzIp3Iyl57mtPpNtv59bi6gi5ana8qTatRImrx0qn3iL+fFU+1SIOrpQ0L84QbMpGRsDKZXoSBbCTD2BtrLAMRoljgNQ1WgnGpOY+LjU4EI57IUpdQq8AZi7kKg3XFhUT+7krxN5b/pQKm19JWQ/a7cjSS+nKvYn5LS0WfSC5Q7BmAGF6CFTWXrxlxnjI5kv9ddp9Yxli4E3FryzZOlgOfWYLbD4xyei16ooTI8GS6GwWv2j9w42PcdxdHbEHtThWLFFiirotvqJKgOS8B4EuADED/x+TNVBVO+KlozMPUg9uZEvXEOKaq3lxik9rSxQllHCfY0u6B2Bfj8B+f0li7gUy23Y++5s7BC4oSSDvv0zILJ4VsMcmPz3gKY58svs8oEaP7pDYA9PFdl1N1Yp1bJg5gZwuG98aOeGDH2UWsTaNGxIGzNV2S+ZQNtYZO9gM7nbuL7lPZDPi6zCuyUyv/tVtXOlTIS/8EmeODW7Qmh/Rsuuekj+QnvmpLPbxFA3GnS/Xe0K3Xe8mAOgFU09DvKcf/9d10gKvMwJY4X+GGINDASEoMwdhPwyG6HkINEn3UyFxjjQEIQjd/bWJIZ6rh+SdZx3saaVx+C0MJqJ1zYViMnO8r15k4ScKIl28TXJq02T34e3wcrqPUqIKOAxOsJ7qGpIkhS3JWDFLcX+8EuB3G8Io2b5DLn+TBKrhhYOlw9mhQdAwgx79MM1Mag3SK1BZr2rYXbUeKHBeJM9dc6VzpBGL6l4L136Q+Aa5qUbZjlJD+y/cGjWgV0/2e6OJxQb0qiFhAdb9Fhn/wd6yDJ7vASypSi9lc8j6GzT1tr+L5xyomrUtX+pqQkvhRZL9SwljRePd9wlqRc6ISAc65ach6iNt4veAKG X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba455b5c-c012-4bb3-92ee-08d9070d1e54 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4456.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2021 10:38:37.6802 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UDrjhnNPyD8S13zD37rAAxF3eFuxXg72076kkDR7OMP0nj+VfW4KHZ0snoYhv04BzLh3rI/lXyVMD+hanwI70g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3895 Subject: [dpdk-dev] [PATCH v4 4/8] baseband/la12xx: add support for multiple modems 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 Sender: "dev" This patch add support for multiple modems by assigning a modem id as dev args in vdev creation. Signed-off-by: Hemant Agrawal --- drivers/baseband/la12xx/bbdev_la12xx.c | 64 +++++++++++++++++++--- drivers/baseband/la12xx/bbdev_la12xx.h | 56 +++++++++++++++++++ drivers/baseband/la12xx/bbdev_la12xx_ipc.h | 20 +++++++ 3 files changed, 133 insertions(+), 7 deletions(-) create mode 100644 drivers/baseband/la12xx/bbdev_la12xx.h create mode 100644 drivers/baseband/la12xx/bbdev_la12xx_ipc.h diff --git a/drivers/baseband/la12xx/bbdev_la12xx.c b/drivers/baseband/la12xx/bbdev_la12xx.c index 8886b35429..f26f3f2a08 100644 --- a/drivers/baseband/la12xx/bbdev_la12xx.c +++ b/drivers/baseband/la12xx/bbdev_la12xx.c @@ -14,6 +14,8 @@ #include #include +#include +#include #define DRIVER_NAME baseband_la12xx @@ -22,18 +24,18 @@ RTE_LOG_REGISTER(bbdev_la12xx_logtype, pmd.bb.la12xx, NOTICE); /* Initialisation params structure that can be used by LA12xx BBDEV driver */ struct bbdev_la12xx_params { uint8_t queues_num; /*< LA12xx BBDEV queues number */ + int8_t modem_id; /*< LA12xx modem instance id */ }; #define LA12XX_MAX_NB_QUEUES_ARG "max_nb_queues" +#define LA12XX_VDEV_MODEM_ID_ARG "modem" +#define LA12XX_MAX_MODEM 4 static const char * const bbdev_la12xx_valid_params[] = { LA12XX_MAX_NB_QUEUES_ARG, + LA12XX_VDEV_MODEM_ID_ARG, }; -/* private data structure */ -struct bbdev_la12xx_private { - unsigned int max_nb_queues; /**< Max number of queues */ -}; static inline int parse_u16_arg(const char *key, const char *value, void *extra_args) { @@ -52,6 +54,28 @@ parse_u16_arg(const char *key, const char *value, void *extra_args) return 0; } +/* Parse integer from integer argument */ +static int +parse_integer_arg(const char *key __rte_unused, + const char *value, void *extra_args) +{ + int i; + char *end; + + errno = 0; + + i = strtol(value, &end, 10); + if (*end != 0 || errno != 0 || i < 0 || i > LA12XX_MAX_MODEM) { + rte_bbdev_log(ERR, "Supported Port IDS are 0 to %d", + LA12XX_MAX_MODEM - 1); + return -EINVAL; + } + + *((uint32_t *)extra_args) = i; + + return 0; +} + /* Parse parameters used to create device */ static int parse_bbdev_la12xx_params(struct bbdev_la12xx_params *params, @@ -73,6 +97,16 @@ parse_bbdev_la12xx_params(struct bbdev_la12xx_params *params, if (ret < 0) goto exit; + ret = rte_kvargs_process(kvlist, + bbdev_la12xx_valid_params[1], + &parse_integer_arg, + ¶ms->modem_id); + + if (params->modem_id >= LA12XX_MAX_MODEM) { + rte_bbdev_log(ERR, "Invalid modem id, must be < %u", + LA12XX_MAX_MODEM); + goto exit; + } } exit: @@ -84,10 +118,11 @@ parse_bbdev_la12xx_params(struct bbdev_la12xx_params *params, /* Create device */ static int la12xx_bbdev_create(struct rte_vdev_device *vdev, - struct bbdev_la12xx_params *init_params __rte_unused) + struct bbdev_la12xx_params *init_params) { struct rte_bbdev *bbdev; const char *name = rte_vdev_device_name(vdev); + struct bbdev_la12xx_private *priv; PMD_INIT_FUNC_TRACE(); @@ -103,6 +138,20 @@ la12xx_bbdev_create(struct rte_vdev_device *vdev, return -ENOMEM; } + priv = bbdev->data->dev_private; + priv->modem_id = init_params->modem_id; + /* if modem id is not configured */ + if (priv->modem_id == -1) + priv->modem_id = bbdev->data->dev_id; + + /* Reset Global variables */ + priv->num_ldpc_enc_queues = 0; + priv->num_ldpc_dec_queues = 0; + priv->num_valid_queues = 0; + priv->max_nb_queues = init_params->queues_num; + + rte_bbdev_log(INFO, "Setting Up %s: DevId=%d, ModemId=%d", + name, bbdev->data->dev_id, priv->modem_id); bbdev->dev_ops = NULL; bbdev->device = &vdev->device; bbdev->data->socket_id = 0; @@ -122,7 +171,7 @@ static int la12xx_bbdev_probe(struct rte_vdev_device *vdev) { struct bbdev_la12xx_params init_params = { - 8 + 8, -1, }; const char *name; const char *input_args; @@ -174,4 +223,5 @@ static struct rte_vdev_driver bbdev_la12xx_pmd_drv = { RTE_PMD_REGISTER_VDEV(DRIVER_NAME, bbdev_la12xx_pmd_drv); RTE_PMD_REGISTER_PARAM_STRING(DRIVER_NAME, - LA12XX_MAX_NB_QUEUES_ARG"="); + LA12XX_MAX_NB_QUEUES_ARG"=" + LA12XX_VDEV_MODEM_ID_ARG "= "); diff --git a/drivers/baseband/la12xx/bbdev_la12xx.h b/drivers/baseband/la12xx/bbdev_la12xx.h new file mode 100644 index 0000000000..5228502331 --- /dev/null +++ b/drivers/baseband/la12xx/bbdev_la12xx.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2020-2021 NXP + */ + +#ifndef __BBDEV_LA12XX_H__ +#define __BBDEV_LA12XX_H__ + +#define BBDEV_IPC_ENC_OP_TYPE 1 +#define BBDEV_IPC_DEC_OP_TYPE 2 + +#define MAX_LDPC_ENC_FECA_QUEUES 4 +#define MAX_LDPC_DEC_FECA_QUEUES 4 + +#define MAX_CHANNEL_DEPTH 16 +/* private data structure */ +struct bbdev_la12xx_private { + void *ipc_priv; + uint8_t num_valid_queues; + uint8_t max_nb_queues; + uint8_t num_ldpc_enc_queues; + uint8_t num_ldpc_dec_queues; + int8_t modem_id; + struct bbdev_la12xx_q_priv *queues_priv[32]; +}; + +struct hugepage_info { + void *vaddr; + phys_addr_t paddr; + size_t len; +}; + +struct bbdev_la12xx_q_priv { + struct bbdev_la12xx_private *bbdev_priv; + uint32_t q_id; /**< Channel ID */ + uint32_t feca_blk_id; /** FECA block ID for processing */ + uint32_t feca_blk_id_be32; /**< FECA Block ID for this queue */ + uint8_t en_napi; /* 0: napi disabled, 1: napi enabled */ + uint16_t queue_size; /**< Queue depth */ + int32_t eventfd; /**< Event FD value */ + enum rte_bbdev_op_type op_type; /**< Operation type */ + uint32_t la12xx_core_id; + /* LA12xx core ID on which this will be scheduled */ + struct rte_mempool *mp; /**< Pool from where buffers would be cut */ + void *bbdev_op[MAX_CHANNEL_DEPTH]; + /**< Stores bbdev op for each index */ + void *msg_ch_vaddr[MAX_CHANNEL_DEPTH]; + /**< Stores msg channel addr for modem->host */ + uint32_t host_pi; /**< Producer_Index for HOST->MODEM */ + uint32_t host_ci; /**< Consumer Index for MODEM->HOST */ + host_ipc_params_t *host_params; /**< Host parameters */ +}; + +#define lower_32_bits(x) ((uint32_t)((uint64_t)x)) +#define upper_32_bits(x) ((uint32_t)(((uint64_t)(x) >> 16) >> 16)) + +#endif diff --git a/drivers/baseband/la12xx/bbdev_la12xx_ipc.h b/drivers/baseband/la12xx/bbdev_la12xx_ipc.h new file mode 100644 index 0000000000..9aa5562981 --- /dev/null +++ b/drivers/baseband/la12xx/bbdev_la12xx_ipc.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2020-2021 NXP + */ +#ifndef __BBDEV_LA12XX_IPC_H__ +#define __BBDEV_LA12XX_IPC_H__ + +/** No. of max channel per instance */ +#define IPC_MAX_DEPTH (16) + +/* This shared memory would be on the host side which have copy of some + * of the parameters which are also part of Shared BD ring. Read access + * of these parameters from the host side would not be over PCI. + */ +typedef struct host_ipc_params { + volatile uint32_t pi; + volatile uint32_t ci; + volatile uint32_t modem_ptr[IPC_MAX_DEPTH]; +} __rte_packed host_ipc_params_t; + +#endif