From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0078.outbound.protection.outlook.com [104.47.32.78]) by dpdk.org (Postfix) with ESMTP id 92AAA1B441 for ; Tue, 9 Oct 2018 11:32:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M3WgKl7toYyFPz4Yyq1gyhdEtGFIksvIKj0/Wzbjcp0=; b=owGENuNiOCJUWzmHww9yUVSBBUkVxoYKx5+3bKrmkre1RgJI5lOZuPlGr4dB8aURemDzY9tsKWjXdD15W83iMEWs2olu1ngMabPJIr2unhH4PAY8OA17xDxWddKVR7R6h5/5+1OgHekk04A/mx0C4fYfj9QC1W3cTpgPB+D2znM= Received: from BLUPR0701MB1651.namprd07.prod.outlook.com (10.163.84.21) by BLUPR0701MB1650.namprd07.prod.outlook.com (10.163.84.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.23; Tue, 9 Oct 2018 09:32:00 +0000 Received: from BLUPR0701MB1651.namprd07.prod.outlook.com ([fe80::7c97:1527:4c0:8b46]) by BLUPR0701MB1651.namprd07.prod.outlook.com ([fe80::7c97:1527:4c0:8b46%3]) with mapi id 15.20.1207.024; Tue, 9 Oct 2018 09:32:00 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "ferruh.yigit@intel.com" , Pavel Belous Thread-Topic: [PATCH v4 18/22] net/atlantic: VLAN filters and offloads Thread-Index: AQHUX7LtCPef3Zx1lkaaGAYkrL1JqA== Date: Tue, 9 Oct 2018 09:32:00 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR01CA0028.eurprd01.prod.exchangelabs.com (2603:10a6:208:69::41) To BLUPR0701MB1651.namprd07.prod.outlook.com (2a01:111:e400:58c6::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BLUPR0701MB1650; 6:YZuPRSDHus6NUBUamjPZS9ZVFbAxHI+xXODc+FX08B9ARhDjFT1jYNJBFCNEpqPleS4t/cWlP31x5RnxHi5SBhSoeNNp09HIcVSrpB1x8DRqEs6zV/FD3FLL/+r7SUR3oqcnYG5u7+6THq9xuQlhPbWb9Ol8hTfW+QEPE1VNp44ml7la+F/tn+BQax15I5qXBTTIH7flEdbjEaKkn1Kyx8GsuQCMO36L8GojbTamqFpZYTX6485+fi+fjVhYbQyKOmv7wX19VQZk2bjrkvaHU1M6FmHWprqzllwrnLlSkcOPlWh+FsSjlmTA1lVPcjdLHGuxlj3SO8cBezCEdi2YOIK5klXurIUB58tVWbsNrAO/Y9cm1/XLiRHOuz5jo6zrM3Jo+hmKL7DCRwjLa8LVoj0is7E92gY4kKVQpbm6PnhnwDUIU5Bn+Y69PcaU3euh1BkrXG1T2PHVbWYK/prQaw==; 5:Ee8QS3Ogzk/bN1CPVkDFHQyK3WDF4xvCqW2hZ4Cgt2KeaJSzGPbn99biUsB30Yc8LlGri2Lv0NW7AIRLhQiRduBZsZHcMShyD5CgaKjc8JZpqGMmpYAyTrhcZqfiN3ZNdvV0XPGhIcFxAVvE8DG0DN+CvZiTlVYHSvKIPJd4TSM=; 7:jOllt8wSXoCaxBhEti9c5wyohfmGCPAR8cziwu8ckxpq0vqVsPsJXGjLVUPM4hkXw9wnXv4UraWWb8V6Aba/qmrxgefVMlKdZI5OZER2FWgDl1zYS8avowV3/bkQh+qhkvaPrZdTgbiemqpTFvHm8MfowtCIoBKgQXiLbwQZT2BhhQTV1h1h/Km6FZhKlMQqOeUrToWna1r/HaxQ5lK4eppM9yvxrRpUUDPRtwVF/k2JLGGWWWBiuLCiXyFD4wR9 x-ms-office365-filtering-correlation-id: c3181cd9-d55f-4629-3b0b-08d62dca1039 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:BLUPR0701MB1650; x-ms-traffictypediagnostic: BLUPR0701MB1650: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(10201501046)(3231355)(944501410)(52105095)(93006095)(93001095)(3002001)(149066)(150057)(6041310)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(201708071742011)(7699051); SRVR:BLUPR0701MB1650; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0701MB1650; x-forefront-prvs: 08200063E9 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(39850400004)(346002)(376002)(396003)(136003)(189003)(199004)(81156014)(5640700003)(6116002)(71200400001)(105586002)(68736007)(316002)(3846002)(107886003)(71190400001)(26005)(118296001)(2616005)(5250100002)(25786009)(4326008)(102836004)(44832011)(446003)(476003)(11346002)(186003)(2906002)(106356001)(97736004)(2501003)(2351001)(486006)(478600001)(99286004)(53936002)(386003)(1730700003)(5660300001)(6506007)(36756003)(66066001)(54906003)(305945005)(256004)(14444005)(86362001)(575784001)(7736002)(2900100001)(76176011)(8936002)(52116002)(8676002)(6486002)(72206003)(6436002)(14454004)(81166006)(6512007)(6916009); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB1650; H:BLUPR0701MB1651.namprd07.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: ikuiI58dxw2jMQYNwCRhOwjGjP3e4oyEcySmLKR5Qs9n3FFV/BhB0URAYZI7vCvDGVugmJewqoR78DX+1H3VSjaLcy7DiQkOKrwKmky4ItpMD/CXqQSkFM8CMFR/C4fIYV3KxnhaEoD8k7Nvm/cYVLwHxGXbkraeMdz0nDvlKwJqQqCEsQ310JWLNjJOinf44wHlm2aCt0iP1Q1RWTU5/SzZ/QIY8f94yU2NRhjPMwoovX4Vnt1Hoc3tzcVtG+L1Ba0KkRfL7JFJ8ajTqPrxa0CW5vC9hJF2DLrcTOupSagpmQ5p6vIg7QfEm9M334OOLUuKro81kfN0pnItlcAaAwiMU4PafSC3Pxjw3+fW194= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3181cd9-d55f-4629-3b0b-08d62dca1039 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Oct 2018 09:32:00.1886 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0701MB1650 Subject: [dpdk-dev] [PATCH v4 18/22] net/atlantic: VLAN filters and offloads 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: , X-List-Received-Date: Tue, 09 Oct 2018 09:32:02 -0000 From: Pavel Belous Signed-off-by: Igor Russkikh Signed-off-by: Pavel Belous --- drivers/net/atlantic/atl_ethdev.c | 161 ++++++++++++++++++++++++++++++++++= ++++ drivers/net/atlantic/atl_types.h | 2 + 2 files changed, 163 insertions(+) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_e= thdev.c index 3f0d2e26d7da..46377b482ab2 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -56,6 +56,20 @@ static const uint32_t *atl_dev_supported_ptypes_get(stru= ct rte_eth_dev *dev); =20 static int atl_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); =20 + +/* VLAN stuff */ +static int atl_vlan_filter_set(struct rte_eth_dev *dev, + uint16_t vlan_id, int on); + +static int atl_vlan_offload_set(struct rte_eth_dev *dev, int mask); + +static void atl_vlan_strip_queue_set(struct rte_eth_dev *dev, + uint16_t queue_id, int on); + +static int atl_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, uint16_t tpid); + + /* Flow control */ static int atl_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf); @@ -230,6 +244,12 @@ static const struct eth_dev_ops atl_eth_dev_ops =3D { =20 .mtu_set =3D atl_dev_mtu_set, =20 + /* VLAN */ + .vlan_filter_set =3D atl_vlan_filter_set, + .vlan_offload_set =3D atl_vlan_offload_set, + .vlan_tpid_set =3D atl_vlan_tpid_set, + .vlan_strip_queue_set =3D atl_vlan_strip_queue_set, + /* Queue Control */ .rx_queue_start =3D atl_rx_queue_start, .rx_queue_stop =3D atl_rx_queue_stop, @@ -1265,6 +1285,147 @@ atl_dev_mtu_set(struct rte_eth_dev *dev, uint16_t m= tu) } =20 static int +atl_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) +{ + struct aq_hw_cfg_s *cfg =3D + ATL_DEV_PRIVATE_TO_CFG(dev->data->dev_private); + struct aq_hw_s *hw =3D ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private); + int err =3D 0; + int i =3D 0; + + PMD_INIT_FUNC_TRACE(); + + for (i =3D 0; i < HW_ATL_B0_MAX_VLAN_IDS; i++) { + if (cfg->vlan_filter[i] =3D=3D vlan_id) { + if (!on) { + /* Disable VLAN filter. */ + hw_atl_rpf_vlan_flr_en_set(hw, 0U, i); + + /* Clear VLAN filter entry */ + cfg->vlan_filter[i] =3D 0; + } + break; + } + } + + /* VLAN_ID was not found. So, nothing to delete. */ + if (i =3D=3D HW_ATL_B0_MAX_VLAN_IDS && !on) + goto exit; + + /* VLAN_ID already exist, or already removed above. Nothing to do. */ + if (i !=3D HW_ATL_B0_MAX_VLAN_IDS) + goto exit; + + /* Try to found free VLAN filter to add new VLAN_ID */ + for (i =3D 0; i < HW_ATL_B0_MAX_VLAN_IDS; i++) { + if (cfg->vlan_filter[i] =3D=3D 0) + break; + } + + if (i =3D=3D HW_ATL_B0_MAX_VLAN_IDS) { + /* We have no free VLAN filter to add new VLAN_ID*/ + err =3D -ENOMEM; + goto exit; + } + + cfg->vlan_filter[i] =3D vlan_id; + hw_atl_rpf_vlan_flr_act_set(hw, 1U, i); + hw_atl_rpf_vlan_id_flr_set(hw, vlan_id, i); + hw_atl_rpf_vlan_flr_en_set(hw, 1U, i); + +exit: + /* Enable VLAN promisc mode if vlan_filter empty */ + for (i =3D 0; i < HW_ATL_B0_MAX_VLAN_IDS; i++) { + if (cfg->vlan_filter[i] !=3D 0) + break; + } + + hw_atl_rpf_vlan_prom_mode_en_set(hw, i =3D=3D HW_ATL_B0_MAX_VLAN_IDS); + + return err; +} + +static int +atl_enable_vlan_filter(struct rte_eth_dev *dev, int en) +{ + struct aq_hw_s *hw =3D ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct aq_hw_cfg_s *cfg =3D + ATL_DEV_PRIVATE_TO_CFG(dev->data->dev_private); + int i; + + PMD_INIT_FUNC_TRACE(); + + for (i =3D 0; i < HW_ATL_B0_MAX_VLAN_IDS; i++) { + if (cfg->vlan_filter[i]) + hw_atl_rpf_vlan_flr_en_set(hw, en, i); + } + return 0; +} + +static int +atl_vlan_offload_set(struct rte_eth_dev *dev, int mask) +{ + struct aq_hw_cfg_s *cfg =3D + ATL_DEV_PRIVATE_TO_CFG(dev->data->dev_private); + struct aq_hw_s *hw =3D ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private); + int ret =3D 0; + int i; + + PMD_INIT_FUNC_TRACE(); + + ret =3D atl_enable_vlan_filter(dev, mask & ETH_VLAN_FILTER_MASK); + + cfg->vlan_strip =3D !!(mask & ETH_VLAN_STRIP_MASK); + + for (i =3D 0; i < dev->data->nb_rx_queues; i++) + hw_atl_rpo_rx_desc_vlan_stripping_set(hw, cfg->vlan_strip, i); + + if (mask & ETH_VLAN_EXTEND_MASK) + ret =3D -ENOTSUP; + + return ret; +} + +static int +atl_vlan_tpid_set(struct rte_eth_dev *dev, enum rte_vlan_type vlan_type, + uint16_t tpid) +{ + struct aq_hw_s *hw =3D ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private); + int err =3D 0; + + PMD_INIT_FUNC_TRACE(); + + switch (vlan_type) { + case ETH_VLAN_TYPE_INNER: + hw_atl_rpf_vlan_inner_etht_set(hw, tpid); + break; + case ETH_VLAN_TYPE_OUTER: + hw_atl_rpf_vlan_outer_etht_set(hw, tpid); + break; + default: + PMD_DRV_LOG(ERR, "Unsupported VLAN type"); + err =3D -ENOTSUP; + } + + return err; +} + +static void +atl_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue_id, int o= n) +{ + struct aq_hw_s *hw =3D ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private); + + PMD_INIT_FUNC_TRACE(); + + if (queue_id > dev->data->nb_rx_queues) { + PMD_DRV_LOG(ERR, "Invalid queue id"); + return; + } + + hw_atl_rpo_rx_desc_vlan_stripping_set(hw, on, queue_id); +} + +static int atl_dev_set_mc_addr_list(struct rte_eth_dev *dev, struct ether_addr *mc_addr_set, uint32_t nb_mc_addr) diff --git a/drivers/net/atlantic/atl_types.h b/drivers/net/atlantic/atl_ty= pes.h index 56887b14d6f8..3d90f6caefc2 100644 --- a/drivers/net/atlantic/atl_types.h +++ b/drivers/net/atlantic/atl_types.h @@ -70,6 +70,8 @@ struct aq_hw_cfg_s { int irq_mask; unsigned int vecs; =20 + bool vlan_strip; + uint32_t vlan_filter[HW_ATL_B0_MAX_VLAN_IDS]; uint32_t flow_control; =20 struct aq_rss_parameters aq_rss; --=20 2.7.4