From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7E2E6A052A; Wed, 23 Dec 2020 10:42:45 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3D3CECB33; Wed, 23 Dec 2020 10:41:40 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 42862CA8F for ; Wed, 23 Dec 2020 10:41:38 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0BN9V44I002511 for ; Wed, 23 Dec 2020 01:41:37 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0220; bh=MOC9sjWZiJ60p1OOV/gOxn0qidTd0UCdRbJD97MJsi8=; b=jWvyLXSlO7HfzA/B++ul5iAfTRaH24/VGUjOrfEW55o/4gNqFVY8Uy97rkdiED5hu7eA 6YfCpUoyf40jw58QbZZpqf8iHFKdwfuAzP0T+k8L7BTxByT9GPkbus/YtQuMfNZWz9Vs H7O6kO//vhmJT3OutujpgCG5iCjoaijsikF0yPfQXLV8+Rj4McrsLWwhu1xaty/2jGW5 FePACrzRUZKz8PUWeaOalNnLcz+bzP1ES/F6Q3dPrsTvIg63wrtCQ1Y+D/XylZc64est gQ7t1UB0PPZS8x9m5+MN2bQ8SrpviaQOkRsvfP3N5GzkXl1r5xsw4QcFlfpBzgKKgkyL ww== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0b-0016f401.pphosted.com with ESMTP id 35k0hx5n82-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 23 Dec 2020 01:41:37 -0800 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 23 Dec 2020 01:41:36 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.105) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Wed, 23 Dec 2020 01:41:35 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z1zpmiqwoIm6XOAV6dBioASEwSFFDe+dMQuHMFZEAN+ik1X9yNPO030cwMz3G5KXlMekAoVLmU6OWqiy/3xG5F8sRNCrIxc/TCFaLXOpGR+mCEWNT+4JfK/pZU3/iHBPJ2vI9J+ptdNntWCcNq/fh9q5BdaERfb5Q3BjJtdZhG1t1ZPt7uDIjoMGlhBQyLZYkf70CEloFEkiV6yqaI4iCjYLAu7IhaU2B5hceaAIQ3LYlAOT9GkK/yJSzU5IJCfS0P3FdIQTHNseUEh9oggokPTwypb9LXR60998t9yOKBI1U43C5vO68Fuhpa7BLsLlOwda8qXP42mxaUUOFKpxFA== 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=MOC9sjWZiJ60p1OOV/gOxn0qidTd0UCdRbJD97MJsi8=; b=HeyIDhWHQBZ2wfvcZzlDzIILOcW0K/Q3RZ4V/mq4Jimbew4bv/dqAO5cPd27/Vw+FC/ELyH0c3QHbNAC4WD8vm4RnMup9of4SnDSE7OoKDjG8qvDiZOtfhFo/6OZYnDoZg7mickiJhYia1D/rchKGDzljIoMWZ3EZP6UYXleyPOLtKXhHIztu3s8spwqUFRRpW8Oqr4mtncYLypDMC1Pfuk17lzsvu7P1LpnygBQHv/4sn6Qsyi758zCbZFLntgOalmcG8AoRMFslym+Cfz42O0R4px2WdYmap0gK3fyAwNpKzGubdntvfOKBHrP4qwh3+brFdB0zkMHQfFvhhLtJQ== 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=MOC9sjWZiJ60p1OOV/gOxn0qidTd0UCdRbJD97MJsi8=; b=axHGg+xKCEAY3uZ0sIZz6QJ4OY3UnvYbNRm08KIiNbfLkjMqbjrt16/e2T/iOeWC39m99wqv5V+zHgN5wGgyuS2mM/DcLsljt6/q8cPCQwALFGAWbzk/ERAO3tWaMOu+aIIkjoVykyY7yVTHocveNvg+IyFjtc20kQLW4/Ch7dU= Received: from DM5PR1801MB2058.namprd18.prod.outlook.com (2603:10b6:4:67::31) by DM6PR18MB3603.namprd18.prod.outlook.com (2603:10b6:5:2a5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3700.27; Wed, 23 Dec 2020 09:41:35 +0000 Received: from DM5PR1801MB2058.namprd18.prod.outlook.com ([fe80::303b:5c79:93c7:b432]) by DM5PR1801MB2058.namprd18.prod.outlook.com ([fe80::303b:5c79:93c7:b432%7]) with mapi id 15.20.3676.033; Wed, 23 Dec 2020 09:41:35 +0000 From: Michael Shamis To: Liron Himi , Jerin Jacob Kollanukkaran CC: "dev@dpdk.org" , Yuri Chipchev , "Liron Himi" Thread-Topic: [dpdk-dev] [PATCH v1 12/38] net/mvpp2: save initial configuration Thread-Index: AQHWyJRJjkn1iBepHk+E5s0/W38Hz6oEjmrQ Date: Wed, 23 Dec 2020 09:41:35 +0000 Message-ID: References: <20201202101212.4717-1-lironh@marvell.com> <20201202101212.4717-13-lironh@marvell.com> In-Reply-To: <20201202101212.4717-13-lironh@marvell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [83.130.154.133] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a8be9c75-8fcb-4b54-70fb-08d8a726f021 x-ms-traffictypediagnostic: DM6PR18MB3603: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:826; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: u6k6Ck3Xwa8LgAqWYi9Yu9E2PaOtOi9BVHS/kx8TkHb3EGINCDpsyNGvMGEykoVF/Ko+lW3tebfnLPWHrKm9ehh+7qVQhBHAE7CM9wvH9cV+0h58GDD3lDYobm01ywgnHAM/sTPH4KQZg4zOyZvIsKAuX0aWpbgNPVWtX50fHq8SoOJCu7eeM/JFKyFoZk1OtXM75FTfNhwMk0rApUDwJ9lLbOEIgeNDcGMNaMGDwI6J3xKP1U/4xibXYbUMPS4jtsButPX7+2XXWRdU032qLeWs7PBGvcZDxEemIYHEyHAh6mZXy2d1RyaXISTy1UF3nH8VHj2r26bzW9EQVReXq5YP9ATUMGy76nwHaLkzdBigwZmOgfL6j1br22zdMzI2K6IkKTjo7MF09hDTSXiByQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR1801MB2058.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(39860400002)(346002)(366004)(376002)(396003)(66446008)(53546011)(54906003)(66556008)(52536014)(66476007)(66946007)(4326008)(5660300002)(64756008)(107886003)(33656002)(8676002)(9686003)(6506007)(76116006)(55016002)(6636002)(86362001)(71200400001)(478600001)(7696005)(186003)(2906002)(110136005)(316002)(83380400001)(26005)(8936002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?bod9UmaIPTCtP8GN5xEtpxBYGOtqTZKqZAlzgpEZQipFATHysKk9JsZ/KpIy?= =?us-ascii?Q?JCGaNOpGxmmTA2jd63lnKwK+BjQXWwP7rNwcgIgOg7+mEnxdb+MyTDXFOp8+?= =?us-ascii?Q?M/SYao2keWJMriPVm/zPiIZoH2eEcvj/JtLvUAtvjU2rari6wGwJqq/qXdzi?= =?us-ascii?Q?gdTiWNaQbrN6kO4bFDUC5RK8wIK/vYc5p9CixEXkcxTPtXwoXunbVl2D/kZD?= =?us-ascii?Q?XS92Sb92W3f2vRnsiAl+HAaXqqEvgQNowpR3z0y1igPjs/4uUkCX0wEhhF7F?= =?us-ascii?Q?Tyt4cd/S0I+3foo9jcmF/7BajrdvyGzfsBGandIQ4wExVEkJC7Lv/3pIYMy3?= =?us-ascii?Q?IwI4GkzCHSmnW3U1cbDxtGAsCpmlIOPsWfPGfbmXzNQ6l+KWQaKnq8Z2xWGv?= =?us-ascii?Q?rXSpHTeGOLhw1VwRV8/L0tq0r46q6+XqTzwX5DZH632hTha8vFr/tdsppoE4?= =?us-ascii?Q?e8+By7di61Pxc2p3oCfqypt9xQO+fZuWHIzJSvf2834zwTPAcgFzfUsySjNG?= =?us-ascii?Q?fWCzRcP+3/sCN0+7QTEdGpVsv4YjsVeORyEWBbrVQTf/D7AUV5TEWCBbQgvU?= =?us-ascii?Q?Wcbd4aXCBKCU6CZzqKlxaJiX0d6Ibunc6nlMcYKj3zwbGKcbNnUsrj5S8m9K?= =?us-ascii?Q?ZcU/CYpRbaDU2xeS0xxVaVcntehJsdA3q1at6vAqC7M4VDcxLe5mCF7hb+Qv?= =?us-ascii?Q?Wt4Oku8oYRv1m4PcPS1/nSrP1RtGruJb5rqS42zKez7LwHKQf4xfafQqKbTY?= =?us-ascii?Q?1mB0bc3+bpsS8hRZk0FSbHPUmybb7yBPjALSvOl6w6mezkpnz3OO4qpJVXX7?= =?us-ascii?Q?1gqoVidL5hXKf2GnJ4codeTWB2pWIRVUAVYO5UhXXddZS9j1XimqEW4QSLCU?= =?us-ascii?Q?VC6s7ezWcS9eIJp54Wk1c0PUtj7SOcpRYk3y5D0RWZmxfIy5XVMUZIQy4rO6?= =?us-ascii?Q?R9Pjs0Gcx57RpuzUo5hade401mPMElRT1U3IQ7UDB0Y=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM5PR1801MB2058.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8be9c75-8fcb-4b54-70fb-08d8a726f021 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Dec 2020 09:41:35.0555 (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: t31dVWjKUGglFo3juTh4+JJie5QPpK0NZm2SOlVm3kMOoYUuasf3+eq27t33IYaZ4okwrHq3QvWJbwRiMRplxw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB3603 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343, 18.0.737 definitions=2020-12-23_04:2020-12-21, 2020-12-23 signatures=0 Subject: Re: [dpdk-dev] [PATCH v1 12/38] net/mvpp2: save initial configuration X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" Reviewed-by: Michael Shamis -----Original Message----- From: dev On Behalf Of lironh@marvell.com Sent: Wednesday, December 2, 2020 12:12 PM To: Jerin Jacob Kollanukkaran Cc: dev@dpdk.org; Yuri Chipchev ; Liron Himi Subject: [dpdk-dev] [PATCH v1 12/38] net/mvpp2: save initial configuration From: Yuri Chipchev save configuration that was done prior 'start' as only then the ppio is bei= ng configured. Signed-off-by: Yuri Chipchev Reviewed-by: Liron Himi --- drivers/net/mvpp2/mrvl_ethdev.c | 107 +++++++++++++++++++++++++++----- 1 file changed, 92 insertions(+), 15 deletions(-) diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethde= v.c index 76847b303..c70a8fe93 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2017 Marvell International Ltd. - * Copyright(c) 2017 Semihalf. + * Copyright(c) 2018 Marvell International Ltd. + * Copyright(c) 2018 Semihalf. * All rights reserved. */ =20 @@ -146,6 +146,15 @@ static int rte_pmd_mrvl_remove(struct rte_vdev_device = *vdev); static void mrvl_deinit_pp2(void); static void mrvl_deinit_hifs(v= oid); =20 +static int +mrvl_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr= , + uint32_t index, uint32_t vmdq __rte_unused); static int=20 +mrvl_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr=20 +*mac_addr); static int mrvl_vlan_filter_set(struct rte_eth_dev *dev,=20 +uint16_t vlan_id, int on); static int mrvl_promiscuous_enable(struct=20 +rte_eth_dev *dev); static int mrvl_allmulticast_enable(struct=20 +rte_eth_dev *dev); =20 #define MRVL_XSTATS_TBL_ENTRY(name) { \ #name, offsetof(struct pp2_ppio_statistics, name), \ @@ -402,8 +411,12 @@ mrvl_dev_configure(struct rte_eth_dev *dev) return 0; } =20 - return mrvl_configure_rss(priv, - &dev->data->dev_conf.rx_adv_conf.rss_conf); + ret =3D mrvl_configure_rss(priv, + &dev->data->dev_conf.rx_adv_conf.rss_conf); + if (ret < 0) + return ret; + + return 0; } =20 /** @@ -490,8 +503,10 @@ mrvl_dev_set_link_up(struct rte_eth_dev *dev) struct mrvl_priv *priv =3D dev->data->dev_private; int ret; =20 - if (!priv->ppio) - return -EPERM; + if (!priv->ppio) { + dev->data->dev_link.link_status =3D ETH_LINK_UP; + return 0; + } =20 ret =3D pp2_ppio_enable(priv->ppio); if (ret) @@ -505,10 +520,13 @@ mrvl_dev_set_link_up(struct rte_eth_dev *dev) * Set mtu to default DPDK value here. */ ret =3D mrvl_mtu_set(dev, dev->data->mtu); - if (ret) + if (ret) { pp2_ppio_disable(priv->ppio); + return ret; + } =20 - return ret; + dev->data->dev_link.link_status =3D ETH_LINK_UP; + return 0; } =20 /** @@ -524,11 +542,18 @@ static int mrvl_dev_set_link_down(struct rte_eth_dev *dev) { struct mrvl_priv *priv =3D dev->data->dev_private; + int ret; =20 - if (!priv->ppio) - return -EPERM; + if (!priv->ppio) { + dev->data->dev_link.link_status =3D ETH_LINK_DOWN; + return 0; + } + ret =3D pp2_ppio_disable(priv->ppio); + if (ret) + return ret; =20 - return pp2_ppio_disable(priv->ppio); + dev->data->dev_link.link_status =3D ETH_LINK_DOWN; + return 0; } =20 /** @@ -610,6 +635,9 @@ mrvl_dev_start(struct rte_eth_dev *dev) struct mrvl_priv *priv =3D dev->data->dev_private; char match[MRVL_MATCH_LEN]; int ret =3D 0, i, def_init_size; + uint32_t j; + struct rte_vlan_filter_conf *vfc; + struct rte_ether_addr *mac_addr; =20 if (priv->ppio) return mrvl_dev_set_link_up(dev); @@ -687,6 +715,47 @@ mrvl_dev_start(struct rte_eth_dev *dev) if (ret) MRVL_LOG(ERR, "Failed to set MTU to %d", dev->data->mtu); =20 + if (!rte_is_zero_ether_addr(&dev->data->mac_addrs[0])) + mrvl_mac_addr_set(dev, &dev->data->mac_addrs[0]); + + for (i =3D 1; i < MRVL_MAC_ADDRS_MAX; i++) { + mac_addr =3D &dev->data->mac_addrs[i]; + + /* skip zero address */ + if (rte_is_zero_ether_addr(mac_addr)) + continue; + + mrvl_mac_addr_add(dev, mac_addr, i, 0); + } + + if (dev->data->all_multicast =3D=3D 1) + mrvl_allmulticast_enable(dev); + + vfc =3D &dev->data->vlan_filter_conf; + for (j =3D 0; j < RTE_DIM(vfc->ids); j++) { + uint64_t vlan; + uint64_t vbit; + uint64_t ids =3D vfc->ids[j]; + + if (ids =3D=3D 0) + continue; + + while (ids) { + vlan =3D 64 * j; + /* count trailing zeroes */ + vbit =3D ~ids & (ids - 1); + /* clear least significant bit set */ + ids ^=3D (ids ^ (ids - 1)) ^ vbit; + for (; vbit; vlan++) + vbit >>=3D 1; + ret =3D mrvl_vlan_filter_set(dev, vlan, 1); + if (ret) { + MRVL_LOG(ERR, "Failed to setup VLAN filter\n"); + goto out; + } + } + } + /* For default QoS config, don't start classifier. */ if (mrvl_qos_cfg && mrvl_qos_cfg->port[dev->data->port_id].use_global_defaults =3D=3D 0) = { @@ -697,10 +766,16 @@ mrvl_dev_start(struct rte_eth_dev *dev) } } =20 - ret =3D mrvl_dev_set_link_up(dev); - if (ret) { - MRVL_LOG(ERR, "Failed to set link up"); - goto out; + if (dev->data->promiscuous =3D=3D 1) + mrvl_promiscuous_enable(dev); + + if (dev->data->dev_link.link_status =3D=3D ETH_LINK_UP) { + ret =3D mrvl_dev_set_link_up(dev); + if (ret) { + MRVL_LOG(ERR, "Failed to set link up"); + dev->data->dev_link.link_status =3D ETH_LINK_DOWN; + goto out; + } } =20 /* start tx queues */ @@ -2963,6 +3038,8 @@ mrvl_eth_dev_create(struct rte_vdev_device *vdev, con= st char *name) eth_dev->dev_ops =3D &mrvl_ops; eth_dev->data->dev_flags |=3D RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; =20 + eth_dev->data->dev_link.link_status =3D ETH_LINK_UP; + rte_eth_dev_probing_finish(eth_dev); return 0; out_free: -- 2.28.0