From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <G.Singh@nxp.com>
Received: from EUR02-AM5-obe.outbound.protection.outlook.com
(mail-eopbgr00073.outbound.protection.outlook.com [40.107.0.73])
by dpdk.org (Postfix) with ESMTP id CE87D4F90
for <dev@dpdk.org>; Mon, 8 Apr 2019 13:22:42 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=s5DsrZGrgAekhq7XCVDpdrpnjWNDk7G0U+0Kr93JIKo=;
b=PmsfTjh9UrhuriCoeprKNdIiJv1pS+uaDgsnFINotQtWgnOQzAGJMmaSO0FHi8wNq6w4cpYQa0/DlonPj1X2cmtqf5uX5Fmw691pUVvtcXqsnWGWk7KoxtY0zONQCuozifqAOujjEoKlrD7AWPl3dLNk43yl+1q/ibMhs3ioN30=
Received: from VE1PR04MB6365.eurprd04.prod.outlook.com (10.255.118.78) by
VE1PR04MB6606.eurprd04.prod.outlook.com (20.179.235.10) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.1771.13; Mon, 8 Apr 2019 11:22:41 +0000
Received: from VE1PR04MB6365.eurprd04.prod.outlook.com
([fe80::f5ad:f178:4c55:13e0]) by VE1PR04MB6365.eurprd04.prod.outlook.com
([fe80::f5ad:f178:4c55:13e0%3]) with mapi id 15.20.1771.016; Mon, 8 Apr 2019
11:22:41 +0000
From: Gagandeep Singh <G.Singh@nxp.com>
To: "dev@dpdk.org" <dev@dpdk.org>, "ferruh.yigit@intel.com"
<ferruh.yigit@intel.com>
CC: Gagandeep Singh <G.Singh@nxp.com>
Thread-Topic: [PATCH 08/13] net/enetc: enable promiscuous and allmulticast
feature
Thread-Index: AQHU7f1gfkJBxqYXFUGGuWgLAUN9sw==
Date: Mon, 8 Apr 2019 11:22:41 +0000
Message-ID: <1554745507-15089-9-git-send-email-g.singh@nxp.com>
References: <1554745507-15089-1-git-send-email-g.singh@nxp.com>
In-Reply-To: <1554745507-15089-1-git-send-email-g.singh@nxp.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach:
X-MS-TNEF-Correlator:
x-clientproxiedby: BM1PR0101CA0003.INDPRD01.PROD.OUTLOOK.COM
(2603:1096:b00:18::13) To VE1PR04MB6365.eurprd04.prod.outlook.com
(2603:10a6:803:12a::14)
x-mailer: git-send-email 1.9.1
authentication-results: spf=none (sender IP is )
smtp.mailfrom=G.Singh@nxp.com;
x-ms-exchange-messagesentrepresentingtype: 1
x-originating-ip: [92.120.1.67]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: cf9646c0-001d-4936-3d51-08d6bc148334
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0; PCL:0;
RULEID:(2390118)(7020095)(4652040)(8989299)(5600139)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020);
SRVR:VE1PR04MB6606;
x-ms-traffictypediagnostic: VE1PR04MB6606:
x-microsoft-antispam-prvs: <VE1PR04MB6606B0AE8E4F34BDEC1E8B3AE12C0@VE1PR04MB6606.eurprd04.prod.outlook.com>
x-forefront-prvs: 0001227049
x-forefront-antispam-report: SFV:NSPM;
SFS:(10009020)(366004)(376002)(346002)(39860400002)(396003)(136003)(199004)(189003)(76176011)(97736004)(81156014)(71200400001)(71190400001)(72206003)(3846002)(25786009)(81166006)(53936002)(2616005)(5660300002)(6116002)(8676002)(7736002)(446003)(478600001)(8936002)(11346002)(305945005)(2906002)(256004)(14444005)(66066001)(6512007)(476003)(6436002)(486006)(50226002)(2501003)(99286004)(106356001)(86362001)(110136005)(4326008)(6486002)(68736007)(105586002)(6506007)(52116002)(316002)(26005)(386003)(14454004)(186003)(36756003)(102836004);
DIR:OUT; SFP:1101; SCL:1; SRVR:VE1PR04MB6606;
H:VE1PR04MB6365.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en;
PTR:InfoNoRecords; A:1; MX:1;
received-spf: None (protection.outlook.com: nxp.com does not designate
permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: NzplWAOB0GsFqGMczb01SEYv343HRMLSxvMOqEei5+mQfBveGQEy+ei2u0y/8FxfqgAVxC4nqnilVhib7Nn4MfexZXSp6qzkgIByTI7mLqA9AeW1uzg/OwKdWhfULE6ZqoBn9xSMav+638OMr8kON42enidEba7D3VBvbiWccEPYINAtZzC2bl/qgw8OpGCSHrtiOpVG6HvlPIf0OSZz5rWpQFqBwPtmNm4m7bVnh2kdntbhz6rYeL5WpDaKCtco8yjWdexGomux/qIfoRzZDq2OyN978PXuf3JCH2joDHTZ4LlCY7dsLECvDrYsm/CZe9FGD5/Sl4X9i/myYpxCUMSUknz2qzOrlm211+XtC7ZEI9sdZKhdwAdfguppjUB7odmqYZJ19LDrELiuy+7hNRXpQtSw/n+6IZremFqExDI=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cf9646c0-001d-4936-3d51-08d6bc148334
X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Apr 2019 11:22:41.0423 (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-Transport-CrossTenantHeadersStamped: VE1PR04MB6606
Subject: [dpdk-dev] [PATCH 08/13] net/enetc: enable promiscuous and
allmulticast feature
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Apr 2019 11:22:43 -0000
Promiscuous and allmulticast enable/disable APIs added.
Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
---
doc/guides/nics/enetc.rst | 2 +
doc/guides/nics/features/enetc.ini | 2 +
drivers/net/enetc/base/enetc_hw.h | 3 +-
drivers/net/enetc/enetc_ethdev.c | 90 ++++++++++++++++++++++++++++++++--=
----
4 files changed, 81 insertions(+), 16 deletions(-)
diff --git a/doc/guides/nics/enetc.rst b/doc/guides/nics/enetc.rst
index 9f575d2..ab13211 100644
--- a/doc/guides/nics/enetc.rst
+++ b/doc/guides/nics/enetc.rst
@@ -47,6 +47,8 @@ ENETC Features
- Link Status
- Packet type information
- Basic stats
+- Promiscuous
+- Multicast
=20
NIC Driver (PMD)
~~~~~~~~~~~~~~~~
diff --git a/doc/guides/nics/features/enetc.ini b/doc/guides/nics/features/=
enetc.ini
index d8bd567..6b7bbfb 100644
--- a/doc/guides/nics/features/enetc.ini
+++ b/doc/guides/nics/features/enetc.ini
@@ -7,6 +7,8 @@
Packet type parsing =3D Y
Link status =3D Y
Basic stats =3D Y
+Promiscuous mode =3D Y
+Allmulticast mode =3D Y
Linux VFIO =3D Y
ARMv8 =3D Y
Usage doc =3D Y
diff --git a/drivers/net/enetc/base/enetc_hw.h b/drivers/net/enetc/base/ene=
tc_hw.h
index 3f0a2a9..90a383a 100644
--- a/drivers/net/enetc/base/enetc_hw.h
+++ b/drivers/net/enetc/base/enetc_hw.h
@@ -78,8 +78,7 @@
#define ENETC_PSR 0x00004 /* RO */
#define ENETC_PSIPMR 0x00018
#define ENETC_PSIPMR_SET_UP(n) (0x1 << (n)) /* n =3D SI index */
-#define ENETC_PSIPMR_SET_MP(n) (0x1 << ((n) + 8))
-#define ENETC_PSIPMR_SET_VLAN_MP(n) (0x1 << ((n) + 16))
+#define ENETC_PSIPMR_SET_MP(n) (0x1 << ((n) + 16))
#define ENETC_PSIPMAR0(n) (0x00100 + (n) * 0x20)
#define ENETC_PSIPMAR1(n) (0x00104 + (n) * 0x20)
#define ENETC_PCAPR0 0x00900
diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_eth=
dev.c
index f8b9510..0bb3b2c 100644
--- a/drivers/net/enetc/enetc_ethdev.c
+++ b/drivers/net/enetc/enetc_ethdev.c
@@ -133,8 +133,8 @@
static int
enetc_hardware_init(struct enetc_eth_hw *hw)
{
- uint32_t psipmr =3D 0;
struct enetc_hw *enetc_hw =3D &hw->hw;
+ uint32_t *mac =3D (uint32_t *)hw->mac.addr;
=20
PMD_INIT_FUNC_TRACE();
/* Calculating and storing the base HW addresses */
@@ -144,19 +144,9 @@
/* Enabling Station Interface */
enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
=20
- /* Setting to accept broadcast packets for each inetrface */
- psipmr |=3D ENETC_PSIPMR_SET_UP(0) | ENETC_PSIPMR_SET_MP(0) |
- ENETC_PSIPMR_SET_VLAN_MP(0);
- psipmr |=3D ENETC_PSIPMR_SET_UP(1) | ENETC_PSIPMR_SET_MP(1) |
- ENETC_PSIPMR_SET_VLAN_MP(1);
- psipmr |=3D ENETC_PSIPMR_SET_UP(2) | ENETC_PSIPMR_SET_MP(2) |
- ENETC_PSIPMR_SET_VLAN_MP(2);
-
- enetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);
-
- /* Enabling broadcast address */
- enetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), 0xFFFFFFFF);
- enetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), 0xFFFF << 16);
+ *mac =3D (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
+ mac++;
+ *mac =3D (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
=20
return 0;
}
@@ -544,6 +534,74 @@ int enetc_stats_get(struct rte_eth_dev *dev,
dev->data->nb_tx_queues =3D 0;
}
=20
+static void
+enetc_promiscuous_enable(struct rte_eth_dev *dev)
+{
+ struct enetc_eth_hw *hw =3D
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw =3D &hw->hw;
+ uint32_t psipmr =3D 0;
+
+ psipmr =3D enetc_port_rd(enetc_hw, ENETC_PSIPMR);
+
+ /* Setting to enable promiscuous mode*/
+ psipmr |=3D ENETC_PSIPMR_SET_UP(0) | ENETC_PSIPMR_SET_MP(0);
+
+ enetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);
+}
+
+static void
+enetc_promiscuous_disable(struct rte_eth_dev *dev)
+{
+ struct enetc_eth_hw *hw =3D
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw =3D &hw->hw;
+ uint32_t psipmr =3D 0;
+
+ /* Setting to disable promiscuous mode for SI0*/
+ psipmr =3D enetc_port_rd(enetc_hw, ENETC_PSIPMR);
+ psipmr &=3D (~ENETC_PSIPMR_SET_UP(0));
+
+ if (dev->data->all_multicast =3D=3D 0)
+ psipmr &=3D (~ENETC_PSIPMR_SET_MP(0));
+
+ enetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);
+}
+
+static void
+enetc_allmulticast_enable(struct rte_eth_dev *dev)
+{
+ struct enetc_eth_hw *hw =3D
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw =3D &hw->hw;
+ uint32_t psipmr =3D 0;
+
+ psipmr =3D enetc_port_rd(enetc_hw, ENETC_PSIPMR);
+
+ /* Setting to enable allmulticast mode for SI0*/
+ psipmr |=3D ENETC_PSIPMR_SET_MP(0);
+
+ enetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);
+}
+
+static void
+enetc_allmulticast_disable(struct rte_eth_dev *dev)
+{
+ struct enetc_eth_hw *hw =3D
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw =3D &hw->hw;
+ uint32_t psipmr =3D 0;
+
+ if (dev->data->promiscuous =3D=3D 1)
+ return; /* must remain in all_multicast mode */
+
+ /* Setting to disable all multicast mode for SI0*/
+ psipmr =3D enetc_port_rd(enetc_hw, ENETC_PSIPMR) &
+ ~(ENETC_PSIPMR_SET_MP(0));
+
+ enetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);
+}
+
/*
* The set of PCI devices this driver supports
*/
@@ -562,6 +620,10 @@ int enetc_stats_get(struct rte_eth_dev *dev,
.link_update =3D enetc_link_update,
.stats_get =3D enetc_stats_get,
.stats_reset =3D enetc_stats_reset,
+ .promiscuous_enable =3D enetc_promiscuous_enable,
+ .promiscuous_disable =3D enetc_promiscuous_disable,
+ .allmulticast_enable =3D enetc_allmulticast_enable,
+ .allmulticast_disable =3D enetc_allmulticast_disable,
.dev_infos_get =3D enetc_dev_infos_get,
.rx_queue_setup =3D enetc_rx_queue_setup,
.rx_queue_release =3D enetc_rx_queue_release,
--=20
1.9.1
From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id 053A2A0096
for <public@inbox.dpdk.org>; Mon, 8 Apr 2019 13:23:49 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 0A2ED5B1C;
Mon, 8 Apr 2019 13:23:03 +0200 (CEST)
Received: from EUR02-AM5-obe.outbound.protection.outlook.com
(mail-eopbgr00073.outbound.protection.outlook.com [40.107.0.73])
by dpdk.org (Postfix) with ESMTP id CE87D4F90
for <dev@dpdk.org>; Mon, 8 Apr 2019 13:22:42 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=s5DsrZGrgAekhq7XCVDpdrpnjWNDk7G0U+0Kr93JIKo=;
b=PmsfTjh9UrhuriCoeprKNdIiJv1pS+uaDgsnFINotQtWgnOQzAGJMmaSO0FHi8wNq6w4cpYQa0/DlonPj1X2cmtqf5uX5Fmw691pUVvtcXqsnWGWk7KoxtY0zONQCuozifqAOujjEoKlrD7AWPl3dLNk43yl+1q/ibMhs3ioN30=
Received: from VE1PR04MB6365.eurprd04.prod.outlook.com (10.255.118.78) by
VE1PR04MB6606.eurprd04.prod.outlook.com (20.179.235.10) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.1771.13; Mon, 8 Apr 2019 11:22:41 +0000
Received: from VE1PR04MB6365.eurprd04.prod.outlook.com
([fe80::f5ad:f178:4c55:13e0]) by VE1PR04MB6365.eurprd04.prod.outlook.com
([fe80::f5ad:f178:4c55:13e0%3]) with mapi id 15.20.1771.016; Mon, 8 Apr 2019
11:22:41 +0000
From: Gagandeep Singh <G.Singh@nxp.com>
To: "dev@dpdk.org" <dev@dpdk.org>, "ferruh.yigit@intel.com"
<ferruh.yigit@intel.com>
CC: Gagandeep Singh <G.Singh@nxp.com>
Thread-Topic: [PATCH 08/13] net/enetc: enable promiscuous and allmulticast
feature
Thread-Index: AQHU7f1gfkJBxqYXFUGGuWgLAUN9sw==
Date: Mon, 8 Apr 2019 11:22:41 +0000
Message-ID: <1554745507-15089-9-git-send-email-g.singh@nxp.com>
References: <1554745507-15089-1-git-send-email-g.singh@nxp.com>
In-Reply-To: <1554745507-15089-1-git-send-email-g.singh@nxp.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach:
X-MS-TNEF-Correlator:
x-clientproxiedby: BM1PR0101CA0003.INDPRD01.PROD.OUTLOOK.COM
(2603:1096:b00:18::13) To VE1PR04MB6365.eurprd04.prod.outlook.com
(2603:10a6:803:12a::14)
x-mailer: git-send-email 1.9.1
authentication-results: spf=none (sender IP is )
smtp.mailfrom=G.Singh@nxp.com;
x-ms-exchange-messagesentrepresentingtype: 1
x-originating-ip: [92.120.1.67]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: cf9646c0-001d-4936-3d51-08d6bc148334
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0; PCL:0;
RULEID:(2390118)(7020095)(4652040)(8989299)(5600139)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020);
SRVR:VE1PR04MB6606;
x-ms-traffictypediagnostic: VE1PR04MB6606:
x-microsoft-antispam-prvs: <VE1PR04MB6606B0AE8E4F34BDEC1E8B3AE12C0@VE1PR04MB6606.eurprd04.prod.outlook.com>
x-forefront-prvs: 0001227049
x-forefront-antispam-report: SFV:NSPM;
SFS:(10009020)(366004)(376002)(346002)(39860400002)(396003)(136003)(199004)(189003)(76176011)(97736004)(81156014)(71200400001)(71190400001)(72206003)(3846002)(25786009)(81166006)(53936002)(2616005)(5660300002)(6116002)(8676002)(7736002)(446003)(478600001)(8936002)(11346002)(305945005)(2906002)(256004)(14444005)(66066001)(6512007)(476003)(6436002)(486006)(50226002)(2501003)(99286004)(106356001)(86362001)(110136005)(4326008)(6486002)(68736007)(105586002)(6506007)(52116002)(316002)(26005)(386003)(14454004)(186003)(36756003)(102836004);
DIR:OUT; SFP:1101; SCL:1; SRVR:VE1PR04MB6606;
H:VE1PR04MB6365.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en;
PTR:InfoNoRecords; A:1; MX:1;
received-spf: None (protection.outlook.com: nxp.com does not designate
permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: NzplWAOB0GsFqGMczb01SEYv343HRMLSxvMOqEei5+mQfBveGQEy+ei2u0y/8FxfqgAVxC4nqnilVhib7Nn4MfexZXSp6qzkgIByTI7mLqA9AeW1uzg/OwKdWhfULE6ZqoBn9xSMav+638OMr8kON42enidEba7D3VBvbiWccEPYINAtZzC2bl/qgw8OpGCSHrtiOpVG6HvlPIf0OSZz5rWpQFqBwPtmNm4m7bVnh2kdntbhz6rYeL5WpDaKCtco8yjWdexGomux/qIfoRzZDq2OyN978PXuf3JCH2joDHTZ4LlCY7dsLECvDrYsm/CZe9FGD5/Sl4X9i/myYpxCUMSUknz2qzOrlm211+XtC7ZEI9sdZKhdwAdfguppjUB7odmqYZJ19LDrELiuy+7hNRXpQtSw/n+6IZremFqExDI=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cf9646c0-001d-4936-3d51-08d6bc148334
X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Apr 2019 11:22:41.0423 (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-Transport-CrossTenantHeadersStamped: VE1PR04MB6606
Subject: [dpdk-dev] [PATCH 08/13] net/enetc: enable promiscuous and
allmulticast feature
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Message-ID: <20190408112241.UQbYDPpXUQqnL2vSzoKPIM69QDilvog6KvrbPVEq7Ow@z>
Promiscuous and allmulticast enable/disable APIs added.
Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
---
doc/guides/nics/enetc.rst | 2 +
doc/guides/nics/features/enetc.ini | 2 +
drivers/net/enetc/base/enetc_hw.h | 3 +-
drivers/net/enetc/enetc_ethdev.c | 90 ++++++++++++++++++++++++++++++++--=
----
4 files changed, 81 insertions(+), 16 deletions(-)
diff --git a/doc/guides/nics/enetc.rst b/doc/guides/nics/enetc.rst
index 9f575d2..ab13211 100644
--- a/doc/guides/nics/enetc.rst
+++ b/doc/guides/nics/enetc.rst
@@ -47,6 +47,8 @@ ENETC Features
- Link Status
- Packet type information
- Basic stats
+- Promiscuous
+- Multicast
=20
NIC Driver (PMD)
~~~~~~~~~~~~~~~~
diff --git a/doc/guides/nics/features/enetc.ini b/doc/guides/nics/features/=
enetc.ini
index d8bd567..6b7bbfb 100644
--- a/doc/guides/nics/features/enetc.ini
+++ b/doc/guides/nics/features/enetc.ini
@@ -7,6 +7,8 @@
Packet type parsing =3D Y
Link status =3D Y
Basic stats =3D Y
+Promiscuous mode =3D Y
+Allmulticast mode =3D Y
Linux VFIO =3D Y
ARMv8 =3D Y
Usage doc =3D Y
diff --git a/drivers/net/enetc/base/enetc_hw.h b/drivers/net/enetc/base/ene=
tc_hw.h
index 3f0a2a9..90a383a 100644
--- a/drivers/net/enetc/base/enetc_hw.h
+++ b/drivers/net/enetc/base/enetc_hw.h
@@ -78,8 +78,7 @@
#define ENETC_PSR 0x00004 /* RO */
#define ENETC_PSIPMR 0x00018
#define ENETC_PSIPMR_SET_UP(n) (0x1 << (n)) /* n =3D SI index */
-#define ENETC_PSIPMR_SET_MP(n) (0x1 << ((n) + 8))
-#define ENETC_PSIPMR_SET_VLAN_MP(n) (0x1 << ((n) + 16))
+#define ENETC_PSIPMR_SET_MP(n) (0x1 << ((n) + 16))
#define ENETC_PSIPMAR0(n) (0x00100 + (n) * 0x20)
#define ENETC_PSIPMAR1(n) (0x00104 + (n) * 0x20)
#define ENETC_PCAPR0 0x00900
diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_eth=
dev.c
index f8b9510..0bb3b2c 100644
--- a/drivers/net/enetc/enetc_ethdev.c
+++ b/drivers/net/enetc/enetc_ethdev.c
@@ -133,8 +133,8 @@
static int
enetc_hardware_init(struct enetc_eth_hw *hw)
{
- uint32_t psipmr =3D 0;
struct enetc_hw *enetc_hw =3D &hw->hw;
+ uint32_t *mac =3D (uint32_t *)hw->mac.addr;
=20
PMD_INIT_FUNC_TRACE();
/* Calculating and storing the base HW addresses */
@@ -144,19 +144,9 @@
/* Enabling Station Interface */
enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
=20
- /* Setting to accept broadcast packets for each inetrface */
- psipmr |=3D ENETC_PSIPMR_SET_UP(0) | ENETC_PSIPMR_SET_MP(0) |
- ENETC_PSIPMR_SET_VLAN_MP(0);
- psipmr |=3D ENETC_PSIPMR_SET_UP(1) | ENETC_PSIPMR_SET_MP(1) |
- ENETC_PSIPMR_SET_VLAN_MP(1);
- psipmr |=3D ENETC_PSIPMR_SET_UP(2) | ENETC_PSIPMR_SET_MP(2) |
- ENETC_PSIPMR_SET_VLAN_MP(2);
-
- enetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);
-
- /* Enabling broadcast address */
- enetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), 0xFFFFFFFF);
- enetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), 0xFFFF << 16);
+ *mac =3D (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
+ mac++;
+ *mac =3D (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
=20
return 0;
}
@@ -544,6 +534,74 @@ int enetc_stats_get(struct rte_eth_dev *dev,
dev->data->nb_tx_queues =3D 0;
}
=20
+static void
+enetc_promiscuous_enable(struct rte_eth_dev *dev)
+{
+ struct enetc_eth_hw *hw =3D
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw =3D &hw->hw;
+ uint32_t psipmr =3D 0;
+
+ psipmr =3D enetc_port_rd(enetc_hw, ENETC_PSIPMR);
+
+ /* Setting to enable promiscuous mode*/
+ psipmr |=3D ENETC_PSIPMR_SET_UP(0) | ENETC_PSIPMR_SET_MP(0);
+
+ enetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);
+}
+
+static void
+enetc_promiscuous_disable(struct rte_eth_dev *dev)
+{
+ struct enetc_eth_hw *hw =3D
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw =3D &hw->hw;
+ uint32_t psipmr =3D 0;
+
+ /* Setting to disable promiscuous mode for SI0*/
+ psipmr =3D enetc_port_rd(enetc_hw, ENETC_PSIPMR);
+ psipmr &=3D (~ENETC_PSIPMR_SET_UP(0));
+
+ if (dev->data->all_multicast =3D=3D 0)
+ psipmr &=3D (~ENETC_PSIPMR_SET_MP(0));
+
+ enetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);
+}
+
+static void
+enetc_allmulticast_enable(struct rte_eth_dev *dev)
+{
+ struct enetc_eth_hw *hw =3D
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw =3D &hw->hw;
+ uint32_t psipmr =3D 0;
+
+ psipmr =3D enetc_port_rd(enetc_hw, ENETC_PSIPMR);
+
+ /* Setting to enable allmulticast mode for SI0*/
+ psipmr |=3D ENETC_PSIPMR_SET_MP(0);
+
+ enetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);
+}
+
+static void
+enetc_allmulticast_disable(struct rte_eth_dev *dev)
+{
+ struct enetc_eth_hw *hw =3D
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw =3D &hw->hw;
+ uint32_t psipmr =3D 0;
+
+ if (dev->data->promiscuous =3D=3D 1)
+ return; /* must remain in all_multicast mode */
+
+ /* Setting to disable all multicast mode for SI0*/
+ psipmr =3D enetc_port_rd(enetc_hw, ENETC_PSIPMR) &
+ ~(ENETC_PSIPMR_SET_MP(0));
+
+ enetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);
+}
+
/*
* The set of PCI devices this driver supports
*/
@@ -562,6 +620,10 @@ int enetc_stats_get(struct rte_eth_dev *dev,
.link_update =3D enetc_link_update,
.stats_get =3D enetc_stats_get,
.stats_reset =3D enetc_stats_reset,
+ .promiscuous_enable =3D enetc_promiscuous_enable,
+ .promiscuous_disable =3D enetc_promiscuous_disable,
+ .allmulticast_enable =3D enetc_allmulticast_enable,
+ .allmulticast_disable =3D enetc_allmulticast_disable,
.dev_infos_get =3D enetc_dev_infos_get,
.rx_queue_setup =3D enetc_rx_queue_setup,
.rx_queue_release =3D enetc_rx_queue_release,
--=20
1.9.1