Skip to contentSkip to conversation

net/enetc: add macro for BD ring alignment

PATCH Superseded Gagandeep Singh 2 participants 28 messages Oct 21, 2019 – Oct 23, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 net/enetc: add macro for BD ring alignment

enetc BD rings should be aligned to 128
instead of RTE_CACHE_LINE_SIZE.

---
 drivers/net/enetc/base/enetc_hw.h | 3 +++
 drivers/net/enetc/enetc_ethdev.c  | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/net/enetc/base/enetc_hw.h +3 -0
index fd71155ee..2fe7ccb5b 100644
@@ -12,6 +12,9 @@
 #define ENETC_DEV_ID_VF		0xef00
 #define ENETC_DEV_ID		0xe100
 
+/* BD RING ALIGNMENT */
+#define ENETC_BD_RING_ALIGN	128
+
 /* ENETC register block BAR */
 #define ENETC_BAR_REGS			0x0
 
drivers/net/enetc/enetc_ethdev.c +4 -4
index dc05c00ff..4e978348c 100644
@@ -178,12 +178,12 @@ enetc_alloc_txbdr(struct enetc_bdr *txr, uint16_t nb_desc)
 	int size;
 
 	size = nb_desc * sizeof(struct enetc_swbd);
-	txr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	txr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (txr->q_swbd == NULL)
 		return -ENOMEM;
 
 	size = nb_desc * sizeof(struct enetc_tx_bd);
-	txr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	txr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (txr->bd_base == NULL) {
 		rte_free(txr->q_swbd);
 		txr->q_swbd = NULL;
@@ -325,12 +325,12 @@ enetc_alloc_rxbdr(struct enetc_bdr *rxr,
 	int size;
 
 	size = nb_rx_desc * sizeof(struct enetc_swbd);
-	rxr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	rxr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (rxr->q_swbd == NULL)
 		return -ENOMEM;
 
 	size = nb_rx_desc * sizeof(union enetc_rx_bd);
-	rxr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	rxr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (rxr->bd_base == NULL) {
 		rte_free(rxr->q_swbd);
 		rxr->q_swbd = NULL;
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 2/2 net/enetc: set random MAC in case no MAC for SI

for SGMII interfaces, there can be 0 value
written on MAC registers.
This patch set the random MAC address for those
interfaces.

---
 drivers/net/enetc/enetc_ethdev.c | 33 +++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)
drivers/net/enetc/enetc_ethdev.c +32 -1
index 4e978348c..cc8fdd051 100644
@@ -4,6 +4,7 @@
 
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
+#include <rte_random.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -123,11 +124,21 @@ enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
 	return rte_eth_linkstatus_set(dev, &link);
 }
 
+static void
+print_ethaddr(const char *name, const struct ether_addr *eth_addr)
+{
+	char buf[ETHER_ADDR_FMT_SIZE];
+	ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+	ENETC_PMD_INFO("%s%s\n", name, buf);
+}
+
 static int
 enetc_hardware_init(struct enetc_eth_hw *hw)
 {
 	struct enetc_hw *enetc_hw = &hw->hw;
 	uint32_t *mac = (uint32_t *)hw->mac.addr;
+	uint32_t high_mac = 0;
+	uint16_t low_mac = 0;
 
 	PMD_INIT_FUNC_TRACE();
 	/* Calculating and storing the base HW addresses */
@@ -138,8 +149,28 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
 	enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
 
 	*mac = (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
+	high_mac = (uint32_t)*mac;
 	mac++;
 	*mac = (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
+	low_mac = (uint16_t)*mac;
+
+	if ((high_mac | low_mac) == 0) {
+		char *first_byte;
+
+		ENETC_PMD_INFO("MAC is not available for this SI, "
+			       "set random MAC\n");
+		mac = (uint32_t *)hw->mac.addr;
+		*mac = (uint32_t)rte_rand();
+		first_byte = (char *)mac;
+		*first_byte &= 0xfe;	/* clear multicast bit */
+		*first_byte |= 0x02;	/* set local assignment bit (IEEE802) */
+
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), *mac);
+		mac++;
+		*mac = (uint16_t)rte_rand();
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), *mac);
+		print_ethaddr("New address: ", (const struct ether_addr *)hw->mac.addr);
+	}
 
 	return 0;
 }
@@ -906,5 +937,5 @@ RTE_INIT(enetc_pmd_init_log)
 {
 	enetc_logtype_pmd = rte_log_register("pmd.net.enetc");
 	if (enetc_logtype_pmd >= 0)
-		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_NOTICE);
+		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_INFO);
 }
Signature · 1 line
2.17.1
#2 lore raw

v2 cover enetc PMD specific changes

In reply to Gagandeep Singh

v2 change-log:
* dpaax integration added
* compilation fixed

Gagandeep Singh (2):
net/enetc: set random MAC in case no MAC for SI
net/enetc: enable dpaax library

 drivers/net/enetc/Makefile       |  4 ++-
 drivers/net/enetc/enetc_ethdev.c | 43 +++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.1
#3 lore raw

PATCH v2 1/2 net/enetc: set random MAC in case no MAC for SI

for SGMII interfaces, there can be 0 value
written on MAC registers.
This patch set the random MAC address for those
interfaces.

---
 drivers/net/enetc/Makefile       |  2 +-
 drivers/net/enetc/enetc_ethdev.c | 35 +++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)
drivers/net/enetc/Makefile +1 -1
index 9895501db..312b37245 100644
@@ -17,7 +17,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_ethdev.c
 SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c
 
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
-LDLIBS += -lrte_ethdev
+LDLIBS += -lrte_ethdev -lrte_net
 LDLIBS += -lrte_bus_pci
 
 include $(RTE_SDK)/mk/rte.lib.mk
drivers/net/enetc/enetc_ethdev.c +34 -1
index 4e978348c..475ec77c3 100644
@@ -4,6 +4,7 @@
 
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
+#include <rte_random.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -123,11 +124,22 @@ enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
 	return rte_eth_linkstatus_set(dev, &link);
 }
 
+static void
+print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
+{
+	char buf[RTE_ETHER_ADDR_FMT_SIZE];
+
+	rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
+	ENETC_PMD_INFO("%s%s\n", name, buf);
+}
+
 static int
 enetc_hardware_init(struct enetc_eth_hw *hw)
 {
 	struct enetc_hw *enetc_hw = &hw->hw;
 	uint32_t *mac = (uint32_t *)hw->mac.addr;
+	uint32_t high_mac = 0;
+	uint16_t low_mac = 0;
 
 	PMD_INIT_FUNC_TRACE();
 	/* Calculating and storing the base HW addresses */
@@ -138,8 +150,29 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
 	enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
 
 	*mac = (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
+	high_mac = (uint32_t)*mac;
 	mac++;
 	*mac = (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
+	low_mac = (uint16_t)*mac;
+
+	if ((high_mac | low_mac) == 0) {
+		char *first_byte;
+
+		ENETC_PMD_INFO("MAC is not available for this SI, "
+			       "set random MAC\n");
+		mac = (uint32_t *)hw->mac.addr;
+		*mac = (uint32_t)rte_rand();
+		first_byte = (char *)mac;
+		*first_byte &= 0xfe;	/* clear multicast bit */
+		*first_byte |= 0x02;	/* set local assignment bit (IEEE802) */
+
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), *mac);
+		mac++;
+		*mac = (uint16_t)rte_rand();
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), *mac);
+		print_ethaddr("New address: ",
+			      (const struct rte_ether_addr *)hw->mac.addr);
+	}
 
 	return 0;
 }
@@ -906,5 +939,5 @@ RTE_INIT(enetc_pmd_init_log)
 {
 	enetc_logtype_pmd = rte_log_register("pmd.net.enetc");
 	if (enetc_logtype_pmd >= 0)
-		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_NOTICE);
+		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_INFO);
 }
