Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2025-02-27 21:50:23 +08:00
commit 1aea98f3c8
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
13 changed files with 56 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package/kernel/linux/modules/bluetooth.mk
View File

@ -60,7 +60,7 @@ $(eval $(call KernelPackage,hci-uart))
define KernelPackage/btusb define KernelPackage/btusb
SUBMENU:=$(BLUETOOTH_MENU) SUBMENU:=$(BLUETOOTH_MENU)
TITLE:=Bluetooth HCI USB support TITLE:=Bluetooth HCI USB support
DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-bluetooth +kmod-btbcm DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-bluetooth +kmod-btbcm +kmod-btmtk
KCONFIG:= \ KCONFIG:= \
CONFIG_BT_HCIBTUSB \ CONFIG_BT_HCIBTUSB \
CONFIG_BT_HCIBTUSB_BCM=y \ CONFIG_BT_HCIBTUSB_BCM=y \
@ -69,8 +69,7 @@ define KernelPackage/btusb
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/bluetooth/btusb.ko \ $(LINUX_DIR)/drivers/bluetooth/btusb.ko \
$(LINUX_DIR)/drivers/bluetooth/btintel.ko \ $(LINUX_DIR)/drivers/bluetooth/btintel.ko \
$(LINUX_DIR)/drivers/bluetooth/btrtl.ko \ $(LINUX_DIR)/drivers/bluetooth/btrtl.ko
$(LINUX_DIR)/drivers/bluetooth/btmtk.ko
AUTOLOAD:=$(call AutoProbe,btusb) AUTOLOAD:=$(call AutoProbe,btusb)
endef endef
@ -93,6 +92,18 @@ endef
$(eval $(call KernelPackage,btbcm)) $(eval $(call KernelPackage,btbcm))
define KernelPackage/btmtk
SUBMENU:=$(BLUETOOTH_MENU)
TITLE:=MTK Bluetooth support
HIDDEN:=1
DEPENDS:=+kmod-bluetooth
KCONFIG:=CONFIG_BT_MTK
FILES:=$(LINUX_DIR)/drivers/bluetooth/btmtk.ko
endef
$(eval $(call KernelPackage,btmtk))
define KernelPackage/ath3k define KernelPackage/ath3k
SUBMENU:=$(BLUETOOTH_MENU) SUBMENU:=$(BLUETOOTH_MENU)
TITLE:=ATH3K Kernel Module support TITLE:=ATH3K Kernel Module support

4
package/kernel/r8125/Makefile
View File

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=r8125 PKG_NAME:=r8125
PKG_VERSION:=9.014.01 PKG_VERSION:=9.015.00
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://github.com/openwrt/rtl8125/releases/download/$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/openwrt/rtl8125/releases/download/$(PKG_VERSION)
PKG_HASH:=f006aa95501738ca55c522812c9d1b473ac781675f3ad88ce341a09316b8aa13 PKG_HASH:=7d6906336c3ad960c3e7c0299ad655659d7110bdc933c5b568b7f2536cb8ffc3
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPLv2 PKG_LICENSE:=GPLv2

15
package/kernel/r8125/patches/110-r8125-print-link-speed-and-duplex-mode.patch
View File

