diff --git a/Makefile b/Makefile index 10a002a..f380251 100644 --- a/Makefile +++ b/Makefile @@ -41,10 +41,10 @@ ENABLE_S5_KEEP_CURR_MAC = n ENABLE_EEE = y ENABLE_S0_MAGIC_PACKET = n ENABLE_TX_NO_CLOSE = y -ENABLE_MULTIPLE_TX_QUEUE = n +ENABLE_MULTIPLE_TX_QUEUE = y ENABLE_PTP_SUPPORT = n ENABLE_PTP_MASTER_MODE = n -ENABLE_RSS_SUPPORT = n +ENABLE_RSS_SUPPORT = y ENABLE_LIB_SUPPORT = n ENABLE_USE_FIRMWARE_FILE = n DISABLE_PM_SUPPORT = n diff --git a/r8125_n.c b/r8125_n.c index 6079c6c..e1e97db 100644 --- a/r8125_n.c +++ b/r8125_n.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -11479,6 +11480,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_private *tp) } } +static int +rtl8125_led_configuration(struct rtl8125_private *tp) +{ + u32 led_data; + int ret; + + ret = of_property_read_u32(tp->pci_dev->dev.of_node, + "realtek,led-data", &led_data); + + if (ret) + return ret; + + RTL_W16(tp, CustomLED, led_data); + + return 0; +} + static void rtl8125_init_software_variable(struct net_device *dev) { @@ -11957,6 +11975,8 @@ rtl8125_init_software_variable(struct net_device *dev) if (tp->InitRxDescType == RX_DESC_RING_TYPE_3) tp->rtl8125_rx_config |= EnableRxDescV3; + rtl8125_led_configuration(tp); + tp->NicCustLedValue = RTL_R16(tp, CustomLED); tp->wol_opts = rtl8125_get_hw_wol(tp); diff --git a/r8125_rss.c b/r8125_rss.c index 1f55c44..5803c03 100644 --- a/r8125_rss.c +++ b/r8125_rss.c @@ -88,7 +88,7 @@ int rtl8125_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, struct rtl8125_private *tp = netdev_priv(dev); int ret = -EOPNOTSUPP; - netif_info(tp, drv, tp->dev, "rss get rxnfc\n"); + //netif_info(tp, drv, tp->dev, "rss get rxnfc\n"); if (!(dev->features & NETIF_F_RXHASH)) return ret; @@ -153,7 +153,7 @@ static int rtl8125_set_rss_hash_opt(struct rtl8125_private *tp, { u32 rss_flags = tp->rss_flags; - netif_info(tp, drv, tp->dev, "rss set hash\n"); + //netif_info(tp, drv, tp->dev, "rss set hash\n"); /* * RSS does not support anything other than hashing @@ -261,7 +261,7 @@ int rtl8125_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd) struct rtl8125_private *tp = netdev_priv(dev); int ret = -EOPNOTSUPP; - netif_info(tp, drv, tp->dev, "rss set rxnfc\n"); + //netif_info(tp, drv, tp->dev, "rss set rxnfc\n"); if (!(dev->features & NETIF_F_RXHASH)) return ret; @@ -286,7 +286,7 @@ u32 rtl8125_get_rxfh_key_size(struct net_device *dev) { struct rtl8125_private *tp = netdev_priv(dev); - netif_info(tp, drv, tp->dev, "rss get key size\n"); + //netif_info(tp, drv, tp->dev, "rss get key size\n"); if (!(dev->features & NETIF_F_RXHASH)) return 0; @@ -298,7 +298,7 @@ u32 rtl8125_rss_indir_size(struct net_device *dev) { struct rtl8125_private *tp = netdev_priv(dev); - netif_info(tp, drv, tp->dev, "rss get indir tbl size\n"); + //netif_info(tp, drv, tp->dev, "rss get indir tbl size\n"); if (!(dev->features & NETIF_F_RXHASH)) return 0; @@ -319,7 +319,7 @@ int rtl8125_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, { struct rtl8125_private *tp = netdev_priv(dev); - netif_info(tp, drv, tp->dev, "rss get rxfh\n"); + //netif_info(tp, drv, tp->dev, "rss get rxfh\n"); if (!(dev->features & NETIF_F_RXHASH)) return -EOPNOTSUPP; @@ -383,7 +383,7 @@ int rtl8125_set_rxfh(struct net_device *dev, const u32 *indir, int i; u32 reta_entries = rtl8125_rss_indir_tbl_entries(tp); - netif_info(tp, drv, tp->dev, "rss set rxfh\n"); + //netif_info(tp, drv, tp->dev, "rss set rxfh\n"); /* We require at least one supported parameter to be changed and no * change in any of the unsupported parameters