Signature · 1 line
2.17.1
#4 lore raw

PATCH v2 2/2 net/enetc: enable dpaax library

In reply to Gagandeep Singh

With this patch, enetc driver would start using the physical-virtual library interfaces.

---
 drivers/net/enetc/Makefile       | 2 ++
 drivers/net/enetc/enetc_ethdev.c | 8 ++++++++
 2 files changed, 10 insertions(+)
drivers/net/enetc/Makefile +2 -0
index 312b37245..4498bc51f 100644
@@ -10,6 +10,7 @@ LIB = librte_pmd_enetc.a
 
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
 EXPORT_MAP := rte_pmd_enetc_version.map
 LIBABIVER := 1
 
@@ -19,5 +20,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
 LDLIBS += -lrte_ethdev -lrte_net
 LDLIBS += -lrte_bus_pci
+LDLIBS += -lrte_common_dpaax
 
 include $(RTE_SDK)/mk/rte.lib.mk
drivers/net/enetc/enetc_ethdev.c +8 -0
index 475ec77c3..03590c6c3 100644
@@ -5,6 +5,7 @@
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
 #include <rte_random.h>
+#include <dpaax_iova_table.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -896,6 +897,9 @@ enetc_dev_init(struct rte_eth_dev *eth_dev)
 	eth_dev->data->mtu = RTE_ETHER_MAX_LEN - RTE_ETHER_HDR_LEN -
 		RTE_ETHER_CRC_LEN;
 
+	if (rte_eal_iova_mode() == RTE_IOVA_PA)
+		dpaax_iova_table_populate();
+
 	ENETC_PMD_DEBUG("port_id %d vendorID=0x%x deviceID=0x%x",
 			eth_dev->data->port_id, pci_dev->id.vendor_id,
 			pci_dev->id.device_id);
@@ -906,6 +910,10 @@ static int
 enetc_dev_uninit(struct rte_eth_dev *eth_dev __rte_unused)
 {
 	PMD_INIT_FUNC_TRACE();
+
+	if (rte_eal_iova_mode() == RTE_IOVA_PA)
+		dpaax_iova_table_depopulate();
+
 	return 0;
 }
 
Signature · 1 line
2.17.1
#5 lore raw

v3 cover enetc PMD specific changes

In reply to Gagandeep Singh

v2 change-log:
* dpaax integration added
* compilation fixed

v3 change-log:
* added missing BD ring alignment patch

Gagandeep Singh (3):
net/enetc: add macro for BD ring alignment
net/enetc: set random MAC in case no MAC for SI
net/enetc: enable dpaax library

 drivers/net/enetc/Makefile        |  4 ++-
 drivers/net/enetc/base/enetc_hw.h |  3 ++
 drivers/net/enetc/enetc_ethdev.c  | 51 ++++++++++++++++++++++++++++---
 3 files changed, 52 insertions(+), 6 deletions(-)
Signature · 1 line
2.17.1
#6 lore raw

PATCH v3 1/3 net/enetc: add macro for BD ring alignment

enetc BD rings should be aligned to 128
instead of RTE_CACHE_LINE_SIZE.

---
 drivers/net/enetc/base/enetc_hw.h | 3 +++
 drivers/net/enetc/enetc_ethdev.c  | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/net/enetc/base/enetc_hw.h +3 -0
index fd71155ee..2fe7ccb5b 100644
@@ -12,6 +12,9 @@
 #define ENETC_DEV_ID_VF		0xef00
 #define ENETC_DEV_ID		0xe100
 
+/* BD RING ALIGNMENT */
+#define ENETC_BD_RING_ALIGN	128
+
 /* ENETC register block BAR */
 #define ENETC_BAR_REGS			0x0
 
drivers/net/enetc/enetc_ethdev.c +4 -4
index dc05c00ff..4e978348c 100644
@@ -178,12 +178,12 @@ enetc_alloc_txbdr(struct enetc_bdr *txr, uint16_t nb_desc)
 	int size;
 
 	size = nb_desc * sizeof(struct enetc_swbd);
-	txr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	txr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (txr->q_swbd == NULL)
 		return -ENOMEM;
 
 	size = nb_desc * sizeof(struct enetc_tx_bd);
-	txr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	txr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (txr->bd_base == NULL) {
 		rte_free(txr->q_swbd);
 		txr->q_swbd = NULL;
@@ -325,12 +325,12 @@ enetc_alloc_rxbdr(struct enetc_bdr *rxr,
 	int size;
 
 	size = nb_rx_desc * sizeof(struct enetc_swbd);
-	rxr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	rxr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (rxr->q_swbd == NULL)
 		return -ENOMEM;
 
 	size = nb_rx_desc * sizeof(union enetc_rx_bd);
-	rxr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	rxr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (rxr->bd_base == NULL) {
 		rte_free(rxr->q_swbd);
 		rxr->q_swbd = NULL;
Signature · 1 line
2.17.1
#7 lore raw

PATCH v3 2/3 net/enetc: set random MAC in case no MAC for SI

In reply to Gagandeep Singh

for SGMII interfaces, there can be 0 value
written on MAC registers.
This patch set the random MAC address for those
interfaces.

---
 drivers/net/enetc/Makefile       |  2 +-
 drivers/net/enetc/enetc_ethdev.c | 35 +++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)
drivers/net/enetc/Makefile +1 -1
index 9895501db..312b37245 100644
@@ -17,7 +17,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_ethdev.c
 SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c
 
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
-LDLIBS += -lrte_ethdev
+LDLIBS += -lrte_ethdev -lrte_net
 LDLIBS += -lrte_bus_pci
 
 include $(RTE_SDK)/mk/rte.lib.mk
drivers/net/enetc/enetc_ethdev.c +34 -1
index 4e978348c..475ec77c3 100644
@@ -4,6 +4,7 @@
 
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
+#include <rte_random.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -123,11 +124,22 @@ enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
 	return rte_eth_linkstatus_set(dev, &link);
 }
 
+static void
+print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
+{
+	char buf[RTE_ETHER_ADDR_FMT_SIZE];
+
+	rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
+	ENETC_PMD_INFO("%s%s\n", name, buf);
+}
+
 static int
 enetc_hardware_init(struct enetc_eth_hw *hw)
 {
 	struct enetc_hw *enetc_hw = &hw->hw;
 	uint32_t *mac = (uint32_t *)hw->mac.addr;
+	uint32_t high_mac = 0;
+	uint16_t low_mac = 0;
 
 	PMD_INIT_FUNC_TRACE();
 	/* Calculating and storing the base HW addresses */
@@ -138,8 +150,29 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
 	enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
 
 	*mac = (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
+	high_mac = (uint32_t)*mac;
 	mac++;
 	*mac = (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
+	low_mac = (uint16_t)*mac;
+
+	if ((high_mac | low_mac) == 0) {
+		char *first_byte;
+
+		ENETC_PMD_INFO("MAC is not available for this SI, "
+			       "set random MAC\n");
+		mac = (uint32_t *)hw->mac.addr;
+		*mac = (uint32_t)rte_rand();
+		first_byte = (char *)mac;
+		*first_byte &= 0xfe;	/* clear multicast bit */
+		*first_byte |= 0x02;	/* set local assignment bit (IEEE802) */
+
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), *mac);
+		mac++;
+		*mac = (uint16_t)rte_rand();
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), *mac);
+		print_ethaddr("New address: ",
+			      (const struct rte_ether_addr *)hw->mac.addr);
+	}
 
 	return 0;
 }
@@ -906,5 +939,5 @@ RTE_INIT(enetc_pmd_init_log)
 {
 	enetc_logtype_pmd = rte_log_register("pmd.net.enetc");
 	if (enetc_logtype_pmd >= 0)
-		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_NOTICE);
+		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_INFO);
 }