@ -18,11 +18,12 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
--- a/src/r8125.h --- a/src/r8125.h
+++ b/src/r8125.h +++ b/src/r8125.h
@@ -1672,6 +1672,8 @@ enum RTL8125_register_content { @@ -1687,6 +1687,9 @@ enum RTL8125_register_content {
LinkStatus = 0x02, LinkStatus = 0x02,
FullDup = 0x01, FullDup = 0x01,
+#define RTL8125_FULL_DUPLEX_MASK (_2500bpsF | _1000bpsF | FullDup) +#define RTL8125_FULL_DUPLEX_MASK (_2500bpsF | _1000bpsF | FullDup)
+#define RTL8125_SPEED_1000_MASK (_1000bpsF | _1000bpsL | _2500bpsL)
+ +
/* DBG_reg */ /* DBG_reg */
Fix_Nak_1 = (1 << 4), Fix_Nak_1 = (1 << 4),
@ -37,11 +38,11 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/delay.h> #include <linux/delay.h>
@@ -5116,6 +5117,38 @@ rtl8125_link_down_patch(struct net_devic @@ -5023,6 +5024,38 @@ rtl8125_link_down_patch(struct net_devic
#endif #endif
} }
+static unsigned int rtl8125_phy_duplex(u16 status) +static unsigned int rtl8125_phy_duplex(u32 status)
+{ +{
+ unsigned int duplex = DUPLEX_UNKNOWN; + unsigned int duplex = DUPLEX_UNKNOWN;
+ +
@ -55,14 +56,14 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+ return duplex; + return duplex;
+} +}
+ +
+static int rtl8125_phy_speed(u16 status) +static int rtl8125_phy_speed(u32 status)
+{ +{
+ int speed = SPEED_UNKNOWN; + int speed = SPEED_UNKNOWN;
+ +
+ if (status & LinkStatus) { + if (status & LinkStatus) {
+ if (status & _2500bpsF) + if (status & _2500bpsF)
+ speed = SPEED_2500; + speed = SPEED_2500;
+ else if (status & _1000bpsF) + else if (status & RTL8125_SPEED_1000_MASK)
+ speed = SPEED_1000; + speed = SPEED_1000;
+ else if (status & _100bps) + else if (status & _100bps)
+ speed = SPEED_100; + speed = SPEED_100;
@ -76,14 +77,14 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
static void static void
_rtl8125_check_link_status(struct net_device *dev, unsigned int link_state) _rtl8125_check_link_status(struct net_device *dev, unsigned int link_state)
{ {
@@ -5128,11 +5161,18 @@ _rtl8125_check_link_status(struct net_de @@ -5035,11 +5068,18 @@ _rtl8125_check_link_status(struct net_de
if (link_state == R8125_LINK_STATE_ON) { if (link_state == R8125_LINK_STATE_ON) {
rtl8125_link_on_patch(dev); rtl8125_link_on_patch(dev);
- if (netif_msg_ifup(tp)) - if (netif_msg_ifup(tp))
- printk(KERN_INFO PFX "%s: link up\n", dev->name); - printk(KERN_INFO PFX "%s: link up\n", dev->name);
+ if (netif_msg_ifup(tp)) { + if (netif_msg_ifup(tp)) {
+ const u16 phy_status = RTL_R16(tp, PHYstatus); + const u32 phy_status = RTL_R32(tp, PHYstatus);
+ const unsigned int phy_duplex = rtl8125_phy_duplex(phy_status); + const unsigned int phy_duplex = rtl8125_phy_duplex(phy_status);
+ const int phy_speed = rtl8125_phy_speed(phy_status); + const int phy_speed = rtl8125_phy_speed(phy_status);
+ printk(KERN_INFO PFX "%s: Link is Up - %s/%s\n", + printk(KERN_INFO PFX "%s: Link is Up - %s/%s\n",

4
package/kernel/r8125/patches/120-add-LED-configuration-from-OF.patch
View File

@ -8,7 +8,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
@@ -14755,6 +14756,25 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri @@ -14221,6 +14222,25 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri
tp->imr_reg[i] = (u16)(IMR1_8125 + (i - 1) * 4); tp->imr_reg[i] = (u16)(IMR1_8125 + (i - 1) * 4);
} }
@ -34,7 +34,7 @@
static void static void
rtl8125_init_software_variable(struct net_device *dev) rtl8125_init_software_variable(struct net_device *dev)
{ {
@@ -15358,6 +15378,8 @@ rtl8125_init_software_variable(struct ne @@ -14677,6 +14697,8 @@ rtl8125_init_software_variable(struct ne
else if (tp->InitRxDescType == RX_DESC_RING_TYPE_4) else if (tp->InitRxDescType == RX_DESC_RING_TYPE_4)
tp->rtl8125_rx_config &= ~EnableRxDescV4_1; tp->rtl8125_rx_config &= ~EnableRxDescV4_1;

4
package/kernel/r8125/patches/130-add-devname-configuration-from-OF.patch
View File

@ -1,6 +1,6 @@
--- a/src/r8125_n.c --- a/src/r8125_n.c
+++ b/src/r8125_n.c +++ b/src/r8125_n.c
@@ -16423,6 +16423,7 @@ rtl8125_init_board(struct pci_dev *pdev, @@ -15723,6 +15723,7 @@ rtl8125_init_board(struct pci_dev *pdev,
void __iomem *ioaddr; void __iomem *ioaddr;
struct net_device *dev; struct net_device *dev;
struct rtl8125_private *tp; struct rtl8125_private *tp;
@ -8,7 +8,7 @@
int rc = -ENOMEM, i, pm_cap; int rc = -ENOMEM, i, pm_cap;
assert(ioaddr_out != NULL); assert(ioaddr_out != NULL);
@@ -16437,6 +16438,9 @@ rtl8125_init_board(struct pci_dev *pdev, @@ -15737,6 +15738,9 @@ rtl8125_init_board(struct pci_dev *pdev,
goto err_out; goto err_out;
} }

4
package/kernel/r8126/Makefile
View File

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=r8126 PKG_NAME:=r8126
PKG_VERSION:=10.014.01 PKG_VERSION:=10.015.00
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://github.com/openwrt/rtl8126/releases/download/$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/openwrt/rtl8126/releases/download/$(PKG_VERSION)
PKG_HASH:=dbb10a7abd0972e4abd1b89ea4eb22fc55d6c1dc2f711b5acf4a3bc376275e21 PKG_HASH:=fac513aa925264a95b053e7532fcda56022d29db288f6625fafee2759a8a6124
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPLv2 PKG_LICENSE:=GPLv2

18
package/kernel/r8126/patches/110-r8126-print-link-speed-and-duplex-mode.patch
View File

@ -18,11 +18,13 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
--- a/src/r8126.h --- a/src/r8126.h
+++ b/src/r8126.h +++ b/src/r8126.h
@@ -1740,6 +1740,8 @@ enum RTL8126_register_content { @@ -1756,6 +1756,10 @@ enum RTL8126_register_content {
LinkStatus = 0x02, LinkStatus = 0x02,
FullDup = 0x01, FullDup = 0x01,
+#define RTL8126_FULL_DUPLEX_MASK (_5000bpsF | _2500bpsF | _1000bpsF | FullDup) +#define RTL8126_FULL_DUPLEX_MASK (_5000bpsF | _2500bpsF | _1000bpsF | FullDup)
+#define RTL8126_SPEED_1000_MASK (_1000bpsF | _1000bpsL | _2500bpsL)
+#define RTL8126_SPEED_2500_MASK (_2500bpsF | _5000bpsL)
+ +
/* DBG_reg */ /* DBG_reg */
Fix_Nak_1 = (1 << 4), Fix_Nak_1 = (1 << 4),
@ -37,11 +39,11 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/delay.h> #include <linux/delay.h>
@@ -4744,6 +4745,40 @@ rtl8126_link_down_patch(struct net_devic @@ -4661,6 +4662,40 @@ rtl8126_link_down_patch(struct net_devic
#endif #endif
} }
+static unsigned int rtl8126_phy_duplex(u16 status) +static unsigned int rtl8126_phy_duplex(u32 status)
+{ +{
+ unsigned int duplex = DUPLEX_UNKNOWN; + unsigned int duplex = DUPLEX_UNKNOWN;
+ +
@ -55,16 +57,16 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+ return duplex; + return duplex;
+} +}
+ +
+static int rtl8126_phy_speed(u16 status) +static int rtl8126_phy_speed(u32 status)
+{ +{
+ int speed = SPEED_UNKNOWN; + int speed = SPEED_UNKNOWN;
+ +
+ if (status & LinkStatus) { + if (status & LinkStatus) {
+ if (status & _5000bpsF) + if (status & _5000bpsF)
+ speed = SPEED_5000; + speed = SPEED_5000;
+ else if (status & _2500bpsF) + else if (status & RTL8126_SPEED_2500_MASK)
+ speed = SPEED_2500; + speed = SPEED_2500;
+ else if (status & _1000bpsF) + else if (status & RTL8126_SPEED_1000_MASK)
+ speed = SPEED_1000; + speed = SPEED_1000;
+ else if (status & _100bps) + else if (status & _100bps)
+ speed = SPEED_100; + speed = SPEED_100;
@ -78,14 +80,14 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
static void static void
_rtl8126_check_link_status(struct net_device *dev, unsigned int link_state) _rtl8126_check_link_status(struct net_device *dev, unsigned int link_state)
{ {
@@ -4756,11 +4791,18 @@ _rtl8126_check_link_status(struct net_de @@ -4673,11 +4708,18 @@ _rtl8126_check_link_status(struct net_de
if (link_state == R8126_LINK_STATE_ON) { if (link_state == R8126_LINK_STATE_ON) {
rtl8126_link_on_patch(dev); rtl8126_link_on_patch(dev);
- if (netif_msg_ifup(tp)) - if (netif_msg_ifup(tp))
- printk(KERN_INFO PFX "%s: link up\n", dev->name); - printk(KERN_INFO PFX "%s: link up\n", dev->name);
+ if (netif_msg_ifup(tp)) { + if (netif_msg_ifup(tp)) {
+ const u16 phy_status = RTL_R16(tp, PHYstatus); + const u32 phy_status = RTL_R32(tp, PHYstatus);
+ const unsigned int phy_duplex = rtl8126_phy_duplex(phy_status); + const unsigned int phy_duplex = rtl8126_phy_duplex(phy_status);
+ const int phy_speed = rtl8126_phy_speed(phy_status); + const int phy_speed = rtl8126_phy_speed(phy_status);
+ printk(KERN_INFO PFX "%s: Link is Up - %s/%s\n", + printk(KERN_INFO PFX "%s: Link is Up - %s/%s\n",

4
package/kernel/r8126/patches/120-add-LED-configuration-from-OF.patch
View File

@ -8,7 +8,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
@@ -12282,6 +12283,25 @@ rtl8126_setup_mqs_reg(struct rtl8126_pri @@ -11910,6 +11911,25 @@ rtl8126_setup_mqs_reg(struct rtl8126_pri
tp->imr_reg[i] = (u16)(IMR1_8125 + (i - 1) * 4); tp->imr_reg[i] = (u16)(IMR1_8125 + (i - 1) * 4);
} }
@ -34,7 +34,7 @@
static void static void
rtl8126_init_software_variable(struct net_device *dev) rtl8126_init_software_variable(struct net_device *dev)
{ {
@@ -12688,6 +12708,8 @@ rtl8126_init_software_variable(struct ne @@ -12188,6 +12208,8 @@ rtl8126_init_software_variable(struct ne
else if (tp->InitRxDescType == RX_DESC_RING_TYPE_4) else if (tp->InitRxDescType == RX_DESC_RING_TYPE_4)
tp->rtl8126_rx_config &= ~EnableRxDescV4_1; tp->rtl8126_rx_config &= ~EnableRxDescV4_1;

4
package/kernel/r8126/patches/130-add-devname-configuration-from-OF.patch
View File

@ -1,6 +1,6 @@
--- a/src/r8126_n.c --- a/src/r8126_n.c
+++ b/src/r8126_n.c +++ b/src/r8126_n.c
@@ -13740,6 +13740,7 @@ rtl8126_init_board(struct pci_dev *pdev, @@ -13226,6 +13226,7 @@ rtl8126_init_board(struct pci_dev *pdev,
void __iomem *ioaddr; void __iomem *ioaddr;
struct net_device *dev; struct net_device *dev;
struct rtl8126_private *tp; struct rtl8126_private *tp;
@ -8,7 +8,7 @@
int rc = -ENOMEM, i, pm_cap; int rc = -ENOMEM, i, pm_cap;
assert(ioaddr_out != NULL); assert(ioaddr_out != NULL);
@@ -13754,6 +13755,9 @@ rtl8126_init_board(struct pci_dev *pdev, @@ -13240,6 +13241,9 @@ rtl8126_init_board(struct pci_dev *pdev,
goto err_out; goto err_out;
} }

4
package/kernel/r8168/patches/120-r8168-add-LED-configuration-from-OF.patch
View File

@ -8,7 +8,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
@@ -26097,6 +26098,22 @@ rtl8168_setup_mqs_reg(struct rtl8168_pri @@ -26135,6 +26136,22 @@ rtl8168_setup_mqs_reg(struct rtl8168_pri
tp->imr_reg[3] = IntrMask3; tp->imr_reg[3] = IntrMask3;
} }
@ -31,7 +31,7 @@
static void static void
rtl8168_init_software_variable(struct net_device *dev) rtl8168_init_software_variable(struct net_device *dev)
{ {
@@ -26792,6 +26809,8 @@ err1: @@ -26852,6 +26869,8 @@ err1:
if (tp->InitRxDescType == RX_DESC_RING_TYPE_2) if (tp->InitRxDescType == RX_DESC_RING_TYPE_2)
tp->RxDescLength = RX_DESC_LEN_TYPE_2; tp->RxDescLength = RX_DESC_LEN_TYPE_2;

6
package/libs/libpcap/Makefile
View File

@ -22,7 +22,11 @@ PKG_CPE_ID:=cpe:/a:tcpdump:libpcap
PKG_ASLR_PIE_REGULAR:=1 PKG_ASLR_PIE_REGULAR:=1
PKG_CONFIG_DEPENDS := CONFIG_PACKAGE_rpcapd PKG_CONFIG_DEPENDS := \
CONFIG_PACKAGE_rpcapd \
CONFIG_PCAP_HAS_USB \
CONFIG_PCAP_HAS_BT \
CONFIG_PCAP_HAS_NETFILTER
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk

8
package/network/services/omcproxy/Makefile
View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=omcproxy PKG_NAME:=omcproxy
PKG_RELEASE:=9 PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/omcproxy.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/omcproxy.git
PKG_MIRROR_HASH:=61f03d76b14149e417360b6aaa630e920b75a31a6a497353b7160b3a374b20b2 PKG_MIRROR_HASH:=b18c6dcc323dc35cfeb3503562dd3d8b9fb27fcf6ddd98690a64bd709920ff3d
PKG_SOURCE_DATE:=2021-11-04 PKG_SOURCE_DATE:=2025-02-27
PKG_SOURCE_VERSION:=bfba2aa75802ff1a70ef2fd3eba53409a8c6e93a PKG_SOURCE_VERSION:=582cd8d3ae7e6af0073ce1d9198387af48affd60
PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org> PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0

2
target/linux/mediatek/modules.mk
View File

@ -18,7 +18,7 @@ $(eval $(call KernelPackage,ata-ahci-mtk))
define KernelPackage/btmtkuart define KernelPackage/btmtkuart
SUBMENU:=Other modules SUBMENU:=Other modules
TITLE:=MediaTek HCI UART driver TITLE:=MediaTek HCI UART driver
DEPENDS:=@TARGET_mediatek_mt7622 +kmod-bluetooth +mt7622bt-firmware DEPENDS:=@TARGET_mediatek_mt7622 +kmod-bluetooth +kmod-btmtk +mt7622bt-firmware
KCONFIG:=CONFIG_BT_MTKUART KCONFIG:=CONFIG_BT_MTKUART
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/bluetooth/btmtkuart.ko $(LINUX_DIR)/drivers/bluetooth/btmtkuart.ko