Skip to contentSkip to conversation

net/e1000: add mac_addr_set set to em

PATCH Applied Chas Williams 4 participants 4 messages Feb 19, 2018 – Apr 6, 2018 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/e1000: add mac_addr_set set to em

From: Chas Williams <[email protected]>

Based on the equivalent code in the igb driver.

---
 drivers/net/e1000/em_ethdev.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/net/e1000/em_ethdev.c +12 -0
index 242375f..5bb9cc9 100644
@@ -94,6 +94,8 @@ static int em_get_rx_buffer_size(struct e1000_hw *hw);
 static int eth_em_rar_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr,
 			  uint32_t index, uint32_t pool);
 static void eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t index);
+static void eth_em_default_mac_addr_set(struct rte_eth_dev *dev,
+					 struct ether_addr *addr);
 
 static int eth_em_set_mc_addr_list(struct rte_eth_dev *dev,
 				   struct ether_addr *mc_addr_set,
@@ -190,6 +192,7 @@ static const struct eth_dev_ops eth_em_ops = {
 	.dev_led_off          = eth_em_led_off,
 	.flow_ctrl_get        = eth_em_flow_ctrl_get,
 	.flow_ctrl_set        = eth_em_flow_ctrl_set,
+	.mac_addr_set         = eth_em_default_mac_addr_set,
 	.mac_addr_add         = eth_em_rar_set,
 	.mac_addr_remove      = eth_em_rar_clear,
 	.set_mc_addr_list     = eth_em_set_mc_addr_list,
@@ -1809,6 +1812,15 @@ eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t index)
 	e1000_rar_set(hw, addr, index);
 }
 
+static void
+eth_em_default_mac_addr_set(struct rte_eth_dev *dev,
+			    struct ether_addr *addr)
+{
+	eth_em_rar_clear(dev, 0);
+
+	eth_em_rar_set(dev, (void *)addr, 0, 0);
+}
+
 static int
 eth_em_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 {
Signature · 1 line
2.9.5
Reviewed-by on v1 1/1
#1 lore raw
Quoted 33 lines · Chas Williams

From: Chas Williams <[email protected]>

Based on the equivalent code in the igb driver.

---
 drivers/net/e1000/em_ethdev.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/net/e1000/em_ethdev.c +3 -0
index 242375f..5bb9cc9 100644
@@ -94,6 +94,8 @@ static int em_get_rx_buffer_size(struct e1000_hw *hw);
 static int eth_em_rar_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr,
                          uint32_t index, uint32_t pool);
 static void eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t index);
+static void eth_em_default_mac_addr_set(struct rte_eth_dev *dev,
+                                        struct ether_addr *addr);
 
 static int eth_em_set_mc_addr_list(struct rte_eth_dev *dev,
                                   struct ether_addr *mc_addr_set,
@@ -190,6 +192,7 @@ static const struct eth_dev_ops eth_em_ops = {
        .dev_led_off          = eth_em_led_off,
        .flow_ctrl_get        = eth_em_flow_ctrl_get,
        .flow_ctrl_set        = eth_em_flow_ctrl_set,
+       .mac_addr_set         = eth_em_default_mac_addr_set,
        .mac_addr_add         = eth_em_rar_set,
        .mac_addr_remove      = eth_em_rar_clear,
        .set_mc_addr_list     = eth_em_set_mc_addr_list,
@@ -1809,6 +1812,15 @@ eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t index)
        e1000_rar_set(hw, addr, index);
 }

drivers/net/e1000/em_ethdev.c eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t index) · line 1823

Quoted 10 lines
drivers/net/e1000/em_ethdev.c +9 -0
 
+static void
+eth_em_default_mac_addr_set(struct rte_eth_dev *dev,
+                           struct ether_addr *addr)
+{
+       eth_em_rar_clear(dev, 0);
+
+       eth_em_rar_set(dev, (void *)addr, 0, 0);
+}
+

Even if copied from igb, this cast is unneeded.
I wrote a similar patch which was in the "upstream" queue, so looks good to me.

Signature · 1 line
David Marchand
Acked-by on v1 1/1
#2 lore raw
In reply to Chas Williams
Quoted 56 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Chas Williams
Sent: Monday, February 19, 2018 8:40 AM
To: [email protected]
Cc: Lu, Wenzhuo <[email protected]>; Chas Williams <[email protected]>
Subject: [dpdk-dev] [PATCH] net/e1000: add mac_addr_set set to em

From: Chas Williams <[email protected]>

Based on the equivalent code in the igb driver.

---
 drivers/net/e1000/em_ethdev.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
(quoted diff) +0 -0

b/drivers/net/e1000/em_ethdev.c index 242375f..5bb9cc9 100644

drivers/net/e1000/em_ethdev.c +0 -0
@@ -94,6 +94,8 @@ static int em_get_rx_buffer_size(struct e1000_hw *hw);