Signature · 1 line
2.17.1
#8 lore raw

PATCH v3 3/3 net/enetc: enable dpaax library

In reply to Gagandeep Singh

With this patch, enetc driver would start using the physical-virtual library interfaces.

---
 drivers/net/enetc/Makefile       | 2 ++
 drivers/net/enetc/enetc_ethdev.c | 8 ++++++++
 2 files changed, 10 insertions(+)
drivers/net/enetc/Makefile +2 -0
index 312b37245..4498bc51f 100644
@@ -10,6 +10,7 @@ LIB = librte_pmd_enetc.a
 
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
 EXPORT_MAP := rte_pmd_enetc_version.map
 LIBABIVER := 1
 
@@ -19,5 +20,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
 LDLIBS += -lrte_ethdev -lrte_net
 LDLIBS += -lrte_bus_pci
+LDLIBS += -lrte_common_dpaax
 
 include $(RTE_SDK)/mk/rte.lib.mk
drivers/net/enetc/enetc_ethdev.c +8 -0
index 475ec77c3..03590c6c3 100644
@@ -5,6 +5,7 @@
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
 #include <rte_random.h>
+#include <dpaax_iova_table.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -896,6 +897,9 @@ enetc_dev_init(struct rte_eth_dev *eth_dev)
 	eth_dev->data->mtu = RTE_ETHER_MAX_LEN - RTE_ETHER_HDR_LEN -
 		RTE_ETHER_CRC_LEN;
 
+	if (rte_eal_iova_mode() == RTE_IOVA_PA)
+		dpaax_iova_table_populate();
+
 	ENETC_PMD_DEBUG("port_id %d vendorID=0x%x deviceID=0x%x",
 			eth_dev->data->port_id, pci_dev->id.vendor_id,
 			pci_dev->id.device_id);
@@ -906,6 +910,10 @@ static int
 enetc_dev_uninit(struct rte_eth_dev *eth_dev __rte_unused)
 {
 	PMD_INIT_FUNC_TRACE();
+
+	if (rte_eal_iova_mode() == RTE_IOVA_PA)
+		dpaax_iova_table_depopulate();
+
 	return 0;
 }
 
Signature · 1 line
2.17.1
#9 lore raw

v4 cover enetc PMD specific changes

In reply to Gagandeep Singh

v2 change-log:
* dpaax integration added
* compilation fixed

v3 change-log:
* added missing BD ring alignment patc

v4 change-log:
* fixed meson build

Gagandeep Singh (3):
net/enetc: add macro for BD ring alignment
net/enetc: set random MAC in case no MAC for SI
net/enetc: enable dpaax library

 drivers/net/enetc/Makefile        |  4 ++-
 drivers/net/enetc/base/enetc_hw.h |  3 ++
 drivers/net/enetc/enetc_ethdev.c  | 51 ++++++++++++++++++++++++++++---
 drivers/net/enetc/meson.build     |  1 +
 4 files changed, 53 insertions(+), 6 deletions(-)
Signature · 1 line
2.17.1
#10 lore raw

PATCH v4 1/3 net/enetc: add macro for BD ring alignment

enetc BD rings should be aligned to 128
instead of RTE_CACHE_LINE_SIZE.

---
 drivers/net/enetc/base/enetc_hw.h | 3 +++
 drivers/net/enetc/enetc_ethdev.c  | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/net/enetc/base/enetc_hw.h +3 -0
index fd71155ee..2fe7ccb5b 100644
@@ -12,6 +12,9 @@
 #define ENETC_DEV_ID_VF		0xef00
 #define ENETC_DEV_ID		0xe100
 
+/* BD RING ALIGNMENT */
+#define ENETC_BD_RING_ALIGN	128
+
 /* ENETC register block BAR */
 #define ENETC_BAR_REGS			0x0
 
drivers/net/enetc/enetc_ethdev.c +4 -4
index dc05c00ff..4e978348c 100644
@@ -178,12 +178,12 @@ enetc_alloc_txbdr(struct enetc_bdr *txr, uint16_t nb_desc)
 	int size;
 
 	size = nb_desc * sizeof(struct enetc_swbd);
-	txr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	txr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (txr->q_swbd == NULL)
 		return -ENOMEM;
 
 	size = nb_desc * sizeof(struct enetc_tx_bd);
