[dpdk-dev] [PATCH 5/6] ether: allow setting mac address

[Stephen Hemminger <stephen@networkplumber.org>]

[-- Attachment #1: mac-addr-set.patch --]
[-- Type: text/plain, Size: 3233 bytes --]

Allow setting the default Ethernet address used on device.
The underlying drivers allow it but the DPDK was blocking any
attempts to change Ethernet address on device.

For most devices, this is just the same as filling in address
in mac address table entry 0, but for some devices this requires
special override.

Signed-off-by: Stephen Hemminger <shemming@brocade.com>


--- a/lib/librte_ether/rte_ethdev.h	2014-05-14 11:44:27.373014227 -0700
+++ b/lib/librte_ether/rte_ethdev.h	2014-05-14 11:44:27.373014227 -0700
@@ -982,6 +982,11 @@ typedef void (*eth_mac_addr_add_t)(struc
 				  struct ether_addr *mac_addr,
 				  uint32_t index,
 				  uint32_t vmdq);
+/**< @internal Change default MAC address */
+
+typedef void (*eth_mac_addr_set_t)(struct rte_eth_dev *dev,
+				   struct ether_addr *mac_addr);
+
 /**< @internal Set a MAC address into Receive Address Address Register */ 
 
 typedef int (*eth_uc_hash_table_set_t)(struct rte_eth_dev *dev,
@@ -1114,6 +1119,7 @@ struct eth_dev_ops {
 	priority_flow_ctrl_set_t   priority_flow_ctrl_set; /**< Setup priority flow control.*/
 	eth_mac_addr_remove_t      mac_addr_remove; /**< Remove MAC address */
 	eth_mac_addr_add_t         mac_addr_add;  /**< Add a MAC address */
+	eth_mac_addr_set_t	   mac_addr_set;  /**< Change default MAC address */
 	eth_uc_hash_table_set_t    uc_hash_table_set;  /**< Set Unicast Table Array */
 	eth_uc_all_hash_table_set_t uc_all_hash_table_set;  /**< Set Unicast hash bitmap */
 	eth_mirror_rule_set_t	   mirror_rule_set;  /**< Add a traffic mirror rule.*/
@@ -2538,6 +2544,21 @@ int rte_eth_dev_mac_addr_add(uint8_t por
 int rte_eth_dev_mac_addr_remove(uint8_t port, struct ether_addr *mac_addr);
 
 /**
+ * Change the default MAC address
+ *
+ * @param port
+ *   The port identifier of the Ethernet device.
+ * @param mac_addr
+ *   MAC address to remove.
+ * @return
+ *   - (0) if successfully added or *mac_addr" was already added.
+ *   - (-ENOTSUP) if hardware doesn't support this feature.
+ *   - (-ENODEV) if *port* is invalid.
+ *   - (-EINVAL) if MAC address is invalid.
+ */
+int rte_eth_dev_macaddr_set(uint8_t port, struct ether_addr *mac_addr);
+
+/**
  * Update Redirection Table(RETA) of Receive Side Scaling of Ethernet device.
  * 
  * @param port
--- a/lib/librte_ether/rte_ethdev.c	2014-05-14 11:44:27.373014227 -0700
+++ b/lib/librte_ether/rte_ethdev.c	2014-05-14 11:44:27.373014227 -0700
@@ -1059,6 +1059,33 @@ rte_eth_macaddr_get(uint8_t port_id, str
 }
 
 int
+rte_eth_dev_macaddr_set(uint8_t port_id, struct ether_addr *addr)
+{
+	struct rte_eth_dev *dev;
+
+	if (port_id >= nb_ports) {
+		PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+		return (-ENODEV);
+	}
+	if (is_zero_ether_addr(addr)) {
+		PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n", port_id);
+		return (-EINVAL);
+	}
+	dev = &rte_eth_devices[port_id];
+
+	if (*dev->dev_ops->mac_addr_set)
+		(*dev->dev_ops->mac_addr_set)(dev, addr);
+	else {
+		FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_add, -ENOTSUP);
+		(*dev->dev_ops->mac_addr_add)(dev, addr, 0, 0);
+	}
+
+	ether_addr_copy(addr, &dev->data->mac_addrs[0]);
+
+	return 0;
+}
+
+int
 rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on)
 {
 	struct rte_eth_dev *dev;