From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-eopbgr680070.outbound.protection.outlook.com [40.107.68.70]) by dpdk.org (Postfix) with ESMTP id AC61A1B498 for ; Thu, 11 Oct 2018 12:35:43 +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=JCYhdsL6UfKGH2nIWA8qaiq9Sld2GuUf/l1bxmXgOkk=; b=GKG+eqPnChYNLvTXEBSkVBKGIPNY8sb24ostp/G9CL66u5RqXAYYyiHBOgQc8QSEhj8+Cj+0zFu0YGSR7RArQAdTXJ3FXMiFlEuMGbgqgoaBsYFLY4ed8LQCyblaowtO727DoZpWsxAxMxPtZpEVlRS6dVIXL1bkD4pfBd0HWP4= Received: from BY1PR0701MB1660.namprd07.prod.outlook.com (10.162.110.22) by BY1PR0701MB1208.namprd07.prod.outlook.com (10.160.105.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.27; Thu, 11 Oct 2018 10:35:42 +0000 Received: from BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::346d:e756:e70e:17]) by BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::346d:e756:e70e:17%3]) with mapi id 15.20.1228.020; Thu, 11 Oct 2018 10:35:42 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "ferruh.yigit@intel.com" , Pavel Belous Thread-Topic: [PATCH v5 20/23] net/atlantic: support for VLAN filters and offloads Thread-Index: AQHUYU4oRQJpHlAK10OkNlwR7bpLzg== Date: Thu, 11 Oct 2018 10:35:42 +0000 Message-ID: <275e2951a2e34edd797d8c30183c405e27e991e3.1539249721.git.igor.russkikh@aquantia.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR04CA0088.eurprd04.prod.outlook.com (2603:10a6:803:64::23) To BY1PR0701MB1660.namprd07.prod.outlook.com (2a01:111:e400:522a::22) 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; BY1PR0701MB1208; 6:77JYb73NsQUxk5NfH0qkvl2PEO8sWVNUQv6RyekTUPA0ltPnr0AmMPOke/ggVzPzPOsEmHOrFgZ8yBlMWUNSu7S770jyRb4QjEALPTcjTeFNJKSsZm1A4B3LM40q2yEuORsVRHL6zSf/FwZuUKQ4qbyPRb2gcxpXV/8V5AYjMfwM65Kgy6EuLnrJPyOTj8qFB28CKBaaUMs/HyZ6JoL2yWwceXtL3Jm6DH2vg8cKp8PZh/Dse/MANzd0lKiPyFXjV0YhNCmfyQfDf5Oxl69dotDxBMGrRdNrYEaC5Ou0rqCzBBg8hKeeYkijs5DWglMTdPGixkzvz5kxjbCKKgiPm9hKyRfK38kPrnUb29cZ8ivk7TKOYmbnPlwQBBGpLiVXpXI/1gnRtgqUJjNj7I7UEYhkrjHmHX0WzeBuSeagExvv8F1A9a3KGbxwzyCOSiwattcOzDtSdsSfjJzN3v0gBekZI3Ikhm2JLf1rQUGVQCE=; 5:2Z0D7om2v3y2LN5NcIgA4tZeyrxhyxNadDTx+ZXOmgyTt2xtbtMqO16zFnSkyJE8+2BQsRwK3Gz0cyDIuOU5N9YSssLc9b3KNXv6Scd0Ty2oGK0CTeFnfef3Cr2Lgd/sIY+G70+rDPpwdiFzW+6I3fyy5uueiUJmP6HOrPfGYnw=; 7:+FM4BohrKK2CB7/Zr+uREEzRcfWOalRq45kTcVhLVBxqxFxJ1Lopw6UkJdxcfR0ky0+I3gmR1KUcuCAYwqWUBts0Q8uxzYHQLOix9mgx9w29o7H1wE/6VgK9qkqZRY1Suzo+NP36EIwVgB2Pk6LlAnS5IfwlWvxqZjb116ipl/DxJEN2sYG0AfRYBsnFg7rI/GG/c1x7oHpfBrIgtujBlxOrsg8+/jGdzKezPMXwFadn/pgXsNXL3HjuX2d/stTy x-ms-office365-filtering-correlation-id: 1245821d-df4b-47e2-5fe9-08d62f654b13 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:BY1PR0701MB1208; x-ms-traffictypediagnostic: BY1PR0701MB1208: 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)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231355)(944501410)(52105095)(149066)(150057)(6041310)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(201708071742011)(7699051); SRVR:BY1PR0701MB1208; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0701MB1208; x-forefront-prvs: 08220FA8D6 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(39840400004)(346002)(396003)(136003)(366004)(199004)(189003)(26005)(99286004)(72206003)(478600001)(76176011)(14454004)(486006)(256004)(97736004)(14444005)(8676002)(316002)(5660300001)(8936002)(476003)(66066001)(4326008)(305945005)(11346002)(2616005)(71190400001)(6116002)(2351001)(54906003)(575784001)(86362001)(446003)(6506007)(6916009)(7736002)(386003)(25786009)(105586002)(106356001)(6512007)(2906002)(36756003)(3846002)(71200400001)(102836004)(68736007)(186003)(118296001)(5250100002)(44832011)(2501003)(81166006)(1730700003)(2900100001)(107886003)(52116002)(53936002)(6486002)(6436002)(81156014)(5640700003); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0701MB1208; H:BY1PR0701MB1660.namprd07.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: qfryaIqkmeL2oHxnYaILu1WNwbU3KRgK7kI1NVnFgvAHI4BWTS7TI8OXt35FnSVLQ9fYHeyAkzNt3sfMakc+GUUlJ96TXNKBLv+j7/iJ/BK5YckPUPbOVkmcFHupxD2KZy0FPIZFCQXOKI3m2VO5PlsZzkaKHVZqzvjfAXqMEnk5Fa/BbjHeuvQlrWjX3PZSUndYkNW46s7iz4Bt+cnFheHl8xwdWm5IuVlwjY6UVG0mqm89zTe1VwdGnAGNeaoVCs6rb/VhTYJg2zT2xQLaqeMfd/0fWMxkZEhTeHgtSLYxeuI4aT/IvLVECeFnW7wPcvIF+UDwYR0F9Ideo9Uai4FZmVqUxC8TpCpMDw5d6qw= 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: 1245821d-df4b-47e2-5fe9-08d62f654b13 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Oct 2018 10:35:42.3051 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1208 Subject: [dpdk-dev] [PATCH v5 20/23] net/atlantic: support for 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: Thu, 11 Oct 2018 10:35:44 -0000 From: Pavel Belous VLAN filters and VLAN offloads implementation. Signed-off-by: Igor Russkikh Signed-off-by: Pavel Belous --- doc/guides/nics/features/atlantic.ini | 2 + drivers/net/atlantic/atl_ethdev.c | 159 ++++++++++++++++++++++++++++++= ++++ drivers/net/atlantic/atl_types.h | 2 + 3 files changed, 163 insertions(+) diff --git a/doc/guides/nics/features/atlantic.ini b/doc/guides/nics/featur= es/atlantic.ini index cfd6ca6a1323..f9aec42d9345 100644 --- a/doc/guides/nics/features/atlantic.ini +++ b/doc/guides/nics/features/atlantic.ini @@ -16,8 +16,10 @@ Unicast MAC filter =3D Y RSS hash =3D Y RSS key update =3D Y RSS reta update =3D Y +VLAN filter =3D Y Flow control =3D Y CRC offload =3D Y +VLAN offload =3D Y L3 checksum offload =3D Y L4 checksum offload =3D Y Packet type parsing =3D Y diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_e= thdev.c index 7df740553e77..105ec0c4e121 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -50,6 +50,18 @@ 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); @@ -223,6 +235,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, @@ -1173,6 +1191,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