-	txr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	txr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (txr->bd_base == NULL) {
 		rte_free(txr->q_swbd);
 		txr->q_swbd = NULL;
@@ -325,12 +325,12 @@ enetc_alloc_rxbdr(struct enetc_bdr *rxr,
 	int size;
 
 	size = nb_rx_desc * sizeof(struct enetc_swbd);
-	rxr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	rxr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (rxr->q_swbd == NULL)
 		return -ENOMEM;
 
 	size = nb_rx_desc * sizeof(union enetc_rx_bd);
-	rxr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	rxr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (rxr->bd_base == NULL) {
 		rte_free(rxr->q_swbd);
 		rxr->q_swbd = NULL;
Signature · 1 line
2.17.1
#11 lore raw
Quoted 2 lines · Gagandeep Singh

enetc BD rings should be aligned to 128
instead of RTE_CACHE_LINE_SIZE.

This looks like a fix, if so can you please update commit log according, via fixes line etc..

Quoted 56 lines
---
 drivers/net/enetc/base/enetc_hw.h | 3 +++
 drivers/net/enetc/enetc_ethdev.c  | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/net/enetc/base/enetc_hw.h +3 -0
index fd71155ee..2fe7ccb5b 100644
@@ -12,6 +12,9 @@
 #define ENETC_DEV_ID_VF		0xef00
 #define ENETC_DEV_ID		0xe100
 
+/* BD RING ALIGNMENT */
+#define ENETC_BD_RING_ALIGN	128
+
 /* ENETC register block BAR */
 #define ENETC_BAR_REGS			0x0
 
drivers/net/enetc/enetc_ethdev.c +4 -4
index dc05c00ff..4e978348c 100644
@@ -178,12 +178,12 @@ enetc_alloc_txbdr(struct enetc_bdr *txr, uint16_t nb_desc)
 	int size;
 
 	size = nb_desc * sizeof(struct enetc_swbd);
-	txr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	txr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (txr->q_swbd == NULL)
 		return -ENOMEM;
 
 	size = nb_desc * sizeof(struct enetc_tx_bd);
-	txr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	txr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (txr->bd_base == NULL) {
 		rte_free(txr->q_swbd);
 		txr->q_swbd = NULL;
@@ -325,12 +325,12 @@ enetc_alloc_rxbdr(struct enetc_bdr *rxr,
 	int size;
 
 	size = nb_rx_desc * sizeof(struct enetc_swbd);
-	rxr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	rxr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (rxr->q_swbd == NULL)
 		return -ENOMEM;
 
 	size = nb_rx_desc * sizeof(union enetc_rx_bd);
-	rxr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	rxr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (rxr->bd_base == NULL) {
 		rte_free(rxr->q_swbd);
 		rxr->q_swbd = NULL;
#12 lore raw
Quoted 8 lines

-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Monday, October 21, 2019 9:24 PM
To: Gagandeep Singh <[email protected]>; [email protected]
Subject: Re: [PATCH v4 1/3] net/enetc: add macro for BD ring alignment

Quoted 7 lines
Quoted 2 lines · Gagandeep Singh

enetc BD rings should be aligned to 128
instead of RTE_CACHE_LINE_SIZE.

This looks like a fix, if so can you please update commit log according, via fixes line etc..

Yes, this is kind a bug fix, I will add the fixes line.

Quoted 59 lines

Review

Quoted 8 lines
---
 drivers/net/enetc/base/enetc_hw.h | 3 +++
 drivers/net/enetc/enetc_ethdev.c  | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
(quoted diff) +0 -0

b/drivers/net/enetc/base/enetc_hw.h

Review

Quoted 14 lines

index fd71155ee..2fe7ccb5b 100644

drivers/net/enetc/base/enetc_hw.h +3 -0
@@ -12,6 +12,9 @@
 #define ENETC_DEV_ID_VF		0xef00
 #define ENETC_DEV_ID		0xe100
 
+/* BD RING ALIGNMENT */
+#define ENETC_BD_RING_ALIGN	128
+
 /* ENETC register block BAR */
 #define ENETC_BAR_REGS			0x0
 
(quoted diff) +0 -0

b/drivers/net/enetc/enetc_ethdev.c

drivers/net/enetc/enetc_ethdev.c enetc_alloc_txbdr(struct enetc_bdr *txr, uint16_t

Quoted 4 lines

index dc05c00ff..4e978348c 100644

drivers/net/enetc/enetc_ethdev.c +0 -0
@@ -178,12 +178,12 @@ enetc_alloc_txbdr(struct enetc_bdr *txr, uint16_t

nb_desc)

Quoted 30 lines
drivers/net/enetc/enetc_ethdev.c +4 -4
 	int size;
 
 	size = nb_desc * sizeof(struct enetc_swbd);
-	txr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	txr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (txr->q_swbd == NULL)
 		return -ENOMEM;
 
 	size = nb_desc * sizeof(struct enetc_tx_bd);
-	txr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	txr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (txr->bd_base == NULL) {
 		rte_free(txr->q_swbd);
 		txr->q_swbd = NULL;
@@ -325,12 +325,12 @@ enetc_alloc_rxbdr(struct enetc_bdr *rxr,
 	int size;
 
 	size = nb_rx_desc * sizeof(struct enetc_swbd);
-	rxr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	rxr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (rxr->q_swbd == NULL)
 		return -ENOMEM;
 
 	size = nb_rx_desc * sizeof(union enetc_rx_bd);
-	rxr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	rxr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (rxr->bd_base == NULL) {
 		rte_free(rxr->q_swbd);
 		rxr->q_swbd = NULL;
#13 lore raw

PATCH v4 2/3 net/enetc: set random MAC in case no MAC for SI

In reply to Gagandeep Singh

for SGMII interfaces, there can be 0 value
written on MAC registers.
This patch set the random MAC address for those
interfaces.

---
 drivers/net/enetc/Makefile       |  2 +-
 drivers/net/enetc/enetc_ethdev.c | 35 +++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)
drivers/net/enetc/Makefile +1 -1
index 9895501db..312b37245 100644
@@ -17,7 +17,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_ethdev.c
 SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c
 
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
-LDLIBS += -lrte_ethdev
+LDLIBS += -lrte_ethdev -lrte_net
 LDLIBS += -lrte_bus_pci
 
 include $(RTE_SDK)/mk/rte.lib.mk
drivers/net/enetc/enetc_ethdev.c +34 -1
index 4e978348c..475ec77c3 100644
@@ -4,6 +4,7 @@
 
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
+#include <rte_random.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -123,11 +124,22 @@ enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
 	return rte_eth_linkstatus_set(dev, &link);
 }
 
+static void
+print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
+{
+	char buf[RTE_ETHER_ADDR_FMT_SIZE];
+
+	rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
+	ENETC_PMD_INFO("%s%s\n", name, buf);
+}
+
 static int
 enetc_hardware_init(struct enetc_eth_hw *hw)
 {
 	struct enetc_hw *enetc_hw = &hw->hw;
 	uint32_t *mac = (uint32_t *)hw->mac.addr;
+	uint32_t high_mac = 0;
+	uint16_t low_mac = 0;
 
 	PMD_INIT_FUNC_TRACE();
 	/* Calculating and storing the base HW addresses */
@@ -138,8 +150,29 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
 	enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
 
 	*mac = (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
+	high_mac = (uint32_t)*mac;
 	mac++;
 	*mac = (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
+	low_mac = (uint16_t)*mac;
+
+	if ((high_mac | low_mac) == 0) {
+		char *first_byte;
+
+		ENETC_PMD_INFO("MAC is not available for this SI, "
+			       "set random MAC\n");
+		mac = (uint32_t *)hw->mac.addr;
+		*mac = (uint32_t)rte_rand();
+		first_byte = (char *)mac;
+		*first_byte &= 0xfe;	/* clear multicast bit */
+		*first_byte |= 0x02;	/* set local assignment bit (IEEE802) */
+
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), *mac);
+		mac++;
+		*mac = (uint16_t)rte_rand();
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), *mac);
+		print_ethaddr("New address: ",
+			      (const struct rte_ether_addr *)hw->mac.addr);
+	}
 
 	return 0;
 }
@@ -906,5 +939,5 @@ RTE_INIT(enetc_pmd_init_log)
 {
 	enetc_logtype_pmd = rte_log_register("pmd.net.enetc");
 	if (enetc_logtype_pmd >= 0)
-		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_NOTICE);
+		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_INFO);
 }
Signature · 1 line
2.17.1
#14 lore raw

Re: [dpdk-dev] [PATCH v4 2/3] net/enetc: set random MAC in case no MAC for SI

Quoted 90 lines · Gagandeep Singh

for SGMII interfaces, there can be 0 value
written on MAC registers.
This patch set the random MAC address for those
interfaces.

---
 drivers/net/enetc/Makefile       |  2 +-
 drivers/net/enetc/enetc_ethdev.c | 35 +++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)
drivers/net/enetc/Makefile +1 -1
index 9895501db..312b37245 100644
@@ -17,7 +17,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_ethdev.c
 SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c
 
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
-LDLIBS += -lrte_ethdev
+LDLIBS += -lrte_ethdev -lrte_net
 LDLIBS += -lrte_bus_pci
 
 include $(RTE_SDK)/mk/rte.lib.mk
drivers/net/enetc/enetc_ethdev.c +33 -0
index 4e978348c..475ec77c3 100644
@@ -4,6 +4,7 @@
 
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
+#include <rte_random.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -123,11 +124,22 @@ enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
 	return rte_eth_linkstatus_set(dev, &link);
 }
 
+static void
+print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
+{
+	char buf[RTE_ETHER_ADDR_FMT_SIZE];
+
+	rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
+	ENETC_PMD_INFO("%s%s\n", name, buf);
+}
+
 static int
 enetc_hardware_init(struct enetc_eth_hw *hw)
 {
 	struct enetc_hw *enetc_hw = &hw->hw;
 	uint32_t *mac = (uint32_t *)hw->mac.addr;
+	uint32_t high_mac = 0;
+	uint16_t low_mac = 0;
 
 	PMD_INIT_FUNC_TRACE();
 	/* Calculating and storing the base HW addresses */
@@ -138,8 +150,29 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
 	enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
 
 	*mac = (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
+	high_mac = (uint32_t)*mac;
 	mac++;
 	*mac = (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
+	low_mac = (uint16_t)*mac;
+
+	if ((high_mac | low_mac) == 0) {
+		char *first_byte;
+
+		ENETC_PMD_INFO("MAC is not available for this SI, "
+			       "set random MAC\n");
+		mac = (uint32_t *)hw->mac.addr;
+		*mac = (uint32_t)rte_rand();
+		first_byte = (char *)mac;
+		*first_byte &= 0xfe;	/* clear multicast bit */
+		*first_byte |= 0x02;	/* set local assignment bit (IEEE802) */
+
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), *mac);
+		mac++;
+		*mac = (uint16_t)rte_rand();
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), *mac);
+		print_ethaddr("New address: ",
+			      (const struct rte_ether_addr *)hw->mac.addr);
+	}
 
 	return 0;
 }

