From 3fe253c6abc2ccc02ea789cffc47761b2381c6ca Mon Sep 17 00:00:00 2001 From: Marty Jones Date: Sat, 10 Jul 2021 04:00:30 -0400 Subject: [PATCH] linux-firmware: add new package r8152-firmware Linux upstream commit https://github.com/torvalds/linux/commit/9370f2d05a2a150b0aa719a3070b26d478180df3 add load firmware file through request_firmware,this affect the nanopi r2s and some USB adapters in kernel 5.10 with this error: 'r8152 4-1:1.0: unable to load firmware patch rtl_nic/rtl8153b-2.fw' This patch split the USB NIC firmware files from r8169 firmware, and adds r8152-firmware to r8152 driver. Add kmod-usb-net-cdc-ncm to support RTL8156A and RTL8156B 2.5G ethernet adapters supported since v5.13-rc1. https://github.com/torvalds/linux/commit/195aae321c829dd1945900d75561e6aa79cce208 Signed-off-by: Marty Jones --- package/firmware/linux-firmware/realtek.mk | 15 ++++++++++++++- package/kernel/linux/modules/usb.mk | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/package/firmware/linux-firmware/realtek.mk b/package/firmware/linux-firmware/realtek.mk index 081cc1b37c1..c883e8ba597 100644 --- a/package/firmware/linux-firmware/realtek.mk +++ b/package/firmware/linux-firmware/realtek.mk @@ -1,8 +1,21 @@ +Package/r8152-firmware = $(call Package/firmware-default,RealTek RTL8152 firmware) +define Package/r8152-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/rtl_nic + $(CP) \ + $(PKG_BUILD_DIR)/rtl_nic/rtl8153* \ + $(PKG_BUILD_DIR)/rtl_nic/rtl8156* \ + $(1)/lib/firmware/rtl_nic +endef +$(eval $(call BuildPackage,r8152-firmware)) + Package/r8169-firmware = $(call Package/firmware-default,RealTek RTL8169 firmware) define Package/r8169-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/rtl_nic $(CP) \ - $(PKG_BUILD_DIR)/rtl_nic/* \ + $(PKG_BUILD_DIR)/rtl_nic/rtl810* \ + $(PKG_BUILD_DIR)/rtl_nic/rtl8125* \ + $(PKG_BUILD_DIR)/rtl_nic/rtl8168* \ + $(PKG_BUILD_DIR)/rtl_nic/rtl84* \ $(1)/lib/firmware/rtl_nic endef $(eval $(call BuildPackage,r8169-firmware)) diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index ce7c57bf739..8815b153ef5 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -1356,6 +1356,7 @@ $(eval $(call KernelPackage,usb-net-rtl8150)) define KernelPackage/usb-net-rtl8152 TITLE:=Kernel module for USB-to-Ethernet Realtek convertors + DEPENDS:=+r8152-firmware +kmod-crypto-sha256 +kmod-usb-net-cdc-ncm KCONFIG:=CONFIG_USB_RTL8152 FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/r8152.ko AUTOLOAD:=$(call AutoProbe,r8152) -- 2.30.2