static int eth_em_rar_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr,

drivers/net/e1000/em_ethdev.c +11 -1
 			  uint32_t index, uint32_t pool);
 static void eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t index);
+static void eth_em_default_mac_addr_set(struct rte_eth_dev *dev,
+					 struct ether_addr *addr);
 
 static int eth_em_set_mc_addr_list(struct rte_eth_dev *dev,
 				   struct ether_addr *mc_addr_set,
@@ -190,6 +192,7 @@ static const struct eth_dev_ops eth_em_ops = {
 	.dev_led_off          = eth_em_led_off,
 	.flow_ctrl_get        = eth_em_flow_ctrl_get,
 	.flow_ctrl_set        = eth_em_flow_ctrl_set,
+	.mac_addr_set         = eth_em_default_mac_addr_set,
 	.mac_addr_add         = eth_em_rar_set,
 	.mac_addr_remove      = eth_em_rar_clear,
 	.set_mc_addr_list     = eth_em_set_mc_addr_list,
@@ -1809,6 +1812,15 @@ eth_em_rar_clear(struct rte_eth_dev *dev,
 uint32_t index)
 	e1000_rar_set(hw, addr, index);
 }
 
+static void
+eth_em_default_mac_addr_set(struct rte_eth_dev *dev,
+			    struct ether_addr *addr)
+{
+	eth_em_rar_clear(dev, 0);
+
+	eth_em_rar_set(dev, (void *)addr, 0, 0); }
+
 static int
 eth_em_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)  {
--
Quoted 1 line

2.9.5

I think this patch is need by em to enable the feature of configuration for default Receive Address Register, if DPDK user use rte function of
rte_eth_dev_default_mac_addr_set(), it can do this config work like other NIC.

Applied
#3 lore raw
Quoted 74 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Zhao1, Wei
Sent: Monday, April 2, 2018 2:17 PM
To: Chas Williams; [email protected]
Cc: Lu, Wenzhuo; Chas Williams
Subject: Re: [dpdk-dev] [PATCH] net/e1000: add mac_addr_set set to em

Quoted 29 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Chas Williams
Sent: Monday, February 19, 2018 8:40 AM
To: [email protected]
Cc: Lu, Wenzhuo <[email protected]>; Chas Williams <[email protected]>
Subject: [dpdk-dev] [PATCH] net/e1000: add mac_addr_set set to em

From: Chas Williams <[email protected]>

Based on the equivalent code in the igb driver.

---
 drivers/net/e1000/em_ethdev.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
(quoted diff) +0 -0

b/drivers/net/e1000/em_ethdev.c index 242375f..5bb9cc9 100644

drivers/net/e1000/em_ethdev.c +2 -0
@@ -94,6 +94,8 @@ static int em_get_rx_buffer_size(struct e1000_hw
 *hw); static int eth_em_rar_set(struct rte_eth_dev *dev, struct
 ether_addr *mac_addr,
 			  uint32_t index, uint32_t pool);
 static void eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t
 index);
+static void eth_em_default_mac_addr_set(struct rte_eth_dev *dev,
+					 struct ether_addr *addr);
 
Quoted 2 lines

static int eth_em_set_mc_addr_list(struct rte_eth_dev *dev,
struct ether_addr *mc_addr_set, @@ -190,6

+192,7 @@ static

Quoted 24 lines

const struct eth_dev_ops eth_em_ops = {

drivers/net/e1000/em_ethdev.c +9 -1
 	.dev_led_off          = eth_em_led_off,
 	.flow_ctrl_get        = eth_em_flow_ctrl_get,
 	.flow_ctrl_set        = eth_em_flow_ctrl_set,
+	.mac_addr_set         = eth_em_default_mac_addr_set,
 	.mac_addr_add         = eth_em_rar_set,
 	.mac_addr_remove      = eth_em_rar_clear,
 	.set_mc_addr_list     = eth_em_set_mc_addr_list,
@@ -1809,6 +1812,15 @@ eth_em_rar_clear(struct rte_eth_dev *dev,
 uint32_t index)
 	e1000_rar_set(hw, addr, index);
 }
 
+static void
+eth_em_default_mac_addr_set(struct rte_eth_dev *dev,
+			    struct ether_addr *addr)
+{
+	eth_em_rar_clear(dev, 0);
+
+	eth_em_rar_set(dev, (void *)addr, 0, 0); }
+
 static int
 eth_em_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)  {
--
Quoted 1 line

2.9.5

I think this patch is need by em to enable the feature of configuration for
default Receive Address Register, if DPDK user use rte function of rte_eth_dev_default_mac_addr_set(), it can do this config work like other NIC.

Quoted 1 line

Applied to dpdk-next-net-intel, thanks!

/Helin