drivers/net/enetc/enetc_ethdev.c RTE_INIT(enetc_pmd_init_log) · line 942

Quoted 5 lines
drivers/net/enetc/enetc_ethdev.c +1 -1
@@ -906,5 +939,5 @@ RTE_INIT(enetc_pmd_init_log)
 {
 	enetc_logtype_pmd = rte_log_register("pmd.net.enetc");
 	if (enetc_logtype_pmd >= 0)
-		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_NOTICE);
+		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_INFO);

This part look unrelated with the what commit log describes. And why you are making the driver more verbose by default?

#15 lore raw

Re: [dpdk-dev] [PATCH v4 2/3] net/enetc: set random MAC in case no MAC for SI

<...>

Quoted 67 lines

Review

Quoted 3 lines

include $(RTE_SDK)/mk/rte.lib.mk

(quoted diff) +0 -0

b/drivers/net/enetc/enetc_ethdev.c

drivers/net/enetc/enetc_ethdev.c enetc_link_update(struct rte_eth_dev *dev, int

Quoted 12 lines

index 4e978348c..475ec77c3 100644

drivers/net/enetc/enetc_ethdev.c +1 -0
@@ -4,6 +4,7 @@
 
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
+#include <rte_random.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -123,11 +124,22 @@ enetc_link_update(struct rte_eth_dev *dev, int

wait_to_complete __rte_unused)

Quoted 50 lines
drivers/net/enetc/enetc_ethdev.c +32 -0
 	return rte_eth_linkstatus_set(dev, &link);
 }
 
+static void
+print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
+{
+	char buf[RTE_ETHER_ADDR_FMT_SIZE];
+
+	rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
+	ENETC_PMD_INFO("%s%s\n", name, buf);
+}
+
 static int
 enetc_hardware_init(struct enetc_eth_hw *hw)
 {
 	struct enetc_hw *enetc_hw = &hw->hw;
 	uint32_t *mac = (uint32_t *)hw->mac.addr;
+	uint32_t high_mac = 0;
+	uint16_t low_mac = 0;
 
 	PMD_INIT_FUNC_TRACE();
 	/* Calculating and storing the base HW addresses */
@@ -138,8 +150,29 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
 	enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
 
 	*mac = (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
+	high_mac = (uint32_t)*mac;
 	mac++;
 	*mac = (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
+	low_mac = (uint16_t)*mac;
+
+	if ((high_mac | low_mac) == 0) {
+		char *first_byte;
+
+		ENETC_PMD_INFO("MAC is not available for this SI, "
+			       "set random MAC\n");
+		mac = (uint32_t *)hw->mac.addr;
+		*mac = (uint32_t)rte_rand();
+		first_byte = (char *)mac;
+		*first_byte &= 0xfe;	/* clear multicast bit */
+		*first_byte |= 0x02;	/* set local assignment bit (IEEE802) */
+
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), *mac);
+		mac++;
+		*mac = (uint16_t)rte_rand();
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), *mac);
+		print_ethaddr("New address: ",
+			      (const struct rte_ether_addr *)hw->mac.addr);
+	}
 
Quoted 13 lines

drivers/net/enetc/enetc_ethdev.c RTE_INIT(enetc_pmd_init_log) · line 942

Quoted 8 lines
drivers/net/enetc/enetc_ethdev.c +1 -1
 	return 0;
 }
@@ -906,5 +939,5 @@ RTE_INIT(enetc_pmd_init_log)
 {
 	enetc_logtype_pmd = rte_log_register("pmd.net.enetc");
 	if (enetc_logtype_pmd >= 0)
-		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_NOTICE);
+		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_INFO);

This part look unrelated with the what commit log describes. And why you are making the driver more verbose by default?

I changed this to print MAC address by default. Currently, enetc driver is not supporting NOTICE type log and the next supported log level is INFO and we are using INFO type log only while setting the random MAC addresses.
If INFO type log is not ok to print this information, please suggest me. Should I add NOTICE Type log? Or just add a printf to display the MAC address.

#16 lore raw

Re: [dpdk-dev] [PATCH v4 2/3] net/enetc: set random MAC in case no MAC for SI

Quoted 82 lines · Gagandeep Singh

<...>

Quoted 67 lines

Review

Quoted 3 lines

include $(RTE_SDK)/mk/rte.lib.mk

(quoted diff) +0 -0

b/drivers/net/enetc/enetc_ethdev.c

drivers/net/enetc/enetc_ethdev.c enetc_link_update(struct rte_eth_dev *dev, int

Quoted 12 lines

index 4e978348c..475ec77c3 100644

drivers/net/enetc/enetc_ethdev.c +1 -0
@@ -4,6 +4,7 @@
 
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
+#include <rte_random.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -123,11 +124,22 @@ enetc_link_update(struct rte_eth_dev *dev, int

wait_to_complete __rte_unused)

Quoted 50 lines
drivers/net/enetc/enetc_ethdev.c +32 -0
 	return rte_eth_linkstatus_set(dev, &link);
 }
 
+static void
+print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
+{
+	char buf[RTE_ETHER_ADDR_FMT_SIZE];
+
+	rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
+	ENETC_PMD_INFO("%s%s\n", name, buf);
+}
+
 static int
 enetc_hardware_init(struct enetc_eth_hw *hw)
 {
 	struct enetc_hw *enetc_hw = &hw->hw;
 	uint32_t *mac = (uint32_t *)hw->mac.addr;
+	uint32_t high_mac = 0;
+	uint16_t low_mac = 0;
 
 	PMD_INIT_FUNC_TRACE();
 	/* Calculating and storing the base HW addresses */
@@ -138,8 +150,29 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
 	enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
 
 	*mac = (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
+	high_mac = (uint32_t)*mac;
 	mac++;
 	*mac = (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
+	low_mac = (uint16_t)*mac;
+
+	if ((high_mac | low_mac) == 0) {
+		char *first_byte;
+
+		ENETC_PMD_INFO("MAC is not available for this SI, "
+			       "set random MAC\n");
+		mac = (uint32_t *)hw->mac.addr;
+		*mac = (uint32_t)rte_rand();
+		first_byte = (char *)mac;
+		*first_byte &= 0xfe;	/* clear multicast bit */
+		*first_byte |= 0x02;	/* set local assignment bit (IEEE802) */
+
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), *mac);
+		mac++;
+		*mac = (uint16_t)rte_rand();
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), *mac);
+		print_ethaddr("New address: ",
+			      (const struct rte_ether_addr *)hw->mac.addr);
+	}
 
Quoted 13 lines

drivers/net/enetc/enetc_ethdev.c RTE_INIT(enetc_pmd_init_log) · line 942

Quoted 8 lines
drivers/net/enetc/enetc_ethdev.c +1 -1
 	return 0;
 }
@@ -906,5 +939,5 @@ RTE_INIT(enetc_pmd_init_log)
 {
 	enetc_logtype_pmd = rte_log_register("pmd.net.enetc");
 	if (enetc_logtype_pmd >= 0)
-		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_NOTICE);
+		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_INFO);

This part look unrelated with the what commit log describes. And why you are making the driver more verbose by default?

Quoted 6 lines

I changed this to print MAC address by default. Currently, enetc driver is not supporting NOTICE type log and the next supported log level is INFO and we are using INFO type log only while setting the random MAC addresses.
If INFO type log is not ok to print this information, please suggest me. Should I add NOTICE Type log? Or just add a printf to display the MAC address.

There is no strict rule, but mostly* drivers set the default log level to NOTICE, the intention is to make logging less noisy by default.

Is the log you have mentioned should be printed always for all applications by default, if so I suggest updating its level to NOTICE, (adding NOTICE level is easy or you can use 'ENETC_PMD_LOG' directly for it.)

But if that log is not required for all, I suggest keeping it INFO and the default level NOTICE.

