diff --git a/package/kernel/r8101/Makefile b/package/kernel/r8101/Makefile new file mode 100644 index 000000000..ad1015d70 --- /dev/null +++ b/package/kernel/r8101/Makefile @@ -0,0 +1,33 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=r8101 +PKG_VERSION:=1.039.00 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://github.com/openwrt/rtl8101/releases/download/$(PKG_VERSION) +PKG_HASH:=e64e1738e71d6717dd844bf771fea4691edae63e92d7d03bb5ad2ef08e56e72b + +PKG_BUILD_PARALLEL:=1 +PKG_LICENSE:=GPLv2 +PKG_MAINTAINER:=Alvaro Fernandez Rojas + +include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/package.mk + +define KernelPackage/r8101 + SUBMENU:=Network Devices + TITLE:=Realtek RTL8101 PCI Fast Ethernet driver + DEPENDS:=@PCI_SUPPORT +kmod-libphy + FILES:=$(PKG_BUILD_DIR)/src/r8101.ko + AUTOLOAD:=$(call AutoProbe,r8101) + PROVIDES:=kmod-r8169 +endef + +define Build/Compile + +$(KERNEL_MAKE) $(PKG_JOBS) \ + M="$(PKG_BUILD_DIR)/src" \ + modules +endef + +$(eval $(call KernelPackage,r8101)) diff --git a/package/kernel/r8101/patches/200-r8101-print-link-speed-and-duplex-mode.patch b/package/kernel/r8101/patches/200-r8101-print-link-speed-and-duplex-mode.patch new file mode 100644 index 000000000..e112d1416 --- /dev/null +++ b/package/kernel/r8101/patches/200-r8101-print-link-speed-and-duplex-mode.patch @@ -0,0 +1,100 @@ +From ec0de750e20073b23c91b67f4bc3ab71c50f0eed Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= +Date: Sat, 17 Aug 2024 21:19:54 +0200 +Subject: [PATCH] r8101: print link speed and duplex mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Like other Ethernet drivers, print link speed and duplex mode +when the interface is up. Formatting output at the same time. + +Signed-off-by: Álvaro Fernández Rojas +--- + src/r8101.h | 2 ++ + src/r8101_n.c | 42 +++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 41 insertions(+), 3 deletions(-) + +--- a/src/r8101.h ++++ b/src/r8101.h +@@ -1162,6 +1162,8 @@ enum RTL8101_register_content { + LinkStatus = 0x02, + FullDup = 0x01, + ++#define RTL8101_FULL_DUPLEX_MASK (FullDup) ++ + /* ResetCounterCommand */ + CounterReset = 0x1, + /* DumpCounterCommand */ +--- a/src/r8101_n.c ++++ b/src/r8101_n.c +@@ -39,6 +39,7 @@ This driver is modified from r8169.c in + #include + #include + #include ++#include + #include + #include + #include +@@ -2838,6 +2839,34 @@ rtl8101_issue_offset_99_event(struct rtl + } + } + ++static unsigned int rtl8101_phy_duplex(u8 status) ++{ ++ unsigned int duplex = DUPLEX_UNKNOWN; ++ ++ if (status & LinkStatus) { ++ if (status & RTL8101_FULL_DUPLEX_MASK) ++ duplex = DUPLEX_FULL; ++ else ++ duplex = DUPLEX_HALF; ++ } ++ ++ return duplex; ++} ++ ++static int rtl8101_phy_speed(u8 status) ++{ ++ int speed = SPEED_UNKNOWN; ++ ++ if (status & LinkStatus) { ++ if (status & _100bps) ++ speed = SPEED_100; ++ else if (status & _10bps) ++ speed = SPEED_10; ++ } ++ ++ return speed; ++} ++ + static void + rtl8101_check_link_status(struct net_device *dev) + { +@@ -2913,8 +2942,15 @@ rtl8101_check_link_status(struct net_dev + tp->phy_reg_aner = rtl8101_mdio_read(tp, MII_EXPANSION); + tp->phy_reg_anlpar = rtl8101_mdio_read(tp, MII_LPA); + +- if (netif_msg_ifup(tp)) +- printk(KERN_INFO PFX "%s: link up\n", dev->name); ++ if (netif_msg_ifup(tp)) { ++ const u8 phy_status = RTL_R8(tp, PHYstatus); ++ const unsigned int phy_duplex = rtl8101_phy_duplex(phy_status); ++ const int phy_speed = rtl8101_phy_speed(phy_status); ++ printk(KERN_INFO PFX "%s: Link is Up - %s/%s\n", ++ dev->name, ++ phy_speed_to_str(phy_speed), ++ phy_duplex_to_str(phy_duplex)); ++ } + } else { + if (tp->mcfg == CFG_METHOD_11 || tp->mcfg == CFG_METHOD_12 || + tp->mcfg == CFG_METHOD_13) { +@@ -2925,7 +2961,7 @@ rtl8101_check_link_status(struct net_dev + rtl8101_mdio_write(tp, 0x1F, 0x0000); + } + if (netif_msg_ifdown(tp)) +- printk(KERN_INFO PFX "%s: link down\n", dev->name); ++ printk(KERN_INFO PFX "%s: Link is Down\n", dev->name); + + tp->phy_reg_aner = 0; + tp->phy_reg_anlpar = 0; diff --git a/package/lean/r8101/Makefile b/package/lean/r8101/Makefile deleted file mode 100644 index 232ad16f0..000000000 --- a/package/lean/r8101/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Download realtek r8101 linux driver from official site: -# [https://www.realtek.com/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software] -# - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=r8101 -PKG_VERSION:=1.038.02 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/sbwml/package_kernel_r8101 -PKG_SOURCE_VERSION:=5dea36329c0524490c093991801973fc48d92a8b -PKG_MIRROR_HASH:=f4182719b25cd177023dddd6f0f555597c8e340fa38127566681d10be885dd9a - -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk - -define KernelPackage/r8101 - TITLE:=Driver for Realtek r8101 chipsets - SUBMENU:=Network Devices - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) - DEPENDS:=@PCI_SUPPORT - FILES:= $(PKG_BUILD_DIR)/src/r8101.ko - AUTOLOAD:=$(call AutoProbe,r8101) -endef - -define Package/r8101/description - This package contains a driver for Realtek r8101 chipsets. -endef - -define Build/Compile - +$(KERNEL_MAKE) M=$(PKG_BUILD_DIR)/src modules -endef - -$(eval $(call KernelPackage,r8101)) diff --git a/package/lean/r8101/patches/010-6.1-support.patch b/package/lean/r8101/patches/010-6.1-support.patch deleted file mode 100644 index 489d2ebed..000000000 --- a/package/lean/r8101/patches/010-6.1-support.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/r8101.h ---- b/src/r8101.h -@@ -492,7 +492,11 @@ - typedef struct napi_struct *napi_ptr; - typedef int napi_budget; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) -+#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add_weight(ndev, &priv->napi, function, weight) -+#else - #define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add(ndev, &priv->napi, function, weight) -+#endif - #define RTL_NAPI_QUOTA(budget, ndev) min(budget, budget) - #define RTL_GET_PRIV(stuct_ptr, priv_struct) container_of(stuct_ptr, priv_struct, stuct_ptr) - #define RTL_GET_NETDEV(priv_ptr) struct net_device *dev = priv_ptr->dev;