[v7,14/17] net/r8169: implement promisc and allmulti modes

Message ID 20241112095804.42091-15-howard_wang@realsil.com.cn (mailing list archive)
State Changes Requested, archived
Delegated to: Ferruh Yigit
Headers
Series modify code as suggested by the maintainer |

Checks

Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Howard Wang Nov. 12, 2024, 9:58 a.m. UTC
Add support for promiscuous/allmulticast modes configuration.

Signed-off-by: Howard Wang <howard_wang@realsil.com.cn>
---
 doc/guides/nics/features/r8169.ini |  4 ++
 drivers/net/r8169/r8169_ethdev.c   | 67 ++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
  

Comments

Ferruh Yigit Nov. 13, 2024, 12:08 a.m. UTC | #1
On 11/12/2024 9:58 AM, Howard Wang wrote:
> diff --git a/doc/guides/nics/features/r8169.ini b/doc/guides/nics/features/r8169.ini
> index e4bbcde2a0..d2ad94dcc6 100644
> --- a/doc/guides/nics/features/r8169.ini
> +++ b/doc/guides/nics/features/r8169.ini
> @@ -10,6 +10,10 @@ Link status          = Y
>  Link status event    = Y
>  Scattered Rx         = Y
>  TSO                  = Y
> +Promiscuous mode     = Y
> +Allmulticast mode    = Y
> +Unicast MAC filter   = Y
> +Multicast MAC filter = Y
>

"Unicast MAC filter" & "Multicast MAC filter" seems not supported.
Please check 'doc/guides/nics/features.rst' for the descriptions of the
features.
  

Patch

diff --git a/doc/guides/nics/features/r8169.ini b/doc/guides/nics/features/r8169.ini
index e4bbcde2a0..d2ad94dcc6 100644
--- a/doc/guides/nics/features/r8169.ini
+++ b/doc/guides/nics/features/r8169.ini
@@ -10,6 +10,10 @@  Link status          = Y
 Link status event    = Y
 Scattered Rx         = Y
 TSO                  = Y
+Promiscuous mode     = Y
+Allmulticast mode    = Y
+Unicast MAC filter   = Y
+Multicast MAC filter = Y
 Flow control         = Y
 L3 checksum offload  = Y
 L4 checksum offload  = Y
diff --git a/drivers/net/r8169/r8169_ethdev.c b/drivers/net/r8169/r8169_ethdev.c
index f0792681a3..c90c3c9d03 100644
--- a/drivers/net/r8169/r8169_ethdev.c
+++ b/drivers/net/r8169/r8169_ethdev.c
@@ -38,6 +38,10 @@  static int rtl_dev_infos_get(struct rte_eth_dev *dev,
 static int rtl_dev_stats_get(struct rte_eth_dev *dev,
 			     struct rte_eth_stats *rte_stats);
 static int rtl_dev_stats_reset(struct rte_eth_dev *dev);
+static int rtl_promiscuous_enable(struct rte_eth_dev *dev);
+static int rtl_promiscuous_disable(struct rte_eth_dev *dev);
+static int rtl_allmulticast_enable(struct rte_eth_dev *dev);
+static int rtl_allmulticast_disable(struct rte_eth_dev *dev);
 
 /*
  * The set of PCI devices this driver supports
@@ -74,6 +78,11 @@  static const struct eth_dev_ops rtl_eth_dev_ops = {
 	.dev_set_link_down    = rtl_dev_set_link_down,
 	.dev_infos_get        = rtl_dev_infos_get,
 
+	.promiscuous_enable   = rtl_promiscuous_enable,
+	.promiscuous_disable  = rtl_promiscuous_disable,
+	.allmulticast_enable  = rtl_allmulticast_enable,
+	.allmulticast_disable = rtl_allmulticast_disable,
+
 	.link_update          = rtl_dev_link_update,
 
 	.stats_get            = rtl_dev_stats_get,
@@ -372,6 +381,64 @@  rtl_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 	return 0;
 }
 
+static int
+rtl_promiscuous_enable(struct rte_eth_dev *dev)
+{
+	struct rtl_adapter *adapter = RTL_DEV_PRIVATE(dev);
+	struct rtl_hw *hw = &adapter->hw;
+
+	int rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys | AcceptAllPhys;
+
+	RTL_W32(hw, RxConfig, rx_mode | (RTL_R32(hw, RxConfig)));
+	rtl_allmulticast_enable(dev);
+
+	return 0;
+}
+
+static int
+rtl_promiscuous_disable(struct rte_eth_dev *dev)
+{
+	struct rtl_adapter *adapter = RTL_DEV_PRIVATE(dev);
+	struct rtl_hw *hw = &adapter->hw;
+	int rx_mode = ~AcceptAllPhys;
+
+	RTL_W32(hw, RxConfig, rx_mode & (RTL_R32(hw, RxConfig)));
+
+	if (dev->data->all_multicast == 1)
+		rtl_allmulticast_enable(dev);
+	else
+		rtl_allmulticast_disable(dev);
+
+	return 0;
+}
+
+static int
+rtl_allmulticast_enable(struct rte_eth_dev *dev)
+{
+	struct rtl_adapter *adapter = RTL_DEV_PRIVATE(dev);
+	struct rtl_hw *hw = &adapter->hw;
+
+	RTL_W32(hw, MAR0 + 0, 0xffffffff);
+	RTL_W32(hw, MAR0 + 4, 0xffffffff);
+
+	return 0;
+}
+
+static int
+rtl_allmulticast_disable(struct rte_eth_dev *dev)
+{
+	struct rtl_adapter *adapter = RTL_DEV_PRIVATE(dev);
+	struct rtl_hw *hw = &adapter->hw;
+
+	if (dev->data->promiscuous == 1)
+		return 0; /* Must remain in all_multicast mode */
+
+	RTL_W32(hw, MAR0 + 0, 0);
+	RTL_W32(hw, MAR0 + 4, 0);
+
+	return 0;
+}
+
 static int
 rtl_dev_stats_reset(struct rte_eth_dev *dev)
 {