#17 lore raw

Re: [dpdk-dev] [PATCH v4 2/3] net/enetc: set random MAC in case no MAC for SI

Quoted 105 lines

-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Tuesday, October 22, 2019 2:30 PM
To: Gagandeep Singh <[email protected]>; [email protected]
Subject: Re: [PATCH v4 2/3] net/enetc: set random MAC in case no MAC for SI

Quoted 69 lines · Gagandeep Singh

<...>

Quoted 67 lines

Review

Quoted 3 lines

include $(RTE_SDK)/mk/rte.lib.mk

(quoted diff) +0 -0

b/drivers/net/enetc/enetc_ethdev.c

drivers/net/enetc/enetc_ethdev.c enetc_link_update(struct rte_eth_dev *dev, int

Quoted 12 lines

index 4e978348c..475ec77c3 100644

drivers/net/enetc/enetc_ethdev.c +1 -0
@@ -4,6 +4,7 @@
 
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
+#include <rte_random.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -123,11 +124,22 @@ enetc_link_update(struct rte_eth_dev *dev, int

wait_to_complete __rte_unused)

Quoted 50 lines
drivers/net/enetc/enetc_ethdev.c +32 -0
 	return rte_eth_linkstatus_set(dev, &link);
 }
 
+static void
+print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
+{
+	char buf[RTE_ETHER_ADDR_FMT_SIZE];
+
+	rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
+	ENETC_PMD_INFO("%s%s\n", name, buf);
+}
+
 static int
 enetc_hardware_init(struct enetc_eth_hw *hw)
 {
 	struct enetc_hw *enetc_hw = &hw->hw;
 	uint32_t *mac = (uint32_t *)hw->mac.addr;
+	uint32_t high_mac = 0;
+	uint16_t low_mac = 0;
 
 	PMD_INIT_FUNC_TRACE();
 	/* Calculating and storing the base HW addresses */
@@ -138,8 +150,29 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
 	enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
 
 	*mac = (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
+	high_mac = (uint32_t)*mac;
 	mac++;
 	*mac = (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
+	low_mac = (uint16_t)*mac;
+
+	if ((high_mac | low_mac) == 0) {
+		char *first_byte;
+
+		ENETC_PMD_INFO("MAC is not available for this SI, "
+			       "set random MAC\n");
+		mac = (uint32_t *)hw->mac.addr;
+		*mac = (uint32_t)rte_rand();
+		first_byte = (char *)mac;
+		*first_byte &= 0xfe;	/* clear multicast bit */
+		*first_byte |= 0x02;	/* set local assignment bit (IEEE802) */
+
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), *mac);
+		mac++;
+		*mac = (uint16_t)rte_rand();
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), *mac);
+		print_ethaddr("New address: ",
+			      (const struct rte_ether_addr *)hw->mac.addr);
+	}
 
Quoted 11 lines
Quoted 11 lines

drivers/net/enetc/enetc_ethdev.c RTE_INIT(enetc_pmd_init_log) · line 942

Quoted 8 lines
drivers/net/enetc/enetc_ethdev.c +1 -1
 	return 0;
 }
@@ -906,5 +939,5 @@ RTE_INIT(enetc_pmd_init_log)
 {
 	enetc_logtype_pmd = rte_log_register("pmd.net.enetc");
 	if (enetc_logtype_pmd >= 0)
-		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_NOTICE);
+		rte_log_set_level(enetc_logtype_pmd, RTE_LOG_INFO);

This part look unrelated with the what commit log describes. And why you

are

Quoted 3 lines
Quoted 2 lines

making the driver more verbose by default?

I changed this to print MAC address by default. Currently, enetc driver is not

supporting

Quoted 1 line

NOTICE type log and the next supported log level is INFO and we are using

INFO type log

Quoted 2 lines

only while setting the random MAC addresses.
If INFO type log is not ok to print this information, please suggest me. Should I

add NOTICE

Quoted 2 lines

Type log? Or just add a printf to display the MAC address.

There is no strict rule, but mostly* drivers set the default log level to NOTICE, the intention is to make logging less noisy by default.

Quoted 6 lines

Is the log you have mentioned should be printed always for all applications by default, if so I suggest updating its level to NOTICE, (adding NOTICE level is easy or you can use 'ENETC_PMD_LOG' directly for it.)

But if that log is not required for all, I suggest keeping it INFO and the default level NOTICE.

Ok, will add the NOTICE level.

#18 lore raw

PATCH v4 3/3 net/enetc: enable dpaax library

In reply to Gagandeep Singh

With this patch, enetc driver would start using the physical-virtual library interfaces.

---
 drivers/net/enetc/Makefile       | 2 ++
 drivers/net/enetc/enetc_ethdev.c | 8 ++++++++
 drivers/net/enetc/meson.build    | 1 +
 3 files changed, 11 insertions(+)
drivers/net/enetc/Makefile +2 -0
index 312b37245..4498bc51f 100644
@@ -10,6 +10,7 @@ LIB = librte_pmd_enetc.a
 
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
 EXPORT_MAP := rte_pmd_enetc_version.map
 LIBABIVER := 1
 
@@ -19,5 +20,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
 LDLIBS += -lrte_ethdev -lrte_net
 LDLIBS += -lrte_bus_pci
+LDLIBS += -lrte_common_dpaax
 
 include $(RTE_SDK)/mk/rte.lib.mk
drivers/net/enetc/enetc_ethdev.c +8 -0
index 475ec77c3..03590c6c3 100644
@@ -5,6 +5,7 @@
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
 #include <rte_random.h>
+#include <dpaax_iova_table.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -896,6 +897,9 @@ enetc_dev_init(struct rte_eth_dev *eth_dev)
 	eth_dev->data->mtu = RTE_ETHER_MAX_LEN - RTE_ETHER_HDR_LEN -
 		RTE_ETHER_CRC_LEN;
 
+	if (rte_eal_iova_mode() == RTE_IOVA_PA)
+		dpaax_iova_table_populate();
+
 	ENETC_PMD_DEBUG("port_id %d vendorID=0x%x deviceID=0x%x",
 			eth_dev->data->port_id, pci_dev->id.vendor_id,
 			pci_dev->id.device_id);
@@ -906,6 +910,10 @@ static int
 enetc_dev_uninit(struct rte_eth_dev *eth_dev __rte_unused)
 {
 	PMD_INIT_FUNC_TRACE();
+
+	if (rte_eal_iova_mode() == RTE_IOVA_PA)
+		dpaax_iova_table_depopulate();
+
 	return 0;
 }
 
drivers/net/enetc/meson.build +1 -0
index 3bc069844..bea54bea8 100644
@@ -6,6 +6,7 @@ if not is_linux
 	reason = 'only supported on linux'
 endif
 
+deps += ['common_dpaax']
 sources = files('enetc_ethdev.c',
 		'enetc_rxtx.c')
 
Signature · 1 line
2.17.1
#19 lore raw

Re: [dpdk-dev] [PATCH v4 3/3] net/enetc: enable dpaax library

Quoted 2 lines · Gagandeep Singh

With this patch, enetc driver would start using the physical-virtual library interfaces.

Out of curiosity what does it mean "start using the physical-virtual library interfaces" ? Can you please provide a little more details how it is done?

Quoted 73 lines
---
 drivers/net/enetc/Makefile       | 2 ++
 drivers/net/enetc/enetc_ethdev.c | 8 ++++++++
 drivers/net/enetc/meson.build    | 1 +
 3 files changed, 11 insertions(+)
drivers/net/enetc/Makefile +2 -0
index 312b37245..4498bc51f 100644
@@ -10,6 +10,7 @@ LIB = librte_pmd_enetc.a
 
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
 EXPORT_MAP := rte_pmd_enetc_version.map
 LIBABIVER := 1
 
@@ -19,5 +20,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
 LDLIBS += -lrte_ethdev -lrte_net
 LDLIBS += -lrte_bus_pci
+LDLIBS += -lrte_common_dpaax
 
 include $(RTE_SDK)/mk/rte.lib.mk
drivers/net/enetc/enetc_ethdev.c +8 -0
index 475ec77c3..03590c6c3 100644
@@ -5,6 +5,7 @@
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
 #include <rte_random.h>
+#include <dpaax_iova_table.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -896,6 +897,9 @@ enetc_dev_init(struct rte_eth_dev *eth_dev)
 	eth_dev->data->mtu = RTE_ETHER_MAX_LEN - RTE_ETHER_HDR_LEN -
 		RTE_ETHER_CRC_LEN;
 
+	if (rte_eal_iova_mode() == RTE_IOVA_PA)
+		dpaax_iova_table_populate();
+
 	ENETC_PMD_DEBUG("port_id %d vendorID=0x%x deviceID=0x%x",
 			eth_dev->data->port_id, pci_dev->id.vendor_id,
 			pci_dev->id.device_id);
@@ -906,6 +910,10 @@ static int
 enetc_dev_uninit(struct rte_eth_dev *eth_dev __rte_unused)
 {
 	PMD_INIT_FUNC_TRACE();
+
+	if (rte_eal_iova_mode() == RTE_IOVA_PA)
+		dpaax_iova_table_depopulate();
+
 	return 0;
 }
 
drivers/net/enetc/meson.build +1 -0
index 3bc069844..bea54bea8 100644
@@ -6,6 +6,7 @@ if not is_linux
 	reason = 'only supported on linux'
 endif
 
+deps += ['common_dpaax']
 sources = files('enetc_ethdev.c',
 		'enetc_rxtx.c')
 
#20 lore raw

Re: [dpdk-dev] [PATCH v4 3/3] net/enetc: enable dpaax library

Quoted 8 lines

-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Monday, October 21, 2019 9:26 PM
To: Gagandeep Singh <[email protected]>; [email protected]
Subject: Re: [PATCH v4 3/3] net/enetc: enable dpaax library

Quoted 7 lines
Quoted 2 lines · Gagandeep Singh

With this patch, enetc driver would start using the physical-virtual library interfaces.

Out of curiosity what does it mean "start using the physical-virtual library interfaces" ? Can you please provide a little more details how it is done?

I was just trying to explain that from now onwards, enetc driver will start interact with DPAAX library for PA to VA translation in case physical mode is enabled.
I will update the commit message with better explanation that how this Change can be useful.

#21 lore raw

Re: [dpdk-dev] [PATCH v4 3/3] net/enetc: enable dpaax library

Quoted 12 lines · Gagandeep Singh
Quoted 12 lines

-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Monday, October 21, 2019 9:26 PM
To: Gagandeep Singh <[email protected]>; [email protected]
Subject: Re: [PATCH v4 3/3] net/enetc: enable dpaax library

Quoted 2 lines · Gagandeep Singh

With this patch, enetc driver would start using the physical-virtual library interfaces.

Quoted 6 lines
Quoted 3 lines

Out of curiosity what does it mean "start using the physical-virtual library interfaces" ? Can you please provide a little more details how it is done?

I was just trying to explain that from now onwards, enetc driver will start interact with DPAAX library for PA to VA translation in case physical mode is enabled.

If it will be used later, what about adding this change in the patch it needs to be used?

Quoted 3 lines

I will update the commit message with better explanation that how this Change can be useful.

#22 lore raw

Re: [dpdk-dev] [PATCH v4 3/3] net/enetc: enable dpaax library

Quoted 24 lines

-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Tuesday, October 22, 2019 2:31 PM
To: Gagandeep Singh <[email protected]>; [email protected]
Subject: Re: [PATCH v4 3/3] net/enetc: enable dpaax library

Quoted 15 lines · Gagandeep Singh
Quoted 15 lines

-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Monday, October 21, 2019 9:26 PM
To: Gagandeep Singh <[email protected]>; [email protected]
Subject: Re: [PATCH v4 3/3] net/enetc: enable dpaax library

Quoted 2 lines · Gagandeep Singh

With this patch, enetc driver would start using the physical-virtual library interfaces.

Out of curiosity what does it mean "start using the physical-virtual library interfaces" ? Can you please provide a little more details how it is done?

Quoted 6 lines
Quoted 3 lines

I was just trying to explain that from now onwards, enetc driver will start interact with DPAAX library for PA to VA translation in case physical mode is enabled.

If it will be used later, what about adding this change in the patch it needs to be used?

This is right that currently enetc is not using the dpaaX table for PA->VA translation, But with this change, caam JR driver can get benefits of dpaaX, when used with enetc over enetc supported SoCs( e.g. in IPsec-secgw application)

Here is caam ptov code:

static inline void *
caam_jr_dma_ptov(rte_iova_t paddr)

{
	void *va;
	va = dpaax_iova_table_get_va(paddr);
	if (likely(va != NULL))
		return va;

	return rte_mem_iova2virt(paddr);
}

Currently, caam JR using the expensive API rte_mem_iova2virt in its datapath, and we can avoid this by enabling the dpaaX.

#23 lore raw

v5 cover enetc PMD specific changes

In reply to Gagandeep Singh

v2 change-log:
* dpaax integration added
* compilation fixed

v3 change-log:
* added missing BD ring alignment patch

v4 change-log:
* fixed meson build

v5 change-log:
* added NOTICE log level
* added fix line for BD ring alignment fix
* updated commit message for dpaaX patch

Gagandeep Singh (4):
net/enetc: fix BD ring alignment
net/enetc: set random MAC in case no MAC for SI
net/enetc: add log level notice
net/enetc: enable dpaax library

 drivers/net/enetc/Makefile        |  4 ++-
 drivers/net/enetc/base/enetc_hw.h |  3 ++
 drivers/net/enetc/enetc_ethdev.c  | 49 ++++++++++++++++++++++++++++---
 drivers/net/enetc/enetc_logs.h    |  2 ++
 drivers/net/enetc/meson.build     |  1 +
 5 files changed, 54 insertions(+), 5 deletions(-)
Signature · 1 line
2.17.1
#24 lore raw

PATCH v5 1/4 net/enetc: fix BD ring alignment

enetc BD rings should be aligned to 128
instead of RTE_CACHE_LINE_SIZE.

Fixes 469c6111a7 ("net/enetc: enable Rx and Tx")
---
 drivers/net/enetc/base/enetc_hw.h | 3 +++
 drivers/net/enetc/enetc_ethdev.c  | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/net/enetc/base/enetc_hw.h +3 -0
index fd71155ee..2fe7ccb5b 100644
@@ -12,6 +12,9 @@
 #define ENETC_DEV_ID_VF		0xef00
 #define ENETC_DEV_ID		0xe100
 
+/* BD RING ALIGNMENT */
+#define ENETC_BD_RING_ALIGN	128
+
 /* ENETC register block BAR */
 #define ENETC_BAR_REGS			0x0
 
drivers/net/enetc/enetc_ethdev.c +4 -4
index dc05c00ff..4e978348c 100644
@@ -178,12 +178,12 @@ enetc_alloc_txbdr(struct enetc_bdr *txr, uint16_t nb_desc)
 	int size;
 
 	size = nb_desc * sizeof(struct enetc_swbd);
-	txr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	txr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (txr->q_swbd == NULL)
 		return -ENOMEM;
 
 	size = nb_desc * sizeof(struct enetc_tx_bd);
-	txr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	txr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (txr->bd_base == NULL) {
 		rte_free(txr->q_swbd);
 		txr->q_swbd = NULL;
@@ -325,12 +325,12 @@ enetc_alloc_rxbdr(struct enetc_bdr *rxr,
 	int size;
 
 	size = nb_rx_desc * sizeof(struct enetc_swbd);
-	rxr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	rxr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (rxr->q_swbd == NULL)
 		return -ENOMEM;
 
 	size = nb_rx_desc * sizeof(union enetc_rx_bd);
-	rxr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+	rxr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
 	if (rxr->bd_base == NULL) {
 		rte_free(rxr->q_swbd);
 		rxr->q_swbd = NULL;
Signature · 1 line
2.17.1
#25 lore raw

PATCH v5 2/4 net/enetc: set random MAC in case no MAC for SI

In reply to Gagandeep Singh

for SGMII interfaces, there can be 0 value
written on MAC registers.
This patch set the random MAC address for those
interfaces.

---
 drivers/net/enetc/Makefile       |  2 +-
 drivers/net/enetc/enetc_ethdev.c | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
drivers/net/enetc/Makefile +1 -1
index 9895501db..312b37245 100644
@@ -17,7 +17,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_ethdev.c
 SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c
 
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
-LDLIBS += -lrte_ethdev
+LDLIBS += -lrte_ethdev -lrte_net
 LDLIBS += -lrte_bus_pci
 
 include $(RTE_SDK)/mk/rte.lib.mk
drivers/net/enetc/enetc_ethdev.c +31 -0
index 4e978348c..d07e61c3f 100644
@@ -4,6 +4,7 @@
 
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
+#include <rte_random.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -123,11 +124,22 @@ enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
 	return rte_eth_linkstatus_set(dev, &link);
 }
 
+static void
+print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
+{
+	char buf[RTE_ETHER_ADDR_FMT_SIZE];
+
+	rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
+	ENETC_PMD_INFO("%s%s\n", name, buf);
+}
+
 static int
 enetc_hardware_init(struct enetc_eth_hw *hw)
 {
 	struct enetc_hw *enetc_hw = &hw->hw;
 	uint32_t *mac = (uint32_t *)hw->mac.addr;
+	uint32_t high_mac = 0;
+	uint16_t low_mac = 0;
 
 	PMD_INIT_FUNC_TRACE();
 	/* Calculating and storing the base HW addresses */
@@ -138,8 +150,27 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
 	enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
 
 	*mac = (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
+	high_mac = (uint32_t)*mac;
 	mac++;
 	*mac = (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
+	low_mac = (uint16_t)*mac;
+
+	if ((high_mac | low_mac) == 0) {
+		char *first_byte;
+
+		mac = (uint32_t *)hw->mac.addr;
+		*mac = (uint32_t)rte_rand();
+		first_byte = (char *)mac;
+		*first_byte &= 0xfe;	/* clear multicast bit */
+		*first_byte |= 0x02;	/* set local assignment bit (IEEE802) */
+
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), *mac);
+		mac++;
+		*mac = (uint16_t)rte_rand();
+		enetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), *mac);
+		print_ethaddr("New address: ",
+			      (const struct rte_ether_addr *)hw->mac.addr);
+	}
 
 	return 0;
 }
Signature · 1 line
2.17.1
#26 lore raw

PATCH v5 3/4 net/enetc: add log level notice

In reply to Gagandeep Singh

To display random MAC address as notice,
a log level NOTICE is added.

---
 drivers/net/enetc/enetc_ethdev.c | 4 +++-
 drivers/net/enetc/enetc_logs.h   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/net/enetc/enetc_ethdev.c +3 -1
index d07e61c3f..c6099714e 100644
@@ -130,7 +130,7 @@ print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
 	char buf[RTE_ETHER_ADDR_FMT_SIZE];
 
 	rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
-	ENETC_PMD_INFO("%s%s\n", name, buf);
+	ENETC_PMD_NOTICE("%s%s\n", name, buf);
 }
 
 static int
@@ -158,6 +158,8 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
 	if ((high_mac | low_mac) == 0) {
 		char *first_byte;
 
+		ENETC_PMD_NOTICE("MAC is not available for this SI, "
+				"set random MAC\n");
 		mac = (uint32_t *)hw->mac.addr;
 		*mac = (uint32_t)rte_rand();
 		first_byte = (char *)mac;
drivers/net/enetc/enetc_logs.h +2 -0
index c8a6c0cf3..0976d42de 100644
@@ -21,6 +21,8 @@ extern int enetc_logtype_pmd;
 	ENETC_PMD_LOG(CRIT, fmt, ## args)
 #define ENETC_PMD_INFO(fmt, args...) \
 	ENETC_PMD_LOG(INFO, fmt, ## args)
+#define ENETC_PMD_NOTICE(fmt, args...) \
+	ENETC_PMD_LOG(NOTICE, fmt, ## args)
 #define ENETC_PMD_ERR(fmt, args...) \
 	ENETC_PMD_LOG(ERR, fmt, ## args)
 #define ENETC_PMD_WARN(fmt, args...) \
Signature · 1 line
2.17.1
#27 lore raw

PATCH v5 4/4 net/enetc: enable dpaax library

In reply to Gagandeep Singh

dpaaX is used to maintain a local copy of PA->VA translations.

Using the rte_mem_virt2iova or rte_mem_virt2phy is expensive. This library is an attempt to reduce the overall cost associated with this translation.

This patch enables this dpaaX library by populating a dpaaX's table for PA to VA translation. This change will also help the caam JR driver in PA to VA translation when used with enetc driver over enetc supported SoCs.

---
 drivers/net/enetc/Makefile       | 2 ++
 drivers/net/enetc/enetc_ethdev.c | 8 ++++++++
 drivers/net/enetc/meson.build    | 1 +
 3 files changed, 11 insertions(+)
drivers/net/enetc/Makefile +2 -0
index 312b37245..4498bc51f 100644
@@ -10,6 +10,7 @@ LIB = librte_pmd_enetc.a
 
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
 EXPORT_MAP := rte_pmd_enetc_version.map
 LIBABIVER := 1
 
@@ -19,5 +20,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
 LDLIBS += -lrte_ethdev -lrte_net
 LDLIBS += -lrte_bus_pci
+LDLIBS += -lrte_common_dpaax
 
 include $(RTE_SDK)/mk/rte.lib.mk
drivers/net/enetc/enetc_ethdev.c +8 -0
index c6099714e..20b77c006 100644
@@ -5,6 +5,7 @@
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
 #include <rte_random.h>
+#include <dpaax_iova_table.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -896,6 +897,9 @@ enetc_dev_init(struct rte_eth_dev *eth_dev)
 	eth_dev->data->mtu = RTE_ETHER_MAX_LEN - RTE_ETHER_HDR_LEN -
 		RTE_ETHER_CRC_LEN;
 
+	if (rte_eal_iova_mode() == RTE_IOVA_PA)
+		dpaax_iova_table_populate();
+
 	ENETC_PMD_DEBUG("port_id %d vendorID=0x%x deviceID=0x%x",
 			eth_dev->data->port_id, pci_dev->id.vendor_id,
 			pci_dev->id.device_id);
@@ -906,6 +910,10 @@ static int
 enetc_dev_uninit(struct rte_eth_dev *eth_dev __rte_unused)
 {
 	PMD_INIT_FUNC_TRACE();
+
+	if (rte_eal_iova_mode() == RTE_IOVA_PA)
+		dpaax_iova_table_depopulate();
+
 	return 0;
 }
 
drivers/net/enetc/meson.build +1 -0
index 3bc069844..bea54bea8 100644
@@ -6,6 +6,7 @@ if not is_linux
 	reason = 'only supported on linux'
 endif
 
+deps += ['common_dpaax']
 sources = files('enetc_ethdev.c',
 		'enetc_rxtx.c')
 
Signature · 1 line
2.17.1